From 2ce5ee64b4a7749fdba61da33258f894d9fd2fe5 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Wed, 13 Aug 2003 11:56:39 +0000
Subject: merge and translate for fr

---
 po/zh_CN.po | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 48784c30..4d3633bf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-08-13 05:36+0200\n"
+"POT-Creation-Date: 2003-08-13 14:00+0200\n"
 "PO-Revision-Date: 2003-07-25 18:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -185,6 +185,16 @@ msgstr "Shell"
 msgid "Chemistry"
 msgstr "化学"
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Choose a key for adding to the medium %s"
+msgstr "在介质限制中选择介质进行添加:"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a key"
+msgstr "添加..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid "True type"
@@ -419,16 +429,16 @@ msgstr "无法启动帮助窗口，稍后桌面上将会出现。"
 msgid "No mirror"
 msgstr "没有镜像"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "波兰"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Reload the packages list"
 msgstr "重新装入软件包清单"
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "波兰"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Path or mount point:"
@@ -1494,6 +1504,11 @@ msgstr " 完成。"
 msgid "You need to insert the medium to continue"
 msgstr "您必须插入介质才能继续"
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "no name found, key doesn't exist in rpm keyring!"
+msgstr ""
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Too many packages are selected"
@@ -1574,6 +1589,7 @@ msgstr "压缩"
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下载“%s”，剩余时间: %s，速度: %s"
 
+#. -PO: We're downloading the said file from the said medium
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "%s from medium %s"
@@ -1599,11 +1615,6 @@ msgstr "否"
 msgid "Media limit"
 msgstr "介质限制"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "no name found"
-msgstr "无法找到函数\n"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Install"
@@ -2156,3 +2167,7 @@ msgstr "删除软件"
 #, fuzzy
 msgid "Software Media Manager"
 msgstr "软件源管理器"
+
+#, fuzzy
+#~ msgid "no name found"
+#~ msgstr "无法找到函数\n"
-- 
cgit v1.2.1