diff options
author | Michael Vogt <mvo@debian.org> | 2014-06-18 08:32:47 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-06-18 08:32:47 +0200 |
commit | aa0bd601ea3db281187275bbbece760d85ff29d9 (patch) | |
tree | c84bebb3966255cdae36562024592c6b4eb6a2f2 /po/zh_CN.po | |
parent | 80624be7c54aec6ed98ee254366155024fca1a71 (diff) | |
parent | 6074bc9ba4ecdd08674a828bdb46323b5d8bf957 (diff) |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
debian/changelog
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r-- | po/zh_CN.po | 375 |
1 files changed, 201 insertions, 174 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 99926a97c..4e6c51bd5 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: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+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" @@ -157,9 +157,9 @@ msgid " Version table:" msgstr " 版本列表:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -327,6 +327,7 @@ msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" @@ -354,12 +355,12 @@ msgstr "无法锁定下载目录" msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码,必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -368,7 +369,7 @@ msgstr "" "提示:%s 的打包工作被维护于以下位置的 %s 版本控制系统中:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, fuzzy, c-format msgid "" "Please use:\n" @@ -379,114 +380,114 @@ msgstr "" "bzr get %s\n" "获得该软件包的最近更新(可能尚未正式发布)。\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, 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:883 +#: cmdline/apt-get.cc:891 #, 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:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "下载完毕,目前是“仅下载”模式" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系,必须指定至少一个软件包" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, 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:1281 +#: cmdline/apt-get.cc:1289 #, 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:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -495,37 +496,37 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 " "%1$s 依赖关系" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, 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:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正在连接 %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "支持的模块:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -618,11 +619,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "要下载源代码,必须指定至少一个对应的软件包" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -825,9 +826,9 @@ msgstr "连接超时" msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "读错误" @@ -840,9 +841,9 @@ msgid "Protocol corruption" msgstr "协议有误" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "写出错" @@ -1152,108 +1153,108 @@ msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [已安装]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [已安装]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [已安装]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [已安装]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "但无法安装它" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " 或" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1261,27 +1262,27 @@ msgstr "" "【警告】:下列基础软件包将被卸载。\n" "请勿尝试,除非您确实知道您在做什么!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包," -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包," -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包," -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" @@ -1290,7 +1291,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1298,21 +1299,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@ -1321,6 +1322,13 @@ msgstr "编译正则表达式时出错 - %s" msgid "The update command takes no arguments" msgstr " update 命令不需要参数" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1381,7 +1389,7 @@ msgstr "解压缩后将会空出 %sB 的空间。\n" msgid "You don't have enough free space in %s." msgstr "您在 %s 上没有足够的可用空间。" -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes" @@ -1471,7 +1479,7 @@ msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请 #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助:" @@ -1512,7 +1520,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1523,22 +1531,63 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "破损的软件包" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "建议安装的软件包:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "推荐安装的软件包:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "忽略了 %s,它已经被安装而且仅请求了升级。\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "不能重新安装 %s,因为无法下载它。\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s 已经是最新的版本了。\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "软件包 %s 还未安装,因而不会被卸载\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "软件包 %s 还未安装,因而不会被卸载\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1550,23 +1599,23 @@ msgstr "" " apt-get 需要 root 特权进行实际的执行。\n" " 同时请记住此时并未锁定,所以请勿完全相信当前的情况!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】:下列软件包不能通过验证!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "不经验证就安装这些软件包吗?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -1763,7 +1812,7 @@ msgid "The diversion path is too long" msgstr "该转移路径太长" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "无法获得 %s 的状态" @@ -2107,27 +2156,27 @@ msgstr "无法写入 %s" msgid "IO Error saving source cache" msgstr "无法读取或写入软件源缓存" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件,%s (%s -> %s)。" @@ -2145,35 +2194,35 @@ msgstr "大小不符" msgid "Invalid file format" msgstr "无效的操作 %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, 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:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, 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:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版:%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2182,12 +2231,12 @@ msgstr "" "校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 错误:%s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2196,12 +2245,12 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2272,7 +2321,7 @@ msgstr "无法识别锁定的类型 %s" msgid "No priority (or zero) specified for pin" msgstr "没有为版本锁定指定优先级(或为零)" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2281,12 +2330,12 @@ msgstr "" "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure " "(%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "无法打开文件 %s" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2685,45 +2734,45 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 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:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "依赖问题 - 保持未配置" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 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:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。" @@ -2857,40 +2906,40 @@ msgstr "无法打开文件 %s" msgid "Could not open file descriptor %d" msgstr "无法打开文件描述符 %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "无法创建子进程的 IPC 管道" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "无法执行压缩程序" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "读取文件出错,还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "写入文件出错,还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "关闭文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "重命名文件 %s 为 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "用 unlink 删除文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "同步文件出错" @@ -3115,31 +3164,31 @@ msgstr "无法读取 %s 的状态" msgid "Cannot get debconf version. Is debconf installed?" msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "软件包的扩展列表太长" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "源扩展列表太长" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "将头写入到目录文件时出错" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3219,42 +3268,47 @@ msgstr "" " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "没有任何选定项是匹配的" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "软件包文件组“%s”中缺少一些文件" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "数据库被损坏,该数据库文件的文件名已改成 %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "数据库已过期,现尝试进行升级 %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "数据库格式无效。如果您是从一个老版本的 apt 升级而来,请删除数据库并重建它。" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "无法打开数据库文件 %s:%s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "无法读取符号链接 %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "归档文件没有包含控制字段" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "无法获得游标" @@ -3319,31 +3373,31 @@ msgstr "*** 无法将 %s 链接到 %s" msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "归档文件没有包含 package 字段" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s 没有源代码的 override 项\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 中没有二进制文件的 override 项\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - 分配内存失败" @@ -3419,7 +3473,7 @@ msgstr "在计算 MD5 校验和时无法读取数据" msgid "Problem unlinking %s" msgstr "在使用 unlink 删除 %s 时出错" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3525,36 +3579,9 @@ msgstr "" #~ 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" |