merge

1 files changed, 119 insertions, 107 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fad8351e..2e928eac 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
-"POT-Creation-Date: 2004-01-12 10:26+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-16 14:42+0000\n"
 "PO-Revision-Date: 2004-01-16 15:43+0800\n"
 "Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n"
 "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: ../contributors.pl_.c:11
 msgid "Per Oyvind Karlsen"
@@ -24,8 +24,7 @@ msgstr "Per Oyvind Karlsen"
 msgid ""
 "massive packages rebuilding and cleaning, Norwegian Bokmaal (nb) "
 "translation, i18n work, games"
-msgstr ""
-"繁杂的软件包重建和清理，挪威语(nb)翻译，国际化工作，游戏"
+msgstr "繁杂的软件包重建和清理，挪威语(nb)翻译，国际化工作，游戏"
 
 #: ../contributors.pl_.c:12
 msgid "Guillaume Rousse"
@@ -60,14 +59,14 @@ msgid ""
 "updated nc with debian patches, fixed some perl packages, dnotify startup "
 "script, urpmc, hddtemp, wipe, etc..."
 msgstr ""
-"更新了 nc 中的 debian 软件包，修正了某些 perl 包，dnotify 启动脚本，urpmc，hddtemp，wipe，等等"
+"更新了 nc 中的 debian 软件包，修正了某些 perl 包，dnotify 启动脚本，urpmc，"
+"hddtemp，wipe，等等"
 
 #: ../contributors.pl_.c:16
 msgid ""
 "\"deep and broad\" kernel work (many new patches before integration in "
 "official kernel)"
-msgstr ""
-"深入广泛的内核工作(集成到官方内核之前的新补丁)"
+msgstr "深入广泛的内核工作(集成到官方内核之前的新补丁)"
 
 #: ../contributors.pl_.c:16
 msgid "Thomas Backlund"
@@ -99,8 +98,8 @@ msgid ""
 "software (grass, mapserver), cursor_themes collection, misc server-side "
 "contributions"
 msgstr ""
-"与 Samba 2.2.x 和平共处的 Samba 3.0(预览版)，Samba-2.2.x，GIS 软件，"
-"光标主题收集，杂类服务器端贡献"
+"与 Samba 2.2.x 和平共处的 Samba 3.0(预览版)，Samba-2.2.x，GIS 软件，光标主题"
+"收集，杂类服务器端贡献"
 
 #: ../contributors.pl_.c:20
 msgid "Goetz Waschk"
@@ -121,8 +120,7 @@ msgstr "Austin Acton"
 msgid ""
 "audio/video/MIDI apps, scientific apps, audio/video production howtos, "
 "bluetooth, pyqt & related"
-msgstr ""
-"影音程序，科学程序，影音制作指南，蓝牙，pyqt 及相关内容。"
+msgstr "影音程序，科学程序，影音制作指南，蓝牙，pyqt 及相关内容。"
 
 #: ../contributors.pl_.c:22
 msgid "ATI/gatos/DRM stuff"
@@ -177,8 +175,9 @@ msgid "Backups"
 msgstr "备份"
 
 #: ../control-center_.c:107
-msgid "Bootstrapping"
-msgstr ""
+#, fuzzy
+msgid "Boot loader"
+msgstr "启动软盘"
 
 #: ../control-center_.c:108
 msgid "Boot theme"
@@ -236,7 +235,7 @@ msgstr "图形服务器"
 msgid "Partitions"
 msgstr "分区"
 
-#: ../control-center_.c:124 ../control-center_.c:161
+#: ../control-center_.c:124 ../control-center_.c:162
 msgid "Hardware"
 msgstr "硬件"
 
@@ -340,169 +339,184 @@ msgstr "WebDAV 挂载点"
 msgid "Boot"
 msgstr "启动"
 
-#: ../control-center_.c:174
+#: ../control-center_.c:175
 msgid "Mount Points"
 msgstr "挂载点"
 
-#: ../control-center_.c:189
+#: ../control-center_.c:190
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: ../control-center_.c:190
+#: ../control-center_.c:191
 msgid "DVD"
 msgstr "DVD"
 
-#: ../control-center_.c:190
+#: ../control-center_.c:191
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: ../control-center_.c:191
+#: ../control-center_.c:192
 msgid "CD Burner"
 msgstr "刻录机"
 
-#: ../control-center_.c:191
+#: ../control-center_.c:192
 msgid "CD/DVD"
 msgstr "CD/DVD"
 
-#: ../control-center_.c:192
+#: ../control-center_.c:193
 msgid "Floppy"
 msgstr "软驱"
 
