summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-02-10 18:02:45 +0100
committerJulian Andres Klode <jak@debian.org>2016-02-10 18:02:45 +0100
commit29f80b30c7c5a0da8544ebde6e7eb54c41171360 (patch)
tree100e51affbbc7b60ddb7d49d6cfc612298599385 /po/zh_CN.po
parent9750213c8117312f9d7dc6d283a4005d14621ef6 (diff)
Release 1.2.31.2.3
Build system messed up the 1.2.2 commit by not updating the .po files properly, so they are now.
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po138
1 files changed, 63 insertions, 75 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 940f68ce9..a95d09012 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.2.x\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-01-25 18:05+0100\n"
+"POT-Creation-Date: 2016-02-10 18:02+0100\n"
"PO-Revision-Date: 2016-01-22 02:00+0000\n"
"Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -255,6 +255,35 @@ msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
#: apt-private/private-install.cc
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"有一些软件包无法被安装。如果您用的是 unstable 发行版,这也许是\n"
+"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
+"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc
+msgid "The following information may help to resolve the situation:"
+msgstr "下列信息可能会对解决问题有所帮助:"
+
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr "破损的软件包"
+
+#: apt-private/private-install.cc
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误,InstallPackages 被用在了损坏的软件包上!"
@@ -397,20 +426,6 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请向 apt 提交错误报告。"
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc
-msgid "The following information may help to resolve the situation:"
-msgstr "下列信息可能会对解决问题有所帮助:"
-
#: apt-private/private-install.cc
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部错误,自动卸载工具坏事了"
@@ -449,21 +464,6 @@ msgstr ""
"以指定一个解决办法)。"
#: apt-private/private-install.cc
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"有一些软件包无法被安装。如果您用的是 unstable 发行版,这也许是\n"
-"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
-"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-
-#: apt-private/private-install.cc
-msgid "Broken packages"
-msgstr "破损的软件包"
-
-#: apt-private/private-install.cc
msgid "The following additional packages will be installed:"
msgstr "将会同时安装下列软件:"
@@ -871,51 +871,6 @@ msgstr "执行构造软件包命令“%s”失败。\n"
#: apt-private/private-source.cc
#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"由于 %3$s 不被软件包 %4$s 所允许,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:已安装的软件包 %3$s 太新"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"软件包 %3$s 的候选版本不能满足版本要求,因此 %2$s 软件包的 %1$s 依赖无法满足"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "软件包 %3$s 没有可用的候选版本,因此 %2$s 的 %1$s 依赖无法满足"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-
-#: apt-private/private-source.cc
-#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
@@ -3702,6 +3657,39 @@ msgstr "部分索引文件下载失败。如果忽略它们,那将转而使用
msgid "Calculating upgrade"
msgstr "正在计算更新"
+#~ msgid ""
+#~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+#~ "packages"
+#~ msgstr ""
+#~ "由于 %3$s 不被软件包 %4$s 所允许,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because the package %s cannot be "
+#~ "found"
+#~ msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+
+#~ msgid ""
+#~ "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#~ msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:已安装的软件包 %3$s 太新"
+
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because candidate version of "
+#~ "package %s can't satisfy version requirements"
+#~ msgstr ""
+#~ "软件包 %3$s 的候选版本不能满足版本要求,因此 %2$s 软件包的 %1$s 依赖无法满"
+#~ "足"
+
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because package %s has no "
+#~ "candidate version"
+#~ msgstr "软件包 %3$s 没有可用的候选版本,因此 %2$s 的 %1$s 依赖无法满足"
+
+#~ msgid "Failed to satisfy %s dependency for %s: %s"
+#~ msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
+
+#~ msgid "Build-dependencies for %s could not be satisfied."
+#~ msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
+
#~ msgid "Problem unlinking %s"
#~ msgstr "在使用 unlink 删除 %s 时出错"