summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-06-18 20:23:53 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-06-18 20:23:53 +0200
commitbc5095b7d708c7e376f98be6edc2ad7cceca57ed (patch)
tree8b45f6fc974330f964bad3684ac85550480fb66b /po/zh_CN.po
parent456821f91483f45b3ceb156f54ccc27983b71595 (diff)
parent51da0c3587c9d36a3c04b3e28b99d8331a29b230 (diff)
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po183
1 files changed, 93 insertions, 90 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4e6c51bd5..23a1e4c82 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-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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"
@@ -159,7 +159,7 @@ msgstr " 版本列表:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: 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:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -327,7 +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
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
@@ -386,7 +386,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的可用空间"
@@ -419,7 +419,7 @@ msgstr "下载源代码 %s\n"
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
@@ -855,7 +855,7 @@ msgstr "无法创建套接字"
msgid "Could not connect data socket, connection timed out"
msgstr "无法连接上数据套接字,连接超时"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "失败"
@@ -1101,12 +1101,7 @@ msgstr "内部错误"
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "内部错误,全部升级工具坏事了"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "完成"
@@ -1191,70 +1186,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "下列软件包有未满足的依赖关系:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "但无法安装它"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "但是它是虚拟软件包"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " 或"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "下列软件包有未满足的依赖关系:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "下列软件包的版本将保持不变:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "下列软件包将被升级:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1262,27 +1257,27 @@ msgstr ""
"【警告】:下列基础软件包将被卸载。\n"
"请勿尝试,除非您确实知道您在做什么!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包,"
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "重新安装了 %lu 个软件包,"
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包,"
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
@@ -1291,7 +1286,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:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1299,21 +1294,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:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
@@ -1329,6 +1324,10 @@ msgid_plural ""
"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
msgstr[0] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1340,70 +1339,70 @@ msgstr[0] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误,Ordering 未能完成"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "怪了……文件大小不符,请发信给 apt@packages.debian.org 吧"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, 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:166
+#: apt-private/private-install.cc:167
#, 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:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 上没有足够的可用空间。"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
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:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "是,按我说的做!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1414,19 +1413,19 @@ msgstr ""
"若还想继续的话,就输入下面的短句“%s”\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "中止执行。"
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "您希望继续执行吗?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "有一些文件无法下载"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1434,19 +1433,19 @@ msgstr ""
"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "中止安装。"
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1455,15 +1454,15 @@ msgid_plural ""
"all files have been overwritten by other packages:"
msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "注意:这是自动被 dpkg 有意完成的。"
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我们不应该进行删除,无法启动自动删除器"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1479,15 +1478,15 @@ msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "下列信息可能会对解决问题有所帮助:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部错误,自动卸载工具坏事了"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1495,14 +1494,14 @@ msgid_plural ""
"required:"
msgstr[0] "下列软件包是自动安装的并且现在不需要了:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, 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:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1520,7 +1519,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
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"
@@ -1531,59 +1530,59 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "破损的软件包"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "忽略了 %s,它已经被安装而且仅请求了升级。\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "不能重新安装 %s,因为无法下载它。\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, 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
+#: apt-private/private-install.cc:941
#, 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
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "软件包 %s 还未安装,因而不会被卸载\n"
@@ -2156,23 +2155,23 @@ msgstr "无法写入 %s"
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2825,7 +2824,7 @@ msgstr "%li分 %li秒"
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
@@ -3473,7 +3472,7 @@ msgstr "在计算 MD5 校验和时无法读取数据"
msgid "Problem unlinking %s"
msgstr "在使用 unlink 删除 %s 时出错"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3526,6 +3525,10 @@ msgstr ""
" -c=? 读取指定配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "内部错误,全部升级工具坏事了"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s 不是一个有效的 DEB 软件包。"