-#: ../control-center_.c:192
+#: ../control-center_.c:193
 msgid "Floppy drive"
 msgstr "软盘驱动器"
 
-#: ../control-center_.c:193
+#: ../control-center_.c:194
 msgid "ZIP drive"
 msgstr "ZIP 驱动器"
 
-#: ../control-center_.c:193
+#: ../control-center_.c:194
 msgid "Zip"
 msgstr "Zip"
 
-#: ../control-center_.c:202
+#: ../control-center_.c:203
 msgid "Network & Internet"
 msgstr "网络和 Internet"
 
-#: ../control-center_.c:213
+#: ../control-center_.c:214
 msgid "Security"
 msgstr "安全"
 
-#: ../control-center_.c:220
+#: ../control-center_.c:221
 msgid "System"
 msgstr "系统"
 
-#: ../control-center_.c:236
+#: ../control-center_.c:237
 msgid "Software Management"
 msgstr "软件管理"
 
-#: ../control-center_.c:245
+#: ../control-center_.c:246
 msgid "Server wizards"
 msgstr "服务器向导"
 
-#: ../control-center_.c:252
+#: ../control-center_.c:253
 msgid "Configure DHCP"
 msgstr "配置 DHCP"
 
-#: ../control-center_.c:253
+#: ../control-center_.c:254
 msgid "Add a DNS client"
 msgstr "添加 DNS 客户"
 
-#: ../control-center_.c:254
+#: ../control-center_.c:255
 msgid "Configure DNS"
 msgstr "配置 DNS"
 
-#: ../control-center_.c:255
+#: ../control-center_.c:256
 msgid "Configure FTP"
 msgstr "配置 FTP"
 
-#: ../control-center_.c:256
+#: ../control-center_.c:257
 msgid "Configure news"
 msgstr "配置新闻"
 
-#: ../control-center_.c:257
+#: ../control-center_.c:258
 msgid "Configure mail"
 msgstr "配置邮件"
 
-#: ../control-center_.c:258
+#: ../control-center_.c:259
 msgid "Configure proxy"
 msgstr "配置代理服务器"
 
-#: ../control-center_.c:259
+#: ../control-center_.c:260
 msgid "Configure Samba"
 msgstr "配置 Samba"
 
-#: ../control-center_.c:260
+#: ../control-center_.c:261
 msgid "Configure time"
 msgstr "配置时间"
 
-#: ../control-center_.c:261
+#: ../control-center_.c:262
 msgid "Configure web"
 msgstr "配置 Web"
 
-#: ../control-center_.c:266
+#: ../control-center_.c:263
+#, fuzzy
+msgid "Configure NIS and Autofs"
+msgstr "配置 DNS"
+
+#: ../control-center_.c:264
+#, fuzzy
+msgid "Configure installation server"
+msgstr "菜单配置中心"
+
+#: ../control-center_.c:265
+#, fuzzy
+msgid "Configure PXE"
+msgstr "配置 FTP"
+
+#: ../control-center_.c:271
 msgid "Online Administration"
 msgstr "在线管理"
 
-#: ../control-center_.c:273
+#: ../control-center_.c:278
 msgid "Local administration"
 msgstr "本地管理"
 
-#: ../control-center_.c:274
+#: ../control-center_.c:279
 msgid "Remote administration"
 msgstr "远程管理"
 
-#: ../control-center_.c:302
+#: ../control-center_.c:307
 msgid "/Display _Logs"
 msgstr "/显示日志(_L)"
 
 #. -PO Translators, please keep all "/" charaters !!!
-#: ../control-center_.c:302 ../control-center_.c:303 ../control-center_.c:304
-#: ../control-center_.c:323
+#: ../control-center_.c:307 ../control-center_.c:308 ../control-center_.c:309
+#: ../control-center_.c:328
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: ../control-center_.c:303
+#: ../control-center_.c:308
 msgid "/_Embedded Mode"
 msgstr "/嵌入模式(_E)"
 
-#: ../control-center_.c:304
+#: ../control-center_.c:309
 msgid "/Expert mode in _wizards"
 msgstr "/在向导中使用专家模式(_W)"
 
-#: ../control-center_.c:308
+#: ../control-center_.c:313
 msgid "/_Profiles"
 msgstr "/配置文件(_P)"
 
-#: ../control-center_.c:309
+#: ../control-center_.c:314
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: ../control-center_.c:310
+#: ../control-center_.c:315
 msgid "/_New"
 msgstr "/新建(_N)"
 
