From c77d65974e931762dcf5d07a467f9825aa807dde Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 11 Apr 2012 18:12:50 +0200 Subject: prepare new experimtnal upload --- po/zh_CN.po | 1471 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 760 insertions(+), 711 deletions(-) (limited to 'po/zh_CN.po') diff --git a/po/zh_CN.po b/po/zh_CN.po index 0ae36fef2..8fb361fb9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-26 12:05+0200\n" +"Report-Msgid-Bugs-To: deity@lists.debian.org\n" +"POT-Creation-Date: 2012-04-11 17:55+0200\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -19,149 +19,150 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: cmdline/apt-cache.cc:154 +#: cmdline/apt-cache.cc:158 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n" -#: cmdline/apt-cache.cc:282 +#: cmdline/apt-cache.cc:286 msgid "Total package names: " msgstr "软件包名称总数：" -#: cmdline/apt-cache.cc:284 +#: cmdline/apt-cache.cc:288 msgid "Total package structures: " msgstr "全部软件包结构：" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:328 msgid " Normal packages: " msgstr " 普通软件包：" -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:329 msgid " Pure virtual packages: " msgstr " 完全虚拟软件包：" -#: cmdline/apt-cache.cc:326 +#: cmdline/apt-cache.cc:330 msgid " Single virtual packages: " msgstr " 单虚拟软件包：" -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:331 msgid " Mixed virtual packages: " msgstr " 混合虚拟软件包：" -#: cmdline/apt-cache.cc:328 +#: cmdline/apt-cache.cc:332 msgid " Missing: " msgstr " 缺失：" -#: cmdline/apt-cache.cc:330 +#: cmdline/apt-cache.cc:334 msgid "Total distinct versions: " msgstr "按版本共计：" -#: cmdline/apt-cache.cc:332 +#: cmdline/apt-cache.cc:336 msgid "Total distinct descriptions: " msgstr "按不同的说明共计：" -#: cmdline/apt-cache.cc:334 +#: cmdline/apt-cache.cc:338 msgid "Total dependencies: " msgstr "按依赖关系共计：" -#: cmdline/apt-cache.cc:337 +#: cmdline/apt-cache.cc:341 msgid "Total ver/file relations: " msgstr "按版本/文件关系共计：" -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:343 msgid "Total Desc/File relations: " msgstr "按说明/文件关系共计：" -#: cmdline/apt-cache.cc:341 +#: cmdline/apt-cache.cc:345 msgid "Total Provides mappings: " msgstr "提供映射共计：" -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:357 msgid "Total globbed strings: " msgstr "Glob 字串共计：" -#: cmdline/apt-cache.cc:367 +#: cmdline/apt-cache.cc:371 msgid "Total dependency version space: " msgstr "依赖关系版本名所占空间共计：" -#: cmdline/apt-cache.cc:372 +#: cmdline/apt-cache.cc:376 msgid "Total slack space: " msgstr "Slack 空间共计：" -#: cmdline/apt-cache.cc:380 +#: cmdline/apt-cache.cc:384 msgid "Total space accounted for: " msgstr "总占用空间：" -#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143 #, c-format msgid "Package file %s is out of sync." msgstr "软件包文件 %s 尚未同步。" -#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374 -#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37 -#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378 +#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40 +#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163 msgid "No packages found" msgstr "没有发现匹配的软件包" -#: cmdline/apt-cache.cc:1218 +#: cmdline/apt-cache.cc:1222 msgid "You must give at least one search pattern" msgstr "您必须明确地给出至少一个表达式" -#: cmdline/apt-cache.cc:1353 +#: cmdline/apt-cache.cc:1357 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440 +#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459 #, c-format msgid "Unable to locate package %s" msgstr "未发现软件包 %s" -#: cmdline/apt-cache.cc:1478 +#: cmdline/apt-cache.cc:1482 msgid "Package files:" msgstr "软件包文件：" -#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576 +#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580 msgid "Cache is out of sync, can't x-ref a package file" msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1499 +#: cmdline/apt-cache.cc:1503 msgid "Pinned packages:" msgstr "被锁定的软件包：" -#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560 msgid "(not found)" msgstr "(没有找到)" -#: cmdline/apt-cache.cc:1519 +#: cmdline/apt-cache.cc:1523 msgid " Installed: " msgstr " 已安装：" -#: cmdline/apt-cache.cc:1520 +#: cmdline/apt-cache.cc:1524 msgid " Candidate: " msgstr " 候选软件包：" -#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546 +#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550 msgid "(none)" msgstr "(无)" -#: cmdline/apt-cache.cc:1553 +#: cmdline/apt-cache.cc:1557 msgid " Package pin: " msgstr " 软件包锁：" #. Show the priority tables -#: cmdline/apt-cache.cc:1562 +#: cmdline/apt-cache.cc:1566 msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 -#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75 +#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32 +#: cmdline/apt-mark.cc:267 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s，用于 %s 构架，编译于 %s %s\n" -#: cmdline/apt-cache.cc:1682 +#: cmdline/apt-cache.cc:1686 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -235,28 +236,28 @@ msgstr "" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" "若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n" -#: cmdline/apt-cdrom.cc:77 +#: cmdline/apt-cdrom.cc:79 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”" -#: cmdline/apt-cdrom.cc:92 +#: cmdline/apt-cdrom.cc:94 msgid "Please insert a Disc in the drive and press enter" msgstr "请把盘片插入驱动器再按回车键" -#: cmdline/apt-cdrom.cc:127 +#: cmdline/apt-cdrom.cc:129 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "无法将 %s 挂载到 %s" -#: cmdline/apt-cdrom.cc:162 +#: cmdline/apt-cdrom.cc:164 msgid "Repeat this process for the rest of the CDs in your set." msgstr "请对您的盘片套件中的其它盘片重复相同的操作。" -#: cmdline/apt-config.cc:44 +#: cmdline/apt-config.cc:46 msgid "Arguments not in pairs" msgstr "参数没有成对" -#: cmdline/apt-config.cc:79 +#: cmdline/apt-config.cc:81 msgid "" "Usage: apt-config [options] command\n" "\n" @@ -284,12 +285,12 @@ msgstr "" " -c=? 读取指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:98 +#: cmdline/apt-extracttemplates.cc:100 #, c-format msgid "%s not a valid DEB package." msgstr "%s 不是一个有效的 DEB 软件包。" -#: cmdline/apt-extracttemplates.cc:232 +#: cmdline/apt-extracttemplates.cc:234 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -313,40 +314,40 @@ msgstr "" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149 +#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" -#: cmdline/apt-extracttemplates.cc:309 +#: cmdline/apt-extracttemplates.cc:311 msgid "Cannot get debconf version. Is debconf installed?" msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？" -#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 msgid "Package extension list is too long" msgstr "软件包的扩展列表太长" -#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189 -#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262 -#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298 +#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 +#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 #, c-format msgid "Error processing directory %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:260 +#: ftparchive/apt-ftparchive.cc:261 msgid "Source extension list is too long" msgstr "源扩展列表太长" -#: ftparchive/apt-ftparchive.cc:377 +#: ftparchive/apt-ftparchive.cc:378 msgid "Error writing header to contents file" msgstr "将头写入到目录文件时出错" -#: ftparchive/apt-ftparchive.cc:407 +#: ftparchive/apt-ftparchive.cc:408 #, c-format msgid "Error processing contents %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:595 +#: ftparchive/apt-ftparchive.cc:596 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -426,137 +427,137 @@ msgstr "" " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项" -#: ftparchive/apt-ftparchive.cc:801 +#: ftparchive/apt-ftparchive.cc:802 msgid "No selections matched" msgstr "没有任何选定项是匹配的" -#: ftparchive/apt-ftparchive.cc:879 +#: ftparchive/apt-ftparchive.cc:880 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "软件包文件组“%s”中缺少一些文件" -#: ftparchive/cachedb.cc:43 +#: ftparchive/cachedb.cc:46 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old" -#: ftparchive/cachedb.cc:61 +#: ftparchive/cachedb.cc:64 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "数据库已过期，现尝试进行升级 %s" -#: ftparchive/cachedb.cc:72 +#: ftparchive/cachedb.cc:75 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。" -#: ftparchive/cachedb.cc:77 +#: ftparchive/cachedb.cc:80 #, c-format msgid "Unable to open DB file %s: %s" msgstr "无法打开数据库文件 %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 +#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 #, c-format msgid "Failed to stat %s" msgstr "无法获得 %s 的状态" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:248 msgid "Archive has no control record" msgstr "归档文件没有包含控制字段" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:489 msgid "Unable to get a cursor" msgstr "无法获得游标" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告：无法读取目录 %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:85 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告：无法获得 %s 的状态\n" -#: ftparchive/writer.cc:139 +#: ftparchive/writer.cc:141 msgid "E: " msgstr "错误：" -#: ftparchive/writer.cc:141 +#: ftparchive/writer.cc:143 msgid "W: " msgstr "警告：" -#: ftparchive/writer.cc:148 +#: ftparchive/writer.cc:150 msgid "E: Errors apply to file " msgstr "错误：处理文件时出错 " -#: ftparchive/writer.cc:166 ftparchive/writer.cc:198 +#: ftparchive/writer.cc:168 ftparchive/writer.cc:200 #, c-format msgid "Failed to resolve %s" msgstr "无法解析 %s" -#: ftparchive/writer.cc:179 +#: ftparchive/writer.cc:181 msgid "Tree walking failed" msgstr "无法遍历目录树" -#: ftparchive/writer.cc:206 +#: ftparchive/writer.cc:208 #, c-format msgid "Failed to open %s" msgstr "无法打开 %s" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:267 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:273 +#: ftparchive/writer.cc:275 #, c-format msgid "Failed to readlink %s" msgstr "无法读取符号链接 %s" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:279 #, c-format msgid "Failed to unlink %s" msgstr "无法使用 unlink 删除 %s" -#: ftparchive/writer.cc:284 +#: ftparchive/writer.cc:286 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 无法将 %s 链接到 %s" -#: ftparchive/writer.cc:294 +#: ftparchive/writer.cc:296 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:398 +#: ftparchive/writer.cc:401 msgid "Archive had no package field" msgstr "归档文件没有包含 package 字段" -#: ftparchive/writer.cc:406 ftparchive/writer.cc:703 +#: ftparchive/writer.cc:409 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:472 ftparchive/writer.cc:811 +#: ftparchive/writer.cc:477 ftparchive/writer.cc:827 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" -#: ftparchive/writer.cc:713 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s 没有源代码的 override 项\n" -#: ftparchive/writer.cc:717 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 中没有二进制文件的 override 项\n" -#: ftparchive/contents.cc:337 ftparchive/contents.cc:368 +#: ftparchive/contents.cc:339 ftparchive/contents.cc:370 msgid "realloc - Failed to allocate memory" msgstr "realloc - 分配内存失败" @@ -566,18 +567,18 @@ msgid "Unable to open %s" msgstr "无法打开 %s" #: ftparchive/override.cc:60 ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %lu #1" +#, fuzzy, c-format +msgid "Malformed override %s line %llu #1" msgstr "override 文件 %s 第 %lu 行的格式有误 #1" #: ftparchive/override.cc:74 ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %lu #2" +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" msgstr "override 文件 %s 第 %lu 行的格式有误 #2" #: ftparchive/override.cc:88 ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %lu #3" +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" msgstr "override 文件 %s 第 %lu 行的格式有误 #3" #: ftparchive/override.cc:127 ftparchive/override.cc:201 @@ -585,63 +586,51 @@ msgstr "override 文件 %s 第 %lu 行的格式有误 #3" msgid "Failed to read the override file %s" msgstr "无法读取 override 文件 %s" -#: ftparchive/multicompress.cc:67 +#: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的压缩算法“%s”" -#: ftparchive/multicompress.cc:97 +#: ftparchive/multicompress.cc:100 #, c-format msgid "Compressed output %s needs a compression set" msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合" -#: ftparchive/multicompress.cc:165 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:97 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: ftparchive/multicompress.cc:191 +#: ftparchive/multicompress.cc:189 msgid "Failed to create FILE*" msgstr "无法创建 FILE*" -#: ftparchive/multicompress.cc:194 +#: ftparchive/multicompress.cc:192 msgid "Failed to fork" msgstr "无法 fork" -#: ftparchive/multicompress.cc:208 +#: ftparchive/multicompress.cc:206 msgid "Compress child" msgstr "压缩子进程" -#: ftparchive/multicompress.cc:231 +#: ftparchive/multicompress.cc:229 #, c-format msgid "Internal error, failed to create %s" msgstr "内部错误，无法创建 %s" -#: ftparchive/multicompress.cc:282 -msgid "Failed to create subprocess IPC" -msgstr "无法创建子进程的 IPC 管道" - -#: ftparchive/multicompress.cc:319 -msgid "Failed to exec compressor " -msgstr "无法执行压缩程序" - -#: ftparchive/multicompress.cc:358 -msgid "decompressor" -msgstr "解压程序" - -#: ftparchive/multicompress.cc:401 +#: ftparchive/multicompress.cc:304 msgid "IO to subprocess/file failed" msgstr "无法对子进程或文件进行读写" -#: ftparchive/multicompress.cc:453 +#: ftparchive/multicompress.cc:342 msgid "Failed to read while computing MD5" msgstr "在计算 MD5 校验和时无法读取数据" -#: ftparchive/multicompress.cc:470 +#: ftparchive/multicompress.cc:358 #, c-format msgid "Problem unlinking %s" msgstr "在使用 unlink 删除 %s 时出错" -#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" @@ -650,75 +639,79 @@ msgstr "无法将 %s 重命名为 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29 +#: cmdline/apt-get.cc:140 +msgid "N" +msgstr "" + +#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" -#: cmdline/apt-get.cc:252 +#: cmdline/apt-get.cc:257 msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系：" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:347 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:349 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: cmdline/apt-get.cc:351 +#: cmdline/apt-get.cc:356 msgid "but it is not installable" msgstr "但无法安装它" -#: cmdline/apt-get.cc:353 +#: cmdline/apt-get.cc:358 msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: cmdline/apt-get.cc:356 +#: cmdline/apt-get.cc:361 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: cmdline/apt-get.cc:356 +#: cmdline/apt-get.cc:361 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:366 msgid " or" msgstr " 或" -#: cmdline/apt-get.cc:390 +#: cmdline/apt-get.cc:395 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: cmdline/apt-get.cc:416 +#: cmdline/apt-get.cc:421 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: cmdline/apt-get.cc:438 +#: cmdline/apt-get.cc:443 msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变：" -#: cmdline/apt-get.cc:459 +#: cmdline/apt-get.cc:464 msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级：" -#: cmdline/apt-get.cc:480 +#: cmdline/apt-get.cc:485 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: cmdline/apt-get.cc:500 +#: cmdline/apt-get.cc:505 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: cmdline/apt-get.cc:555 +#: cmdline/apt-get.cc:560 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:568 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -726,59 +719,59 @@ msgstr "" "【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: cmdline/apt-get.cc:594 +#: cmdline/apt-get.cc:599 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: cmdline/apt-get.cc:598 +#: cmdline/apt-get.cc:603 #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包，" -#: cmdline/apt-get.cc:600 +#: cmdline/apt-get.cc:605 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:607 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:611 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" -#: cmdline/apt-get.cc:628 +#: cmdline/apt-get.cc:632 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "注意，为任务 %2$s 选中了 %1$s\n" -#: cmdline/apt-get.cc:634 +#: cmdline/apt-get.cc:637 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n" -#: cmdline/apt-get.cc:651 +#: cmdline/apt-get.cc:654 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:665 msgid " [Installed]" msgstr " [已安装]" -#: cmdline/apt-get.cc:671 +#: cmdline/apt-get.cc:674 msgid " [Not candidate version]" msgstr " [无候选版本]" -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:676 msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:679 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -789,177 +782,177 @@ msgstr "" "这可能意味着这个缺失的软件包可能已被废弃，\n" "或者只能在其他发布源中找到\n" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:697 msgid "However the following packages replace it:" msgstr "可是下列软件包取代了它：" -#: cmdline/apt-get.cc:706 +#: cmdline/apt-get.cc:709 #, c-format msgid "Package '%s' has no installation candidate" msgstr "软件包 %s 没有可供安装的候选者" -#: cmdline/apt-get.cc:717 +#: cmdline/apt-get.cc:720 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "类似 %s 的虚拟软件包可以卸载\n" -#: cmdline/apt-get.cc:748 +#: cmdline/apt-get.cc:764 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "注意，选取 %s 而非 %s\n" -#: cmdline/apt-get.cc:778 +#: cmdline/apt-get.cc:794 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:798 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n" -#: cmdline/apt-get.cc:794 +#: cmdline/apt-get.cc:810 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s，因为无法下载它。\n" -#: cmdline/apt-get.cc:799 +#: cmdline/apt-get.cc:815 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59 +#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:844 +#: cmdline/apt-get.cc:860 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:865 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" -#: cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:907 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" -#: cmdline/apt-get.cc:971 +#: cmdline/apt-get.cc:985 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." -#: cmdline/apt-get.cc:974 +#: cmdline/apt-get.cc:988 msgid " failed." msgstr " 失败。" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:991 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Unable to minimize the upgrade set" msgstr "无法最小化要升级的软件包集合" -#: cmdline/apt-get.cc:982 +#: cmdline/apt-get.cc:996 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1000 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。" -#: cmdline/apt-get.cc:989 +#: cmdline/apt-get.cc:1003 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1028 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】：下列软件包不能通过验证！" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1032 msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1039 msgid "Install these packages without verification [y/N]? " msgstr "不经验证就安装这些软件包吗？[y/N] " -#: cmdline/apt-get.cc:1027 +#: cmdline/apt-get.cc:1041 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197 +#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211 msgid "There are problems and -y was used without --force-yes" msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" -#: cmdline/apt-get.cc:1077 +#: cmdline/apt-get.cc:1091 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1100 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: cmdline/apt-get.cc:1097 +#: cmdline/apt-get.cc:1111 msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" -#: cmdline/apt-get.cc:1135 +#: cmdline/apt-get.cc:1149 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1147 +#: cmdline/apt-get.cc:1161 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1154 +#: cmdline/apt-get.cc:1168 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1159 +#: cmdline/apt-get.cc:1173 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499 -#: cmdline/apt-get.cc:2502 +#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534 +#: cmdline/apt-get.cc:2537 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" -#: cmdline/apt-get.cc:1187 +#: cmdline/apt-get.cc:1201 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 上没有足够的可用空间。" -#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。" -#: cmdline/apt-get.cc:1205 +#: cmdline/apt-get.cc:1219 msgid "Yes, do as I say!" msgstr "是，按我说的做！" -#: cmdline/apt-get.cc:1207 +#: cmdline/apt-get.cc:1221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -970,28 +963,28 @@ msgstr "" "若还想继续的话，就输入下面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232 +#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246 msgid "Abort." msgstr "中止执行。" -#: cmdline/apt-get.cc:1228 +#: cmdline/apt-get.cc:1242 msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438 +#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: cmdline/apt-get.cc:1318 +#: cmdline/apt-get.cc:1332 msgid "Some files failed to download" msgstr "有一些文件无法下载" -#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:1325 +#: cmdline/apt-get.cc:1339 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -999,19 +992,19 @@ msgstr "" "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" "再试试？" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换" -#: cmdline/apt-get.cc:1334 +#: cmdline/apt-get.cc:1348 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: cmdline/apt-get.cc:1335 +#: cmdline/apt-get.cc:1349 msgid "Aborting install." msgstr "中止安装。" -#: cmdline/apt-get.cc:1363 +#: cmdline/apt-get.cc:1377 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1020,35 +1013,35 @@ msgid_plural "" "all files have been overwritten by other packages:" msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失：" -#: cmdline/apt-get.cc:1367 +#: cmdline/apt-get.cc:1381 msgid "Note: This is done automatic and on purpose by dpkg." msgstr "注意：这是自动被 dpkg 有意完成的。" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1519 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1551 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "选择 %s 作为源代码包而非 %s\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1575 +#: cmdline/apt-get.cc:1589 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "忽略不可用的 %2$s 软件包的 %1$s 版" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1605 msgid "The update command takes no arguments" msgstr " update 命令不需要参数" -#: cmdline/apt-get.cc:1653 +#: cmdline/apt-get.cc:1668 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我们不应该进行删除，无法启动自动删除器" -#: cmdline/apt-get.cc:1748 +#: cmdline/apt-get.cc:1772 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1064,15 +1057,15 @@ msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请 #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944 msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助：" -#: cmdline/apt-get.cc:1755 +#: cmdline/apt-get.cc:1779 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，自动卸载工具坏事了" -#: cmdline/apt-get.cc:1762 +#: cmdline/apt-get.cc:1786 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1080,26 +1073,26 @@ msgid_plural "" "required:" msgstr[0] "下列软件包是自动安装的并且现在不需要了：" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1790 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n" -#: cmdline/apt-get.cc:1768 +#: cmdline/apt-get.cc:1792 msgid "Use 'apt-get autoremove' to remove them." msgstr "使用'apt-get autoremove'来卸载它们" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1811 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，全部升级工具坏事了" -#: cmdline/apt-get.cc:1886 +#: cmdline/apt-get.cc:1910 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: cmdline/apt-get.cc:1890 +#: cmdline/apt-get.cc:1914 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1107,7 +1100,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1906 +#: cmdline/apt-get.cc:1929 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" @@ -1118,73 +1111,73 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1950 msgid "Broken packages" msgstr "破损的软件包" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1976 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2066 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:2067 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2109 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61 +#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105 +#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2140 msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111 +#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:2148 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，问题解决工具坏事了" -#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287 msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2396 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713 +#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2418 +#: cmdline/apt-get.cc:2453 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -1193,7 +1186,7 @@ msgstr "" "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n" "%s\n" -#: cmdline/apt-get.cc:2423 +#: cmdline/apt-get.cc:2458 #, c-format msgid "" "Please use:\n" @@ -1204,104 +1197,104 @@ msgstr "" "bzr get %s\n" "获得该软件包的最近更新(可能尚未正式发布)。\n" -#: cmdline/apt-get.cc:2476 +#: cmdline/apt-get.cc:2511 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2548 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2522 +#: cmdline/apt-get.cc:2557 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2527 +#: cmdline/apt-get.cc:2562 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2533 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2571 +#: cmdline/apt-get.cc:2606 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2602 +#: cmdline/apt-get.cc:2637 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2615 +#: cmdline/apt-get.cc:2650 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2637 +#: cmdline/apt-get.cc:2672 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2657 +#: cmdline/apt-get.cc:2692 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2676 +#: cmdline/apt-get.cc:2711 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2701 +#: cmdline/apt-get.cc:2736 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2718 +#: cmdline/apt-get.cc:2753 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:2738 +#: cmdline/apt-get.cc:2773 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:2868 +#: cmdline/apt-get.cc:2903 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:2889 +#: cmdline/apt-get.cc:2924 #, 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:2912 +#: cmdline/apt-get.cc:2947 #, 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:2951 +#: cmdline/apt-get.cc:2986 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1310,37 +1303,37 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 " "%1$s 依赖关系" -#: cmdline/apt-get.cc:2957 +#: cmdline/apt-get.cc:2992 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:2980 +#: cmdline/apt-get.cc:3015 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:2996 +#: cmdline/apt-get.cc:3031 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:3001 +#: cmdline/apt-get.cc:3036 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106 +#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正在连接 %s (%s)" -#: cmdline/apt-get.cc:3225 +#: cmdline/apt-get.cc:3260 msgid "Supported modules:" msgstr "支持的模块：" -#: cmdline/apt-get.cc:3266 +#: cmdline/apt-get.cc:3301 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1428,7 +1421,7 @@ msgstr "" "以获取更多信息和选项。\n" " 本 APT 具有超级牛力。\n" -#: cmdline/apt-get.cc:3429 +#: cmdline/apt-get.cc:3466 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1439,33 +1432,33 @@ msgstr "" "　　　apt-get 需要 root 特权进行实际的执行。\n" "　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！" -#: cmdline/acqprogress.cc:57 +#: cmdline/acqprogress.cc:59 msgid "Hit " msgstr "命中 " -#: cmdline/acqprogress.cc:81 +#: cmdline/acqprogress.cc:83 msgid "Get:" msgstr "获取：" -#: cmdline/acqprogress.cc:112 +#: cmdline/acqprogress.cc:114 msgid "Ign " msgstr "忽略 " -#: cmdline/acqprogress.cc:116 +#: cmdline/acqprogress.cc:118 msgid "Err " msgstr "错误 " -#: cmdline/acqprogress.cc:137 +#: cmdline/acqprogress.cc:139 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "下载 %sB，耗时 %s (%sB/s)\n" -#: cmdline/acqprogress.cc:227 +#: cmdline/acqprogress.cc:229 #, c-format msgid " [Working]" msgstr " [执行中]" -#: cmdline/acqprogress.cc:283 +#: cmdline/acqprogress.cc:285 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1476,46 +1469,62 @@ msgstr "" "“%s”\n" "的盘片插入驱动器“%s”再按回车键\n" -#: cmdline/apt-mark.cc:46 +#: cmdline/apt-internal-solver.cc:36 +msgid "" +"Usage: apt-internal-resolver\n" +"\n" +"apt-internal-resolver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"apt.conf(5) manual pages for more information and options.\n" +" This APT has Super Cow Powers.\n" +msgstr "" + +#: cmdline/apt-mark.cc:49 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "但是它还没有被安装" -#: cmdline/apt-mark.cc:52 +#: cmdline/apt-mark.cc:55 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-mark.cc:54 +#: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-mark.cc:169 +#: cmdline/apt-mark.cc:172 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-mark.cc:171 +#: cmdline/apt-mark.cc:174 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207 +#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s 已设置为手动安装。\n" -#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212 +#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "无法打开 %s" -#: cmdline/apt-mark.cc:220 +#: cmdline/apt-mark.cc:223 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:268 +#: cmdline/apt-mark.cc:271 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -1537,11 +1546,11 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt-sortpkgs.cc:86 +#: cmdline/apt-sortpkgs.cc:89 msgid "Unknown package record!" msgstr "未知的软件包记录！" -#: cmdline/apt-sortpkgs.cc:150 +#: cmdline/apt-sortpkgs.cc:153 msgid "" "Usage: apt-sortpkgs [options] file1 [file2 ...]\n" "\n" @@ -1599,196 +1608,198 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们， msgid "Merging available information" msgstr "正在合并可用信息" -#: apt-inst/contrib/extracttar.cc:114 +#: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" msgstr "无法创建管道" -#: apt-inst/contrib/extracttar.cc:141 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "无法执行 gzip" -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 msgid "Corrupted archive" msgstr "包文件已被损坏" -#: apt-inst/contrib/extracttar.cc:193 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar 的校验和不符，文件已损坏" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:303 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 数据头类型 %u，成员 %s" -#: apt-inst/contrib/arfile.cc:70 +#: apt-inst/contrib/arfile.cc:74 msgid "Invalid archive signature" msgstr "无效的归档签名" -#: apt-inst/contrib/arfile.cc:78 +#: apt-inst/contrib/arfile.cc:82 msgid "Error reading archive member header" msgstr "读取归档成员文件头出错" -#: apt-inst/contrib/arfile.cc:90 +#: apt-inst/contrib/arfile.cc:94 #, c-format msgid "Invalid archive member header %s" msgstr "归档文件中成员文件头 %s 无效" -#: apt-inst/contrib/arfile.cc:102 +#: apt-inst/contrib/arfile.cc:106 msgid "Invalid archive member header" msgstr "归档文件中成员文件头无效" -#: apt-inst/contrib/arfile.cc:128 +#: apt-inst/contrib/arfile.cc:132 msgid "Archive is too short" msgstr "归档文件太短" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:136 msgid "Failed to read the archive headers" msgstr "无法读取归档文件的数据头" -#: apt-inst/filelist.cc:380 +#: apt-inst/filelist.cc:382 msgid "DropNode called on still linked node" msgstr "把 DropNode 用在了仍在链表中的节点上" -#: apt-inst/filelist.cc:412 +#: apt-inst/filelist.cc:414 msgid "Failed to locate the hash element!" msgstr "无法定位哈希表元素！" -#: apt-inst/filelist.cc:459 +#: apt-inst/filelist.cc:461 msgid "Failed to allocate diversion" msgstr "无法分配转移项" -#: apt-inst/filelist.cc:464 +#: apt-inst/filelist.cc:466 msgid "Internal error in AddDiversion" msgstr "内部错误，出现在 AddDiversion" -#: apt-inst/filelist.cc:477 +#: apt-inst/filelist.cc:479 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s" -#: apt-inst/filelist.cc:506 +#: apt-inst/filelist.cc:508 #, c-format msgid "Double add of diversion %s -> %s" msgstr "添加了两个转移项 %s-> %s" -#: apt-inst/filelist.cc:549 +#: apt-inst/filelist.cc:551 #, c-format msgid "Duplicate conf file %s/%s" msgstr "重复的配置文件 %s/%s" -#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:50 #, c-format msgid "Failed to write file %s" msgstr "无法写入文件 %s" +#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "无法关闭文件 %s" -#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" msgstr "路径名 %s 太长" -#: apt-inst/extract.cc:124 +#: apt-inst/extract.cc:127 #, c-format msgid "Unpacking %s more than once" msgstr "%s 被解包了不只一次" -#: apt-inst/extract.cc:134 +#: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" msgstr "目录 %s 已被转移" -#: apt-inst/extract.cc:144 +#: apt-inst/extract.cc:147 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "该软件包正尝试写入转移对象 %s/%s" -#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" msgstr "该转移路径太长" -#: apt-inst/extract.cc:240 +#: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "目录 %s 要被一个非目录的文件替换" -#: apt-inst/extract.cc:280 +#: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" msgstr "无法在其散列桶中分配节点" -#: apt-inst/extract.cc:284 +#: apt-inst/extract.cc:287 msgid "The path is too long" msgstr "路径名太长" -#: apt-inst/extract.cc:412 +#: apt-inst/extract.cc:415 #, c-format msgid "Overwrite package match with no version for %s" msgstr "用来覆盖的软件包不属于 %s 的任何版本" -#: apt-inst/extract.cc:429 +#: apt-inst/extract.cc:432 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104 -#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352 -#: methods/mirror.cc:91 +#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183 +#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108 +#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359 +#: methods/mirror.cc:95 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" -#: apt-inst/extract.cc:489 +#: apt-inst/extract.cc:492 #, c-format msgid "Unable to stat %s" msgstr "无法读取 %s 的状态" -#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 +#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" msgstr "无法卸载 %s" -#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 +#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format msgid "Unable to create %s" msgstr "无法创建 %s " -#: apt-inst/deb/dpkgdb.cc:114 +#: apt-inst/deb/dpkgdb.cc:118 #, c-format msgid "Failed to stat %sinfo" msgstr "无法读取 %sinfo 的状态" -#: apt-inst/deb/dpkgdb.cc:119 +#: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" msgstr "info 和 temp 目录要求处于同一文件系统之下" -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048 -#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158 -#: apt-pkg/pkgcachegen.cc:1320 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170 +#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280 +#: apt-pkg/pkgcachegen.cc:1436 msgid "Reading package lists" msgstr "正在读取软件包列表" -#: apt-inst/deb/dpkgdb.cc:176 +#: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "无法切换工作目录到 admin 目录 %sinfo" -#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 -#: apt-inst/deb/dpkgdb.cc:444 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 +#: apt-inst/deb/dpkgdb.cc:448 msgid "Internal error getting a package name" msgstr "在获取软件包名字时出现内部错误" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "正在读取文件列表" -#: apt-inst/deb/dpkgdb.cc:212 +#: apt-inst/deb/dpkgdb.cc:216 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1798,113 +1809,114 @@ msgstr "" "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件并马上重" "新安装相同版本的这个软件包！" -#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 +#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "无法读取列表文件 %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:262 +#: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" msgstr "获得一个节点时出现内部错误" -#: apt-inst/deb/dpkgdb.cc:305 +#: apt-inst/deb/dpkgdb.cc:309 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "无法打开转移配置文件 %sdiversions" -#: apt-inst/deb/dpkgdb.cc:320 +#: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" msgstr "该转移配置文件被损坏了" -#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 -#: apt-inst/deb/dpkgdb.cc:337 +#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 +#: apt-inst/deb/dpkgdb.cc:341 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "转移配置文件中有一行是无效的：%s" -#: apt-inst/deb/dpkgdb.cc:358 +#: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" msgstr "添加转移配置时出现内部错误" -#: apt-inst/deb/dpkgdb.cc:379 +#: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialized first" msgstr "必须首先初始化软件包缓存" -#: apt-inst/deb/dpkgdb.cc:439 +#: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "无法找到某个软件包：包头，于偏移位置 %lu" -#: apt-inst/deb/dpkgdb.cc:461 +#: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu" -#: apt-inst/deb/dpkgdb.cc:466 +#: apt-inst/deb/dpkgdb.cc:470 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "解析 MD5 出错。文件内偏移量为 %lu" -#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44 +#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”" #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain -#: apt-inst/deb/debfile.cc:53 +#: apt-inst/deb/debfile.cc:56 apt-inst/deb/debfile.cc:55 #, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”，“%s”或者“%s”" -#: apt-inst/deb/debfile.cc:113 +#: apt-inst/deb/debfile.cc:116 #, c-format msgid "Couldn't change to %s" msgstr "无法切换工作目录到 %s" -#: apt-inst/deb/debfile.cc:154 +#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120 #, c-format msgid "Internal error, could not locate member %s" msgstr "内部错误，无法定位包内文件 %s" -#: apt-inst/deb/debfile.cc:189 +#: apt-inst/deb/debfile.cc:192 msgid "Failed to locate a valid control file" msgstr "无法在归档文件中找到有效的主控文件" -#: apt-inst/deb/debfile.cc:274 +#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214 msgid "Unparsable control file" msgstr "不能解析的主控文件" -#: methods/bzip2.cc:60 methods/gzip.cc:52 +#: methods/bzip2.cc:63 methods/gzip.cc:54 msgid "Empty files can't be valid archives" msgstr "" -#: methods/bzip2.cc:64 +#: methods/bzip2.cc:67 #, c-format msgid "Couldn't open pipe for %s" msgstr "无法为 %s 开启管道" -#: methods/bzip2.cc:108 +#: methods/bzip2.cc:111 #, c-format msgid "Read error from %s process" msgstr "从 %s 进程读取数据出错" -#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43 -#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524 -#: methods/rred.cc:533 +#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46 +#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493 +#: methods/rred.cc:502 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 -#: methods/rred.cc:530 +#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100 +#: methods/rred.cc:499 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" -#: methods/cdrom.cc:199 +#: methods/cdrom.cc:203 #, c-format msgid "Unable to read the cdrom database %s" msgstr "无法读取盘片数据库 %s" -#: methods/cdrom.cc:208 +#: methods/cdrom.cc:212 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@ -1912,357 +1924,362 @@ msgstr "" "请使用 apt-cdrom，通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来" "加入新的盘片。" -#: methods/cdrom.cc:218 +#: methods/cdrom.cc:222 msgid "Wrong CD-ROM" msgstr "错误的 CD-ROM" -#: methods/cdrom.cc:245 +#: methods/cdrom.cc:249 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" -#: methods/cdrom.cc:250 +#: methods/cdrom.cc:254 msgid "Disk not found." msgstr "找不到盘片。" -#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271 msgid "File not found" msgstr "无法找到该文件" -#: methods/file.cc:44 +#: methods/file.cc:47 msgid "Invalid URI, local URIS must not start with //" msgstr "无效的 URI，本地的 URI 不能以 // 开头" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:168 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "正在登录" -#: methods/ftp.cc:174 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "无法获知对方主机名" -#: methods/ftp.cc:179 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "无法获知本地主机名" -#: methods/ftp.cc:210 methods/ftp.cc:238 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "服务器拒绝了我们的连接，响应信息为：%s" -#: methods/ftp.cc:216 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:223 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:243 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。" -#: methods/ftp.cc:271 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s" -#: methods/ftp.cc:297 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227 +#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233 msgid "Connection timeout" msgstr "连接超时" -#: methods/ftp.cc:341 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191 +#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197 msgid "Read error" msgstr "读错误" -#: methods/ftp.cc:351 methods/rsh.cc:198 +#: methods/ftp.cc:355 methods/rsh.cc:204 msgid "A response overflowed the buffer." msgstr "回应超出了缓存区大小。" -#: methods/ftp.cc:368 methods/ftp.cc:380 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233 +#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239 msgid "Write error" msgstr "写出错" -#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "无法创建套接字" -#: methods/ftp.cc:703 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "无法连接上数据套接字，连接超时" -#: methods/ftp.cc:709 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "无法连接被动模式的套接字。" -#: methods/ftp.cc:727 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo 无法得到监听套接字" -#: methods/ftp.cc:741 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "无法绑定套接字" -#: methods/ftp.cc:745 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "无法在套接字上监听" -#: methods/ftp.cc:752 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "无法确定套接字的名字" -#: methods/ftp.cc:784 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "无法发出 PORT 指令" -#: methods/ftp.cc:794 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "无法识别的地址族 %u (AF_*)" -#: methods/ftp.cc:803 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:823 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "数据套接字连接超时" -#: methods/ftp.cc:830 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303 +#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" -#: methods/ftp.cc:882 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "无法获取文件，服务器响应信息为“%s”" -#: methods/ftp.cc:897 methods/rsh.cc:322 +#: methods/ftp.cc:901 methods/rsh.cc:328 msgid "Data socket timed out" msgstr "数据套接字超时" -#: methods/ftp.cc:927 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "数据传送出错，服务器响应信息为“%s”" #. Get the files information -#: methods/ftp.cc:1004 +#: methods/ftp.cc:1008 msgid "Query" msgstr "查询" -#: methods/ftp.cc:1116 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "无法调用 " -#: methods/connect.cc:71 +#: methods/connect.cc:75 #, c-format msgid "Connecting to %s (%s)" msgstr "正在连接 %s (%s)" -#: methods/connect.cc:82 +#: methods/connect.cc:86 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:89 +#: methods/connect.cc:93 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)" -#: methods/connect.cc:95 +#: methods/connect.cc:99 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "无法发起与 %s:%s (%s) 的连接" -#: methods/connect.cc:103 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "无法连接上 %s:%s (%s)，连接超时" -#: methods/connect.cc:121 +#: methods/connect.cc:125 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "无法连接上 %s:%s (%s)。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:149 methods/rsh.cc:425 +#: methods/connect.cc:153 methods/rsh.cc:431 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" -#: methods/connect.cc:168 methods/connect.cc:187 +#: methods/connect.cc:172 methods/connect.cc:191 #, c-format msgid "Could not resolve '%s'" msgstr "无法解析域名“%s”" -#: methods/connect.cc:193 +#: methods/connect.cc:197 #, c-format msgid "Temporary failure resolving '%s'" msgstr "暂时不能解析域名“%s”" -#: methods/connect.cc:196 +#: methods/connect.cc:200 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)" -#: methods/connect.cc:243 +#: methods/connect.cc:247 #, c-format msgid "Unable to connect to %s:%s:" msgstr "不能连接到 %s：%s：" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:172 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:177 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:175 +#: methods/gpgv.cc:181 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)" -#: methods/gpgv.cc:180 +#: methods/gpgv.cc:186 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:214 methods/gpgv.cc:221 +#: methods/gpgv.cc:220 methods/gpgv.cc:227 msgid "The following signatures were invalid:\n" msgstr "下列签名无效：\n" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:234 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "由于没有公钥，无法验证下列签名：\n" -#: methods/http.cc:385 +#: methods/http.cc:393 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/http.cc:531 +#: methods/http.cc:539 #, c-format msgid "Got a single header line over %u chars" msgstr "接收到一行报头行，它的长度超过了 %u 个字符" -#: methods/http.cc:539 +#: methods/http.cc:547 msgid "Bad header line" msgstr "错误的报头行" -#: methods/http.cc:564 methods/http.cc:571 +#: methods/http.cc:572 methods/http.cc:579 msgid "The HTTP server sent an invalid reply header" msgstr "该 HTTP 服务器发送了一个无效的应答报头" -#: methods/http.cc:600 +#: methods/http.cc:608 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头" -#: methods/http.cc:615 +#: methods/http.cc:623 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头" -#: methods/http.cc:617 +#: methods/http.cc:625 msgid "This HTTP server has broken range support" msgstr "该 HTTP 服务器的 range 支持不正常" -#: methods/http.cc:641 +#: methods/http.cc:649 msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:800 +#: methods/http.cc:808 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:805 +#: methods/http.cc:813 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:828 +#: methods/http.cc:836 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:859 +#: methods/http.cc:867 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:887 +#: methods/http.cc:895 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:901 +#: methods/http.cc:909 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:903 +#: methods/http.cc:911 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291 -msgid "Failed to truncate file" -msgstr "无法截断文件" - -#: methods/http.cc:1183 +#: methods/http.cc:1181 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1200 methods/http.cc:1255 +#: methods/http.cc:1198 methods/http.cc:1253 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1347 +#: methods/http.cc:1345 msgid "Internal error" msgstr "内部错误" -#: apt-pkg/contrib/mmap.cc:77 +#: apt-pkg/contrib/mmap.cc:79 msgid "Can't mmap an empty file" msgstr "无法 mmap 一个空文件" -#: apt-pkg/contrib/mmap.cc:89 +#: apt-pkg/contrib/mmap.cc:109 #, c-format msgid "Couldn't duplicate file descriptor %i" msgstr "无法为复制文件描述符 %i" -#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258 -#, c-format -msgid "Couldn't make mmap of %lu bytes" +#: apt-pkg/contrib/mmap.cc:117 +#, fuzzy, c-format +msgid "Couldn't make mmap of %llu bytes" msgstr "无法 mmap %lu 字节的数据" -#: apt-pkg/contrib/mmap.cc:124 +#: apt-pkg/contrib/mmap.cc:144 msgid "Unable to close mmap" msgstr "无法关闭 mmap" -#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180 +#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200 msgid "Unable to synchronize mmap" msgstr "无法同步 mmap " -#: apt-pkg/contrib/mmap.cc:310 +#: apt-pkg/contrib/mmap.cc:278 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "无法 mmap %lu 字节的数据" + +#: apt-pkg/contrib/mmap.cc:311 +msgid "Failed to truncate file" +msgstr "无法截断文件" + +#: apt-pkg/contrib/mmap.cc:330 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2271,14 +2288,14 @@ msgstr "" "动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%lu。(man 5 " "apt.conf)" -#: apt-pkg/contrib/mmap.cc:409 +#: apt-pkg/contrib/mmap.cc:429 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。" -#: apt-pkg/contrib/mmap.cc:412 +#: apt-pkg/contrib/mmap.cc:432 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。" @@ -2307,93 +2324,93 @@ msgstr "%li分 %li秒" msgid "%lis" msgstr "%li秒" -#: apt-pkg/contrib/strutl.cc:1138 +#: apt-pkg/contrib/strutl.cc:1165 #, c-format msgid "Selection %s not found" msgstr "找不到您选则的 %s" -#: apt-pkg/contrib/configuration.cc:465 +#: apt-pkg/contrib/configuration.cc:468 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "无法识别的类型缩写：“%c”" -#: apt-pkg/contrib/configuration.cc:523 +#: apt-pkg/contrib/configuration.cc:526 #, c-format msgid "Opening configuration file %s" msgstr "正在打开配置文件 %s" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:694 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "语法错误 %s:%u：配置小节没有以名字开头" -#: apt-pkg/contrib/configuration.cc:710 +#: apt-pkg/contrib/configuration.cc:713 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "语法错误 %s:%u：标签格式有误" -#: apt-pkg/contrib/configuration.cc:727 +#: apt-pkg/contrib/configuration.cc:730 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "语法错误 %s:%u：配置值后有多余的无意义数据" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示" -#: apt-pkg/contrib/configuration.cc:774 +#: apt-pkg/contrib/configuration.cc:777 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "语法错误 %s:%u：太多的嵌套 include 命令" -#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783 +#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "语法错误 %s:%u：Included from here" -#: apt-pkg/contrib/configuration.cc:787 +#: apt-pkg/contrib/configuration.cc:790 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "语法错误 %s:%u：不支持的指令“%s”" -#: apt-pkg/contrib/configuration.cc:790 +#: apt-pkg/contrib/configuration.cc:793 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数" -#: apt-pkg/contrib/configuration.cc:840 +#: apt-pkg/contrib/configuration.cc:843 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据" -#: apt-pkg/contrib/progress.cc:153 +#: apt-pkg/contrib/progress.cc:146 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 有错误！" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完成" -#: apt-pkg/contrib/cmndline.cc:77 +#: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "未知的命令行选项“%c” [来自 %s]" -#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 -#: apt-pkg/contrib/cmndline.cc:119 +#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112 +#: apt-pkg/contrib/cmndline.cc:120 #, c-format msgid "Command line option %s is not understood" msgstr "无法识别命令行选项 %s" -#: apt-pkg/contrib/cmndline.cc:124 +#: apt-pkg/contrib/cmndline.cc:125 #, c-format msgid "Command line option %s is not boolean" msgstr "命令行选项 %s 不是布尔值" -#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186 +#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format msgid "Option %s requires an argument." msgstr "选项 %s 要求有一个参数" @@ -2403,336 +2420,349 @@ msgstr "选项 %s 要求有一个参数" msgid "Option %s: Configuration item specification must have an =." msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定" -#: apt-pkg/contrib/cmndline.cc:236 +#: apt-pkg/contrib/cmndline.cc:235 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”" -#: apt-pkg/contrib/cmndline.cc:267 +#: apt-pkg/contrib/cmndline.cc:266 #, c-format msgid "Option '%s' is too long" msgstr "选项“%s”太长" -#: apt-pkg/contrib/cmndline.cc:300 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "不能识别参数 %s，请用 true 或 false" -#: apt-pkg/contrib/cmndline.cc:350 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "无效的操作 %s" -#: apt-pkg/contrib/cdromutl.cc:52 +#: apt-pkg/contrib/cdromutl.cc:56 #, c-format msgid "Unable to stat the mount point %s" msgstr "无法读取文件系统挂载点 %s 的状态" -#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 -#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 -#: methods/mirror.cc:97 +#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213 +#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42 +#: methods/mirror.cc:101 #, c-format msgid "Unable to change to %s" msgstr "无法切换工作目录到 %s" -#: apt-pkg/contrib/cdromutl.cc:220 +#: apt-pkg/contrib/cdromutl.cc:224 msgid "Failed to stat the cdrom" msgstr "无法读取盘片的状态" -#: apt-pkg/contrib/fileutl.cc:168 +#: apt-pkg/contrib/fileutl.cc:197 #, c-format msgid "Not using locking for read only lock file %s" msgstr "由于文件系统为只读，因而无法使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:173 +#: apt-pkg/contrib/fileutl.cc:202 #, c-format msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" -#: apt-pkg/contrib/fileutl.cc:191 +#: apt-pkg/contrib/fileutl.cc:220 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/fileutl.cc:224 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" -#: apt-pkg/contrib/fileutl.cc:335 +#: apt-pkg/contrib/fileutl.cc:364 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:362 +#: apt-pkg/contrib/fileutl.cc:391 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:380 +#: apt-pkg/contrib/fileutl.cc:409 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:389 +#: apt-pkg/contrib/fileutl.cc:418 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" -#: apt-pkg/contrib/fileutl.cc:691 +#: apt-pkg/contrib/fileutl.cc:731 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/fileutl.cc:693 +#: apt-pkg/contrib/fileutl.cc:733 #, c-format msgid "Sub-process %s received signal %u." msgstr "子进程 %s 收到信号 %u。" -#: apt-pkg/contrib/fileutl.cc:697 +#: apt-pkg/contrib/fileutl.cc:737 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/fileutl.cc:699 +#: apt-pkg/contrib/fileutl.cc:739 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出" -#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 +#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:781 +#: apt-pkg/contrib/fileutl.cc:923 #, c-format msgid "Could not open file descriptor %d" msgstr "无法打开文件描述符 %d" -#: apt-pkg/contrib/fileutl.cc:841 -#, c-format -msgid "read, still have %lu to read but none left" +#: apt-pkg/contrib/fileutl.cc:970 +msgid "Failed to create subprocess IPC" +msgstr "无法创建子进程的 IPC 管道" + +#: apt-pkg/contrib/fileutl.cc:1019 +msgid "Failed to exec compressor " +msgstr "无法执行压缩程序" + +#: apt-pkg/contrib/fileutl.cc:1087 +#, fuzzy, c-format +msgid "read, still have %llu to read but none left" msgstr "读取文件出错，还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:874 -#, c-format -msgid "write, still have %lu to write but couldn't" +#: apt-pkg/contrib/fileutl.cc:1152 +#, fuzzy, c-format +msgid "write, still have %llu to write but couldn't" msgstr "写入文件出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:1010 +#: apt-pkg/contrib/fileutl.cc:1410 #, c-format msgid "Problem closing the gzip file %s" msgstr "关闭 gzip %s 文件出错" -#: apt-pkg/contrib/fileutl.cc:1013 +#: apt-pkg/contrib/fileutl.cc:1414 #, c-format msgid "Problem closing the file %s" msgstr "关闭文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1018 +#: apt-pkg/contrib/fileutl.cc:1419 #, c-format msgid "Problem renaming the file %s to %s" msgstr "重命名文件 %s 为 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1029 +#: apt-pkg/contrib/fileutl.cc:1430 #, c-format msgid "Problem unlinking the file %s" msgstr "用 unlink 删除文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1042 +#: apt-pkg/contrib/fileutl.cc:1450 msgid "Problem syncing the file" msgstr "同步文件出错" -#: apt-pkg/pkgcache.cc:145 +#: apt-pkg/pkgcache.cc:148 msgid "Empty package cache" msgstr "软件包缓存区是空的" -#: apt-pkg/pkgcache.cc:151 +#: apt-pkg/pkgcache.cc:154 msgid "The package cache file is corrupted" msgstr "软件包缓存文件损坏了" -#: apt-pkg/pkgcache.cc:156 +#: apt-pkg/pkgcache.cc:159 msgid "The package cache file is an incompatible version" msgstr "软件包缓存区文件的版本不兼容" -#: apt-pkg/pkgcache.cc:161 +#: apt-pkg/pkgcache.cc:162 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "软件包缓存文件损坏了" + +#: apt-pkg/pkgcache.cc:167 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "本程序目前不支持“%s”版本系统" -#: apt-pkg/pkgcache.cc:166 +#: apt-pkg/pkgcache.cc:172 msgid "The package cache was built for a different architecture" msgstr "软件包缓存区是为其它架构的硬件构建的" -#: apt-pkg/pkgcache.cc:299 +#: apt-pkg/pkgcache.cc:305 msgid "Depends" msgstr "依赖" -#: apt-pkg/pkgcache.cc:299 +#: apt-pkg/pkgcache.cc:305 msgid "PreDepends" msgstr "预依赖" -#: apt-pkg/pkgcache.cc:299 +#: apt-pkg/pkgcache.cc:305 msgid "Suggests" msgstr "建议" -#: apt-pkg/pkgcache.cc:300 +#: apt-pkg/pkgcache.cc:306 msgid "Recommends" msgstr "推荐" -#: apt-pkg/pkgcache.cc:300 +#: apt-pkg/pkgcache.cc:306 msgid "Conflicts" msgstr "冲突" -#: apt-pkg/pkgcache.cc:300 +#: apt-pkg/pkgcache.cc:306 msgid "Replaces" msgstr "替换" -#: apt-pkg/pkgcache.cc:301 +#: apt-pkg/pkgcache.cc:307 msgid "Obsoletes" msgstr "废弃" -#: apt-pkg/pkgcache.cc:301 +#: apt-pkg/pkgcache.cc:307 msgid "Breaks" msgstr "破坏" -#: apt-pkg/pkgcache.cc:301 +#: apt-pkg/pkgcache.cc:307 msgid "Enhances" msgstr "增强" -#: apt-pkg/pkgcache.cc:312 +#: apt-pkg/pkgcache.cc:318 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:312 +#: apt-pkg/pkgcache.cc:318 msgid "required" msgstr "必需" -#: apt-pkg/pkgcache.cc:312 +#: apt-pkg/pkgcache.cc:318 msgid "standard" msgstr "标准" -#: apt-pkg/pkgcache.cc:313 +#: apt-pkg/pkgcache.cc:319 msgid "optional" msgstr "可选" -#: apt-pkg/pkgcache.cc:313 +#: apt-pkg/pkgcache.cc:319 msgid "extra" msgstr "额外" -#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154 +#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 msgid "Building dependency tree" msgstr "正在分析软件包的依赖关系树" -#: apt-pkg/depcache.cc:126 +#: apt-pkg/depcache.cc:133 msgid "Candidate versions" msgstr "候选版本" -#: apt-pkg/depcache.cc:155 +#: apt-pkg/depcache.cc:162 msgid "Dependency generation" msgstr "生成依赖关系" -#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212 +#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 msgid "Reading state information" msgstr "正在读取状态信息" -#: apt-pkg/depcache.cc:237 +#: apt-pkg/depcache.cc:244 #, c-format msgid "Failed to open StateFile %s" msgstr "无法打开状态文件 %s" -#: apt-pkg/depcache.cc:243 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "无法写入临时状态文件 %s" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:126 #, c-format msgid "Unable to parse package file %s (1)" msgstr "无法解析软件包文件 %s (1)" -#: apt-pkg/tagfile.cc:189 +#: apt-pkg/tagfile.cc:213 #, c-format msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)" -#: apt-pkg/sourcelist.cc:106 +#: apt-pkg/sourcelist.cc:110 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:116 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)" -#: apt-pkg/sourcelist.cc:115 +#: apt-pkg/sourcelist.cc:119 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)" -#: apt-pkg/sourcelist.cc:128 +#: apt-pkg/sourcelist.cc:132 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)" -#: apt-pkg/sourcelist.cc:130 +#: apt-pkg/sourcelist.cc:134 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:137 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" -#: apt-pkg/sourcelist.cc:139 +#: apt-pkg/sourcelist.cc:143 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)" -#: apt-pkg/sourcelist.cc:146 +#: apt-pkg/sourcelist.cc:150 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:248 #, c-format msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444 +#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485 #, c-format msgid "Line %u too long in source list %s." msgstr "源列表 %2$s 的第 %1$u 行太长了。" -#: apt-pkg/sourcelist.cc:281 +#: apt-pkg/sourcelist.cc:285 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623 +#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2741,7 +2771,12 @@ msgstr "" "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure " "(%d)" -#: apt-pkg/packagemanager.cc:456 +#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "无法打开文件 %s" + +#: apt-pkg/packagemanager.cc:507 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2752,27 +2787,18 @@ msgstr "" "少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::" "Force-LoopBreak 选项。" -#: apt-pkg/packagemanager.cc:501 -#, c-format -msgid "" -"Could not perform immediate configuration on already unpacked '%s'. Please " -"see man 5 apt.conf under APT::Immediate-Configure for details." -msgstr "" -"无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-" -"Configure。" - -#: apt-pkg/pkgrecords.cc:32 +#: apt-pkg/pkgrecords.cc:34 #, c-format msgid "Index file type '%s' is not supported" msgstr "不支持索引文件类型“%s”" -#: apt-pkg/algorithms.cc:247 +#: apt-pkg/algorithms.cc:255 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" -#: apt-pkg/algorithms.cc:1158 +#: apt-pkg/algorithms.cc:1191 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2780,13 +2806,13 @@ msgstr "" "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" "缘故。" -#: apt-pkg/algorithms.cc:1160 +#: apt-pkg/algorithms.cc:1193 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466 +#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2794,231 +2820,193 @@ msgid "" msgstr "" "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。" -#: apt-pkg/acquire.cc:79 +#: apt-pkg/acquire.cc:81 #, c-format msgid "List directory %spartial is missing." msgstr "软件包列表的目录 %spartial 缺失。" -#: apt-pkg/acquire.cc:83 +#: apt-pkg/acquire.cc:85 #, c-format msgid "Archives directory %spartial is missing." msgstr "仓库目录 %spartial 确实。" -#: apt-pkg/acquire.cc:91 +#: apt-pkg/acquire.cc:93 #, c-format msgid "Unable to lock directory %s" msgstr "无法对目录 %s 加锁" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:857 +#: apt-pkg/acquire.cc:864 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)" -#: apt-pkg/acquire.cc:859 +#: apt-pkg/acquire.cc:866 #, c-format msgid "Retrieving file %li of %li" msgstr "正在下载第 %li 个文件，共 %li 个" -#: apt-pkg/acquire-worker.cc:110 +#: apt-pkg/acquire-worker.cc:112 #, c-format msgid "The method driver %s could not be found." msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" -#: apt-pkg/acquire-worker.cc:159 +#: apt-pkg/acquire-worker.cc:161 #, c-format msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" -#: apt-pkg/acquire-worker.cc:423 +#: apt-pkg/acquire-worker.cc:425 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。" -#: apt-pkg/init.cc:147 +#: apt-pkg/init.cc:151 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支持“%s”打包系统" -#: apt-pkg/init.cc:163 +#: apt-pkg/init.cc:167 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" -#: apt-pkg/clean.cc:56 +#: apt-pkg/clean.cc:59 #, c-format msgid "Unable to stat %s." msgstr "无法读取 %s 的状态。" -#: apt-pkg/srcrecords.cc:44 +#: apt-pkg/srcrecords.cc:47 msgid "You must put some 'source' URIs in your sources.list" msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI" -#: apt-pkg/cachefile.cc:84 +#: apt-pkg/cachefile.cc:87 msgid "The package lists or status file could not be parsed or opened." msgstr "无法解析或打开软件包的列表或是状态文件。" -#: apt-pkg/cachefile.cc:88 +#: apt-pkg/cachefile.cc:91 msgid "You may want to run apt-get update to correct these problems" msgstr "您可能需要运行 apt-get update 来解决这些问题" -#: apt-pkg/cachefile.cc:106 +#: apt-pkg/cachefile.cc:109 msgid "The list of sources could not be read." msgstr "无法读取源列表。" -#: apt-pkg/policy.cc:71 +#: apt-pkg/policy.cc:74 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:389 +#: apt-pkg/policy.cc:396 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头" -#: apt-pkg/policy.cc:411 +#: apt-pkg/policy.cc:418 #, c-format msgid "Did not understand pin type %s" msgstr "无法识别锁定的类型 %s" -#: apt-pkg/policy.cc:419 +#: apt-pkg/policy.cc:426 msgid "No priority (or zero) specified for pin" msgstr "没有为版本锁定指定优先级(或为零)" -#: apt-pkg/pkgcachegen.cc:80 +#: apt-pkg/pkgcachegen.cc:85 msgid "Cache has an incompatible versioning system" msgstr "软件包暂存区使用的是不兼容的版本控制系统" -#: apt-pkg/pkgcachegen.cc:187 -#, c-format -msgid "Error occurred while processing %s (NewPackage)" -msgstr "处理 %s (NewPackage)时出错" - -#: apt-pkg/pkgcachegen.cc:204 -#, c-format -msgid "Error occurred while processing %s (UsePackage1)" -msgstr "处理 %s (UsePackage1)时出错" - -#: apt-pkg/pkgcachegen.cc:242 -#, c-format -msgid "Error occurred while processing %s (NewFileDesc1)" -msgstr "处理 %s (NewFileDesc1)时出错" - -#: apt-pkg/pkgcachegen.cc:274 -#, c-format -msgid "Error occurred while processing %s (UsePackage2)" -msgstr "处理 %s (UsePackage2)时出错" - -#: apt-pkg/pkgcachegen.cc:278 -#, c-format -msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "处理 %s (NewFileVer1)时出错" - -#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305 -#: apt-pkg/pkgcachegen.cc:313 -#, c-format -msgid "Error occurred while processing %s (NewVersion%d)" -msgstr "处理 %s (NewVersion%d)时出错" - -#: apt-pkg/pkgcachegen.cc:309 -#, c-format -msgid "Error occurred while processing %s (UsePackage3)" -msgstr "处理 %s (UsePackage3)时出错" - -#: apt-pkg/pkgcachegen.cc:342 -#, c-format -msgid "Error occurred while processing %s (NewFileDesc2)" -msgstr "处理 %s (NewFileDesc2)时出错" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277 +#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355 +#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390 +#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465 +#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "处理 %s (FindPkg)时出错" -#: apt-pkg/pkgcachegen.cc:348 +#: apt-pkg/pkgcachegen.cc:234 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "哇，软件包数量超出了本 APT 的处理能力。" -#: apt-pkg/pkgcachegen.cc:351 +#: apt-pkg/pkgcachegen.cc:237 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "哇，软件包版本数量超出了本 APT 的处理能力。" -#: apt-pkg/pkgcachegen.cc:354 +#: apt-pkg/pkgcachegen.cc:240 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "哇，软件包说明数量超出了本 APT 的处理能力。" -#: apt-pkg/pkgcachegen.cc:357 +#: apt-pkg/pkgcachegen.cc:243 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "哇，依赖关系数量超出了本 APT 的处理能力。" -#: apt-pkg/pkgcachegen.cc:386 -#, c-format -msgid "Error occurred while processing %s (FindPkg)" -msgstr "处理 %s (FindPkg)时出错" - -#: apt-pkg/pkgcachegen.cc:400 -#, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "处理 %s (CollectFileProvides)时出错" - -#: apt-pkg/pkgcachegen.cc:406 +#: apt-pkg/pkgcachegen.cc:517 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" -#: apt-pkg/pkgcachegen.cc:960 +#: apt-pkg/pkgcachegen.cc:1082 #, c-format msgid "Couldn't stat source package list %s" msgstr "无法获取源软件包列表 %s 的状态" -#: apt-pkg/pkgcachegen.cc:1065 +#: apt-pkg/pkgcachegen.cc:1187 msgid "Collecting File Provides" msgstr "正在收集文件所提供的软件包" -#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266 +#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385 msgid "IO Error saving source cache" msgstr "无法读取或写入软件源缓存" -#: apt-pkg/acquire-item.cc:135 +#: apt-pkg/acquire-item.cc:139 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:636 +#: apt-pkg/acquire-item.cc:640 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848 -#: apt-pkg/acquire-item.cc:1991 +#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863 +#: apt-pkg/acquire-item.cc:2006 msgid "Hash Sum mismatch" msgstr "Hash 校验和不符" -#: apt-pkg/acquire-item.cc:1388 +#: apt-pkg/acquire-item.cc:1399 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1415 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/acquire-item.cc:1439 +#: apt-pkg/acquire-item.cc:1450 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1488 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1499 +#: apt-pkg/acquire-item.cc:1510 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc:1532 +#: apt-pkg/acquire-item.cc:1543 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3027,12 +3015,12 @@ msgstr "" "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547 +#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 错误：%s: %s" -#: apt-pkg/acquire-item.cc:1639 +#: apt-pkg/acquire-item.cc:1650 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3041,7 +3029,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1698 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3049,47 +3037,47 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:1753 +#: apt-pkg/acquire-item.cc:1768 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:1840 +#: apt-pkg/acquire-item.cc:1855 msgid "Size mismatch" msgstr "大小不符" -#: apt-pkg/indexrecords.cc:53 +#: apt-pkg/indexrecords.cc:61 #, c-format msgid "Unable to parse Release file %s" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/indexrecords.cc:63 +#: apt-pkg/indexrecords.cc:71 #, c-format msgid "No sections in Release file %s" msgstr "软件包仓库 Release 文件 %s 内无组件章节信息" -#: apt-pkg/indexrecords.cc:97 +#: apt-pkg/indexrecords.cc:105 #, c-format msgid "No Hash entry in Release file %s" msgstr "软件包仓库 Release 文件 %s 内无哈希条目" -#: apt-pkg/indexrecords.cc:110 +#: apt-pkg/indexrecords.cc:118 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:137 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效" -#: apt-pkg/vendorlist.cc:71 +#: apt-pkg/vendorlist.cc:78 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "软件提供者数据块内 %s 没有包含指纹信息" -#: apt-pkg/cdrom.cc:525 +#: apt-pkg/cdrom.cc:566 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -3098,41 +3086,41 @@ msgstr "" "现把 %s 作为了 CD-ROM 的挂载点\n" "正在挂载 CD-ROM\n" -#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631 +#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672 msgid "Identifying.. " msgstr "正在鉴别.. " -#: apt-pkg/cdrom.cc:562 +#: apt-pkg/cdrom.cc:603 #, c-format msgid "Stored label: %s\n" msgstr "已归档文件的标签：%s\n" -#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847 +#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894 msgid "Unmounting CD-ROM...\n" msgstr "正在卸载 CD-ROM...\n" -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:632 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:650 msgid "Unmounting CD-ROM\n" msgstr "正在卸载 CD-ROM 文件系统\n" -#: apt-pkg/cdrom.cc:614 +#: apt-pkg/cdrom.cc:655 msgid "Waiting for disc...\n" msgstr "等待插入盘片……\n" -#: apt-pkg/cdrom.cc:623 +#: apt-pkg/cdrom.cc:664 msgid "Mounting CD-ROM...\n" msgstr "正在挂载 CD-ROM 文件系统……\n" -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:683 msgid "Scanning disc for index files..\n" msgstr "正在盘片中查找索引文件..\n" -#: apt-pkg/cdrom.cc:684 +#: apt-pkg/cdrom.cc:731 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3141,7 +3129,7 @@ msgstr "" "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签" "名\n" -#: apt-pkg/cdrom.cc:695 +#: apt-pkg/cdrom.cc:742 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3149,16 +3137,16 @@ msgstr "" "无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构" "架。" -#: apt-pkg/cdrom.cc:722 +#: apt-pkg/cdrom.cc:769 #, c-format msgid "Found label '%s'\n" msgstr "找到标签 '%s'\n" -#: apt-pkg/cdrom.cc:751 +#: apt-pkg/cdrom.cc:798 msgid "That is not a valid name, try again.\n" msgstr "这不是一个有效的名字，请重试。\n" -#: apt-pkg/cdrom.cc:768 +#: apt-pkg/cdrom.cc:815 #, c-format msgid "" "This disc is called: \n" @@ -3167,293 +3155,354 @@ msgstr "" "这张盘片现在的名字是：\n" "“%s”\n" -#: apt-pkg/cdrom.cc:770 +#: apt-pkg/cdrom.cc:817 msgid "Copying package lists..." msgstr "正在复制软件包列表……" -#: apt-pkg/cdrom.cc:797 +#: apt-pkg/cdrom.cc:844 msgid "Writing new source list\n" msgstr "正在写入新的源列表\n" -#: apt-pkg/cdrom.cc:805 +#: apt-pkg/cdrom.cc:852 msgid "Source list entries for this disc are:\n" msgstr "对应于该盘片的软件源设置项是：\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873 #, c-format msgid "Wrote %i records.\n" msgstr "已写入 %i 条记录。\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n" -#: apt-pkg/indexcopy.cc:537 +#: apt-pkg/indexcopy.cc:503 #, c-format msgid "Skipping nonexistent file %s" msgstr "跳过不存在的文件 %s" -#: apt-pkg/indexcopy.cc:543 +#: apt-pkg/indexcopy.cc:509 #, c-format msgid "Can't find authentication record for: %s" msgstr "无法找到认证记录：%s" -#: apt-pkg/indexcopy.cc:549 +#: apt-pkg/indexcopy.cc:515 #, c-format msgid "Hash mismatch for: %s" msgstr "Hash 校验和不符：%s" -#: apt-pkg/indexcopy.cc:677 +#: apt-pkg/indexcopy.cc:659 #, c-format msgid "File %s doesn't start with a clearsigned message" msgstr "" #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/indexcopy.cc:708 +#: apt-pkg/indexcopy.cc:690 #, c-format msgid "No keyring installed in %s." msgstr "%s 中没有安装密钥环。" -#: apt-pkg/cacheset.cc:337 +#: apt-pkg/cacheset.cc:352 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”发布版本" -#: apt-pkg/cacheset.cc:340 +#: apt-pkg/cacheset.cc:355 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: apt-pkg/cacheset.cc:447 +#: apt-pkg/cacheset.cc:466 #, c-format msgid "Couldn't find task '%s'" msgstr "无法找到任务 %s" -#: apt-pkg/cacheset.cc:454 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "无法按照正则表达式 %s 找到任何软件包" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:483 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "无法从完全虚拟的软件包 %s 中选择版本" -#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483 +#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择" -#: apt-pkg/cacheset.cc:491 +#: apt-pkg/cacheset.cc:504 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版" -#: apt-pkg/cacheset.cc:499 +#: apt-pkg/cacheset.cc:512 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "因为软件包 %s 没有候选版本，无法进行选择" -#: apt-pkg/cacheset.cc:507 +#: apt-pkg/cacheset.cc:520 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本" -#: apt-pkg/deb/dpkgpm.cc:54 +#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +msgid "Send scenario to solver" +msgstr "" + +#: apt-pkg/edsp.cc:213 +msgid "Send request to solver" +msgstr "" + +#: apt-pkg/edsp.cc:281 +msgid "Prepare for receiving solution" +msgstr "" + +#: apt-pkg/edsp.cc:288 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567 +msgid "Execute external solver" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:71 #, c-format msgid "Installing %s" msgstr "正在安装 %s" -#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848 +#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855 +#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907 #, c-format msgid "Removing %s" msgstr "正在删除 %s" -#: apt-pkg/deb/dpkgpm.cc:57 +#: apt-pkg/deb/dpkgpm.cc:74 #, c-format msgid "Completely removing %s" msgstr "完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:58 +#: apt-pkg/deb/dpkgpm.cc:75 #, c-format msgid "Noting disappearance of %s" msgstr "注意到 %s 已经消失" -#: apt-pkg/deb/dpkgpm.cc:59 +#: apt-pkg/deb/dpkgpm.cc:76 #, c-format msgid "Running post-installation trigger %s" msgstr "执行安装后执行的触发器 %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:654 +#: apt-pkg/deb/dpkgpm.cc:672 #, c-format msgid "Directory '%s' missing" msgstr "目录 %s 缺失" -#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689 +#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707 #, c-format msgid "Could not open file '%s'" msgstr "无法打开文件 %s" -#: apt-pkg/deb/dpkgpm.cc:841 +#: apt-pkg/deb/dpkgpm.cc:893 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:842 +#: apt-pkg/deb/dpkgpm.cc:894 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:847 +#: apt-pkg/deb/dpkgpm.cc:899 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:849 +#: apt-pkg/deb/dpkgpm.cc:901 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:854 +#: apt-pkg/deb/dpkgpm.cc:906 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:856 +#: apt-pkg/deb/dpkgpm.cc:908 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:861 +#: apt-pkg/deb/dpkgpm.cc:913 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:862 +#: apt-pkg/deb/dpkgpm.cc:914 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:1082 +#: apt-pkg/deb/dpkgpm.cc:1142 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n" -#: apt-pkg/deb/dpkgpm.cc:1113 +#: apt-pkg/deb/dpkgpm.cc:1172 msgid "Running dpkg" msgstr "正在运行 dpkg" -#: apt-pkg/deb/dpkgpm.cc:1338 +#: apt-pkg/deb/dpkgpm.cc:1351 +msgid "Operation was interrupted before it could finish" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1408 msgid "No apport report written because MaxReports is reached already" msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1343 +#: apt-pkg/deb/dpkgpm.cc:1413 msgid "dependency problems - leaving unconfigured" msgstr "依赖问题 - 保持未配置" -#: apt-pkg/deb/dpkgpm.cc:1345 +#: apt-pkg/deb/dpkgpm.cc:1415 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1351 +#: apt-pkg/deb/dpkgpm.cc:1421 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1357 +#: apt-pkg/deb/dpkgpm.cc:1427 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1364 +#: apt-pkg/deb/dpkgpm.cc:1434 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。" -#: apt-pkg/deb/debsystem.cc:69 +#: apt-pkg/deb/debsystem.cc:84 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？" -#: apt-pkg/deb/debsystem.cc:72 +#: apt-pkg/deb/debsystem.cc:87 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:88 +#: apt-pkg/deb/debsystem.cc:103 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。" -#: apt-pkg/deb/debsystem.cc:106 +#: apt-pkg/deb/debsystem.cc:121 msgid "Not locked" msgstr "未锁定" #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default -#: methods/mirror.cc:260 +#: methods/mirror.cc:279 #, c-format msgid "No mirror file '%s' found " msgstr "没有找到镜像文件 %s" #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default -#: methods/mirror.cc:267 +#: methods/mirror.cc:286 #, fuzzy, c-format msgid "Can not read mirror file '%s'" msgstr "没有找到镜像文件 %s" -#: methods/mirror.cc:422 +#: methods/mirror.cc:441 #, c-format msgid "[Mirror: %s]" msgstr "[镜像：%s]" -#: methods/rred.cc:503 +#: methods/rred.cc:472 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。" -#: methods/rred.cc:508 +#: methods/rred.cc:477 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " "to be corrupt." msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。" -#: methods/rsh.cc:330 +#: methods/rsh.cc:336 msgid "Connection closed prematurely" msgstr "连接被永久关闭" +#~ msgid "decompressor" +#~ msgstr "解压程序" + +#~ msgid "" +#~ "Could not perform immediate configuration on already unpacked '%s'. " +#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details." +#~ msgstr "" +#~ "无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::" +#~ "Immediate-Configure。" + +#~ msgid "Error occurred while processing %s (NewPackage)" +#~ msgstr "处理 %s (NewPackage)时出错" + +#~ msgid "Error occurred while processing %s (UsePackage1)" +#~ msgstr "处理 %s (UsePackage1)时出错" + +#~ msgid "Error occurred while processing %s (NewFileDesc1)" +#~ msgstr "处理 %s (NewFileDesc1)时出错" + +#~ msgid "Error occurred while processing %s (UsePackage2)" +#~ msgstr "处理 %s (UsePackage2)时出错" + +#~ msgid "Error occurred while processing %s (NewFileVer1)" +#~ msgstr "处理 %s (NewFileVer1)时出错" + +#~ msgid "Error occurred while processing %s (NewVersion%d)" +#~ msgstr "处理 %s (NewVersion%d)时出错" + +#~ msgid "Error occurred while processing %s (UsePackage3)" +#~ msgstr "处理 %s (UsePackage3)时出错" + +#~ msgid "Error occurred while processing %s (NewFileDesc2)" +#~ msgstr "处理 %s (NewFileDesc2)时出错" + +#~ msgid "Error occurred while processing %s (CollectFileProvides)" +#~ msgstr "处理 %s (CollectFileProvides)时出错" + #~ msgid "Internal error, could not locate member" #~ msgstr "内部错误，无法定位包内文件" -- cgit v1.2.3 From a12d5352927c7d3a2fe66a90fc7794b4a8e596ad Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 12 Apr 2012 12:23:57 +0200 Subject: merged r1972 from lp:~paolorotolo/apt/fix-for-967393 --- po/zh_CN.po | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'po/zh_CN.po') diff --git a/po/zh_CN.po b/po/zh_CN.po index 8fb361fb9..8dfa91730 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3466,9 +3466,27 @@ msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可 msgid "Connection closed prematurely" msgstr "连接被永久关闭" +#~ msgid "Malformed override %s line %lu #1" +#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #1" + +#~ msgid "Malformed override %s line %lu #2" +#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #2" + +#~ msgid "Malformed override %s line %lu #3" +#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #3" + #~ msgid "decompressor" #~ msgstr "解压程序" +#~ msgid "Note: This is done automatically and on purpose by dpkg." +#~ msgstr "注意：这是自动被 dpkg 有意完成的。" + +#~ msgid "read, still have %lu to read but none left" +#~ msgstr "读取文件出错，还剩 %lu 字节没有读出" + +#~ msgid "write, still have %lu to write but couldn't" +#~ msgstr "写入文件出错，还剩 %lu 字节没有保存" + #~ msgid "" #~ "Could not perform immediate configuration on already unpacked '%s'. " #~ "Please see man 5 apt.conf under APT::Immediate-Configure for details." @@ -3500,6 +3518,9 @@ msgstr "连接被永久关闭" #~ msgid "Error occurred while processing %s (NewFileDesc2)" #~ msgstr "处理 %s (NewFileDesc2)时出错" +#~ msgid "Error occurred while processing %s (FindPkg)" +#~ msgstr "处理 %s (FindPkg)时出错" + #~ msgid "Error occurred while processing %s (CollectFileProvides)" #~ msgstr "处理 %s (CollectFileProvides)时出错" -- cgit v1.2.3 From 8eca4bb8a23bcd29f7b16b170a344bf568b4c536 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 12 Apr 2012 15:13:53 +0200 Subject: (semi)automatic translations update --- po/zh_CN.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'po/zh_CN.po') diff --git a/po/zh_CN.po b/po/zh_CN.po index 8dfa91730..bb740d586 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1014,7 +1014,7 @@ msgid_plural "" msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失：" #: cmdline/apt-get.cc:1381 -msgid "Note: This is done automatic and on purpose by dpkg." +msgid "Note: This is done automatically and on purpose by dpkg." msgstr "注意：这是自动被 dpkg 有意完成的。" #: cmdline/apt-get.cc:1519 @@ -3466,6 +3466,9 @@ msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可 msgid "Connection closed prematurely" msgstr "连接被永久关闭" +#~ msgid "Note: This is done automatic and on purpose by dpkg." +#~ msgstr "注意：这是自动被 dpkg 有意完成的。" + #~ msgid "Malformed override %s line %lu #1" #~ msgstr "override 文件 %s 第 %lu 行的格式有误 #1" @@ -3478,9 +3481,6 @@ msgstr "连接被永久关闭" #~ msgid "decompressor" #~ msgstr "解压程序" -#~ msgid "Note: This is done automatically and on purpose by dpkg." -#~ msgstr "注意：这是自动被 dpkg 有意完成的。" - #~ msgid "read, still have %lu to read but none left" #~ msgstr "读取文件出错，还剩 %lu 字节没有读出" -- cgit v1.2.3