merge

1 files changed, 133 insertions, 129 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c181fe9b..ee68195c 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-05 13:54+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-05 15:56+0000\n"
 "PO-Revision-Date: 2003-09-24 16:17+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"
@@ -163,352 +163,356 @@ msgid "Auto Install floppy"
 msgstr ""
 
 #: ../control-center_.c:109
-msgid "Backups"
+msgid "Autologin"
 msgstr ""
 
 #: ../control-center_.c:110
-msgid "Bootstrapping"
+msgid "Backups"
 msgstr ""
 
 #: ../control-center_.c:111
-msgid "Boot floppy"
+msgid "Bootstrapping"
 msgstr ""
 
 #: ../control-center_.c:112
-msgid "Internet connection sharing"
+msgid "Boot floppy"
 msgstr ""
 
 #: ../control-center_.c:113
-msgid "New connection"
+msgid "Internet connection sharing"
 msgstr ""
 
 #: ../control-center_.c:114
-msgid "Manage connections"
+msgid "New connection"
 msgstr ""
 
 #: ../control-center_.c:115
-msgid "Monitor connections"
+msgid "Manage connections"
 msgstr ""
 
 #: ../control-center_.c:116
+msgid "Monitor connections"
+msgstr ""
+
+#: ../control-center_.c:117
 msgid "Internet access"
 msgstr ""
 
-#: ../control-center_.c:118
+#: ../control-center_.c:119
 msgid "Console"
 msgstr ""
 
-#: ../control-center_.c:120
+#: ../control-center_.c:121
 #, fuzzy
 msgid "Date and time"
 msgstr "设定日期和时间"
 
-#: ../control-center_.c:121
+#: ../control-center_.c:122
 #, fuzzy
 msgid "Display manager"
 msgstr "选择显示管理器"
 
-#: ../control-center_.c:122
+#: ../control-center_.c:123
 msgid "Firewall"
 msgstr ""
 
-#: ../control-center_.c:123
+#: ../control-center_.c:124
 msgid "Fonts"
 msgstr ""
 
-#: ../control-center_.c:124
+#: ../control-center_.c:125
 msgid "Graphical server"
 msgstr ""
 
-#: ../control-center_.c:125
+#: ../control-center_.c:126
 msgid "Partitions"
 msgstr ""
 
-#: ../control-center_.c:126 ../control-center_.c:162
+#: ../control-center_.c:127 ../control-center_.c:164
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../control-center_.c:127
+#: ../control-center_.c:128
 msgid "Install"
 msgstr ""
 
-#: ../control-center_.c:128
+#: ../control-center_.c:129
 msgid "Keyboard"
 msgstr ""
 
-#: ../control-center_.c:129 ../control-center_.c:530
+#: ../control-center_.c:130 ../control-center_.c:532
 msgid "Logs"
 msgstr "日志"
 
-#: ../control-center_.c:130
+#: ../control-center_.c:131
 msgid "Updates"
 msgstr ""
 
-#: ../control-center_.c:131
+#: ../control-center_.c:132
 msgid "Menus"
 msgstr ""
 
-#: ../control-center_.c:132
+#: ../control-center_.c:133
 msgid "Monitor"
 msgstr ""
 
-#: ../control-center_.c:133
+#: ../control-center_.c:134
 msgid "Mouse"
 msgstr ""
 
-#: ../control-center_.c:134
+#: ../control-center_.c:135
 #, fuzzy
 msgid "NFS mount points"
 msgstr "设定 NFS 载入点"
 
-#: ../control-center_.c:135
+#: ../control-center_.c:136
 msgid "Local disk sharing"
 msgstr ""
 
-#: ../control-center_.c:136
+#: ../control-center_.c:137
 msgid "Printers"
 msgstr ""
 
-#: ../control-center_.c:137
+#: ../control-center_.c:138
 msgid "Scheduled tasks"
 msgstr ""
 
-#: ../control-center_.c:138
+#: ../control-center_.c:139
 msgid "Proxy"
 msgstr ""
 
-#: ../control-center_.c:139
+#: ../control-center_.c:140
 msgid "Remove a connection"
 msgstr ""
 
-#: ../control-center_.c:140
+#: ../control-center_.c:141
 msgid "Remove"
 msgstr ""
 
-#: ../control-center_.c:141
+#: ../control-center_.c:142
 #, fuzzy
 msgid "Screen resolution"
 msgstr "更改您的屏幕分辨率"
 
-#: ../control-center_.c:142
+#: ../control-center_.c:143
 #, fuzzy
 msgid "Samba mount points"
 msgstr "设定 Samba 载入点"
 
-#: ../control-center_.c:143
+#: ../control-center_.c:144
 msgid "Scanners"
 msgstr ""
 