-#: ../control-center_.c:321 ../control-center_.c:322
+#: ../control-center_.c:326 ../control-center_.c:327
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: ../control-center_.c:322
+#: ../control-center_.c:327
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: ../control-center_.c:322
+#: ../control-center_.c:327
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../control-center_.c:322
+#: ../control-center_.c:327
 msgid "Quit"
 msgstr "退出(Q)"
 
-#: ../control-center_.c:338 ../control-center_.c:341 ../control-center_.c:354
+#: ../control-center_.c:343 ../control-center_.c:346 ../control-center_.c:359
 msgid "/_Themes"
 msgstr "/主题(_T)"
 
-#: ../control-center_.c:344
+#: ../control-center_.c:349
 msgid ""
 "This action will restart the control center.\n"
 "Any change not applied will be lost."
@@ -510,201 +524,200 @@ msgstr ""
 "此操作将重新启动控制中心。\n"
 "所有没有应用的改变都将会丢失。"
 
-#: ../control-center_.c:354
+#: ../control-center_.c:359
 msgid "/_More themes"
 msgstr "/更多主题(_M)"
 
-#: ../control-center_.c:358
+#: ../control-center_.c:363
 msgid "New profile..."
 msgstr "新建配置文件..."
 
-#: ../control-center_.c:361
+#: ../control-center_.c:366
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
-msgstr ""
-"要创建的配置文件的名称(新配置文件将会创建为当前配置文件的副本)："
+msgstr "要创建的配置文件的名称(新配置文件将会创建为当前配置文件的副本)："
 
-#: ../control-center_.c:365 ../control-center_.c:398 ../control-center_.c:524
+#: ../control-center_.c:370 ../control-center_.c:403 ../control-center_.c:529
 msgid "Cancel"
 msgstr "取消"
 
-#: ../control-center_.c:367 ../control-center_.c:399
+#: ../control-center_.c:372 ../control-center_.c:404
 msgid "Ok"
 msgstr "确定"
 
-#: ../control-center_.c:373
+#: ../control-center_.c:378
 msgid "Error"
 msgstr "错误"
 
-#: ../control-center_.c:373
+#: ../control-center_.c:378
 #, c-format
 msgid "The \"%s\" profile already exists!"
 msgstr "“%s”配置文件已经存在！"
 
-#: ../control-center_.c:391
+#: ../control-center_.c:396
 msgid "Delete profile"
 msgstr "删除配置文件"
 
-#: ../control-center_.c:393
+#: ../control-center_.c:398
 msgid "Profile to delete:"
 msgstr "要删除的配置文件："
 
-#: ../control-center_.c:402 ../control-center_.c:462 ../control-center_.c:913
+#: ../control-center_.c:407 ../control-center_.c:467 ../control-center_.c:918
 msgid "Warning"
 msgstr "警告"
 
-#: ../control-center_.c:402
+#: ../control-center_.c:407
 msgid "You can not delete the current profile"
 msgstr "您无法删除当前配置文件"
 
-#: ../control-center_.c:417 ../control-center_.c:418 ../control-center_.c:419
-#: ../control-center_.c:420
+#: ../control-center_.c:422 ../control-center_.c:423 ../control-center_.c:424
+#: ../control-center_.c:425
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../control-center_.c:418
+#: ../control-center_.c:423
 msgid "Help"
 msgstr "帮助(H)"
 
-#: ../control-center_.c:419
+#: ../control-center_.c:424
 msgid "/_Report Bug"
 msgstr "/故障报告(_R)"
 
-#: ../control-center_.c:420
+#: ../control-center_.c:425
 msgid "/_About..."
 msgstr "/关于(_A)..."
 
-#: ../control-center_.c:463
+#: ../control-center_.c:468
 #, c-format
 msgid ""
 "We are about to switch from the \"%s\" profile to the \"%s\" profile.\n"
 "\n"
 "Are you sure you want to do the switch?"
 msgstr ""
-"您即将从“%s”配置文件切换为“%s”配置文件。\n\n"
+"您即将从“%s”配置文件切换为“%s”配置文件。\n"
+"\n"
 "您确定想要切换吗？"
 
-#: ../control-center_.c:513
+#: ../control-center_.c:518
 msgid "Please wait..."
 msgstr "请稍候..."
 
-#: ../control-center_.c:529
+#: ../control-center_.c:534
 msgid "Previous"
 msgstr "上一步"
 
-#: ../control-center_.c:544
+#: ../control-center_.c:549
 #, c-format
 msgid "Mandrake Control Center %s [on %s]"
 msgstr "Mandrake 控制中心 %s [位于 %s]"
 
