summaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-01-18 14:29:17 +0000
committerThierry Vignaud <tv@mandriva.org>2007-01-18 14:29:17 +0000
commit5bf1115832ed3cfd4fb6ab4a3fec84fd8708dcca (patch)
treef8daf70578eb7b3af1c11d39fae3f4a4deb4834f /po/zh_CN.po
parent9916a26ef1ce76f892612d40c5e9bcbcc5e7bf80 (diff)
downloadurpmi-5bf1115832ed3cfd4fb6ab4a3fec84fd8708dcca.tar
urpmi-5bf1115832ed3cfd4fb6ab4a3fec84fd8708dcca.tar.gz
urpmi-5bf1115832ed3cfd4fb6ab4a3fec84fd8708dcca.tar.bz2
urpmi-5bf1115832ed3cfd4fb6ab4a3fec84fd8708dcca.tar.xz
urpmi-5bf1115832ed3cfd4fb6ab4a3fec84fd8708dcca.zip
sync with code
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po52
1 files changed, 31 insertions, 21 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ee2d30c8..741601fb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-15 14:22+0100\n"
+"POT-Creation-Date: 2007-01-18 15:22+0100\n"
"PO-Revision-Date: 2006-08-10 22:36+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -185,16 +185,6 @@ msgstr ""
"%s\n"
"仍然继续安装吗?"
-#: ../gurpmi2:210
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be "
-"installed:\n"
-"%s\n"
-msgstr ""
-"为了满足依赖性要求,将另外安装以下%d个软件包:\n"
-"%s\n"
-
#: ../gurpmi2:217
#, c-format
msgid "Package installation..."
@@ -2099,14 +2089,13 @@ msgstr[1] ""
msgid "(test only, removal will not be actually done)"
msgstr "(只是测试,删除将不会实际发生)"
-#: ../urpmi:578 ../urpmi:589
+#: ../urpmi:578
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed"
+msgid "To satisfy dependencies, the following package is going to be installed"
msgid_plural ""
-"To satisfy dependencies, the following package is going to be installed"
-msgstr[0] "为了满足依赖性要求,将另外安装以下软件包"
-msgstr[1] "为了满足依赖性要求,将另外安装以下软件包"
+"To satisfy dependencies, the following packages are going to be installed"
+msgstr[0] "为了满足依赖关系,将安装下列软件包"
+msgstr[1] "为了满足依赖关系,将安装下列软件包"
#: ../urpmi:580
#, c-format
@@ -2122,6 +2111,15 @@ msgstr ""
"您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
"%s\n"
+#: ../urpmi:589 ../gurpmi2:209
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgid_plural ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr[0] "为了满足依赖关系,将安装下列软件包"
+msgstr[1] "为了满足依赖关系,将安装下列软件包"
+
#: ../urpmi:592
#, c-format
msgid "(test only, installation will not be actually done)"
@@ -2829,6 +2827,22 @@ msgstr "没有找到文件列表\n"
msgid "No changelog found\n"
msgstr "没有找到更新日志\n"
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "为了满足依赖性要求,将另外安装以下%d个软件包:\n"
+#~ "%s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed"
+#~ msgid_plural ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr[0] "为了满足依赖性要求,将另外安装以下软件包"
+#~ msgstr[1] "为了满足依赖性要求,将另外安装以下软件包"
+
#~ msgid "skipping media %s: no hdlist"
#~ msgstr "跳过介质 %s:无 hdlist"
@@ -2886,10 +2900,6 @@ msgstr "没有找到更新日志\n"
#~ msgid "Preparing install on %s..."
#~ msgstr "正在准备在 %s 上安装..."
-#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr "为了满足依赖关系,将安装下列软件包"
-
#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
#~ msgstr " --probe-synthesis - 试图查找并使用综合文件。\n"