From c07009bc84b312e8733f4632c75186757078dc8c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 22 Jan 2004 11:54:48 +0000
Subject: merge

---
 po/zh_CN.po | 97 ++++++++++++++++++++++++-------------------------------------
 1 file changed, 38 insertions(+), 59 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d37b6e70..64280aa2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-21 18:52+0100\n"
+"POT-Creation-Date: 2004-01-22 12:55+0100\n"
 "PO-Revision-Date: 2004-01-17 18:44+0800\n"
 "Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n"
 "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -209,7 +209,7 @@ msgstr "自动登录"
 msgid "Backups"
 msgstr "备份"
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr "引导程序"
@@ -224,7 +224,7 @@ msgstr "启动主题"
 msgid "Boot floppy"
 msgstr "启动软盘"
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr "Internet 连接共享"
@@ -279,7 +279,7 @@ msgstr "字体"
 msgid "Graphical server"
 msgstr "图形服务器"
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr "分区"
@@ -294,7 +294,7 @@ msgstr "硬件"
 msgid "Install"
 msgstr "安装"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "键盘"
@@ -319,7 +319,7 @@ msgstr "菜单"
 msgid "Monitor"
 msgstr "显示器"
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "鼠标"
@@ -384,7 +384,7 @@ msgstr "级别和检查"
 msgid "Permissions"
 msgstr "权限"
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "服务"
@@ -399,7 +399,7 @@ msgstr "介质管理器"
 msgid "TV card"
 msgstr "电视卡"
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr "用户和组"
@@ -656,7 +656,7 @@ msgid ""
 "current one):"
 msgstr "要创建的配置文件的名称(新配置文件将会创建为当前配置文件的副本)："
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -733,7 +733,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "请稍候..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "上一步"
@@ -860,66 +860,31 @@ msgstr "Mandrake 控制中心 %s\n"
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "Mandrakesoft SA 版权所有 (C) 1999-2004"
 
-#: ../control-center:996
+#: ../control-center:998
 #, c-format
 msgid "Authors"
 msgstr "作者"
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Mandrake Linux 贡献者"
 
 #: ../drakxconf:25
 #, fuzzy, c-format
-msgid "Display Configuration"
-msgstr "打印配置"
-
-#: ../drakxconf:26
-#, fuzzy, c-format
-msgid "KeyBoard Configuration"
-msgstr "菜单配置中心"
-
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr "菜单配置中心"
+msgid "Display"
+msgstr "/显示日志(_L)"
 
 #: ../drakxconf:28
 #, fuzzy, c-format
 msgid "Internet & Network"
 msgstr "Internet 访问"
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr "打印配置"
-
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr "打印配置"
-
 #: ../drakxconf:33
 #, fuzzy, c-format
 msgid "Auto Install"
 msgstr "自动安装软盘"
 
-#: ../drakxconf:34
-#, fuzzy, c-format
-msgid "Connection Sharing"
-msgstr "Internet 连接共享"
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, fuzzy, c-format
 msgid "Control Center"
@@ -933,16 +898,6 @@ msgstr ""
 "\n"
 "选择您要配置的菜单"
 
-#: ../gecko.pm:52
-#, c-format
-msgid "Next"
-msgstr ""
-
-#: ../gecko.pm:60
-#, c-format
-msgid "Skip Wizard"
-msgstr ""
-
 #: ../menus_launcher.pl:19 ../menus_launcher.pl:41
 #, c-format
 msgid "Menu Configuration Center"
@@ -988,3 +943,27 @@ msgstr "单击此处配置打印系统"
 #, c-format
 msgid "Done"
 msgstr "完成"
+
+#, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr "打印配置"
+
+#, fuzzy
+#~ msgid "KeyBoard Configuration"
+#~ msgstr "菜单配置中心"
+
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr "菜单配置中心"
+
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr "打印配置"
+
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr "打印配置"
+
+#, fuzzy
+#~ msgid "Connection Sharing"
+#~ msgstr "Internet 连接共享"
-- 
cgit v1.2.1