aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-06-18 17:08:29 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-06-18 17:08:29 +0000
commitafea9f23bd47b71e45bc0b1ee689be5c6230ff87 (patch)
tree29e04eb0971c1a600fff2c63656df19cf8d28c1c /po/zh_CN.po
parent76f795ad2dc38aeb34dbc367fe271706df71dcd6 (diff)
downloadrpmdrake-afea9f23bd47b71e45bc0b1ee689be5c6230ff87.tar
rpmdrake-afea9f23bd47b71e45bc0b1ee689be5c6230ff87.tar.gz
rpmdrake-afea9f23bd47b71e45bc0b1ee689be5c6230ff87.tar.bz2
rpmdrake-afea9f23bd47b71e45bc0b1ee689be5c6230ff87.tar.xz
rpmdrake-afea9f23bd47b71e45bc0b1ee689be5c6230ff87.zip
merge
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po68
1 files changed, 31 insertions, 37 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 59167b21..49550626 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-06-13 21:08+0200\n"
+"POT-Creation-Date: 2003-06-18 19:02+0200\n"
"PO-Revision-Date: 2003-05-24 11:13+0800\n"
"Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n"
"Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -585,6 +585,21 @@ msgstr "重要性:"
msgid "Unable to create medium."
msgstr "无法创建来源。"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"要升级其它软件包,必须删除下列软件包:\n"
+"\n"
+"%s\n"
+"\n"
+"确定继续吗?"
+
#: ../edit-urpm-sources.pl:1
#, fuzzy, c-format
msgid ""
@@ -810,6 +825,21 @@ msgstr "不可恢复的错误:对不起,没有发现可安装的软件包。
msgid "Some packages can't be removed"
msgstr "有些软件包无法删除"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"对不起,不能选择下列软件包:\n"
+"\n"
+"%s\n"
+"\n"
+"原因如下:\n"
+"\n"
+"%s"
+
#: ../rpmdrake.pm:1
#, c-format
msgid "Finland"
@@ -995,23 +1025,6 @@ msgid "Removable device"
msgstr "可移动设备"
#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"(waiting for urpmi subroutine for explanation)\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"要升级其它软件包,必须删除下列软件包:\n"
-"\n"
-"%s\n"
-"\n"
-"确定继续吗?"
-
-#: ../rpmdrake:1
#, c-format
msgid "Graphical desktop/Icewm"
msgstr ""
@@ -1227,25 +1240,6 @@ msgstr "%s KB"
#: ../rpmdrake:1
#, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"对不起,不能选择下列软件包:\n"
-"\n"
-"%s\n"
-"\n"
-"原因如下:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, c-format
msgid "Sciences/Chemistry"
msgstr ""