-#: ../control-center_.c:144
+#: ../control-center_.c:145
 msgid "Level and checks"
 msgstr ""
 
-#: ../control-center_.c:145
+#: ../control-center_.c:146
 msgid "Permissions"
 msgstr ""
 
-#: ../control-center_.c:146
+#: ../control-center_.c:147
 msgid "Services"
 msgstr ""
 
-#: ../control-center_.c:147
+#: ../control-center_.c:148
 msgid "Media Manager"
 msgstr ""
 
-#: ../control-center_.c:148
+#: ../control-center_.c:149
 msgid "TV card"
 msgstr ""
 
-#: ../control-center_.c:149
+#: ../control-center_.c:150
 msgid "Users and groups"
 msgstr ""
 
-#: ../control-center_.c:150
+#: ../control-center_.c:151
 #, fuzzy
 msgid "WebDAV mount points"
 msgstr "设定 WebDAV 载入点"
 
-#: ../control-center_.c:155
+#: ../control-center_.c:156
 msgid "Boot"
 msgstr "启动"
 
-#: ../control-center_.c:175
+#: ../control-center_.c:177
 msgid "Mount Points"
 msgstr "载入点"
 
-#: ../control-center_.c:190
+#: ../control-center_.c:192
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: ../control-center_.c:191
+#: ../control-center_.c:193
 msgid "DVD"
 msgstr "DVD"
 
-#: ../control-center_.c:191
+#: ../control-center_.c:193
 #, fuzzy
 msgid "DVD-ROM"
 msgstr "CD-ROM"
 
-#: ../control-center_.c:192
+#: ../control-center_.c:194
 msgid "CD Burner"
 msgstr "刻录机"
 
-#: ../control-center_.c:192
+#: ../control-center_.c:194
 #, fuzzy
 msgid "CD/DVD"
 msgstr "DVD"
 
-#: ../control-center_.c:193
+#: ../control-center_.c:195
 msgid "Floppy"
 msgstr "软驱"
 
-#: ../control-center_.c:193
+#: ../control-center_.c:195
 #, fuzzy
 msgid "Floppy drive"
 msgstr "软驱"
 
-#: ../control-center_.c:194
+#: ../control-center_.c:196
 msgid "ZIP drive"
 msgstr ""
 
-#: ../control-center_.c:194
+#: ../control-center_.c:196
 msgid "Zip"
 msgstr "Zip"
 
-#: ../control-center_.c:203
+#: ../control-center_.c:205
 msgid "Network & Internet"
 msgstr "网络和 Internet"
 
-#: ../control-center_.c:214
+#: ../control-center_.c:216
 msgid "Security"
 msgstr "安全"
 
-#: ../control-center_.c:221
+#: ../control-center_.c:223
 msgid "System"
 msgstr "系统"
 
-#: ../control-center_.c:237
+#: ../control-center_.c:239
 msgid "Software Management"
 msgstr "软件管理"
 
-#: ../control-center_.c:246
+#: ../control-center_.c:248
 msgid "Server wizards"
 msgstr ""
 
-#: ../control-center_.c:253
+#: ../control-center_.c:255
 #, fuzzy
 msgid "Configure DHCP"
 msgstr "配置..."
 
-#: ../control-center_.c:254
+#: ../control-center_.c:256
 msgid "Add a DNS client"
 msgstr ""
 
-#: ../control-center_.c:255
+#: ../control-center_.c:257
 #, fuzzy
 msgid "Configure DNS"
 msgstr "配置..."
 
-#: ../control-center_.c:256
+#: ../control-center_.c:258
 #, fuzzy
 msgid "Configure FTP"
 msgstr "配置..."
 
-#: ../control-center_.c:257
+#: ../control-center_.c:259
 #, fuzzy
 msgid "Configure news"
 msgstr "配置..."
 
-#: ../control-center_.c:258
+#: ../control-center_.c:260
 #, fuzzy
 msgid "Configure mail"
 msgstr "配置..."
 
-#: ../control-center_.c:259
+#: ../control-center_.c:261
 #, fuzzy
 msgid "Configure proxy"
 msgstr "配置..."
 
-#: ../control-center_.c:260
+#: ../control-center_.c:262
 #, fuzzy
 msgid "Configure Samba"
 msgstr "配置..."
 
-#: ../control-center_.c:261
+#: ../control-center_.c:263
 #, fuzzy
 msgid "Configure time"
 msgstr "配置..."
 
-#: ../control-center_.c:262
+#: ../control-center_.c:264
 #, fuzzy
 msgid "Configure web"
 msgstr "配置..."
 
-#: ../control-center_.c:267
+#: ../control-center_.c:269
 msgid "Online Administration"
 msgstr ""
 
-#: ../control-center_.c:274
+#: ../control-center_.c:276
 msgid "Local administration"
 msgstr ""
 
