summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1834
1 files changed, 953 insertions, 881 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ebccc335e..79ea2286e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
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-07-31 16:24+0200\n"
+"POT-Creation-Date: 2013-12-29 17:01+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"
@@ -19,150 +19,152 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: cmdline/apt-cache.cc:158
+#: cmdline/apt-cache.cc:140
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系:\n"
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:268
msgid "Total package names: "
msgstr "软件包名称总数:"
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:270
msgid "Total package structures: "
msgstr "全部软件包结构:"
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:310
msgid " Normal packages: "
msgstr " 普通软件包:"
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:311
msgid " Pure virtual packages: "
msgstr " 完全虚拟软件包:"
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:312
msgid " Single virtual packages: "
msgstr " 单虚拟软件包:"
-#: cmdline/apt-cache.cc:331
+#: cmdline/apt-cache.cc:313
msgid " Mixed virtual packages: "
msgstr " 混合虚拟软件包:"
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:314
msgid " Missing: "
msgstr " 缺失:"
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:316
msgid "Total distinct versions: "
msgstr "按版本共计:"
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:318
msgid "Total distinct descriptions: "
msgstr "按不同的说明共计:"
-#: cmdline/apt-cache.cc:338
+#: cmdline/apt-cache.cc:320
msgid "Total dependencies: "
msgstr "按依赖关系共计:"
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:323
msgid "Total ver/file relations: "
msgstr "按版本/文件关系共计:"
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:325
msgid "Total Desc/File relations: "
msgstr "按说明/文件关系共计:"
-#: cmdline/apt-cache.cc:345
+#: cmdline/apt-cache.cc:327
msgid "Total Provides mappings: "
msgstr "提供映射共计:"
-#: cmdline/apt-cache.cc:357
+#: cmdline/apt-cache.cc:339
msgid "Total globbed strings: "
msgstr "Glob 字串共计:"
-#: cmdline/apt-cache.cc:371
+#: cmdline/apt-cache.cc:353
msgid "Total dependency version space: "
msgstr "依赖关系版本名所占空间共计:"
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:358
msgid "Total slack space: "
msgstr "Slack 空间共计:"
-#: cmdline/apt-cache.cc:384
+#: cmdline/apt-cache.cc:366
msgid "Total space accounted for: "
msgstr "总占用空间:"
-#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165
+#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
+#: apt-private/private-show.cc:52
#, c-format
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步。"
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452
-#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46
-#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
+#: 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
msgid "No packages found"
msgstr "没有发现匹配的软件包"
-#: cmdline/apt-cache.cc:1265
+#: cmdline/apt-cache.cc:1245
msgid "You must give at least one search pattern"
msgstr "您必须明确地给出至少一个表达式"
-#: cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1411
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574
#, c-format
msgid "Unable to locate package %s"
msgstr "未发现软件包 %s"
-#: cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1536
msgid "Package files:"
msgstr "软件包文件:"
-#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654
+#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
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:1577
+#: cmdline/apt-cache.cc:1557
msgid "Pinned packages:"
msgstr "被锁定的软件包:"
-#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
msgid "(not found)"
msgstr "(没有找到)"
-#: cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1577
msgid " Installed: "
msgstr " 已安装:"
-#: cmdline/apt-cache.cc:1598
+#: cmdline/apt-cache.cc:1578
msgid " Candidate: "
msgstr " 候选软件包:"
-#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
msgid "(none)"
msgstr "(无)"
-#: cmdline/apt-cache.cc:1631
+#: cmdline/apt-cache.cc:1611
msgid " Package pin: "
msgstr " 软件包锁:"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1640
+#: cmdline/apt-cache.cc:1620
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-internal-solver.cc:34 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:1760
+#: cmdline/apt-cache.cc:1740
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -237,35 +239,35 @@ msgstr ""
"若要了解更多信息,您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
#. }}}
-#: cmdline/apt-cdrom.cc:43
+#: 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:85
+#: cmdline/apt-cdrom.cc:89
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:100
+#: cmdline/apt-cdrom.cc:104
msgid "Please insert a Disc in the drive and press enter"
msgstr "请把盘片插入驱动器再按回车键"
-#: cmdline/apt-cdrom.cc:135
+#: cmdline/apt-cdrom.cc:139
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "无法将 %s 挂载到 %s"
-#: cmdline/apt-cdrom.cc:170
+#: cmdline/apt-cdrom.cc:174
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
-#: cmdline/apt-config.cc:46
+#: cmdline/apt-config.cc:48
msgid "Arguments not in pairs"
msgstr "参数没有成对"
-#: cmdline/apt-config.cc:87
+#: cmdline/apt-config.cc:89
msgid ""
"Usage: apt-config [options] command\n"
"\n"
@@ -293,582 +295,70 @@ msgstr ""
" -c=? 读取指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如:-o dir::cache=/tmp\n"
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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.
-#: cmdline/apt-get.cc:146
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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.
-#: cmdline/apt-get.cc:152
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: cmdline/apt-get.cc:163
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: cmdline/apt-get.cc:169
-msgid "N"
-msgstr ""
-
-#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "编译正则表达式时出错 - %s"
-
-#: cmdline/apt-get.cc:289
-msgid "The following packages have unmet dependencies:"
-msgstr "下列软件包有未满足的依赖关系:"
-
-#: cmdline/apt-get.cc:379
-#, c-format
-msgid "but %s is installed"
-msgstr "但是 %s 已经安装"
-
-#: cmdline/apt-get.cc:381
-#, c-format
-msgid "but %s is to be installed"
-msgstr "但是 %s 正要被安装"
-
-#: cmdline/apt-get.cc:388
-msgid "but it is not installable"
-msgstr "但无法安装它"
-
-#: cmdline/apt-get.cc:390
-msgid "but it is a virtual package"
-msgstr "但是它是虚拟软件包"
-
-#: cmdline/apt-get.cc:393
-msgid "but it is not installed"
-msgstr "但是它还没有被安装"
-
-#: cmdline/apt-get.cc:393
-msgid "but it is not going to be installed"
-msgstr "但是它将不会被安装"
-
-#: cmdline/apt-get.cc:398
-msgid " or"
-msgstr " 或"
-
-#: cmdline/apt-get.cc:427
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】软件包将被安装:"
-
-#: cmdline/apt-get.cc:453
-msgid "The following packages will be REMOVED:"
-msgstr "下列软件包将被【卸载】:"
-
-#: cmdline/apt-get.cc:475
-msgid "The following packages have been kept back:"
-msgstr "下列软件包的版本将保持不变:"
-
-#: cmdline/apt-get.cc:496
-msgid "The following packages will be upgraded:"
-msgstr "下列软件包将被升级:"
-
-#: cmdline/apt-get.cc:517
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列软件包将被【降级】:"
-
-#: cmdline/apt-get.cc:537
-msgid "The following held packages will be changed:"
-msgstr "下列被要求保持版本不变的软件包将被改变:"
-
-#: cmdline/apt-get.cc:592
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (是由于 %s) "
-
-#: cmdline/apt-get.cc:600
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"【警告】:下列基础软件包将被卸载。\n"
-"请勿尝试,除非您确实知道您在做什么!"
-
-#: cmdline/apt-get.cc:631
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包,"
-
-#: cmdline/apt-get.cc:635
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "重新安装了 %lu 个软件包,"
-
-#: cmdline/apt-get.cc:637
-#, c-format
-msgid "%lu downgraded, "
-msgstr "降级了 %lu 个软件包,"
-
-#: cmdline/apt-get.cc:639
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n"
-
-#: cmdline/apt-get.cc:643
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-
-#: cmdline/apt-get.cc:664
-#, c-format
-msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "注意,为任务 %2$s 选中了 %1$s\n"
-
-#: cmdline/apt-get.cc:669
-#, c-format
-msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "注意,根据正则表达式 %2$s 选中了 %1$s\n"
-
-#: cmdline/apt-get.cc:686
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包:\n"
-
-#: cmdline/apt-get.cc:697
-msgid " [Installed]"
-msgstr " [已安装]"
-
-#: cmdline/apt-get.cc:706
-msgid " [Not candidate version]"
-msgstr " [无候选版本]"
-
-#: cmdline/apt-get.cc:708
-msgid "You should explicitly select one to install."
-msgstr "请您明确地选择一个来进行安装。"
-
-#: cmdline/apt-get.cc:711
-#, c-format
-msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"现在没有可用的软件包 %s,但是它被其它的软件包引用了。\n"
-"这可能意味着这个缺失的软件包可能已被废弃,\n"
-"或者只能在其他发布源中找到\n"
-
-#: cmdline/apt-get.cc:729
-msgid "However the following packages replace it:"
-msgstr "可是下列软件包取代了它:"
-
-#: cmdline/apt-get.cc:741
-#, c-format
-msgid "Package '%s' has no installation candidate"
-msgstr "软件包 %s 没有可供安装的候选者"
-
-#: cmdline/apt-get.cc:754
-#, c-format
-msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "类似 %s 的虚拟软件包可以卸载\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969
+#: cmdline/apt-get.cc:244
#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "软件包 %s 还未安装,因而不会被卸载\n"
+msgid "Can not find a package for architecture '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975
+#: cmdline/apt-get.cc:326
#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "软件包 %s 还未安装,因而不会被卸载\n"
-
-#: cmdline/apt-get.cc:817
-#, c-format
-msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "注意,选取 %s 而非 %s\n"
-
-#: cmdline/apt-get.cc:847
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n"
-
-#: cmdline/apt-get.cc:851
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "忽略了 %s,它已经被安装而且仅请求了升级。\n"
-
-#: cmdline/apt-get.cc:863
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "不能重新安装 %s,因为无法下载它。\n"
-
-#: cmdline/apt-get.cc:868
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 已经是最新的版本了。\n"
-
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s 被设置为手动安装。\n"
-
-#: cmdline/apt-get.cc:913
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:329
#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
-
-#: cmdline/apt-get.cc:1054
-msgid "Correcting dependencies..."
-msgstr "正在更正依赖关系..."
-
-#: cmdline/apt-get.cc:1057
-msgid " failed."
-msgstr " 失败。"
-
-#: cmdline/apt-get.cc:1060
-msgid "Unable to correct dependencies"
-msgstr "无法更正依赖关系"
-
-#: cmdline/apt-get.cc:1063
-msgid "Unable to minimize the upgrade set"
-msgstr "无法最小化要升级的软件包集合"
-
-#: cmdline/apt-get.cc:1065
-msgid " Done"
-msgstr " 完成"
-
-#: cmdline/apt-get.cc:1069
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-
-#: cmdline/apt-get.cc:1072
-msgid "Unmet dependencies. Try using -f."
-msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-
-#: cmdline/apt-get.cc:1097
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】:下列软件包不能通过验证!"
-
-#: cmdline/apt-get.cc:1101
-msgid "Authentication warning overridden.\n"
-msgstr "忽略了认证警告。\n"
-
-#: cmdline/apt-get.cc:1108
-msgid "Install these packages without verification?"
-msgstr "不经验证就安装这些软件包吗?"
-
-#: cmdline/apt-get.cc:1110
-msgid "Some packages could not be authenticated"
-msgstr "有些软件包不能通过验证"
-
-#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280
-msgid "There are problems and -y was used without --force-yes"
-msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-
-#: cmdline/apt-get.cc:1160
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-
-#: cmdline/apt-get.cc:1169
-msgid "Packages need to be removed but remove is disabled."
-msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-
-#: cmdline/apt-get.cc:1180
-msgid "Internal error, Ordering didn't finish"
-msgstr "内部错误,Ordering 未能完成"
-
-#: cmdline/apt-get.cc:1218
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "怪了……文件大小不符,请发信给 apt@packages.debian.org 吧"
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "需要下载 %sB/%sB 的软件包。\n"
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1230
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "需要下载 %sB 的软件包。\n"
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1237
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1242
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "解压缩后将会空出 %sB 的空间。\n"
-
-#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621
-#: cmdline/apt-get.cc:2624
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "无法获知您在 %s 上的可用空间"
-
-#: cmdline/apt-get.cc:1270
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "您在 %s 上没有足够的可用空间。"
-
-#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308
-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)
-#: cmdline/apt-get.cc:1290
-msgid "Yes, do as I say!"
-msgstr "是,按我说的做!"
-
-#: cmdline/apt-get.cc:1292
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"您的操作会导致潜在的危害。\n"
-"若还想继续的话,就输入下面的短句“%s”\n"
-" ?] "
-
-#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317
-msgid "Abort."
-msgstr "中止执行。"
-
-#: cmdline/apt-get.cc:1313
-msgid "Do you want to continue?"
-msgstr "您希望继续执行吗?"
-
-#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566
-#, c-format
-msgid "Failed to fetch %s %s\n"
-msgstr "无法下载 %s %s\n"
-
-#: cmdline/apt-get.cc:1403
-msgid "Some files failed to download"
-msgstr "有一些文件无法下载"
-
-#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698
-msgid "Download complete and in download only mode"
-msgstr "下载完毕,目前是“仅下载”模式"
-
-#: cmdline/apt-get.cc:1410
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
-"再试试?"
-
-#: cmdline/apt-get.cc:1414
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "目前还不支持 --fix-missing 和介质交换"
-
-#: cmdline/apt-get.cc:1419
-msgid "Unable to correct missing packages."
-msgstr "无法更正缺少的软件包。"
-
-#: cmdline/apt-get.cc:1420
-msgid "Aborting install."
-msgstr "中止安装。"
-
-#: cmdline/apt-get.cc:1448
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失:"
-
-#: cmdline/apt-get.cc:1452
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "注意:这是自动被 dpkg 有意完成的。"
-
-#: cmdline/apt-get.cc:1590
-#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: cmdline/apt-get.cc:1622
+#: cmdline/apt-get.cc:366
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "选择 %s 作为源代码包而非 %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1660
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
+#: cmdline/apt-get.cc:422
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
-#: cmdline/apt-get.cc:1676
-msgid "The update command takes no arguments"
-msgstr " update 命令不需要参数"
-
-#: cmdline/apt-get.cc:1742
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "我们不应该进行删除,无法启动自动删除器"
-
-#: cmdline/apt-get.cc:1846
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请向 apt 提交错误报告。"
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << endl;
-#. }
-#.
-#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017
-msgid "The following information may help to resolve the situation:"
-msgstr "下列信息可能会对解决问题有所帮助:"
-
-#: cmdline/apt-get.cc:1853
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "内部错误,自动卸载工具坏事了"
-
-#: cmdline/apt-get.cc:1860
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "下列软件包是自动安装的并且现在不需要了:"
-
-#: cmdline/apt-get.cc:1864
-#, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
-
-#: cmdline/apt-get.cc:1866
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "使用'apt-get autoremove'来卸载它们"
-
-#: cmdline/apt-get.cc:1885
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr "内部错误,全部升级工具坏事了"
-
-#: cmdline/apt-get.cc:1984
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
-
-#: cmdline/apt-get.cc:1988
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
-"以指定一个解决办法)。"
-
-#: cmdline/apt-get.cc:2002
-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"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"有一些软件包无法被安装。如果您用的是 unstable 发行版,这也许是\n"
-"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
-"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-
-#: cmdline/apt-get.cc:2023
-msgid "Broken packages"
-msgstr "破损的软件包"
-
-#: cmdline/apt-get.cc:2049
-msgid "The following extra packages will be installed:"
-msgstr "将会安装下列额外的软件包:"
-
-#: cmdline/apt-get.cc:2139
-msgid "Suggested packages:"
-msgstr "建议安装的软件包:"
-
-#: cmdline/apt-get.cc:2140
-msgid "Recommended packages:"
-msgstr "推荐安装的软件包:"
-
-#: cmdline/apt-get.cc:2182
+#: cmdline/apt-get.cc:453
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s 被设置为手动安装。\n"
+
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:2213
-msgid "Calculating upgrade... "
-msgstr "正在对升级进行计算... "
-
-#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116
-msgid "Failed"
-msgstr "失败"
-
-#: cmdline/apt-get.cc:2221
-msgid "Done"
-msgstr "完成"
-
-#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,问题解决工具坏事了"
-#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
-#: cmdline/apt-get.cc:2418
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2423
-#, c-format
-msgid "Downloading %s %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2483
+#: cmdline/apt-get.cc:722
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835
+#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:779
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -877,7 +367,7 @@ msgstr ""
"提示:%s 的打包工作被维护于以下位置的 %s 版本控制系统中:\n"
"%s\n"
-#: cmdline/apt-get.cc:2545
+#: cmdline/apt-get.cc:784
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -888,104 +378,114 @@ msgstr ""
"bzr get %s\n"
"获得该软件包的最近更新(可能尚未正式发布)。\n"
-#: cmdline/apt-get.cc:2598
+#: cmdline/apt-get.cc:837
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2635
+#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863
+#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "无法获知您在 %s 上的可用空间"
+
+#: 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:2644
+#: 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:2649
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2693
+#: cmdline/apt-get.cc:915
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2724
+#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325
+msgid "Download complete and in download only mode"
+msgstr "下载完毕,目前是“仅下载”模式"
+
+#: cmdline/apt-get.cc:946
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:2736
+#: cmdline/apt-get.cc:958
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2737
+#: cmdline/apt-get.cc:959
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2759
+#: cmdline/apt-get.cc:981
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2779
+#: cmdline/apt-get.cc:1001
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2798
+#: cmdline/apt-get.cc:1020
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系,必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2823
+#: cmdline/apt-get.cc:1045
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850
+#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:2870
+#: cmdline/apt-get.cc:1092
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:3040
+#: cmdline/apt-get.cc:1262
#, 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:3058
+#: cmdline/apt-get.cc:1280
#, 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:3081
+#: cmdline/apt-get.cc:1303
#, 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:3120
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -994,37 +494,37 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 "
"%1$s 依赖关系"
-#: cmdline/apt-get.cc:3126
+#: cmdline/apt-get.cc:1348
#, 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:3149
+#: cmdline/apt-get.cc:1371
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:3164
+#: cmdline/apt-get.cc:1386
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:3169
+#: cmdline/apt-get.cc:1391
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274
+#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "正在连接 %s (%s)"
-#: cmdline/apt-get.cc:3397
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:3438
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1112,101 +612,53 @@ msgstr ""
"以获取更多信息和选项。\n"
" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-get.cc:3603
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"注意:这只是模拟!\n"
-"   apt-get 需要 root 特权进行实际的执行。\n"
-"   同时请记住此时并未锁定,所以请勿完全相信当前的情况!"
-
-#: cmdline/acqprogress.cc:60
-msgid "Hit "
-msgstr "命中 "
-
-#: cmdline/acqprogress.cc:84
-msgid "Get:"
-msgstr "获取:"
-
-#: cmdline/acqprogress.cc:115
-msgid "Ign "
-msgstr "忽略 "
-
-#: cmdline/acqprogress.cc:119
-msgid "Err "
-msgstr "错误 "
-
-#: cmdline/acqprogress.cc:140
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "下载 %sB,耗时 %s (%sB/s)\n"
-
-#: cmdline/acqprogress.cc:230
-#, c-format
-msgid " [Working]"
-msgstr " [执行中]"
-
-#: cmdline/acqprogress.cc:286
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"更换介质:请把标有\n"
-"“%s”\n"
-"的盘片插入驱动器“%s”再按回车键\n"
-
-#: cmdline/apt-mark.cc:55
+#: cmdline/apt-mark.cc:57
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "但是它还没有被安装"
-#: cmdline/apt-mark.cc:61
+#: cmdline/apt-mark.cc:63
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-mark.cc:228
+#: cmdline/apt-mark.cc:230
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:232
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1032
+#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
+#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
-#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
+#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s 已设置为手动安装。\n"
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
+#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "无法打开 %s"
-#: cmdline/apt-mark.cc:332
+#: cmdline/apt-mark.cc:334
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:379
+#: cmdline/apt-mark.cc:381
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -1228,6 +680,23 @@ msgid ""
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
+#: cmdline/apt.cc:71
+msgid ""
+"Usage: apt [options] command\n"
+"\n"
+"CLI for apt.\n"
+"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"
+" install - install packages\n"
+" upgrade - upgrade the systems packages\n"
+"\n"
+" edit-sources - edit the source information file\n"
+msgstr ""
+
#: methods/cdrom.cc:203
#, c-format
msgid "Unable to read the cdrom database %s"
@@ -1324,8 +793,8 @@ msgstr "连接超时"
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264
-#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276
+#: 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
msgid "Read error"
msgstr "读错误"
@@ -1338,8 +807,8 @@ msgid "Protocol corruption"
msgstr "协议有误"
#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397
+#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
+#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "写出错"
@@ -1351,6 +820,10 @@ msgstr "无法创建套接字"
msgid "Could not connect data socket, connection timed out"
msgstr "无法连接上数据套接字,连接超时"
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+msgid "Failed"
+msgstr "失败"
+
#: methods/ftp.cc:714
msgid "Could not connect passive socket."
msgstr "无法连接被动模式的套接字。"
@@ -1393,7 +866,7 @@ msgstr "数据套接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313
+#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313
msgid "Problem hashing file"
msgstr "把文件加入哈希表时出错"
@@ -1521,81 +994,586 @@ msgstr "由于没有公钥,无法验证下列签名:\n"
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:394
+#: methods/http.cc:519
+msgid "Error writing to the file"
+msgstr "写入文件出错"
+
+#: methods/http.cc:533
+msgid "Error reading from server. Remote end closed connection"
+msgstr "从服务器读取数据时出错,对方关闭了连接"
+
+#: methods/http.cc:535
+msgid "Error reading from server"
+msgstr "从服务器读取数据出错"
+
+#: methods/http.cc:571
+msgid "Error writing to file"
+msgstr "写入文件出错"
+
+#: methods/http.cc:631
+msgid "Select failed"
+msgstr "select 调用出错"
+
+#: methods/http.cc:636
+msgid "Connection timed out"
+msgstr "连接超时"
+
+#: methods/http.cc:659
+msgid "Error writing to output file"
+msgstr "写输出文件时出错"
+
+#: methods/server.cc:56
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:544
+#: methods/server.cc:114
msgid "Bad header line"
msgstr "错误的报头行"
-#: methods/http.cc:569 methods/http.cc:576
+#: methods/server.cc:139 methods/server.cc:146
msgid "The HTTP server sent an invalid reply header"
msgstr "该 HTTP 服务器发送了一个无效的应答报头"
-#: methods/http.cc:606
+#: methods/server.cc:176
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:621
+#: methods/server.cc:199
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:623
+#: methods/server.cc:201
msgid "This HTTP server has broken range support"
msgstr "该 HTTP 服务器的 range 支持不正常"
-#: methods/http.cc:647
+#: methods/server.cc:225
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:826
-msgid "Select failed"
-msgstr "select 调用出错"
+#: methods/server.cc:490
+msgid "Bad header data"
+msgstr "错误的报头数据"
-#: methods/http.cc:831
-msgid "Connection timed out"
-msgstr "连接超时"
+#: methods/server.cc:507 methods/server.cc:564
+msgid "Connection failed"
+msgstr "连接失败"
-#: methods/http.cc:854
-msgid "Error writing to output file"
-msgstr "写输出文件时出错"
+#: methods/server.cc:656
+msgid "Internal error"
+msgstr "内部错误"
-#: methods/http.cc:885
-msgid "Error writing to file"
-msgstr "写入文件出错"
+#: apt-private/private-list.cc:143
+msgid "Listing"
+msgstr ""
-#: methods/http.cc:913
-msgid "Error writing to the file"
-msgstr "写入文件出错"
+#: apt-private/private-install.cc:93
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-#: methods/http.cc:927
-msgid "Error reading from server. Remote end closed connection"
-msgstr "从服务器读取数据时出错,对方关闭了连接"
+#: apt-private/private-install.cc:102
+msgid "Packages need to be removed but remove is disabled."
+msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-#: methods/http.cc:929
-msgid "Error reading from server"
-msgstr "从服务器读取数据出错"
+#: apt-private/private-install.cc:121
+msgid "Internal error, Ordering didn't finish"
+msgstr "内部错误,Ordering 未能完成"
-#: methods/http.cc:1197
-msgid "Bad header data"
-msgstr "错误的报头数据"
+#: apt-private/private-install.cc:159
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr "怪了……文件大小不符,请发信给 apt@packages.debian.org 吧"
-#: methods/http.cc:1214 methods/http.cc:1269
-msgid "Connection failed"
-msgstr "连接失败"
+#. 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
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "需要下载 %sB/%sB 的软件包。\n"
-#: methods/http.cc:1361
-msgid "Internal error"
-msgstr "内部错误"
+#. 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
+#, 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
+#, 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
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "解压缩后将会空出 %sB 的空间。\n"
+
+#: apt-private/private-install.cc:211
+#, 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
+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
+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
+msgid "Yes, do as I say!"
+msgstr "是,按我说的做!"
+
+#: apt-private/private-install.cc:233
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"您的操作会导致潜在的危害。\n"
+"若还想继续的话,就输入下面的短句“%s”\n"
+" ?] "
+
+#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+msgid "Abort."
+msgstr "中止执行。"
+
+#: apt-private/private-install.cc:254
+msgid "Do you want to continue?"
+msgstr "您希望继续执行吗?"
+
+#: apt-private/private-install.cc:324
+msgid "Some files failed to download"
+msgstr "有一些文件无法下载"
+
+#: apt-private/private-install.cc:331
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
+"再试试?"
+
+#: apt-private/private-install.cc:335
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "目前还不支持 --fix-missing 和介质交换"
+
+#: apt-private/private-install.cc:340
+msgid "Unable to correct missing packages."
+msgstr "无法更正缺少的软件包。"
+
+#: apt-private/private-install.cc:341
+msgid "Aborting install."
+msgstr "中止安装。"
+
+#: apt-private/private-install.cc:377
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失:"
+
+#: apt-private/private-install.cc:381
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "注意:这是自动被 dpkg 有意完成的。"
+
+#: apt-private/private-install.cc:402
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "我们不应该进行删除,无法启动自动删除器"
+
+#: apt-private/private-install.cc:510
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请向 apt 提交错误报告。"
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+msgid "The following information may help to resolve the situation:"
+msgstr "下列信息可能会对解决问题有所帮助:"
+
+#: apt-private/private-install.cc:517
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "内部错误,自动卸载工具坏事了"
+
+#: apt-private/private-install.cc:524
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "下列软件包是自动安装的并且现在不需要了:"
+
+#: apt-private/private-install.cc:528
+#, 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
+#, 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
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
+
+#: apt-private/private-install.cc:626
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
+"以指定一个解决办法)。"
+
+#: apt-private/private-install.cc:639
+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"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"有一些软件包无法被安装。如果您用的是 unstable 发行版,这也许是\n"
+"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
+"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
+
+#: apt-private/private-install.cc:660
+msgid "Broken packages"
+msgstr "破损的软件包"
+
+#: apt-private/private-install.cc:713
+msgid "The following extra packages will be installed:"
+msgstr "将会安装下列额外的软件包:"
+
+#: apt-private/private-install.cc:803
+msgid "Suggested packages:"
+msgstr "建议安装的软件包:"
+
+#: apt-private/private-install.cc:804
+msgid "Recommended packages:"
+msgstr "推荐安装的软件包:"
+
+#: apt-private/private-download.cc:32
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "【警告】:下列软件包不能通过验证!"
+
+#: apt-private/private-download.cc:36
+msgid "Authentication warning overridden.\n"
+msgstr "忽略了认证警告。\n"
+
+#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+msgid "Some packages could not be authenticated"
+msgstr "有些软件包不能通过验证"
+
+#: apt-private/private-download.cc:46
+msgid "Install these packages without verification?"
+msgstr "不经验证就安装这些软件包吗?"
+
+#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#, c-format
+msgid "Failed to fetch %s %s\n"
+msgstr "无法下载 %s %s\n"
+
+#: apt-private/private-output.cc:198
+msgid "installed,upgradable to: "
+msgstr ""
+
+#: apt-private/private-output.cc:204
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [已安装]"
+
+#: apt-private/private-output.cc:207
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:209
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [已安装]"
+
+#: apt-private/private-output.cc:211
+#, fuzzy
+msgid "[installed]"
+msgstr " [已安装]"
+
+#: apt-private/private-output.cc:217
+msgid "[upgradable from: "
+msgstr ""
+
+#: apt-private/private-output.cc:223
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:314
+msgid "The following packages have unmet dependencies:"
+msgstr "下列软件包有未满足的依赖关系:"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is installed"
+msgstr "但是 %s 已经安装"
+
+#: apt-private/private-output.cc:406
+#, c-format
+msgid "but %s is to be installed"
+msgstr "但是 %s 正要被安装"
+
+#: apt-private/private-output.cc:413
+msgid "but it is not installable"
+msgstr "但无法安装它"
+
+#: apt-private/private-output.cc:415
+msgid "but it is a virtual package"
+msgstr "但是它是虚拟软件包"
+
+#: apt-private/private-output.cc:418
+msgid "but it is not installed"
+msgstr "但是它还没有被安装"
+
+#: apt-private/private-output.cc:418
+msgid "but it is not going to be installed"
+msgstr "但是它将不会被安装"
+
+#: apt-private/private-output.cc:423
+msgid " or"
+msgstr " 或"
+
+#: apt-private/private-output.cc:452
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】软件包将被安装:"
+
+#: apt-private/private-output.cc:478
+msgid "The following packages will be REMOVED:"
+msgstr "下列软件包将被【卸载】:"
+
+#: apt-private/private-output.cc:500
+msgid "The following packages have been kept back:"
+msgstr "下列软件包的版本将保持不变:"
+
+#: apt-private/private-output.cc:521
+msgid "The following packages will be upgraded:"
+msgstr "下列软件包将被升级:"
+
+#: apt-private/private-output.cc:542
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列软件包将被【降级】:"
+
+#: apt-private/private-output.cc:562
+msgid "The following held packages will be changed:"
+msgstr "下列被要求保持版本不变的软件包将被改变:"
+
+#: apt-private/private-output.cc:617
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (是由于 %s) "
+
+#: apt-private/private-output.cc:625
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"【警告】:下列基础软件包将被卸载。\n"
+"请勿尝试,除非您确实知道您在做什么!"
+
+#: apt-private/private-output.cc:656
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包,"
+
+#: apt-private/private-output.cc:660
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "重新安装了 %lu 个软件包,"
+
+#: apt-private/private-output.cc:662
+#, c-format
+msgid "%lu downgraded, "
+msgstr "降级了 %lu 个软件包,"
+
+#: apt-private/private-output.cc:664
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n"
+
+#: apt-private/private-output.cc:668
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:707
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:713
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "编译正则表达式时出错 - %s"
+
+#: apt-private/private-cachefile.cc:87
+msgid "Correcting dependencies..."
+msgstr "正在更正依赖关系..."
+
+#: apt-private/private-cachefile.cc:90
+msgid " failed."
+msgstr " 失败。"
+
+#: apt-private/private-cachefile.cc:93
+msgid "Unable to correct dependencies"
+msgstr "无法更正依赖关系"
+
+#: apt-private/private-cachefile.cc:96
+msgid "Unable to minimize the upgrade set"
+msgstr "无法最小化要升级的软件包集合"
+
+#: apt-private/private-cachefile.cc:98
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:102
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unmet dependencies. Try using -f."
+msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
+
+#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-update.cc:45
+msgid "The update command takes no arguments"
+msgstr " update 命令不需要参数"
+
+#: apt-private/private-upgrade.cc:18
+msgid "Calculating upgrade... "
+msgstr "正在对升级进行计算... "
+
+#: apt-private/private-upgrade.cc:23
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "内部错误,全部升级工具坏事了"
+
+#: apt-private/private-upgrade.cc:25
+msgid "Done"
+msgstr "完成"
+
+#: apt-private/private-search.cc:61
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/private-show.cc:106
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:19
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"注意:这只是模拟!\n"
+"   apt-get 需要 root 特权进行实际的执行。\n"
+"   同时请记住此时并未锁定,所以请勿完全相信当前的情况!"
+
+#: apt-private/private-sources.cc:41
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "无法将 %s 重命名为 %s"
+
+#: apt-private/private-sources.cc:52
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/acqprogress.cc:60
+msgid "Hit "
+msgstr "命中 "
+
+#: apt-private/acqprogress.cc:84
+msgid "Get:"
+msgstr "获取:"
+
+#: apt-private/acqprogress.cc:115
+msgid "Ign "
+msgstr "忽略 "
+
+#: apt-private/acqprogress.cc:119
+msgid "Err "
+msgstr "错误 "
+
+#: apt-private/acqprogress.cc:140
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "下载 %sB,耗时 %s (%sB/s)\n"
+
+#: apt-private/acqprogress.cc:230
+#, c-format
+msgid " [Working]"
+msgstr " [执行中]"
+
+#: apt-private/acqprogress.cc:291
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"更换介质:请把标有\n"
+"“%s”\n"
+"的盘片插入驱动器“%s”再按回车键\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:404
-#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: 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
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
@@ -1654,32 +1632,32 @@ msgstr "无法为子进程创建 IPC 管道"
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
-#: dselect/install:32
+#: dselect/install:33
msgid "Bad default setting!"
msgstr "错误的默认设置!"
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
-#: dselect/install:105 dselect/update:45
+#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
+#: dselect/install:106 dselect/update:45
msgid "Press enter to continue."
msgstr "按回车键继续。"
-#: dselect/install:91
+#: dselect/install:92
msgid "Do you want to erase any previously downloaded .deb files?"
msgstr "您想要删除之前下载的所有 .deb 文件吗?"
-#: dselect/install:101
+#: dselect/install:102
msgid "Some errors occurred while unpacking. Packages that were installed"
msgstr "在解包时发生了一些错误。已经安装的软件包"
-#: dselect/install:102
+#: dselect/install:103
msgid "will be configured. This may result in duplicate errors"
msgstr "将被配置。这个操作可能会导致出现重复的错误"
-#: dselect/install:103
+#: dselect/install:104
msgid "or errors caused by missing dependencies. This is OK, only the errors"
msgstr "或一些由于依赖关系不能满足所产生的错误。这个问题不大,只有"
-#: dselect/install:104
+#: dselect/install:105
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr "这个提示之前的错误消息才值得您注意。请更正它们,然后再次执行 [I]nstall"
@@ -1688,12 +1666,12 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们,
msgid "Merging available information"
msgstr "正在合并可用信息"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s 不是一个有效的 DEB 软件包。"
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1717,12 +1695,12 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
@@ -1926,36 +1904,36 @@ msgstr "无法读取符号链接 %s"
msgid "Failed to unlink %s"
msgstr "无法使用 unlink 删除 %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:289
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:299
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:404
msgid "Archive had no package field"
msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
@@ -2034,7 +2012,7 @@ msgstr "在使用 unlink 删除 %s 时出错"
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
-#: cmdline/apt-internal-solver.cc:37
+#: cmdline/apt-internal-solver.cc:38
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2103,7 +2081,7 @@ msgstr "包文件已被损坏"
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar 的校验和不符,文件已损坏"
-#: apt-inst/contrib/extracttar.cc:302
+#: apt-inst/contrib/extracttar.cc:300
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 数据头类型 %u,成员 %s"
@@ -2227,22 +2205,17 @@ 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
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”"
-#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:55
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”,“%s”或者“%s”"
-
-#: apt-inst/deb/debfile.cc:120
+#: apt-inst/deb/debfile.cc:119
#, c-format
msgid "Internal error, could not locate member %s"
msgstr "内部错误,无法定位包内文件 %s"
-#: apt-inst/deb/debfile.cc:214
+#: apt-inst/deb/debfile.cc:213
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
@@ -2299,85 +2272,85 @@ msgid ""
msgstr "无法增加 MMap 大小,因为用户已禁用自动增加。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:401
#, 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:385
+#: apt-pkg/contrib/strutl.cc:408
#, c-format
msgid "%lih %limin %lis"
msgstr "%li小时 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:415
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:420
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1173
+#: apt-pkg/contrib/strutl.cc:1229
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:503
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "无法识别的类型缩写:“%c”"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:617
#, c-format
msgid "Opening configuration file %s"
msgstr "正在打开配置文件 %s"
-#: apt-pkg/contrib/configuration.cc:773
+#: apt-pkg/contrib/configuration.cc:785
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "语法错误 %s:%u:配置小节没有以名字开头"
-#: apt-pkg/contrib/configuration.cc:792
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "语法错误 %s:%u:标签格式有误"
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:821
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "语法错误 %s:%u:配置值后有多余的无意义数据"
-#: apt-pkg/contrib/configuration.cc:849
+#: apt-pkg/contrib/configuration.cc:861
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "语法错误 %s:%u:只能在顶层配置文件中使用指示"
-#: apt-pkg/contrib/configuration.cc:856
+#: apt-pkg/contrib/configuration.cc:868
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "语法错误 %s:%u:太多的嵌套 include 命令"
-#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
+#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "语法错误 %s:%u:Included from here"
-#: apt-pkg/contrib/configuration.cc:869
+#: apt-pkg/contrib/configuration.cc:881
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "语法错误 %s:%u:不支持的指令“%s”"
-#: apt-pkg/contrib/configuration.cc:872
+#: apt-pkg/contrib/configuration.cc:884
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "语法错误 %s:%u:clean 指令需要一个选项树作为参数"
-#: apt-pkg/contrib/configuration.cc:922
+#: apt-pkg/contrib/configuration.cc:934
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "语法错误 %s:%u:文件尾部有多余的无意义的数据"
@@ -2402,48 +2375,48 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... 完成"
-#: apt-pkg/contrib/cmndline.cc:80
+#: apt-pkg/contrib/cmndline.cc:116
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "未知的命令行选项“%c” [来自 %s]"
-#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
+#: apt-pkg/contrib/cmndline.cc:158
#, c-format
msgid "Command line option %s is not understood"
msgstr "无法识别命令行选项 %s"
-#: apt-pkg/contrib/cmndline.cc:127
+#: apt-pkg/contrib/cmndline.cc:163
#, c-format
msgid "Command line option %s is not boolean"
msgstr "命令行选项 %s 不是布尔值"
-#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
+#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
#, c-format
msgid "Option %s requires an argument."
msgstr "选项 %s 要求有一个参数"
-#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208
+#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "选项 %s:配置项后必须包含有形如“=<变量>”的具体指定"
-#: apt-pkg/contrib/cmndline.cc:237
+#: apt-pkg/contrib/cmndline.cc:273
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "选项 %s 要求有一个整数作为参数,而不是“%s”"
-#: apt-pkg/contrib/cmndline.cc:268
+#: apt-pkg/contrib/cmndline.cc:304
#, c-format
msgid "Option '%s' is too long"
msgstr "选项“%s”太长"
-#: apt-pkg/contrib/cmndline.cc:300
+#: apt-pkg/contrib/cmndline.cc:336
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "不能识别参数 %s,请用 true 或 false"
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:386
#, c-format
msgid "Invalid operation %s"
msgstr "无效的操作 %s"
@@ -2457,121 +2430,121 @@ msgstr "无法读取文件系统挂载点 %s 的状态"
msgid "Failed to stat the cdrom"
msgstr "无法读取盘片的状态"
-#: apt-pkg/contrib/fileutl.cc:93
+#: apt-pkg/contrib/fileutl.cc:95
#, c-format
msgid "Problem closing the gzip file %s"
msgstr "关闭 gzip %s 文件出错"
-#: apt-pkg/contrib/fileutl.cc:226
+#: apt-pkg/contrib/fileutl.cc:228
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "由于文件系统为只读,因而无法使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:231
+#: apt-pkg/contrib/fileutl.cc:233
#, c-format
msgid "Could not open lock file %s"
msgstr "无法打开锁文件 %s"
-#: apt-pkg/contrib/fileutl.cc:254
+#: apt-pkg/contrib/fileutl.cc:256
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:259
+#: apt-pkg/contrib/fileutl.cc:261
#, c-format
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510
+#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:430
+#: apt-pkg/contrib/fileutl.cc:432
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:448
+#: apt-pkg/contrib/fileutl.cc:450
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:457
+#: apt-pkg/contrib/fileutl.cc:459
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:844
+#: apt-pkg/contrib/fileutl.cc:862
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:864
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:988
+#: apt-pkg/contrib/fileutl.cc:1016
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:1065
+#: apt-pkg/contrib/fileutl.cc:1093
#, c-format
msgid "Could not open file descriptor %d"
msgstr "无法打开文件描述符 %d"
-#: apt-pkg/contrib/fileutl.cc:1150
+#: apt-pkg/contrib/fileutl.cc:1178
msgid "Failed to create subprocess IPC"
msgstr "无法创建子进程的 IPC 管道"
-#: apt-pkg/contrib/fileutl.cc:1205
+#: apt-pkg/contrib/fileutl.cc:1233
msgid "Failed to exec compressor "
msgstr "无法执行压缩程序"
-#: apt-pkg/contrib/fileutl.cc:1298
+#: apt-pkg/contrib/fileutl.cc:1326
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "读取文件出错,还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407
+#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "写入文件出错,还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:1695
+#: apt-pkg/contrib/fileutl.cc:1726
#, c-format
msgid "Problem closing the file %s"
msgstr "关闭文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1707
+#: apt-pkg/contrib/fileutl.cc:1738
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "重命名文件 %s 为 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1718
+#: apt-pkg/contrib/fileutl.cc:1749
#, c-format
msgid "Problem unlinking the file %s"
msgstr "用 unlink 删除文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1731
+#: apt-pkg/contrib/fileutl.cc:1762
msgid "Problem syncing the file"
msgstr "同步文件出错"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "%s 中没有安装密钥环。"
@@ -2684,12 +2657,12 @@ msgstr "无法打开状态文件 %s"
msgid "Failed to write temporary StateFile %s"
msgstr "无法写入临时状态文件 %s"
-#: apt-pkg/tagfile.cc:129
+#: apt-pkg/tagfile.cc:138
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "无法解析软件包文件 %s (1)"
-#: apt-pkg/tagfile.cc:216
+#: apt-pkg/tagfile.cc:231
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
@@ -2764,7 +2737,7 @@ msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923
+#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2773,12 +2746,12 @@ msgstr ""
"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
"(%d)"
-#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529
+#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "无法打开文件 %s"
-#: apt-pkg/packagemanager.cc:571
+#: apt-pkg/packagemanager.cc:570
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2800,7 +2773,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装,但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1238
+#: apt-pkg/algorithms.cc:1068
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2808,20 +2781,12 @@ msgstr ""
"错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1240
+#: apt-pkg/algorithms.cc:1070
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
"系。"
-#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。"
-
#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
#, c-format
msgid "List directory %spartial is missing."
@@ -2864,12 +2829,12 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:143
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:159
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2901,17 +2866,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:399
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "首选项文件 %s 中发现有无效的记录,无 Package 字段头"
-#: apt-pkg/policy.cc:421
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "无法识别锁定的类型 %s"
-#: apt-pkg/policy.cc:429
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
@@ -2978,44 +2943,48 @@ msgstr "无法读取或写入软件源缓存"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:599
-msgid "MD5Sum mismatch"
-msgstr "MD5 校验和不符"
-
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887
-#: apt-pkg/acquire-item.cc:2030
+#: apt-pkg/acquire-item.cc:154
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:159
+msgid "Size mismatch"
+msgstr "大小不符"
+
+#: apt-pkg/acquire-item.cc:164
+#, fuzzy
+msgid "Invalid file format"
+msgstr "无效的操作 %s"
+
+#: apt-pkg/acquire-item.cc:1419
#, 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:1404
+#: apt-pkg/acquire-item.cc:1435
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/acquire-item.cc:1446
+#: apt-pkg/acquire-item.cc:1477
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:1484
+#: apt-pkg/acquire-item.cc:1515
#, 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:1506
+#: apt-pkg/acquire-item.cc:1537
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1567
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3024,12 +2993,12 @@ msgstr ""
"校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551
+#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
-#: apt-pkg/acquire-item.cc:1663
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3038,30 +3007,23 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1722
+#: apt-pkg/acquire-item.cc:1771
#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package."
+msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1781
+#: apt-pkg/acquire-item.cc:1829
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1879
-msgid "Size mismatch"
-msgstr "大小不符"
-
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:73
#, c-format
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:81
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
@@ -3206,49 +3168,49 @@ msgstr "无法找到认证记录:%s"
msgid "Hash mismatch for: %s"
msgstr "Hash 校验和不符:%s"
-#: apt-pkg/cacheset.cc:403
+#: apt-pkg/cacheset.cc:467
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: apt-pkg/cacheset.cc:406
+#: apt-pkg/cacheset.cc:470
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: apt-pkg/cacheset.cc:517
+#: apt-pkg/cacheset.cc:581
#, c-format
msgid "Couldn't find task '%s'"
msgstr "无法找到任务 %s"
-#: apt-pkg/cacheset.cc:523
+#: apt-pkg/cacheset.cc:587
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: apt-pkg/cacheset.cc:534
+#: apt-pkg/cacheset.cc:598
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "无法从完全虚拟的软件包 %s 中选择版本"
-#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
+#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612
#, 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:555
+#: apt-pkg/cacheset.cc:619
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "因为软件包 %s 是完全的虚拟软件包,无法选择它的最新版"
-#: apt-pkg/cacheset.cc:563
+#: apt-pkg/cacheset.cc:627
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "因为软件包 %s 没有候选版本,无法进行选择"
-#: apt-pkg/cacheset.cc:571
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "因为软件包 %s 没有安装,无法选择它的已安装版本"
@@ -3273,127 +3235,156 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/install-progress.cc:51
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
+msgid "Running dpkg"
+msgstr "正在运行 dpkg"
+
+#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。"
+
+#: apt-pkg/deb/dpkgpm.cc:91
#, c-format
msgid "Installing %s"
msgstr "正在安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982
+#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:94
#, c-format
msgid "Completely removing %s"
msgstr "完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:95
#, c-format
msgid "Noting disappearance of %s"
msgstr "注意到 %s 已经消失"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:96
#, c-format
msgid "Running post-installation trigger %s"
msgstr "执行安装后执行的触发器 %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:735
+#: apt-pkg/deb/dpkgpm.cc:809
#, c-format
msgid "Directory '%s' missing"
msgstr "目录 %s 缺失"
-#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770
+#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846
#, c-format
msgid "Could not open file '%s'"
msgstr "无法打开文件 %s"
-#: apt-pkg/deb/dpkgpm.cc:975
+#: apt-pkg/deb/dpkgpm.cc:971
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:972
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:981
+#: apt-pkg/deb/dpkgpm.cc:977
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:979
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:988
+#: apt-pkg/deb/dpkgpm.cc:984
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:986
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/deb/dpkgpm.cc:991
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/deb/dpkgpm.cc:992
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:1243
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ?)\n"
+#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "无法写入 %s"
-#: apt-pkg/deb/dpkgpm.cc:1273
-msgid "Running dpkg"
-msgstr "正在运行 dpkg"
+#: apt-pkg/deb/dpkgpm.cc:1045
+msgid "Is /dev/pts mounted?"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1445
+#: apt-pkg/deb/dpkgpm.cc:1066
+msgid "Is stdout a terminal?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1549
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1507
+#: apt-pkg/deb/dpkgpm.cc:1611
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:1512
+#: apt-pkg/deb/dpkgpm.cc:1616
msgid "dependency problems - leaving unconfigured"
msgstr "依赖问题 - 保持未配置"
-#: apt-pkg/deb/dpkgpm.cc:1514
+#: apt-pkg/deb/dpkgpm.cc:1618
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:1520
+#: apt-pkg/deb/dpkgpm.cc:1624
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1526
+#: apt-pkg/deb/dpkgpm.cc:1631
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1533
+#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1665
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
@@ -3422,6 +3413,87 @@ msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。"
msgid "Not locked"
msgstr "未锁定"
+#~ msgid "Note, selecting '%s' for task '%s'\n"
+#~ msgstr "注意,为任务 %2$s 选中了 %1$s\n"
+
+#~ msgid "Note, selecting '%s' for regex '%s'\n"
+#~ msgstr "注意,根据正则表达式 %2$s 选中了 %1$s\n"
+
+#~ msgid "Package %s is a virtual package provided by:\n"
+#~ msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包:\n"
+
+#~ msgid " [Not candidate version]"
+#~ msgstr " [无候选版本]"
+
+#~ msgid "You should explicitly select one to install."
+#~ msgstr "请您明确地选择一个来进行安装。"
+
+#~ msgid ""
+#~ "Package %s is not available, but is referred to by another package.\n"
+#~ "This may mean that the package is missing, has been obsoleted, or\n"
+#~ "is only available from another source\n"
+#~ msgstr ""
+#~ "现在没有可用的软件包 %s,但是它被其它的软件包引用了。\n"
+#~ "这可能意味着这个缺失的软件包可能已被废弃,\n"
+#~ "或者只能在其他发布源中找到\n"
+
+#~ msgid "However the following packages replace it:"
+#~ msgstr "可是下列软件包取代了它:"
+
+#~ msgid "Package '%s' has no installation candidate"
+#~ msgstr "软件包 %s 没有可供安装的候选者"
+
+#~ msgid "Virtual packages like '%s' can't be removed\n"
+#~ msgstr "类似 %s 的虚拟软件包可以卸载\n"
+
+#, fuzzy
+#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+#~ msgstr "软件包 %s 还未安装,因而不会被卸载\n"
+
+#, fuzzy
+#~ msgid "Package '%s' is not installed, so not removed\n"
+#~ msgstr "软件包 %s 还未安装,因而不会被卸载\n"
+
+#~ msgid "Note, selecting '%s' instead of '%s'\n"
+#~ msgstr "注意,选取 %s 而非 %s\n"
+
+#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+#~ msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n"
+
+#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+#~ msgstr "忽略了 %s,它已经被安装而且仅请求了升级。\n"
+
+#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+#~ msgstr "不能重新安装 %s,因为无法下载它。\n"
+
+#~ msgid "%s is already the newest version.\n"
+#~ msgstr "%s 已经是最新的版本了。\n"
+
+#~ msgid "Selected version '%s' (%s) for '%s'\n"
+#~ msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+
+#, fuzzy
+#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+#~ msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+
+#~ msgid "Ignore unavailable target release '%s' of package '%s'"
+#~ msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"
+
+#~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+#~ msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”,“%s”或者“%s”"
+
+#~ msgid "MD5Sum mismatch"
+#~ msgstr "MD5 校验和不符"
+
+#~ msgid ""
+#~ "I wasn't able to locate a file for the %s package. This might mean you "
+#~ "need to manually fix this package."
+#~ msgstr ""
+#~ "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
+
+#~ msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+#~ msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ?)\n"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "跳过不存在的文件 %s"