-#: ../control-center_.c:555
+#: ../control-center_.c:560
 msgid ""
 "_banner font:\n"
 "Sans 15"
-msgstr ""
-"Sans 15"
+msgstr "Sans 15"
 
-#: ../control-center_.c:557
+#: ../control-center_.c:562
 msgid "Welcome to the Mandrake Control Center"
 msgstr "欢迎使用 Mandrake 控制中心"
 
-#: ../control-center_.c:700
+#: ../control-center_.c:705
 msgid "The modifications done in the current module won't be saved."
 msgstr "在当前模块中所作的修改将不会被保存。"
 
-#: ../control-center_.c:776
+#: ../control-center_.c:781
 #, c-format
 msgid "cannot fork: %s"
 msgstr "无法创建子进程：%s"
 
-#: ../control-center_.c:786
+#: ../control-center_.c:791
 #, c-format
 msgid "cannot fork and exec \"%s\" since it is not executable"
 msgstr "无法创建子进程并执行“%s”，原因是该文件不可执行"
 
-#: ../control-center_.c:904
+#: ../control-center_.c:909
 msgid "This program has exited abnormally"
 msgstr "此程序异常结束"
 
-#: ../control-center_.c:923
+#: ../control-center_.c:928
 msgid "Close"
 msgstr "关闭"
 
-#: ../control-center_.c:930
+#: ../control-center_.c:935
 msgid "More themes"
 msgstr "更多主题"
 
-#: ../control-center_.c:932
+#: ../control-center_.c:937
 msgid "Getting new themes"
 msgstr "获取新的主题"
 
-#: ../control-center_.c:933
+#: ../control-center_.c:938
 msgid "Additional themes"
 msgstr "额外主题"
 
-#: ../control-center_.c:935
+#: ../control-center_.c:940
 msgid "Get additional themes on www.damz.net"
 msgstr "在 www.damz.net 里获得额外主题"
 
-#: ../control-center_.c:943
+#: ../control-center_.c:948
 msgid "About - Mandrake Control Center"
 msgstr "关于 - Mandrake 控制中心"
 
-#: ../control-center_.c:953
+#: ../control-center_.c:958
 msgid "Authors: "
 msgstr "作者："
 
-#: ../control-center_.c:954
+#: ../control-center_.c:959
 msgid "(original C version)"
 msgstr "（最初的 C 版本）"
 
 #. -PO "perl" here is the programming language
-#: ../control-center_.c:956 ../control-center_.c:959
+#: ../control-center_.c:961 ../control-center_.c:964
 msgid "(perl version)"
 msgstr "（perl 版本）"
 
-#: ../control-center_.c:961
+#: ../control-center_.c:966
 msgid "Artwork: "
 msgstr "美工："
 
-#: ../control-center_.c:962
+#: ../control-center_.c:967
 msgid "(design)"
 msgstr "（设计）"
 
 #. -PO If your language allows it, use eacute for first "e" and egrave for 2nd one.
-#: ../control-center_.c:964
+#: ../control-center_.c:969
 msgid "Helene Durosini"
 msgstr "Helene Durosini"
 
 #. -PO Add your Name here to find it in the About section in your language.
-#: ../control-center_.c:978
+#: ../control-center_.c:983
 msgid "~ * ~"
 msgstr "汤诗语"
 
 #. -PO Add your E-Mail address here if you want to show it in the about doialog.
-#: ../control-center_.c:980
+#: ../control-center_.c:985
 msgid "~ @ ~"
 msgstr "shiyutang@netscape.net"
 
-#: ../control-center_.c:982
+#: ../control-center_.c:987
 msgid "Translator: "
 msgstr "翻译者："
 
-#: ../control-center_.c:988
+#: ../control-center_.c:993
 #, c-format
 msgid "Mandrake Control Center %s\n"
 msgstr "Mandrake 控制中心 %s\n"
 
-#: ../control-center_.c:989
+#: ../control-center_.c:994
 msgid "Copyright (C) 1999-2003 Mandrakesoft SA"
 msgstr "Mandrakesoft SA 版权所有 (C) 1999-2003"
 
-#: ../control-center_.c:993
+#: ../control-center_.c:998
 msgid "Authors"
 msgstr "作者"
 
-#: ../control-center_.c:994
+#: ../control-center_.c:999
 msgid "Mandrake Linux Contributors"
 msgstr "Mandrake Linux 贡献者"
 
@@ -746,4 +759,3 @@ msgstr "单击此处配置打印系统"
 #: ../print_launcher.pl_.c:37
 msgid "Done"
 msgstr "完成"
-