-#: ../control-center_.c:275
+#: ../control-center_.c:277
 msgid "Remote administration"
 msgstr ""
 
-#: ../control-center_.c:303
+#: ../control-center_.c:305
 msgid "/Display _Logs"
 msgstr "/显示日志(_L)"
 
 #. -PO Translators, please keep all "/" charaters !!!
-#: ../control-center_.c:303 ../control-center_.c:304 ../control-center_.c:305
-#: ../control-center_.c:324
+#: ../control-center_.c:305 ../control-center_.c:306 ../control-center_.c:307
+#: ../control-center_.c:326
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: ../control-center_.c:304
+#: ../control-center_.c:306
 msgid "/_Embedded Mode"
 msgstr "/嵌入模式(_E)"
 
-#: ../control-center_.c:305
+#: ../control-center_.c:307
 msgid "/Expert mode in _wizards"
 msgstr "/在向导中使用专家模式(_W)"
 
-#: ../control-center_.c:309
+#: ../control-center_.c:311
 #, fuzzy
 msgid "/_Profiles"
 msgstr "/文件(_F)"
 
-#: ../control-center_.c:310
+#: ../control-center_.c:312
 msgid "/_Delete"
 msgstr ""
 
-#: ../control-center_.c:311
+#: ../control-center_.c:313
 msgid "/_New"
 msgstr ""
 
-#: ../control-center_.c:322 ../control-center_.c:323
+#: ../control-center_.c:324 ../control-center_.c:325
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: ../control-center_.c:323
+#: ../control-center_.c:325
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: ../control-center_.c:323
+#: ../control-center_.c:325
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../control-center_.c:323
+#: ../control-center_.c:325
 #, fuzzy
 msgid "Quit"
 msgstr "/退出(_Q)"
 
-#: ../control-center_.c:345 ../control-center_.c:348 ../control-center_.c:361
+#: ../control-center_.c:347 ../control-center_.c:350 ../control-center_.c:363
 msgid "/_Themes"
 msgstr "/主题(_T)"
 
-#: ../control-center_.c:351
+#: ../control-center_.c:353
 msgid ""
 "This action will restart the control center.\n"
 "Any change not applied will be lost."
@@ -516,192 +520,192 @@ msgstr ""
 "此操作将重新启动控制中心。\n"
 "所有没有应用的改变都将会丢失。"
 
-#: ../control-center_.c:361
+#: ../control-center_.c:363
 msgid "/_More themes"
 msgstr "/更多主题(_M)"
 
-#: ../control-center_.c:365
+#: ../control-center_.c:367
 msgid "New profile..."
 msgstr ""
 
-#: ../control-center_.c:368
+#: ../control-center_.c:370
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
 msgstr ""
 
-#: ../control-center_.c:372 ../control-center_.c:405 ../control-center_.c:522
+#: ../control-center_.c:374 ../control-center_.c:407 ../control-center_.c:524
 msgid "Cancel"
 msgstr ""
 
-#: ../control-center_.c:374 ../control-center_.c:406
+#: ../control-center_.c:376 ../control-center_.c:408
 msgid "Ok"
 msgstr ""
 
-#: ../control-center_.c:380
+#: ../control-center_.c:382
 msgid "Error"
 msgstr ""
 
-#: ../control-center_.c:380
+#: ../control-center_.c:382
 #, c-format
 msgid "The \"%s\" profile already exists!"
 msgstr ""
 
-#: ../control-center_.c:398
+#: ../control-center_.c:400
 msgid "Delete profile"
 msgstr ""
 
-#: ../control-center_.c:400
+#: ../control-center_.c:402
 msgid "Profile to delete:"
 msgstr ""
 
-#: ../control-center_.c:409 ../control-center_.c:470 ../control-center_.c:945
+#: ../control-center_.c:411 ../control-center_.c:472 ../control-center_.c:947
 msgid "Warning"
 msgstr "警告"
 
-#: ../control-center_.c:409
+#: ../control-center_.c:411
 msgid "You can not delete the current profile"
 msgstr ""
 
-#: ../control-center_.c:425 ../control-center_.c:426 ../control-center_.c:427
-#: ../control-center_.c:428
+#: ../control-center_.c:427 ../control-center_.c:428 ../control-center_.c:429
+#: ../control-center_.c:430
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../control-center_.c:426
+#: ../control-center_.c:428
 #, fuzzy
 msgid "Help"
 msgstr "/帮助(_H)"
 
-#: ../control-center_.c:427
+#: ../control-center_.c:429
 msgid "/_Report Bug"
 msgstr "/故障报告(_R)"
 
-#: ../control-center_.c:428
+#: ../control-center_.c:430
 msgid "/_About..."
 msgstr "/关于(_A)..."
 
