diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2013-08-01 12:58:20 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2013-08-01 13:37:52 +0200 |
| commit | 55732492ddea83e7d97b2e0c3e6799948fc5f152 (patch) | |
| tree | 639665f9fbd33d4302739c5b1dfa66c6842ab0a8 /po/zh_CN.po | |
| parent | 0c33605d981ceb78a4761e39043dc79ef9a571b2 (diff) | |
unset LANGUAGE for showing [Y/n] answer hints
nl_langinfo is used to acquire the YESEXPR of the language used,
but it will return the one from LC_MESSAGES, which might be different
from the language chosen for display of the question (based on LANGUAGE)
so this commit removes the [Y/n] help text from the questions itself and
moves it to the prompt creation in which the usage of LC_MESSAGES is
forced for it, so that the helptext shown actually represents the
characters accepted as input for the question.
There is still room for problems of course starting with an untranslated
"[Y/n]" but a translated YESEXPR or the problem that the question is
asked in a completely different language which might have a conflicting
definition of [Y/n] input or the user simple ignores the helptext and
assumes that an answer matching the question language is accepted, but
the mayority of users will never have this problem to begin with, so we
should be fine (or at least a bit finer than before).
Closes nothing really, but should at least help a bit with bugs like
deb:194614, deb:471102, lp:1205578, and countless others.
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 582 |
1 files changed, 300 insertions, 282 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 51bfebd4f..ebccc335e 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-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\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" @@ -92,77 +92,77 @@ msgstr "Slack 空间共计：" msgid "Total space accounted for: " msgstr "总占用空间：" -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "软件包文件 %s 尚未同步。" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: 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 msgid "No packages found" msgstr "没有发现匹配的软件包" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "您必须明确地给出至少一个表达式" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "未发现软件包 %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "软件包文件：" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 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:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "被锁定的软件包：" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(没有找到)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " 已安装：" -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " 候选软件包：" -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(无)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " 软件包锁：" #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: 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 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s，用于 %s 构架，编译于 %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -293,83 +293,101 @@ msgstr "" " -c=? 读取指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. 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 "Y" +msgstr "" -#: cmdline/apt-get.cc:140 +#. 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:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系：" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "但无法安装它" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " 或" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变：" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级：" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: cmdline/apt-get.cc:571 +#: 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!" @@ -377,59 +395,59 @@ msgstr "" "【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包，" -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" -#: cmdline/apt-get.cc:635 +#: 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:640 +#: 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:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [已安装]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [无候选版本]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -440,185 +458,185 @@ msgstr "" "这可能意味着这个缺失的软件包可能已被废弃，\n" "或者只能在其他发布源中找到\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "可是下列软件包取代了它：" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "软件包 %s 没有可供安装的候选者" -#: cmdline/apt-get.cc:725 +#: 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:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "注意，选取 %s 而非 %s\n" -#: cmdline/apt-get.cc:818 +#: 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:822 +#: 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:834 +#: 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:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: 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:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, 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:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " 失败。" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "无法最小化要升级的软件包集合" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:1040 +#: 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:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】：下列软件包不能通过验证！" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "不经验证就安装这些软件包吗？[y/N] " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "不经验证就安装这些软件包吗？" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: 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:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" -#: cmdline/apt-get.cc:1189 +#: 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:1196 +#: 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:1201 +#: 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:1208 +#: 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:1213 +#: 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: 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:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 上没有足够的可用空间。" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: 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:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "是，按我说的做！" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -629,28 +647,28 @@ msgstr "" "若还想继续的话，就输入下面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "中止执行。" -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "您希望继续执行吗？[Y/n]" +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "您希望继续执行吗？" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: 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:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "有一些文件无法下载" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -658,19 +676,19 @@ msgstr "" "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" "再试试？" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "中止安装。" -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -679,35 +697,35 @@ msgid_plural "" "all files have been overwritten by other packages:" msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失：" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "注意：这是自动被 dpkg 有意完成的。" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, 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:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "忽略不可用的 %2$s 软件包的 %1$s 版" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr " update 命令不需要参数" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我们不应该进行删除，无法启动自动删除器" -#: cmdline/apt-get.cc:1817 +#: 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." @@ -723,15 +741,15 @@ msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请 #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: 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:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，自动卸载工具坏事了" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -739,28 +757,28 @@ msgid_plural "" "required:" msgstr[0] "下列软件包是自动安装的并且现在不需要了：" -#: cmdline/apt-get.cc:1835 +#: 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:1837 +#: 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:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，全部升级工具坏事了" -#: cmdline/apt-get.cc:1955 +#: 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -768,7 +786,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1973 +#: 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" @@ -779,78 +797,78 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "破损的软件包" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，问题解决工具坏事了" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -859,7 +877,7 @@ msgstr "" "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, fuzzy, c-format msgid "" "Please use:\n" @@ -870,104 +888,104 @@ msgstr "" "bzr get %s\n" "获得该软件包的最近更新(可能尚未正式发布)。\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, 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:2613 +#: cmdline/apt-get.cc:2644 #, 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:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, 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:3027 +#: cmdline/apt-get.cc:3058 #, 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:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -976,37 +994,37 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 " "%1$s 依赖关系" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, 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:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正在连接 %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "支持的模块：" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1094,7 +1112,7 @@ msgstr "" "以获取更多信息和选项。\n" " 本 APT 具有超级牛力。\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1168,8 +1186,8 @@ 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:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" @@ -1236,7 +1254,7 @@ msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" msgid "Disk not found." msgstr "找不到盘片。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "无法找到该文件" @@ -1298,7 +1316,7 @@ msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s" msgid "TYPE failed, server said: %s" msgstr "TYPE 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "连接超时" @@ -1306,8 +1324,8 @@ msgstr "连接超时" msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: 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 msgid "Read error" msgstr "读错误" @@ -1319,86 +1337,86 @@ msgstr "回应超出了缓存区大小。" msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: 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 msgid "Write error" msgstr "写出错" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "无法创建套接字" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "无法连接上数据套接字，连接超时" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "无法连接被动模式的套接字。" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo 无法得到监听套接字" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "无法绑定套接字" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "无法在套接字上监听" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "无法确定套接字的名字" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "无法发出 PORT 指令" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "无法识别的地址族 %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "数据套接字连接超时" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "无法获取文件，服务器响应信息为“%s”" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "数据套接字超时" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "数据传送出错，服务器响应信息为“%s”" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "查询" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "无法调用 " @@ -1434,7 +1452,7 @@ msgstr "无法连接上 %s:%s (%s)。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" @@ -1464,36 +1482,36 @@ msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "不能连接到 %s：%s：" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 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:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "下列签名无效：\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1531,59 +1549,59 @@ msgstr "该 HTTP 服务器的 range 支持不正常" msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "内部错误" #. 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:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: 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 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: 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 #, c-format @@ -1632,7 +1650,7 @@ msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "连接被永久关闭" @@ -2107,11 +2125,11 @@ msgstr "归档文件中成员文件头 %s 无效" msgid "Invalid archive member header" msgstr "归档文件中成员文件头无效" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "归档文件太短" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "无法读取归档文件的数据头" @@ -2435,7 +2453,7 @@ msgstr "无效的操作 %s" msgid "Unable to stat the mount point %s" msgstr "无法读取文件系统挂载点 %s 的状态" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "无法读取盘片的状态" @@ -2454,101 +2472,101 @@ msgstr "由于文件系统为只读，因而无法使用文件锁 %s" msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "子进程 %s 收到信号 %u。" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "无法打开文件描述符 %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "无法创建子进程的 IPC 管道" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "无法执行压缩程序" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "读取文件出错，还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "写入文件出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "关闭文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "重命名文件 %s 为 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "用 unlink 删除文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "同步文件出错" @@ -2746,7 +2764,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:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2755,12 +2773,12 @@ msgstr "" "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure " "(%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "无法打开文件 %s" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2782,7 +2800,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2790,13 +2808,13 @@ msgstr "" "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" "缘故。" -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: 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 " @@ -2964,40 +2982,40 @@ msgstr "无法重命名文件，%s (%s -> %s)。" msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Hash 校验和不符" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, 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:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, 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:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3006,12 +3024,12 @@ msgstr "" "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 错误：%s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3020,7 +3038,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3028,13 +3046,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "大小不符" @@ -3158,22 +3176,22 @@ msgstr "正在写入新的源列表\n" msgid "Source list entries for this disc are:\n" msgstr "对应于该盘片的软件源设置项是：\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "已写入 %i 条记录。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n" @@ -3260,12 +3278,12 @@ msgstr "" msgid "Installing %s" msgstr "正在安装 %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "正在删除 %s" @@ -3286,96 +3304,96 @@ msgid "Running post-installation trigger %s" msgstr "执行安装后执行的触发器 %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "目录 %s 缺失" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "无法打开文件 %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: 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:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "正在运行 dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 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:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "依赖问题 - 保持未配置" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 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:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。" |