msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-07 14:40+0100\n"
+"POT-Creation-Date: 2014-03-15 18:13+0100\n"
"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
msgid "Total package names: "
msgstr "软件包名称总数："
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
msgid "Total package structures: "
msgstr "全部软件包结构："
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
msgid " Normal packages: "
msgstr " 普通软件包："
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
msgid " Pure virtual packages: "
msgstr " 完全虚拟软件包："
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
msgid " Single virtual packages: "
msgstr " 单虚拟软件包："
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
msgid " Mixed virtual packages: "
msgstr " 混合虚拟软件包："
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
msgid " Missing: "
msgstr " 缺失："
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
msgid "Total distinct versions: "
msgstr "按版本共计："
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
msgid "Total distinct descriptions: "
msgstr "按不同的说明共计："
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
msgid "Total dependencies: "
msgstr "按依赖关系共计："
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
msgid "Total ver/file relations: "
msgstr "按版本/文件关系共计："
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
msgid "Total Desc/File relations: "
msgstr "按说明/文件关系共计："
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
msgid "Total Provides mappings: "
msgstr "提供映射共计："
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
msgid "Total globbed strings: "
msgstr "Glob 字串共计："
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
msgid "Total dependency version space: "
msgstr "依赖关系版本名所占空间共计："
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
msgid "Total slack space: "
msgstr "Slack 空间共计："
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
msgid "Total space accounted for: "
msgstr "总占用空间："
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步。"
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "没有发现匹配的软件包"
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
msgid "You must give at least one search pattern"
msgstr "您必须明确地给出至少一个表达式"
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594
#, c-format
msgid "Unable to locate package %s"
msgstr "未发现软件包 %s"
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
msgid "Package files:"
msgstr "软件包文件："
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
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:1557
+#: cmdline/apt-cache.cc:1566
msgid "Pinned packages:"
msgstr "被锁定的软件包："
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
msgid "(not found)"
msgstr "(没有找到)"
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
msgid " Installed: "
msgstr " 已安装："
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
msgid " Candidate: "
msgstr " 候选软件包："
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
msgid "(none)"
msgstr "(无)"
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
msgid " Package pin: "
msgstr " 软件包锁："
#. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
msgid " Version table:"
msgstr " 版本列表："
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1524 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: 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:1740
+#: cmdline/apt-cache.cc:1749
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
"若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”"
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
msgid "Please insert a Disc in the drive and press enter"
msgstr "请把盘片插入驱动器再按回车键"
msgid "Failed to mount '%s' to '%s'"
msgstr "无法将 %s 挂载到 %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
" -c=? 读取指定的配置文件\n"
" -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:313
+#: cmdline/apt-get.cc:245
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
+
+#: cmdline/apt-get.cc:327
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
+
+#: cmdline/apt-get.cc:330
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
+
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "选择 %s 作为源代码包而非 %s\n"
-#: cmdline/apt-get.cc:367
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
+#: cmdline/apt-get.cc:423
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
-#: cmdline/apt-get.cc:398
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:403 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:405 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:413 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:482 cmdline/apt-get.cc:490
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误，问题解决工具坏事了"
-#: cmdline/apt-get.cc:518 cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码，必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:707 cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:724
+#: cmdline/apt-get.cc:782
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
"%s\n"
-#: cmdline/apt-get.cc:729
+#: cmdline/apt-get.cc:787
#, fuzzy, c-format
msgid ""
"Please use:\n"
"bzr get %s\n"
"获得该软件包的最近更新(可能尚未正式发布)。\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:805 cmdline/apt-get.cc:808
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的可用空间"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:874
#, 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:828
+#: cmdline/apt-get.cc:883
#, 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:833
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:860
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:865 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "下载完毕，目前是“仅下载”模式"
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:903
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:904
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:965
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1014 cmdline/apt-get.cc:1017
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1263
#, 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:1225
+#: cmdline/apt-get.cc:1281
#, 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:1248
+#: cmdline/apt-get.cc:1304
#, 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:1287
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 "
"%1$s 依赖关系"
-#: cmdline/apt-get.cc:1293
+#: cmdline/apt-get.cc:1349
#, 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:1316
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
-#: cmdline/apt-get.cc:1331
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:1429 cmdline/apt-get.cc:1441
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "正在连接 %s (%s)"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1583
msgid "Supported modules:"
msgstr "支持的模块："
-#: cmdline/apt-get.cc:1570
+#: cmdline/apt-get.cc:1624
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
"以获取更多信息和选项。\n"
" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "要下载源代码，必须指定至少一个对应的软件包"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+" apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+" download-file - download the given uri to the target-path\n"
+"\n"
+" This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "但是它还没有被安装"
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1174
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
+#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1186
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出，但是它并不存在"
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s 已设置为手动安装。\n"
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "无法打开 %s"
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+" full-upgrade - upgrade the system by removing/installing/upgrading "
+"packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
msgid "Disk not found."
msgstr "找不到盘片。"
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
msgid "File not found"
msgstr "无法找到该文件"
-#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
-#: methods/file.cc:47
+#: methods/file.cc:48
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:173
+#: methods/ftp.cc:177
msgid "Logging in"
msgstr "正在登录"
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
msgid "Unable to determine the peer name"
msgstr "无法获知对方主机名"
-#: methods/ftp.cc:184
+#: methods/ftp.cc:188
msgid "Unable to determine the local name"
msgstr "无法获知本地主机名"
-#: methods/ftp.cc:215 methods/ftp.cc:243
+#: methods/ftp.cc:219 methods/ftp.cc:247
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "服务器拒绝了我们的连接，响应信息为：%s"
-#: methods/ftp.cc:221
+#: methods/ftp.cc:225
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER 指令出错，服务器响应信息为：%s"
-#: methods/ftp.cc:228
+#: methods/ftp.cc:232
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS 指令出错，服务器响应信息为：%s"
-#: methods/ftp.cc:248
+#: methods/ftp.cc:252
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
"您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"
-#: methods/ftp.cc:276
+#: methods/ftp.cc:280
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"
-#: methods/ftp.cc:302
+#: methods/ftp.cc:306
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE 指令出错，服务器响应信息为：%s"
-#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
msgid "Connection timeout"
msgstr "连接超时"
-#: methods/ftp.cc:346
+#: methods/ftp.cc:350
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451
+#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465
+#: apt-pkg/contrib/fileutl.cc:1467
msgid "Read error"
msgstr "读错误"
-#: methods/ftp.cc:356 methods/rsh.cc:206
+#: methods/ftp.cc:360 methods/rsh.cc:209
msgid "A response overflowed the buffer."
msgstr "回应超出了缓存区大小。"
-#: methods/ftp.cc:373 methods/ftp.cc:385
+#: methods/ftp.cc:377 methods/ftp.cc:389
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871
+#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582
+#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589
+#: apt-pkg/contrib/fileutl.cc:1614
msgid "Write error"
msgstr "写出错"
-#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
msgid "Could not create a socket"
msgstr "无法创建套接字"
-#: methods/ftp.cc:708
+#: methods/ftp.cc:712
msgid "Could not connect data socket, connection timed out"
msgstr "无法连接上数据套接字，连接超时"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
msgid "Failed"
msgstr "失败"
-#: methods/ftp.cc:714
+#: methods/ftp.cc:718
msgid "Could not connect passive socket."
msgstr "无法连接被动模式的套接字。"
-#: methods/ftp.cc:731
+#: methods/ftp.cc:735
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo 无法得到监听套接字"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
msgid "Could not bind a socket"
msgstr "无法绑定套接字"
-#: methods/ftp.cc:749
+#: methods/ftp.cc:753
msgid "Could not listen on the socket"
msgstr "无法在套接字上监听"
-#: methods/ftp.cc:756
+#: methods/ftp.cc:760
msgid "Could not determine the socket's name"
msgstr "无法确定套接字的名字"
-#: methods/ftp.cc:788
+#: methods/ftp.cc:792
msgid "Unable to send PORT command"
msgstr "无法发出 PORT 指令"
-#: methods/ftp.cc:798
+#: methods/ftp.cc:802
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "无法识别的地址族 %u (AF_*)"
-#: methods/ftp.cc:807
+#: methods/ftp.cc:811
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT 指令出错，服务器响应信息为：%s"
-#: methods/ftp.cc:827
+#: methods/ftp.cc:831
msgid "Data socket connect timed out"
msgstr "数据套接字连接超时"
-#: methods/ftp.cc:834
+#: methods/ftp.cc:838
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
msgid "Problem hashing file"
msgstr "把文件加入哈希表时出错"
-#: methods/ftp.cc:886
+#: methods/ftp.cc:890
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "无法获取文件，服务器响应信息为“%s”"
-#: methods/ftp.cc:901 methods/rsh.cc:332
+#: methods/ftp.cc:905 methods/rsh.cc:335
msgid "Data socket timed out"
msgstr "数据套接字超时"
-#: methods/ftp.cc:931
+#: methods/ftp.cc:935
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "数据传送出错，服务器响应信息为“%s”"
#. Get the files information
-#: methods/ftp.cc:1008
+#: methods/ftp.cc:1014
msgid "Query"
msgstr "查询"
-#: methods/ftp.cc:1120
+#: methods/ftp.cc:1128
msgid "Unable to invoke "
msgstr "无法调用 "
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
#, c-format
msgid "Connecting to %s"
msgstr "正在连接 %s"
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s：%s："
-#: methods/gpgv.cc:167
+#: methods/gpgv.cc:168
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:172
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:173
+#: methods/gpgv.cc:174
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:180
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:184
msgid "Unknown error executing gpgv"
msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:216 methods/gpgv.cc:223
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效：\n"
-#: methods/gpgv.cc:230
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr "由于没有公钥，无法验证下列签名：\n"
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:519
+#: methods/http.cc:508
msgid "Error writing to the file"
msgstr "写入文件出错"
-#: methods/http.cc:533
+#: methods/http.cc:522
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错，对方关闭了连接"
-#: methods/http.cc:535
+#: methods/http.cc:524
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:571
+#: methods/http.cc:560
msgid "Error writing to file"
msgstr "写入文件出错"
-#: methods/http.cc:631
+#: methods/http.cc:620
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:636
+#: methods/http.cc:625
msgid "Connection timed out"
msgstr "连接超时"
-#: methods/http.cc:659
+#: methods/http.cc:648
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/server.cc:56
+#: methods/server.cc:51
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/server.cc:114
+#: methods/server.cc:109
msgid "Bad header line"
msgstr "错误的报头行"
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
msgid "The HTTP server sent an invalid reply header"
msgstr "该 HTTP 服务器发送了一个无效的应答报头"
-#: methods/server.cc:176
+#: methods/server.cc:171
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
-#: methods/server.cc:199
+#: methods/server.cc:194
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
-#: methods/server.cc:201
+#: methods/server.cc:196
msgid "This HTTP server has broken range support"
msgstr "该 HTTP 服务器的 range 支持不正常"
-#: methods/server.cc:225
+#: methods/server.cc:220
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/server.cc:490
+#: methods/server.cc:489
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/server.cc:507 methods/server.cc:564
+#: methods/server.cc:506 methods/server.cc:562
msgid "Connection failed"
msgstr "连接失败"
-#: methods/server.cc:656
+#: methods/server.cc:654
msgid "Internal error"
msgstr "内部错误"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:132
msgid "Listing"
msgstr ""
-#: apt-private/private-install.cc:93
+#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误，Ordering 未能完成"
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
#, 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
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
#, 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
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
#, 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
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 上没有足够的可用空间。"
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
msgid "Yes, do as I say!"
msgstr "是，按我说的做！"
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"若还想继续的话，就输入下面的短句“%s”\n"
" ?] "
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
msgid "Abort."
msgstr "中止执行。"
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
msgid "Do you want to continue?"
msgstr "您希望继续执行吗？"
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
msgid "Some files failed to download"
msgstr "有一些文件无法下载"
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试？"
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换"
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
msgid "Aborting install."
msgstr "中止安装。"
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
"all files have been overwritten by other packages:"
msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "注意：这是自动被 dpkg 有意完成的。"
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我们不应该进行删除，无法启动自动删除器"
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
msgid "The following information may help to resolve the situation:"
msgstr "下列信息可能会对解决问题有所帮助："
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部错误，自动卸载工具坏事了"
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
"required:"
msgstr[0] "下列软件包是自动安装的并且现在不需要了："
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
#, 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"
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "使用'apt-get autoremove'来卸载它们"
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
msgid "You might want to run 'apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
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"
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
msgid "Broken packages"
msgstr "破损的软件包"
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包："
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
msgid "Suggested packages:"
msgstr "建议安装的软件包："
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
msgid "Recommended packages:"
msgstr "推荐安装的软件包："
-#: apt-private/private-download.cc:32
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】：下列软件包不能通过验证！"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "不经验证就安装这些软件包吗？"
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: apt-private/private-output.cc:198
-msgid "installed,upgradable to: "
+#: apt-private/private-output.cc:81 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:207
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [已安装]"
+
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,local]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:214
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:216
#, fuzzy
msgid "[installed,automatic]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:218
#, fuzzy
msgid "[installed]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:217
-msgid "[upgradable from: "
+#: apt-private/private-output.cc:222
+#, c-format
+msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:226
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:326
msgid "The following packages have unmet dependencies:"
msgstr "下列软件包有未满足的依赖关系："
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:416
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:418
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:425
msgid "but it is not installable"
msgstr "但无法安装它"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:427
msgid "but it is a virtual package"
msgstr "但是它是虚拟软件包"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:430
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:430
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:435
msgid " or"
msgstr " 或"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:464
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装："
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:490
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】："
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:512
msgid "The following packages have been kept back:"
msgstr "下列软件包的版本将保持不变："
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:533
msgid "The following packages will be upgraded:"
msgstr "下列软件包将被升级："
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:554
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】："
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:574
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变："
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:629
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:637
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
"【警告】：下列基础软件包将被卸载。\n"
"请勿尝试，除非您确实知道您在做什么！"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:672
#, c-format
msgid "%lu reinstalled, "
msgstr "重新安装了 %lu 个软件包，"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包，"
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:676
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:680
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:702
msgid "[Y/n]"
msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:708
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:719
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:725
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
-#: apt-private/private-cachefile.cc:87
+#: apt-private/private-cachefile.cc:93
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: apt-private/private-cachefile.cc:90
+#: apt-private/private-cachefile.cc:96
msgid " failed."
msgstr " 失败。"
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:99
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:102
msgid "Unable to minimize the upgrade set"
msgstr "无法最小化要升级的软件包集合"
-#: apt-private/private-cachefile.cc:98
+#: apt-private/private-cachefile.cc:104
msgid " Done"
msgstr " 完成"
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:108
msgid "You might want to run 'apt-get -f install' to correct these."
msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-#: apt-private/private-cachefile.cc:105
+#: apt-private/private-cachefile.cc:111
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
msgid "Sorting"
msgstr ""
-#: apt-private/private-update.cc:45
+#: apt-private/private-update.cc:31
msgid "The update command takes no arguments"
msgstr " update 命令不需要参数"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:30
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "内部错误，全部升级工具坏事了"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:32
msgid "Done"
msgstr "完成"
-#: apt-private/private-search.cc:61
+#: apt-private/private-search.cc:51
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:163
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-main.cc:19
+#: apt-private/private-main.cc:23
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
" apt-get 需要 root 特权进行实际的执行。\n"
" 同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:58
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "无法将 %s 重命名为 %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:70
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
-#: apt-private/acqprogress.cc:60
+#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "命中 "
-#: apt-private/acqprogress.cc:84
+#: apt-private/acqprogress.cc:90
msgid "Get:"
msgstr "获取："
-#: apt-private/acqprogress.cc:115
+#: apt-private/acqprogress.cc:121
msgid "Ign "
msgstr "忽略 "
-#: apt-private/acqprogress.cc:119
+#: apt-private/acqprogress.cc:125
msgid "Err "
msgstr "错误 "
-#: apt-private/acqprogress.cc:140
+#: apt-private/acqprogress.cc:146
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr "下载 %sB，耗时 %s (%sB/s)\n"
-#: apt-private/acqprogress.cc:230
+#: apt-private/acqprogress.cc:236
#, c-format
msgid " [Working]"
msgstr " [执行中]"
-#: apt-private/acqprogress.cc:291
+#: apt-private/acqprogress.cc:297
#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367
+#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280
+#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102
+#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127
#, c-format
msgid "Unable to change to %s"
msgstr "无法切换工作目录到 %s"
msgid "[Mirror: %s]"
msgstr "[镜像：%s]"
-#: methods/rred.cc:491
-#, 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:496
-#, 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:99 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
msgid "Failed to create IPC pipe to subprocess"
msgstr "无法为子进程创建 IPC 管道"
-#: methods/rsh.cc:340
+#: methods/rsh.cc:343
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
msgid "Merging available information"
msgstr "正在合并可用信息"
-#: cmdline/apt-extracttemplates.cc:102
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s 不是一个有效的 DEB 软件包。"
-
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:223
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:297
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "软件包的扩展列表太长"
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "处理目录 %s 时出错"
-#: ftparchive/apt-ftparchive.cc:262
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "源扩展列表太长"
-#: ftparchive/apt-ftparchive.cc:379
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "将头写入到目录文件时出错"
-#: ftparchive/apt-ftparchive.cc:409
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "处理目录 %s 时出错"
-#: ftparchive/apt-ftparchive.cc:597
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
" -c=? 读取指定配置文件\n"
" -o=? 设置任意指定的配置选项"
-#: ftparchive/apt-ftparchive.cc:803
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "没有任何选定项是匹配的"
-#: ftparchive/apt-ftparchive.cc:881
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "软件包文件组“%s”中缺少一些文件"
-#: ftparchive/cachedb.cc:47
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"
-#: ftparchive/cachedb.cc:65
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "数据库已过期，现尝试进行升级 %s"
-#: ftparchive/cachedb.cc:76
+#: ftparchive/cachedb.cc:80
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:81
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "无法打开数据库文件 %s：%s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "无法获得 %s 的状态"
-#: ftparchive/cachedb.cc:249
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "归档文件没有包含控制字段"
-#: ftparchive/cachedb.cc:490
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "无法获得游标"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:91
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告：无法读取目录 %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:96
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告：无法获得 %s 的状态\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:152
msgid "E: "
msgstr "错误："
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:154
msgid "W: "
msgstr "警告："
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:161
msgid "E: Errors apply to file "
msgstr "错误：处理文件时出错 "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
#, c-format
msgid "Failed to resolve %s"
msgstr "无法解析 %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:192
msgid "Tree walking failed"
msgstr "无法遍历目录树"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:219
#, c-format
msgid "Failed to open %s"
msgstr "无法打开 %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:278
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:286
#, c-format
msgid "Failed to readlink %s"
msgstr "无法读取符号链接 %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:290
#, c-format
msgid "Failed to unlink %s"
msgstr "无法使用 unlink 删除 %s"
-#: ftparchive/writer.cc:289
+#: ftparchive/writer.cc:298
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:308
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:404
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
msgid "realloc - Failed to allocate memory"
msgstr "realloc - 分配内存失败"
-#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
#, c-format
msgid "Unable to open %s"
msgstr "无法打开 %s"
-#: ftparchive/override.cc:61 ftparchive/override.cc:167
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "无法读取 override 文件 %s"
+
+#: ftparchive/override.cc:166
#, fuzzy, c-format
msgid "Malformed override %s line %llu #1"
msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
-#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#: ftparchive/override.cc:178
#, fuzzy, c-format
msgid "Malformed override %s line %llu #2"
msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
-#: ftparchive/override.cc:89 ftparchive/override.cc:192
+#: ftparchive/override.cc:191
#, fuzzy, c-format
msgid "Malformed override %s line %llu #3"
msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
-#: ftparchive/override.cc:128 ftparchive/override.cc:202
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "无法读取 override 文件 %s"
-
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:73
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "未知的压缩算法“%s”"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:103
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:192
msgid "Failed to create FILE*"
msgstr "无法创建 FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:195
msgid "Failed to fork"
msgstr "无法 fork"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:209
msgid "Compress child"
msgstr "压缩子进程"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:232
#, c-format
msgid "Internal error, failed to create %s"
msgstr "内部错误，无法创建 %s"
-#: ftparchive/multicompress.cc:304
+#: ftparchive/multicompress.cc:305
msgid "IO to subprocess/file failed"
msgstr "无法对子进程或文件进行读写"
-#: ftparchive/multicompress.cc:342
+#: ftparchive/multicompress.cc:343
msgid "Failed to read while computing MD5"
msgstr "在计算 MD5 校验和时无法读取数据"
-#: ftparchive/multicompress.cc:358
+#: ftparchive/multicompress.cc:359
#, c-format
msgid "Problem unlinking %s"
msgstr "在使用 unlink 删除 %s 时出错"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
#, c-format
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
-#: cmdline/apt-internal-solver.cc:38
+#: cmdline/apt-internal-solver.cc:46
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
" -c=? 读取指定配置文件\n"
" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:124
msgid "Failed to create pipes"
msgstr "无法创建管道"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:151
msgid "Failed to exec gzip "
msgstr "无法执行 gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
msgid "Corrupted archive"
msgstr "包文件已被损坏"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:203
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar 的校验和不符，文件已损坏"
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:308
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 数据头类型 %u，成员 %s"
-#: apt-inst/contrib/arfile.cc:74
+#: apt-inst/contrib/arfile.cc:76
msgid "Invalid archive signature"
msgstr "无效的归档签名"
-#: apt-inst/contrib/arfile.cc:82
+#: apt-inst/contrib/arfile.cc:84
msgid "Error reading archive member header"
msgstr "读取归档成员文件头出错"
-#: apt-inst/contrib/arfile.cc:94
+#: apt-inst/contrib/arfile.cc:96
#, c-format
msgid "Invalid archive member header %s"
msgstr "归档文件中成员文件头 %s 无效"
-#: apt-inst/contrib/arfile.cc:106
+#: apt-inst/contrib/arfile.cc:108
msgid "Invalid archive member header"
msgstr "归档文件中成员文件头无效"
-#: apt-inst/contrib/arfile.cc:135
+#: apt-inst/contrib/arfile.cc:137
msgid "Archive is too short"
msgstr "归档文件太短"
-#: apt-inst/contrib/arfile.cc:139
+#: apt-inst/contrib/arfile.cc:141
msgid "Failed to read the archive headers"
msgstr "无法读取归档文件的数据头"
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "把 DropNode 用在了仍在链表中的节点上"
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
msgstr "无法定位哈希表元素！"
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
msgstr "无法分配转移项"
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
msgid "Internal error in AddDiversion"
msgstr "内部错误，出现在 AddDiversion"
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
#, c-format
msgid "Double add of diversion %s -> %s"
msgstr "添加了两个转移项 %s-> %s"
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
#, c-format
msgid "Duplicate conf file %s/%s"
msgstr "重复的配置文件 %s/%s"
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
#, c-format
msgid "Failed to write file %s"
msgstr "无法写入文件 %s"
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-inst/dirstream.cc:105
#, c-format
msgid "Failed to close file %s"
msgstr "无法关闭文件 %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
#, c-format
msgid "The path %s is too long"
msgstr "路径名 %s 太长"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
#, c-format
msgid "Unpacking %s more than once"
msgstr "%s 被解包了不只一次"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
#, c-format
msgid "The directory %s is diverted"
msgstr "目录 %s 已被转移"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "该软件包正尝试写入转移对象 %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
msgid "The diversion path is too long"
msgstr "该转移路径太长"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:249
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "目录 %s 要被一个非目录的文件替换"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
msgid "Failed to locate node in its hash bucket"
msgstr "无法在其散列桶中分配节点"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
msgid "The path is too long"
msgstr "路径名太长"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "用来覆盖的软件包不属于 %s 的任何版本"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
#, c-format
msgid "Unable to stat %s"
msgstr "无法读取 %s 的状态"
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
-#: apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
-#: apt-inst/deb/debfile.cc:119
+#: apt-inst/deb/debfile.cc:130
#, c-format
msgid "Internal error, could not locate member %s"
msgstr "内部错误，无法定位包内文件 %s"
-#: apt-inst/deb/debfile.cc:213
+#: apt-inst/deb/debfile.cc:225
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
"动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 "
"apt.conf)"
-#: apt-pkg/contrib/mmap.cc:440
+#: apt-pkg/contrib/mmap.cc:446
#, 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:443
+#: apt-pkg/contrib/mmap.cc:449
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-pkg/contrib/strutl.cc:406
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li天 %li小时 %li分 %li秒"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/contrib/strutl.cc:413
#, c-format
msgid "%lih %limin %lis"
msgstr "%li小时 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/contrib/strutl.cc:420
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-pkg/contrib/strutl.cc:1236
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
-#: apt-pkg/contrib/configuration.cc:503
+#: apt-pkg/contrib/configuration.cc:519
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "无法识别的类型缩写：“%c”"
-#: apt-pkg/contrib/configuration.cc:617
+#: apt-pkg/contrib/configuration.cc:633
#, c-format
msgid "Opening configuration file %s"
msgstr "正在打开配置文件 %s"
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-pkg/contrib/configuration.cc:801
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "语法错误 %s:%u：配置小节没有以名字开头"
-#: apt-pkg/contrib/configuration.cc:804
+#: apt-pkg/contrib/configuration.cc:820
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "语法错误 %s:%u：标签格式有误"
-#: apt-pkg/contrib/configuration.cc:821
+#: apt-pkg/contrib/configuration.cc:837
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"
-#: apt-pkg/contrib/configuration.cc:861
+#: apt-pkg/contrib/configuration.cc:877
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"
-#: apt-pkg/contrib/configuration.cc:868
+#: apt-pkg/contrib/configuration.cc:884
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "语法错误 %s:%u：Included from here"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:897
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "语法错误 %s:%u：不支持的指令“%s”"
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/contrib/configuration.cc:950
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/contrib/progress.cc:148
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... 有错误！"
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/contrib/progress.cc:150
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... 完成"
-#: apt-pkg/contrib/progress.cc:179
+#: apt-pkg/contrib/progress.cc:181
msgid "..."
msgstr ""
#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/contrib/progress.cc:197
#, fuzzy, c-format
msgid "%c%s... %u%%"
msgstr "%c%s... 完成"
-#: apt-pkg/contrib/cmndline.cc:116
+#: apt-pkg/contrib/cmndline.cc:121
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "未知的命令行选项“%c” [来自 %s]"
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
#, c-format
msgid "Command line option %s is not understood"
msgstr "无法识别命令行选项 %s"
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-pkg/contrib/cmndline.cc:168
#, c-format
msgid "Command line option %s is not boolean"
msgstr "命令行选项 %s 不是布尔值"
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
#, c-format
msgid "Option %s requires an argument."
msgstr "选项 %s 要求有一个参数"
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"
-#: apt-pkg/contrib/cmndline.cc:273
+#: apt-pkg/contrib/cmndline.cc:278
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
-#: apt-pkg/contrib/cmndline.cc:304
+#: apt-pkg/contrib/cmndline.cc:309
#, c-format
msgid "Option '%s' is too long"
msgstr "选项“%s”太长"
-#: apt-pkg/contrib/cmndline.cc:336
+#: apt-pkg/contrib/cmndline.cc:341
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "不能识别参数 %s，请用 true 或 false"
-#: apt-pkg/contrib/cmndline.cc:386
+#: apt-pkg/contrib/cmndline.cc:391
#, c-format
msgid "Invalid operation %s"
msgstr "无效的操作 %s"
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/contrib/cdromutl.cc:65
#, c-format
msgid "Unable to stat the mount point %s"
msgstr "无法读取文件系统挂载点 %s 的状态"
-#: apt-pkg/contrib/cdromutl.cc:225
+#: apt-pkg/contrib/cdromutl.cc:246
msgid "Failed to stat the cdrom"
msgstr "无法读取盘片的状态"
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "关闭 gzip %s 文件出错"
-
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/contrib/fileutl.cc:189
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "由于文件系统为只读，因而无法使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/contrib/fileutl.cc:194
#, c-format
msgid "Could not open lock file %s"
msgstr "无法打开锁文件 %s"
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/contrib/fileutl.cc:217
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/contrib/fileutl.cc:222
#, c-format
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/contrib/fileutl.cc:393
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/contrib/fileutl.cc:411
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:420
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/contrib/fileutl.cc:823
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/contrib/fileutl.cc:825
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/contrib/fileutl.cc:912
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "关闭 gzip %s 文件出错"
+
+#: apt-pkg/contrib/fileutl.cc:1093
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199
#, c-format
msgid "Could not open file descriptor %d"
msgstr "无法打开文件描述符 %d"
-#: apt-pkg/contrib/fileutl.cc:1178
+#: apt-pkg/contrib/fileutl.cc:1306
msgid "Failed to create subprocess IPC"
msgstr "无法创建子进程的 IPC 管道"
-#: apt-pkg/contrib/fileutl.cc:1233
+#: apt-pkg/contrib/fileutl.cc:1361
msgid "Failed to exec compressor "
msgstr "无法执行压缩程序"
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/contrib/fileutl.cc:1489
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "读取文件出错，还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "写入文件出错，还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1894
#, c-format
msgid "Problem closing the file %s"
msgstr "关闭文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1906
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "重命名文件 %s 为 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1917
#, c-format
msgid "Problem unlinking the file %s"
msgstr "用 unlink 删除文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1930
msgid "Problem syncing the file"
msgstr "同步文件出错"
+#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "无法重命名文件，%s (%s -> %s)。"
+
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:72
#, c-format
msgid "No keyring installed in %s."
msgstr "%s 中没有安装密钥环。"
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
msgid "The package cache file is corrupted"
msgstr "软件包缓存文件损坏了"
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
msgid "The package cache file is an incompatible version"
msgstr "软件包缓存区文件的版本不兼容"
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "软件包缓存文件损坏了"
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "本程序目前不支持“%s”版本系统"
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
msgid "The package cache was built for a different architecture"
msgstr "软件包缓存区是为其它架构的硬件构建的"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
msgid "Depends"
msgstr "依赖"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
msgid "PreDepends"
msgstr "预依赖"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
msgid "Suggests"
msgstr "建议"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
msgid "Recommends"
msgstr "推荐"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
msgid "Conflicts"
msgstr "冲突"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
msgid "Replaces"
msgstr "替换"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
msgid "Obsoletes"
msgstr "废弃"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
msgid "Breaks"
msgstr "破坏"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
msgid "Enhances"
msgstr "增强"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
msgid "required"
msgstr "必需"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
msgid "standard"
msgstr "标准"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
msgid "optional"
msgstr "可选"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
msgid "extra"
msgstr "额外"
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/depcache.cc:133
+#: apt-pkg/depcache.cc:139
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:162
+#: apt-pkg/depcache.cc:168
msgid "Dependency generation"
msgstr "生成依赖关系"
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
msgid "Reading state information"
msgstr "正在读取状态信息"
-#: apt-pkg/depcache.cc:244
+#: apt-pkg/depcache.cc:250
#, c-format
msgid "Failed to open StateFile %s"
msgstr "无法打开状态文件 %s"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/depcache.cc:256
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "无法写入临时状态文件 %s"
-#: apt-pkg/tagfile.cc:138
+#: apt-pkg/tagfile.cc:140
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "无法解析软件包文件 %s (1)"
-#: apt-pkg/tagfile.cc:231
+#: apt-pkg/tagfile.cc:237
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
+
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:173
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:184
#, 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:116
+#: apt-pkg/sourcelist.cc:190
#, 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:119
+#: apt-pkg/sourcelist.cc:193
#, 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:132
+#: apt-pkg/sourcelist.cc:206
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:208
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:211
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:217
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:224
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:335
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
#, c-format
msgid "Line %u too long in source list %s."
msgstr "源列表 %2$s 的第 %1$u 行太长了。"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:371
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:375
#, 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:296 apt-pkg/packagemanager.cc:922
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
"(%d)"
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "无法打开文件 %s"
-#: apt-pkg/packagemanager.cc:570
+#: apt-pkg/packagemanager.cc:577
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
"少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
"Force-LoopBreak 选项。"
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%s”"
-#: apt-pkg/algorithms.cc:266
+#: apt-pkg/algorithms.cc:265
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1068
+#: apt-pkg/algorithms.cc:1083
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1070
+#: apt-pkg/algorithms.cc:1085
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
"系。"
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816
#, c-format
msgid "List directory %spartial is missing."
msgstr "软件包列表的目录 %spartial 缺失。"
-#: apt-pkg/acquire.cc:85
+#: apt-pkg/acquire.cc:91
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "仓库目录 %spartial 确实。"
-#: apt-pkg/acquire.cc:93
+#: apt-pkg/acquire.cc:99
#, c-format
msgid "Unable to lock directory %s"
msgstr "无法对目录 %s 加锁"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:893
+#: apt-pkg/acquire.cc:899
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
-#: apt-pkg/acquire.cc:895
+#: apt-pkg/acquire.cc:901
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在下载第 %li 个文件，共 %li 个"
-#: apt-pkg/acquire-worker.cc:112
+#: apt-pkg/acquire-worker.cc:116
#, c-format
msgid "The method driver %s could not be found."
msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
-#: apt-pkg/acquire-worker.cc:161
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
+
+#: apt-pkg/acquire-worker.cc:169
#, c-format
msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-#: apt-pkg/acquire-worker.cc:447
+#: apt-pkg/acquire-worker.cc:455
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:143
+#: apt-pkg/init.cc:145
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:159
+#: apt-pkg/init.cc:161
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
-#: apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:61
#, c-format
msgid "Unable to stat %s."
msgstr "无法读取 %s 的状态。"
-#: apt-pkg/srcrecords.cc:47
+#: apt-pkg/srcrecords.cc:52
msgid "You must put some 'source' URIs in your sources.list"
msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
-#: apt-pkg/cachefile.cc:87
+#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "无法解析或打开软件包的列表或是状态文件。"
-#: apt-pkg/cachefile.cc:91
+#: apt-pkg/cachefile.cc:98
msgid "You may want to run apt-get update to correct these problems"
msgstr "您可能需要运行 apt-get update 来解决这些问题"
-#: apt-pkg/cachefile.cc:109
+#: apt-pkg/cachefile.cc:116
msgid "The list of sources could not be read."
msgstr "无法读取源列表。"
-#: apt-pkg/policy.cc:75
+#: apt-pkg/policy.cc:83
#, 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:410
+#: apt-pkg/policy.cc:422
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:444
#, c-format
msgid "Did not understand pin type %s"
msgstr "无法识别锁定的类型 %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:452
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
msgid "Cache has an incompatible versioning system"
msgstr "软件包暂存区使用的是不兼容的版本控制系统"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "处理 %s (FindPkg)时出错"
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "哇，软件包数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
msgid "Reading package lists"
msgstr "正在读取软件包列表"
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
-#: apt-pkg/acquire-item.cc:139
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "无法重命名文件，%s (%s -> %s)。"
-
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
#, fuzzy
msgid "Invalid file format"
msgstr "无效的操作 %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1579
#, 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:1435
+#: apt-pkg/acquire-item.cc:1595
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1637
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥：\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1675
#, 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:1537
+#: apt-pkg/acquire-item.cc:1697
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1727
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误：%s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1865
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1931
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1989
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:86
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:117
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:130
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:149
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/vendorlist.cc:85
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "软件提供者数据块内 %s 没有包含指纹信息"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"现把 %s 作为了 CD-ROM 的挂载点\n"
-"正在挂载 CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "正在鉴别.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "已归档文件的标签：%s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "正在卸载 CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:577
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
-#: apt-pkg/cdrom.cc:660
-msgid "Unmounting CD-ROM\n"
-msgstr "正在卸载 CD-ROM 文件系统\n"
+#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893
+msgid "Unmounting CD-ROM...\n"
+msgstr "正在卸载 CD-ROM...\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:592
msgid "Waiting for disc...\n"
msgstr "等待插入盘片……\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:602
msgid "Mounting CD-ROM...\n"
msgstr "正在挂载 CD-ROM 文件系统……\n"
-#: apt-pkg/cdrom.cc:693
-msgid "Scanning disc for index files..\n"
-msgstr "正在盘片中查找索引文件..\n"
+#: apt-pkg/cdrom.cc:610
+msgid "Identifying... "
+msgstr "正在鉴别... "
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:648
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "已归档文件的标签：%s\n"
+
+#: apt-pkg/cdrom.cc:672
+msgid "Scanning disc for index files...\n"
+msgstr "正在盘片中查找索引文件...\n"
+
+#: apt-pkg/cdrom.cc:722
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
"名\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:733
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
"无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
"架。"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:760
#, c-format
msgid "Found label '%s'\n"
msgstr "找到标签 '%s'\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:789
msgid "That is not a valid name, try again.\n"
msgstr "这不是一个有效的名字，请重试。\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:806
#, c-format
msgid ""
"This disc is called: \n"
"这张盘片现在的名字是：\n"
"“%s”\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:808
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:843
msgid "Writing new source list\n"
msgstr "正在写入新的源列表\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:851
msgid "Source list entries for this disc are:\n"
msgstr "对应于该盘片的软件源设置项是：\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
msgid "Hash mismatch for: %s"
msgstr "Hash 校验和不符：%s"
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:487
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: apt-pkg/cacheset.cc:470
+#: apt-pkg/cacheset.cc:490
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: apt-pkg/cacheset.cc:581
+#: apt-pkg/cacheset.cc:601
#, c-format
msgid "Couldn't find task '%s'"
msgstr "无法找到任务 %s"
-#: apt-pkg/cacheset.cc:587
+#: apt-pkg/cacheset.cc:607
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: apt-pkg/cacheset.cc:598
+#: apt-pkg/cacheset.cc:613
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
+
+#: apt-pkg/cacheset.cc:624
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "无法从完全虚拟的软件包 %s 中选择版本"
-#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612
+#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638
#, 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:619
+#: apt-pkg/cacheset.cc:645
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
-#: apt-pkg/cacheset.cc:627
+#: apt-pkg/cacheset.cc:653
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "因为软件包 %s 没有候选版本，无法进行选择"
-#: apt-pkg/cacheset.cc:635
+#: apt-pkg/cacheset.cc:661
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:209
+#: apt-pkg/edsp.cc:216
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:279
+#: apt-pkg/edsp.cc:286
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:286
+#: apt-pkg/edsp.cc:293
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:57
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
msgid "Running dpkg"
msgstr "正在运行 dpkg"
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
msgstr ""
"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
-#: apt-pkg/deb/dpkgpm.cc:90
+#: apt-pkg/deb/dpkgpm.cc:95
#, c-format
msgid "Installing %s"
msgstr "正在安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:91 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:93
+#: apt-pkg/deb/dpkgpm.cc:98
#, c-format
msgid "Completely removing %s"
msgstr "完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:99
#, c-format
msgid "Noting disappearance of %s"
msgstr "注意到 %s 已经消失"
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:100
#, c-format
msgid "Running post-installation trigger %s"
msgstr "执行安装后执行的触发器 %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:812
#, c-format
msgid "Directory '%s' missing"
msgstr "目录 %s 缺失"
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849
#, c-format
msgid "Could not open file '%s'"
msgstr "无法打开文件 %s"
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:974
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:975
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:980
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:982
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:987
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:989
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:994
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:995
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:1041 apt-pkg/deb/dpkgpm.cc:1062
+#: apt-pkg/deb/dpkgpm.cc:1050
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "无法写入 %s"
-#: apt-pkg/deb/dpkgpm.cc:1041
+#: apt-pkg/deb/dpkgpm.cc:1053
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1062
+#: apt-pkg/deb/dpkgpm.cc:1074
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1545
+#: apt-pkg/deb/dpkgpm.cc:1562
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1607
+#: apt-pkg/deb/dpkgpm.cc:1624
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:1612
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "dependency problems - leaving unconfigured"
msgstr "依赖问题 - 保持未配置"
-#: apt-pkg/deb/dpkgpm.cc:1614
+#: apt-pkg/deb/dpkgpm.cc:1631
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:1620
+#: apt-pkg/deb/dpkgpm.cc:1637
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1644
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1634 apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1661
+#: apt-pkg/deb/dpkgpm.cc:1678
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:84
+#: apt-pkg/deb/debsystem.cc:91
#, c-format
msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
#, 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:103
+#: apt-pkg/deb/debsystem.cc:110
#, c-format
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
msgid "Not locked"
msgstr "未锁定"
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "%s 不是一个有效的 DEB 软件包。"
+
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "现把 %s 作为了 CD-ROM 的挂载点\n"
+#~ "正在挂载 CD-ROM\n"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "注意，为任务 %2$s 选中了 %1$s\n"
projects / apt.git / blobdiff