-#: ../control-center_.c:471
+#: ../control-center_.c:473
 #, 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."
+"Are you sure you want to do the switch?"
 msgstr ""
 
-#: ../control-center_.c:519
+#: ../control-center_.c:521
 msgid "Please wait..."
 msgstr "请稍候..."
 
-#: ../control-center_.c:533
+#: ../control-center_.c:535
 msgid "Previous"
 msgstr "上一步"
 
-#: ../control-center_.c:541
+#: ../control-center_.c:543
 #, c-format
 msgid "Mandrake Control Center %s"
 msgstr "Mandrake 控制中心 %s"
 
-#: ../control-center_.c:556
+#: ../control-center_.c:558
 msgid "Welcome to the Mandrake Control Center"
 msgstr "欢迎使用 Mandrake 控制中心"
 
-#: ../control-center_.c:618
+#: ../control-center_.c:620
 msgid "The modifications done in the current module won't be saved."
 msgstr "在当前模块中所作的修改将不会被保存。"
 
-#: ../control-center_.c:808
+#: ../control-center_.c:810
 #, c-format
 msgid "cannot fork: %s"
 msgstr "无法创建子进程：%s"
 
-#: ../control-center_.c:818
+#: ../control-center_.c:820
 #, c-format
 msgid "cannot fork and exec \"%s\" since it is not executable"
 msgstr "无法创建子进程并执行“%s”，原因是该文件不可执行"
 
-#: ../control-center_.c:936
+#: ../control-center_.c:938
 msgid "This program has exited abnormally"
 msgstr "此程序异常结束"
 
-#: ../control-center_.c:955
+#: ../control-center_.c:957
 msgid "Close"
 msgstr ""
 
-#: ../control-center_.c:962
+#: ../control-center_.c:964
 msgid "More themes"
 msgstr "更多主题"
 
-#: ../control-center_.c:964
+#: ../control-center_.c:966
 msgid "Getting new themes"
 msgstr "获取新的主题"
 
-#: ../control-center_.c:965
+#: ../control-center_.c:967
 msgid "Additional themes"
 msgstr "额外主题"
 
-#: ../control-center_.c:967
+#: ../control-center_.c:969
 msgid "Get additional themes on www.damz.net"
 msgstr "在 www.damz.net 里获得额外主题"
 
-#: ../control-center_.c:975
+#: ../control-center_.c:977
 msgid "About - Mandrake Control Center"
 msgstr "关于 - Mandrake 控制中心"
 
-#: ../control-center_.c:985
+#: ../control-center_.c:987
 msgid "Authors: "
 msgstr "作者："
 
-#: ../control-center_.c:986
+#: ../control-center_.c:988
 msgid "(original C version)"
 msgstr "（最初的 C 版本）"
 
 #. -PO "perl" here is the programming language
-#: ../control-center_.c:988 ../control-center_.c:991
+#: ../control-center_.c:990 ../control-center_.c:993
 msgid "(perl version)"
 msgstr "（perl 版本）"
 
-#: ../control-center_.c:993
+#: ../control-center_.c:995
 msgid "Artwork: "
 msgstr "美工："
 
-#: ../control-center_.c:994
+#: ../control-center_.c:996
 msgid "(design)"
 msgstr "（设计）"
 
 #. -PO If your language allows it, use eacute for first "e" and egrave for 2nd one.
-#: ../control-center_.c:996
+#: ../control-center_.c:998
 msgid "Helene Durosini"
 msgstr "Helene Durosini"
 
 #. -PO Add your Name here to find it in the About section in your language.
-#: ../control-center_.c:1010
+#: ../control-center_.c:1012
 msgid "~ * ~"
 msgstr "汤诗语"
 
 #. -PO Add your E-Mail address here if you want to show it in the about doialog.
-#: ../control-center_.c:1012
+#: ../control-center_.c:1014
 msgid "~ @ ~"
 msgstr "shiyutang@netscape.net"
 
-#: ../control-center_.c:1014
+#: ../control-center_.c:1016
 msgid "Translator: "
 msgstr "翻译者："
 
-#: ../control-center_.c:1020
+#: ../control-center_.c:1022
 #, c-format
 msgid "Mandrake Control Center %s\n"
 msgstr "Mandrake 控制中心 %s\n"
 
-#: ../control-center_.c:1021
+#: ../control-center_.c:1023
 msgid "Copyright (C) 1999-2003 Mandrakesoft SA"
 msgstr "Mandrakesoft SA 版权所有 (C) 1999-2003"
 
-#: ../control-center_.c:1025
+#: ../control-center_.c:1027
 msgid "Authors"
 msgstr "作者"
 
-#: ../control-center_.c:1026
+#: ../control-center_.c:1028
 msgid "Mandrake Linux Contributors"
 msgstr "Mandrake Linux 贡献者"