X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/260666c017cbf4674b14891277647f19416bc868..dbb5999c796f2b35ab4e30c5295045081de894c0:/po/zh_CN.po diff --git a/po/zh_CN.po b/po/zh_CN.po index 204f78276..fd85230d7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,12 +2,12 @@ # This file is put in the public domain. # Tchaikov , 2005,2007. # Carlos Z.F. Liu , 2004,2006 -# +# msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-09 01:22+1000\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-03-29 17:14+0800\n" "Last-Translator: Kov Chai \n" "Language-Team: Debian Chinese [GB] \n" @@ -158,9 +158,9 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#, c-format -msgid "%s %s for %s %s compiled on %s %s\n" +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s %s ,编译于 %s %s\n" #: cmdline/apt-cache.cc:1721 @@ -455,7 +455,7 @@ msgid "Unable to open DB file %s: %s" msgstr "无法打开 DB 文件 %s:%s" #: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 -#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "无法读取 %s 的状态" @@ -468,97 +468,97 @@ msgstr "存档没有包含控制字段" msgid "Unable to get a cursor" msgstr "无法获得游标(cursor)" -#: ftparchive/writer.cc:75 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告:无法读取目录 %s\n" -#: ftparchive/writer.cc:80 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告:无法对 %s 进行统计\n" -#: ftparchive/writer.cc:131 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "错误:" -#: ftparchive/writer.cc:133 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "警告:" -#: ftparchive/writer.cc:140 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "错误:处理文件时出错 " -#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "无法解析路径 %s" -#: ftparchive/writer.cc:169 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "无法遍历目录树" -#: ftparchive/writer.cc:194 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "无法打开 %s" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:261 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "无法读取符号链接 %s" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "无法 unlink %s" -#: ftparchive/writer.cc:272 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 无法将 %s 链接到 %s" -#: ftparchive/writer.cc:282 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "存档没有包含软件包(package)字段" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" -#: ftparchive/writer.cc:619 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s 没有源代码的 override 项\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 中没有二进制文件的 override 项\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "内部错误,无法定位包内文件 %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - 无法再分配内存" @@ -587,140 +587,140 @@ msgstr "override 文件 %s 第 %lu 行的格式有误 #3" msgid "Failed to read the override file %s" msgstr "无法读取 override 文件 %s" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的压缩算法“%s”" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合" -#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: ftparchive/multicompress.cc:194 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "无法创建 FILE*" -#: ftparchive/multicompress.cc:197 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "无法 fork" -#: ftparchive/multicompress.cc:211 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "压缩子进程" -#: ftparchive/multicompress.cc:234 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "内部错误,无法建立 %s" -#: ftparchive/multicompress.cc:285 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "无法建立子进程的 IPC 管道" -#: ftparchive/multicompress.cc:320 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "无法执行压缩程序" -#: ftparchive/multicompress.cc:359 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "解压程序" -#: ftparchive/multicompress.cc:402 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "无法对子进程或文件进行读写" -#: ftparchive/multicompress.cc:454 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "在计算 MD5 校验和时,无法读取数据" -#: ftparchive/multicompress.cc:471 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "在 unlink %s 时出错" -#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" -#: cmdline/apt-get.cc:121 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" -#: cmdline/apt-get.cc:238 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "下列的软件包有不能满足的依赖关系:" -#: cmdline/apt-get.cc:328 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装了" -#: cmdline/apt-get.cc:330 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: cmdline/apt-get.cc:337 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "但却无法安装它" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "但是它只是个虚拟软件包" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: cmdline/apt-get.cc:347 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " 或" -#: cmdline/apt-get.cc:376 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装:" -#: cmdline/apt-get.cc:402 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "下列的软件包的版本将保持不变:" -#: cmdline/apt-get.cc:445 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "下列的软件包将被升级:" -#: cmdline/apt-get.cc:466 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】:" -#: cmdline/apt-get.cc:486 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变:" -#: cmdline/apt-get.cc:539 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: cmdline/apt-get.cc:547 +#: cmdline/apt-get.cc:550 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -728,143 +728,143 @@ msgstr "" "【警告】:下列的重要软件包将被卸载 \n" "请勿尝试,除非您确实知道您在做什么!" -#: cmdline/apt-get.cc:578 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "共升级了 %lu 个软件包,新安装了 %lu 个软件包," -#: cmdline/apt-get.cc:582 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "共重新安装了 %lu 个软件包," -#: cmdline/apt-get.cc:584 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包," -#: cmdline/apt-get.cc:586 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包,有 %lu 个软件未被升级。\n" -#: cmdline/apt-get.cc:590 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " 失败。" -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "无法最小化要升级的软件包集合" -#: cmdline/apt-get.cc:675 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" -#: cmdline/apt-get.cc:704 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】:下列的软件包不能通过验证!" -#: cmdline/apt-get.cc:708 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" -#: cmdline/apt-get.cc:715 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "不经验证就安装这些软件包么?[y/N] " -#: cmdline/apt-get.cc:717 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes" -#: cmdline/apt-get.cc:770 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。" -#: cmdline/apt-get.cc:790 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "内部错误,Ordering 未能完成" -#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "无法对下载目录加锁" -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "无法读取安装源列表。" -#: cmdline/apt-get.cc:831 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "怪了……文件大小不符,发信给 apt@packages.debian.org 吧" -#: cmdline/apt-get.cc:836 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" -#: cmdline/apt-get.cc:844 -#, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" -#: cmdline/apt-get.cc:847 -#, c-format -msgid "After unpacking %sB disk space will be freed.\n" +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的空余空间" -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 中没有足够的空余空间。" -#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了 Trivial Only,但这不是个日常(trivial)操作。" -#: cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -875,28 +875,28 @@ msgstr "" "若还想继续的话,就输入下面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "中止执行。" -#: cmdline/apt-get.cc:904 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗?[Y/n]" -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "有一些文件下载失败" -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "下载完毕,目前是“仅下载”模式" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -904,47 +904,47 @@ msgstr "" "有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项" "再试试?" -#: cmdline/apt-get.cc:1005 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)" -#: cmdline/apt-get.cc:1010 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "放弃安装。" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意,我选了 %s 而非 %s\n" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n" -#: cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "软件包 %s 还未安装,因而不会被卸载\n" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包:\n" -#: cmdline/apt-get.cc:1096 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [已安装]" -#: cmdline/apt-get.cc:1101 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" -#: cmdline/apt-get.cc:1106 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -955,114 +955,107 @@ msgstr "" "这可能意味着这个缺失的软件包可能已被废弃,\n" "或者只能在其他发布源中找到\n" -#: cmdline/apt-get.cc:1125 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "可是下列的软件包取代了它:" -#: cmdline/apt-get.cc:1128 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "软件包 %s 还没有可供安装的候选者" -#: cmdline/apt-get.cc:1148 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s,因为无法下载它。\n" -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:1185 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”发布版本" -#: cmdline/apt-get.cc:1187 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: cmdline/apt-get.cc:1193 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "选定了版本为 %s (%s) 的 %s\n" -#: cmdline/apt-get.cc:1330 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr " update 命令是不需任何参数的" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" -#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。" - -#: cmdline/apt-get.cc:1433 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1465 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "下列【新】软件包将被安装:" -#: cmdline/apt-get.cc:1467 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1472 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "下列的信息可能会对解决问题有所帮助:" -#: cmdline/apt-get.cc:1479 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误,problem resolver 坏事了" -#: cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误,AllUpgrade 坏事了" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意,根据正则表达式“%2$s”选中了 %1$s\n" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format -msgid "%s set to manual installed.\n" +msgid "%s set to manually installed.\n" msgstr "但是 %s 正要被安装" -#: cmdline/apt-get.cc:1724 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:" -#: cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1070,7 +1063,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1739 +#: cmdline/apt-get.cc:1711 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" @@ -1081,7 +1074,7 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们还在新到(incoming)目录中。" -#: cmdline/apt-get.cc:1747 +#: cmdline/apt-get.cc:1719 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" @@ -1090,137 +1083,137 @@ msgstr "" "您仅要求对单一软件包进行操作,这极有可能是因为该软件包安装不上,同时,\n" "您最好提交一个针对这个软件包的故障报告。" -#: cmdline/apt-get.cc:1755 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "无法安装的软件包" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包:" -#: cmdline/apt-get.cc:1873 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "建议安装的软件包:" -#: cmdline/apt-get.cc:1874 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "推荐安装的软件包:" -#: cmdline/apt-get.cc:1902 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "正在筹划升级... " -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1910 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误,problem resolver 坏事了" -#: cmdline/apt-get.cc:2085 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码,必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2131 +#: cmdline/apt-get.cc:2103 #, c-format msgid "" -"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2136 +#: cmdline/apt-get.cc:2108 #, c-format msgid "" "Please use:\n" "bzr get %s\n" -"to modify the package.\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2194 +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" -#: cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:2226 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2291 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" -#: cmdline/apt-get.cc:2303 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2304 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2321 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2340 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps),必须指定至少一个软件包" -#: cmdline/apt-get.cc:2384 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" -#: cmdline/apt-get.cc:2404 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:2456 +#: cmdline/apt-get.cc:2430 #, 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:2508 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1229,30 +1222,30 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" -#: cmdline/apt-get.cc:2543 +#: cmdline/apt-get.cc:2519 #, 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:2568 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s" -#: cmdline/apt-get.cc:2582 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2586 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "被支持模块:" -#: cmdline/apt-get.cc:2659 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1268,6 +1261,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" autoremove - Remove all automatic unused packages\n" " purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" @@ -1556,9 +1550,9 @@ msgstr "用来覆盖的软件包不属于 %s 的任何版本" msgid "File %s/%s overwrites the one in the package %s" msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" @@ -1670,25 +1664,25 @@ msgstr "无法解析 MD5 码。文件内偏移量为 %lu" msgid "This is not a valid DEB archive, missing '%s' member" msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”" -#: apt-inst/deb/debfile.cc:48 -#, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +#: apt-inst/deb/debfile.cc:50 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”或者“%s”" -#: apt-inst/deb/debfile.cc:108 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "无法切换工作目录到 %s" -#: apt-inst/deb/debfile.cc:134 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "内部错误,无法定位包内文件" -#: apt-inst/deb/debfile.cc:167 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "无法在打包文件中找到有效的主控文件" -#: apt-inst/deb/debfile.cc:252 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "不能解析的主控文件" @@ -1722,13 +1716,12 @@ msgstr "找不到光盘。" msgid "File not found" msgstr "无法找到该文件" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 +#: methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -1789,7 +1782,7 @@ msgstr "连接超时" msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "读错误" @@ -1801,7 +1794,7 @@ msgstr "回应超出了缓存区大小。" msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "写文件出错" @@ -1944,33 +1937,33 @@ msgstr "不能连接上 %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "无法访问密匙:“%s”" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "错误:Acquire::gpgv::Options 的参数列表超长。结束运行。" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误:签名正确无误,但是无法确认密钥的指纹(key fingerprint)?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "无法运行\"%s\"以便验证签名(您安装了 gnupg 么?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "下列签名无效:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2047,23 +2040,23 @@ msgstr "从服务器读取数据时出错,对方关闭了连接" msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1110 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1127 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1218 +#: methods/http.cc:1230 msgid "Internal error" msgstr "内部错误" -#: apt-pkg/contrib/mmap.cc:78 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "无法 mmap 一个空文件" -#: apt-pkg/contrib/mmap.cc:83 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "无法 mmap %lu 字节的数据" @@ -2073,67 +2066,67 @@ msgstr "无法 mmap %lu 字节的数据" msgid "Selection %s not found" msgstr "没有发现您的所选 %s" -#: apt-pkg/contrib/configuration.cc:433 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "无法识别的类型缩写:“%c”" -#: apt-pkg/contrib/configuration.cc:491 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "正在打开配置文件 %s" -#: apt-pkg/contrib/configuration.cc:509 -#, c-format -msgid "Line %d too long (max %d)" +#: apt-pkg/contrib/configuration.cc:515 +#, fuzzy, c-format +msgid "Line %d too long (max %u)" msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。" -#: apt-pkg/contrib/configuration.cc:605 +#: apt-pkg/contrib/configuration.cc:611 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "语法错误 %s:%u:配置小节没有以名字开头" -#: apt-pkg/contrib/configuration.cc:624 +#: apt-pkg/contrib/configuration.cc:630 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "语法错误 %s:%u:标签格式有误" -#: apt-pkg/contrib/configuration.cc:641 +#: apt-pkg/contrib/configuration.cc:647 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据" -#: apt-pkg/contrib/configuration.cc:681 +#: apt-pkg/contrib/configuration.cc:687 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示" -#: apt-pkg/contrib/configuration.cc:688 +#: apt-pkg/contrib/configuration.cc:694 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "语法错误 %s:%u:太多的嵌套 include 命令" -#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 +#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "语法错误 %s:%u: Included from here" -#: apt-pkg/contrib/configuration.cc:701 +#: apt-pkg/contrib/configuration.cc:707 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "语法错误 %s:%u: 不支持的指令“%s”" -#: apt-pkg/contrib/configuration.cc:735 +#: apt-pkg/contrib/configuration.cc:741 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据" -#: apt-pkg/contrib/progress.cc:152 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 有错误!" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完成" @@ -2190,7 +2183,7 @@ msgid "Unable to stat the mount point %s" msgstr "无法读取文件系统挂载点 %s 的状态" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 -#: methods/mirror.cc:88 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "无法切换工作目录到 %s" @@ -2199,70 +2192,70 @@ msgstr "无法切换工作目录到 %s" msgid "Failed to stat the cdrom" msgstr "无法读取光盘的状态" -#: apt-pkg/contrib/fileutl.cc:80 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "由于文件系统为只读,因而无法使用文件锁%s" -#: apt-pkg/contrib/fileutl.cc:85 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" -#: apt-pkg/contrib/fileutl.cc:103 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:107 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" -#: apt-pkg/contrib/fileutl.cc:375 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出,但是它并不存在" -#: apt-pkg/contrib/fileutl.cc:385 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/fileutl.cc:388 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出了" -#: apt-pkg/contrib/fileutl.cc:434 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:490 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "读文件时出错,还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:520 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "写文件时出错,还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:595 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "关闭文件时出错" -#: apt-pkg/contrib/fileutl.cc:601 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "用 unlink 删除文件时出错" -#: apt-pkg/contrib/fileutl.cc:612 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "同步文件时出错" @@ -2339,29 +2332,29 @@ msgstr "可选" msgid "extra" msgstr "额外" -#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "正在分析软件包的依赖关系树" -#: apt-pkg/depcache.cc:101 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "候选版本" -#: apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "生成依赖关系" -#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 #, fuzzy msgid "Reading state information" msgstr "正在合并现有信息" -#: apt-pkg/depcache.cc:198 +#: apt-pkg/depcache.cc:219 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "无法打开 %s" -#: apt-pkg/depcache.cc:204 +#: apt-pkg/depcache.cc:225 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "无法写入文件 %s" @@ -2426,7 +2419,7 @@ msgstr "无法识别在安装源列表 %3$s 里,第 %2$u 行中的软件包类 msgid "Malformed line %u in source list %s (vendor id)" msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2448,7 +2441,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "软件包 %s 需要重新安装,但是我无法找到相应的安装文件。" -#: apt-pkg/algorithms.cc:1103 +#: apt-pkg/algorithms.cc:1105 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2456,12 +2449,19 @@ msgstr "" "错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的" "缘故。" -#: apt-pkg/algorithms.cc:1105 +#: apt-pkg/algorithms.cc:1107 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关" "系。" +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。" + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2494,17 +2494,17 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" -#: apt-pkg/acquire-worker.cc:381 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。" -#: apt-pkg/init.cc:126 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支持“%s”打包系统" -#: apt-pkg/init.cc:142 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" @@ -2517,11 +2517,11 @@ msgstr "无法读取 %s 的状态。" msgid "You must put some 'source' URIs in your sources.list" msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "无法解析或打开软件包的列表或是状态文件。" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "您可能需要运行 apt-get update 来解决这些问题" @@ -2554,7 +2554,7 @@ msgstr "处理 %s (UsePackage1)时出错" #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format -msgid "Error occured while processing %s (NewFileDesc1)" +msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "处理 %s (NewFileVer1)时出错" #: apt-pkg/pkgcachegen.cc:178 @@ -2584,7 +2584,7 @@ msgstr "处理 %s (NewVersion2)时出错" #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format -msgid "Error occured while processing %s (NewFileDesc2)" +msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "处理 %s (NewFileVer1)时出错" #: apt-pkg/pkgcachegen.cc:251 @@ -2637,16 +2637,20 @@ msgstr "无法写入来源缓存文件" msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件,%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 -#: apt-pkg/acquire-item.cc:1462 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:1156 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "MD5 校验和不符" + +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 key ID 没有可用的公钥:\n" -#: apt-pkg/acquire-item.cc:1270 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2655,7 +2659,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1329 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2663,13 +2667,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:1452 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "大小不符" @@ -2687,54 +2691,59 @@ msgstr "" "现把 %s 作为了 CD-ROM 的挂载点\n" "正在挂载 CD-ROM\n" -#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "正在鉴别.. " #: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "存档标签:%s \n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "正在卸载 CD-ROM 文件系统……" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" -#: apt-pkg/cdrom.cc:601 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "正在卸载 CD-ROM 文件系统\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "等待插入盘片……\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:613 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "正在挂载 CD-ROM 文件系统……\n" -#: apt-pkg/cdrom.cc:631 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "正在光盘中查找索引文件..\n" -#: apt-pkg/cdrom.cc:671 +#: apt-pkg/cdrom.cc:678 #, fuzzy, c-format msgid "" -"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"Found %u package indexes, %u source indexes, %u translation indexes and %u " "signatures\n" msgstr "找到了 %i 个软件包索引、%i 个源代码包索引,和 %i 个数字签名\n" -#: apt-pkg/cdrom.cc:708 +#: apt-pkg/cdrom.cc:715 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "存档标签:%s \n" -#: apt-pkg/cdrom.cc:737 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "这不是一个有效的名字,请再次命名。\n" -#: apt-pkg/cdrom.cc:753 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2743,93 +2752,110 @@ msgstr "" "这张光盘现在的名字是:\n" "“%s”\n" -#: apt-pkg/cdrom.cc:757 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "正在复制软件包列表……" -#: apt-pkg/cdrom.cc:783 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "正在写入新的软件包源列表\n" -#: apt-pkg/cdrom.cc:792 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "对应于该光盘的软件包源设置项是:\n" -#: apt-pkg/cdrom.cc:834 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "正在卸载 CD-ROM 文件系统……" - -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "已写入 %i 条记录。\n" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "已写入 %i 条记录,并有 %i 个文件不吻合\n" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不吻合\n" -#: apt-pkg/deb/dpkgpm.cc:357 +#: apt-pkg/deb/dpkgpm.cc:454 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "软件包列表的目录 %spartial 不见了。" + +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 +#, fuzzy, c-format +msgid "Processing triggers for %s" +msgstr "处理目录 %s 时出错" + +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "正在删除 %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:377 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" +#: apt-pkg/deb/dpkgpm.cc:716 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "无法打开补丁文件" @@ -2838,6 +2864,32 @@ msgstr "无法打开补丁文件" msgid "Connection closed prematurely" msgstr "连接被永久关闭" +#, fuzzy +#~ msgid "Line %d too long (max %d)" +#~ msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "处理 %s (NewFileVer1)时出错" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "处理 %s (NewFileVer1)时出错" + +#, fuzzy +#~ msgid "Stored label: %s \n" +#~ msgstr "存档标签:%s \n" + +#, fuzzy +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "找到了 %i 个软件包索引、%i 个源代码包索引,和 %i 个数字签名\n" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "select 调用出错" + #~ msgid "File date has changed %s" #~ msgstr "文件 %s 的时间已被改动"