update cataglog

author: Thierry Vignaud <tvignaud@mandriva.org> 2005-05-19 08:37:55 +0000
committer: Thierry Vignaud <tvignaud@mandriva.org> 2005-05-19 08:37:55 +0000
commit: d21399ea877ea9c0fa1e342f0ea319df1b76a8c7 (patch)
tree: 37a4c762f819973f604b1beca49317e491cdd759 /perl-install/share/po/zh_CN.po
parent: 4b83d153ddfeb3ea6f6ce9965ef298c915c6fab6 (diff)
download: drakx-backup-do-not-use-d21399ea877ea9c0fa1e342f0ea319df1b76a8c7.tar
drakx-backup-do-not-use-d21399ea877ea9c0fa1e342f0ea319df1b76a8c7.tar.gz
drakx-backup-do-not-use-d21399ea877ea9c0fa1e342f0ea319df1b76a8c7.tar.bz2
drakx-backup-do-not-use-d21399ea877ea9c0fa1e342f0ea319df1b76a8c7.tar.xz
drakx-backup-do-not-use-d21399ea877ea9c0fa1e342f0ea319df1b76a8c7.zip
1 files changed, 1544 insertions, 1367 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index ed5124e7f..80ce881e8 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 10.3\n"
-"POT-Creation-Date: 2005-04-21 14:27+0200\n"
+"POT-Creation-Date: 2005-05-19 17:21+0200\n"
 "PO-Revision-Date: 2005-04-29 23:58+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -162,18 +162,19 @@ msgstr "请稍候, 正在检测并配置设备..."
 #: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664
 #: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:227
 #: diskdrake/interactive.pm:240 diskdrake/interactive.pm:401
-#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:555
-#: diskdrake/interactive.pm:560 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:182
-#: install_any.pm:1699 install_any.pm:1722 install_steps.pm:82
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:556
+#: diskdrake/interactive.pm:561 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:182
+#: install_any.pm:1698 install_any.pm:1721 install_steps.pm:82
 #: install_steps_interactive.pm:38 interactive/http.pm:117
 #: interactive/http.pm:118 network/ndiswrapper.pm:27 network/ndiswrapper.pm:41
 #: network/ndiswrapper.pm:89 network/ndiswrapper.pm:101
-#: network/netconnect.pm:1001 network/netconnect.pm:1131
-#: network/netconnect.pm:1135 network/netconnect.pm:1139
-#: network/netconnect.pm:1144 network/netconnect.pm:1273
-#: network/netconnect.pm:1277 network/netconnect.pm:1339
-#: network/netconnect.pm:1344 network/netconnect.pm:1364
-#: network/netconnect.pm:1575 printer/printerdrake.pm:244
+#: network/netconnect.pm:1013 network/netconnect.pm:1121
+#: network/netconnect.pm:1125 network/netconnect.pm:1129
+#: network/netconnect.pm:1134 network/netconnect.pm:1266
+#: network/netconnect.pm:1270 network/netconnect.pm:1274
+#: network/netconnect.pm:1278 network/netconnect.pm:1386
+#: network/netconnect.pm:1391 network/netconnect.pm:1411
+#: network/netconnect.pm:1622 printer/printerdrake.pm:244
 #: printer/printerdrake.pm:251 printer/printerdrake.pm:276
 #: printer/printerdrake.pm:422 printer/printerdrake.pm:427
 #: printer/printerdrake.pm:440 printer/printerdrake.pm:450
@@ -194,25 +195,27 @@ msgstr "请稍候, 正在检测并配置设备..."
 #: printer/printerdrake.pm:3048 printer/printerdrake.pm:3596
 #: printer/printerdrake.pm:3600 printer/printerdrake.pm:3604
 #: printer/printerdrake.pm:4064 printer/printerdrake.pm:4309
-#: printer/printerdrake.pm:4329 printer/printerdrake.pm:4406
-#: printer/printerdrake.pm:4472 printer/printerdrake.pm:4592
-#: standalone/drakTermServ:392 standalone/drakTermServ:746
-#: standalone/drakTermServ:753 standalone/drakTermServ:772
-#: standalone/drakTermServ:991 standalone/drakTermServ:1467
-#: standalone/drakTermServ:1472 standalone/drakTermServ:1479
-#: standalone/drakTermServ:1491 standalone/drakTermServ:1512
-#: standalone/drakauth:36 standalone/drakbackup:511 standalone/drakbackup:625
-#: standalone/drakbackup:1126 standalone/drakbackup:1159
-#: standalone/drakbackup:1674 standalone/drakbackup:1830
-#: standalone/drakbackup:2429 standalone/drakbackup:4117
-#: standalone/drakbackup:4337 standalone/drakclock:124
+#: printer/printerdrake.pm:4333 printer/printerdrake.pm:4410
+#: printer/printerdrake.pm:4476 printer/printerdrake.pm:4596
+#: standalone/drakTermServ:393 standalone/drakTermServ:467
+#: standalone/drakTermServ:476 standalone/drakTermServ:771
+#: standalone/drakTermServ:778 standalone/drakTermServ:801
+#: standalone/drakTermServ:847 standalone/drakTermServ:1023
+#: standalone/drakTermServ:1503 standalone/drakTermServ:1519
+#: standalone/drakTermServ:1524 standalone/drakTermServ:1532
+#: standalone/drakTermServ:1544 standalone/drakTermServ:1565
+#: standalone/drakauth:36 standalone/drakbackup:498 standalone/drakbackup:612
+#: standalone/drakbackup:1090 standalone/drakbackup:1122
+#: standalone/drakbackup:1643 standalone/drakbackup:1799
+#: standalone/drakbackup:2413 standalone/drakbackup:4102
+#: standalone/drakbackup:4322 standalone/drakclock:124
 #: standalone/drakconnect:683 standalone/drakconnect:687
 #: standalone/drakconnect:692 standalone/drakconnect:707
 #: standalone/drakfloppy:297 standalone/drakfloppy:300
-#: standalone/drakfloppy:306 standalone/drakfont:209 standalone/drakfont:222
-#: standalone/drakfont:260 standalone/draksplash:21 standalone/draksplash:507
+#: standalone/drakfloppy:306 standalone/drakfont:210 standalone/drakfont:223
+#: standalone/drakfont:261 standalone/drakroam:41 standalone/draksplash:26
 #: standalone/drakxtv:107 standalone/finish-install:39 standalone/logdrake:169
-#: standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59
+#: standalone/logdrake:438 standalone/logdrake:443 standalone/scannerdrake:59
 #: standalone/scannerdrake:202 standalone/scannerdrake:261
 #: standalone/scannerdrake:715 standalone/scannerdrake:726
 #: standalone/scannerdrake:865 standalone/scannerdrake:876
@@ -295,8 +298,8 @@ msgid "No CDROM support"
 msgstr "无 CDROM 支持"
 
 #: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:95
-#: diskdrake/interactive.pm:1038 diskdrake/interactive.pm:1048
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1039 diskdrake/interactive.pm:1049
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid "Read carefully!"
 msgstr "请仔细阅读！"
@@ -455,8 +458,8 @@ msgstr "自定义"
 
 #: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
 #: install_steps_interactive.pm:86 printer/printerdrake.pm:744
-#: printer/printerdrake.pm:4401 printer/printerdrake.pm:4853
-#: standalone/draksplash:120 standalone/logdrake:174 standalone/net_applet:229
+#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4857
+#: standalone/draksplash:83 standalone/logdrake:174 standalone/net_applet:229
 #: standalone/scannerdrake:477
 #, c-format
 msgid "Quit"
@@ -596,8 +599,8 @@ msgid "Resolutions"
 msgstr "分辨率"
 
 #: Xconfig/resolution_and_depth.pm:310 diskdrake/hd_gtk.pm:339
-#: install_steps_gtk.pm:288 mouse.pm:168 services.pm:162
-#: standalone/drakbackup:1612 standalone/drakperm:251
+#: install_steps_gtk.pm:283 mouse.pm:168 services.pm:162
+#: standalone/drakbackup:1581 standalone/drakperm:251
 #, c-format
 msgid "Other"
 msgstr "其它"
@@ -614,47 +617,46 @@ msgstr "显示卡: %s"
 
 #: Xconfig/resolution_and_depth.pm:374 interactive.pm:433
 #: interactive/gtk.pm:767 interactive/http.pm:103 interactive/http.pm:156
-#: interactive/newt.pm:319 interactive/newt.pm:421 interactive/stdio.pm:39
+#: interactive/newt.pm:321 interactive/newt.pm:424 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakTermServ:199 standalone/drakTermServ:490
-#: standalone/drakbackup:1376 standalone/drakbackup:3974
-#: standalone/drakbackup:4034 standalone/drakbackup:4078
+#: standalone/drakTermServ:200 standalone/drakTermServ:518
+#: standalone/drakbackup:1345 standalone/drakbackup:3959
+#: standalone/drakbackup:4019 standalone/drakbackup:4063
 #: standalone/drakconnect:166 standalone/drakconnect:885
 #: standalone/drakconnect:972 standalone/drakconnect:1071
-#: standalone/drakfont:574 standalone/drakfont:586 standalone/drakperm:310
-#: standalone/drakroam:387 standalone/draksplash:167 standalone/drakups:212
-#: standalone/net_monitor:345 ugtk2.pm:409 ugtk2.pm:506 ugtk2.pm:909
-#: ugtk2.pm:932
+#: standalone/drakfont:574 standalone/drakfont:586 standalone/drakroam:392
+#: standalone/draksplash:145 standalone/drakups:212 standalone/net_monitor:345
+#: ugtk2.pm:409 ugtk2.pm:506 ugtk2.pm:908 ugtk2.pm:931
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
 #: Xconfig/resolution_and_depth.pm:374 diskdrake/smbnfs_gtk.pm:81 help.pm:89
-#: help.pm:444 install_steps_gtk.pm:484 install_steps_interactive.pm:422
+#: help.pm:444 install_steps_gtk.pm:479 install_steps_interactive.pm:422
 #: install_steps_interactive.pm:827 interactive.pm:434 interactive/gtk.pm:771
 #: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:318
-#: interactive/newt.pm:425 interactive/stdio.pm:39 interactive/stdio.pm:142
+#: interactive/newt.pm:428 interactive/stdio.pm:39 interactive/stdio.pm:142
 #: interactive/stdio.pm:176 printer/printerdrake.pm:3676
-#: standalone/drakautoinst:217 standalone/drakbackup:1376
-#: standalone/drakbackup:3900 standalone/drakbackup:3904
-#: standalone/drakbackup:3962 standalone/drakconnect:165
+#: standalone/drakautoinst:217 standalone/drakbackup:1345
+#: standalone/drakbackup:3885 standalone/drakbackup:3889
+#: standalone/drakbackup:3947 standalone/drakconnect:165
 #: standalone/drakconnect:970 standalone/drakconnect:1070
 #: standalone/drakfont:586 standalone/drakfont:664 standalone/drakfont:741
-#: standalone/drakperm:310 standalone/draksplash:167 standalone/drakups:219
-#: standalone/logdrake:174 standalone/net_monitor:344 ugtk2.pm:403
-#: ugtk2.pm:504 ugtk2.pm:513 ugtk2.pm:909
+#: standalone/draksplash:145 standalone/drakups:219 standalone/logdrake:174
+#: standalone/net_monitor:344 ugtk2.pm:403 ugtk2.pm:504 ugtk2.pm:513
+#: ugtk2.pm:908
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
 #: Xconfig/resolution_and_depth.pm:374 diskdrake/hd_gtk.pm:153
-#: install_steps_gtk.pm:232 install_steps_gtk.pm:633 interactive.pm:528
-#: interactive/gtk.pm:637 interactive/gtk.pm:639 standalone/drakTermServ:284
-#: standalone/drakbackup:3896 standalone/drakbug:104
+#: install_steps_gtk.pm:227 install_steps_gtk.pm:628 interactive.pm:528
+#: interactive/gtk.pm:637 interactive/gtk.pm:639 standalone/drakTermServ:285
+#: standalone/drakbackup:3881 standalone/drakbug:104
 #: standalone/drakconnect:161 standalone/drakconnect:246
 #: standalone/drakfont:509 standalone/drakperm:134 standalone/draksec:336
 #: standalone/draksec:338 standalone/draksec:356 standalone/draksec:358
-#: ugtk2.pm:1041 ugtk2.pm:1042
+#: ugtk2.pm:1040 ugtk2.pm:1041
 #, c-format
 msgid "Help"
 msgstr "帮助"
@@ -790,7 +792,7 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "您的电视信号是什么制式?"
 
-#: Xconfig/xfree.pm:627
+#: Xconfig/xfree.pm:630
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
@@ -799,8 +801,8 @@ msgstr "其它"
 
 #: any.pm:143 harddrake/sound.pm:191 interactive.pm:471 pkgs.pm:481
 #: standalone/drakconnect:168 standalone/drakconnect:646 standalone/draksec:68
-#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:236
-#: standalone/service_harddrake:204
+#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:244
+#: standalone/service_harddrake:203
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
@@ -892,7 +894,7 @@ msgstr "LILO/grub 安装"
 msgid "Where do you want to install the bootloader?"
 msgstr "您希望启动引导程序安装到哪里?"
 
-#: any.pm:268 standalone/drakboot:307
+#: any.pm:268 standalone/drakboot:261
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "启动风格配置"
@@ -918,7 +920,7 @@ msgstr "没有密码不能使用“限定命令行选项”"
 msgid "The passwords do not match"
 msgstr "两次密码不符"
 
-#: any.pm:277 any.pm:610 authentication.pm:182 diskdrake/interactive.pm:1291
+#: any.pm:277 any.pm:610 authentication.pm:182 diskdrake/interactive.pm:1292
 #, c-format
 msgid "Please try again"
 msgstr "请再试一次"
@@ -954,9 +956,9 @@ msgid "Force No Local APIC"
 msgstr "强制无本地 APIC"
 
 #: any.pm:293 any.pm:637 authentication.pm:187 diskdrake/smbnfs_gtk.pm:180
-#: network/netconnect.pm:680 printer/printerdrake.pm:1663
-#: printer/printerdrake.pm:1784 standalone/drakbackup:1656
-#: standalone/drakbackup:3503 standalone/drakups:299
+#: network/netconnect.pm:688 printer/printerdrake.pm:1663
+#: printer/printerdrake.pm:1784 standalone/drakbackup:1625
+#: standalone/drakbackup:3488 standalone/drakups:299
 #, c-format
 msgid "Password"
 msgstr "密码"
@@ -1031,7 +1033,7 @@ msgstr "根目录"
 msgid "Append"
 msgstr "追加"
 
-#: any.pm:369 standalone/drakboot:309 standalone/drakboot:313
+#: any.pm:369 standalone/drakboot:263 standalone/drakboot:267
 #, c-format
 msgid "Video mode"
 msgstr "显示模式"
@@ -1199,8 +1201,8 @@ msgstr ""
 #: any.pm:623 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
 #: diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530
 #: interactive/http.pm:151 printer/printerdrake.pm:197
-#: printer/printerdrake.pm:382 printer/printerdrake.pm:4853
-#: standalone/drakbackup:2716 standalone/scannerdrake:668
+#: printer/printerdrake.pm:382 printer/printerdrake.pm:4857
+#: standalone/drakbackup:2701 standalone/scannerdrake:668
 #: standalone/scannerdrake:818
 #, c-format
 msgid "Done"
@@ -1216,7 +1218,7 @@ msgstr "接受用户"
 msgid "Real name"
 msgstr "真实姓名"
 
-#: any.pm:636 standalone/drakbackup:1651
+#: any.pm:636 standalone/drakbackup:1620
 #, c-format
 msgid "Login name"
 msgstr "登录名"
@@ -1248,9 +1250,9 @@ msgstr "您要使用此特性吗?"
 
 #: any.pm:690 help.pm:180 help.pm:285 help.pm:444 install_any.pm:887
 #: interactive.pm:158 modules/interactive.pm:71 printer/printerdrake.pm:743
-#: standalone/drakbackup:2516 standalone/drakgw:287 standalone/drakgw:288
+#: standalone/drakbackup:2501 standalone/drakgw:287 standalone/drakgw:288
 #: standalone/drakgw:296 standalone/drakgw:306 standalone/draksec:55
-#: standalone/harddrake2:310 standalone/net_applet:309 ugtk2.pm:908
+#: standalone/harddrake2:306 standalone/net_applet:309 ugtk2.pm:907
 #: wizards.pm:156 wizards2.pm:158
 #, c-format
 msgid "Yes"
@@ -1258,8 +1260,8 @@ msgstr "是"
 
 #: any.pm:690 help.pm:180 help.pm:285 help.pm:313 help.pm:444
 #: install_any.pm:887 interactive.pm:158 modules/interactive.pm:71
-#: standalone/drakbackup:2516 standalone/draksec:54 standalone/harddrake2:311
-#: standalone/net_applet:305 ugtk2.pm:908 wizards.pm:156 wizards2.pm:158
+#: standalone/drakbackup:2501 standalone/draksec:54 standalone/harddrake2:307
+#: standalone/net_applet:305 ugtk2.pm:907 wizards.pm:156 wizards2.pm:158
 #, c-format
 msgid "No"
 msgstr "否"
@@ -1324,14 +1326,20 @@ msgstr "在此列出了可用的全部国家/地区"
 msgid "Other Countries"
 msgstr "其它国家"
 
+#: any.pm:798 help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
+#: interactive.pm:394
+#, c-format
+msgid "Advanced"
+msgstr "高级"
+
 #: any.pm:806
 #, c-format
 msgid "Input method:"
 msgstr "输入法:"
 
-#: any.pm:807 install_any.pm:422 network/netconnect.pm:181
-#: network/netconnect.pm:372 network/netconnect.pm:377
-#: network/netconnect.pm:1330 printer/printerdrake.pm:105
+#: any.pm:807 install_any.pm:422 network/netconnect.pm:186
+#: network/netconnect.pm:380 network/netconnect.pm:385
+#: network/netconnect.pm:1377 printer/printerdrake.pm:105
 #: printer/printerdrake.pm:2199
 #, c-format
 msgid "None"
@@ -1387,9 +1395,9 @@ msgstr "运行“Drak 用户管理”"
 
 #: any.pm:973 printer/printerdrake.pm:3900 printer/printerdrake.pm:3903
 #: printer/printerdrake.pm:3904 printer/printerdrake.pm:3905
-#: printer/printerdrake.pm:5162 standalone/drakTermServ:294
-#: standalone/drakbackup:4096 standalone/drakbug:126 standalone/drakfont:497
-#: standalone/drakroam:234 standalone/net_monitor:123
+#: printer/printerdrake.pm:5166 standalone/drakTermServ:295
+#: standalone/drakbackup:4081 standalone/drakbug:126 standalone/drakfont:497
+#: standalone/drakroam:242 standalone/net_monitor:123
 #: standalone/printerdrake:547
 #, c-format
 msgid "Close"
@@ -1552,7 +1560,7 @@ msgstr "域"
 
 #: authentication.pm:114 diskdrake/dav.pm:63 help.pm:146
 #: printer/printerdrake.pm:141 share/compssUsers.pl:81
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:270
 #, c-format
 msgid "Server"
 msgstr "服务器"
@@ -1673,7 +1681,7 @@ msgstr "无密码"
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "这个密码太简单了(至少要有 %d 个字符)"
 
-#: authentication.pm:189 network/netconnect.pm:377 network/netconnect.pm:681
+#: authentication.pm:189 network/netconnect.pm:385 network/netconnect.pm:689
 #: standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:492
 #, c-format
 msgid "Authentication"
@@ -1685,7 +1693,7 @@ msgid "Can not use broadcast with no NIS domain"
 msgstr "没有 NIS 域无法广播"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:752
+#: bootloader.pm:751
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1700,51 +1708,51 @@ msgstr ""
 "wait for default boot.\n"
 "\n"
 
-#: bootloader.pm:839
+#: bootloader.pm:851
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "图形菜单 LILO"
 
-#: bootloader.pm:840
+#: bootloader.pm:852
 #, c-format
 msgid "LILO with text menu"
 msgstr "文本菜单 LILO"
 
-#: bootloader.pm:841
+#: bootloader.pm:853
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:842
+#: bootloader.pm:854
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:906
+#: bootloader.pm:925
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot 中没有足够空间"
 
-#: bootloader.pm:1348
+#: bootloader.pm:1374
 #, c-format
 msgid "You can not install the bootloader on a %s partition\n"
 msgstr "%s 分区不能安装启动引导程序\n"
 
-#: bootloader.pm:1393
+#: bootloader.pm:1408
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr "必须更新您的启动引导程序配置, 因为分区已经重新编号"
 
-#: bootloader.pm:1408
+#: bootloader.pm:1421
 #, c-format
 msgid ""
 "The bootloader can not be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
 
-#: bootloader.pm:1409
+#: bootloader.pm:1422
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "重新安装启动引导程序"
@@ -1784,12 +1792,12 @@ msgstr "1 分钟"
 msgid "%d seconds"
 msgstr "%d 秒钟"
 
-#: common.pm:254
+#: common.pm:261
 #, c-format
 msgid "kdesu missing"
 msgstr "缺少 kdesu"
 
-#: common.pm:257
+#: common.pm:264
 #, c-format
 msgid "consolehelper missing"
 msgstr "缺少 consolehelper"
@@ -2009,7 +2017,7 @@ msgid "Mount"
 msgstr "挂载"
 
 #: diskdrake/dav.pm:64 diskdrake/interactive.pm:443
-#: diskdrake/interactive.pm:667 diskdrake/interactive.pm:686
+#: diskdrake/interactive.pm:668 diskdrake/interactive.pm:687
 #: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
@@ -2030,13 +2038,13 @@ msgstr "URL 应该是以 http:// 或 https:// 开头"
 msgid "Server: "
 msgstr "服务器: "
 
-#: diskdrake/dav.pm:110 diskdrake/interactive.pm:518
-#: diskdrake/interactive.pm:1184 diskdrake/interactive.pm:1259
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:519
+#: diskdrake/interactive.pm:1185 diskdrake/interactive.pm:1260
 #, c-format
 msgid "Mount point: "
 msgstr "挂载点: "
 
-#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1266
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1267
 #, c-format
 msgid "Options: %s"
 msgstr "选项: %s"
@@ -2082,8 +2090,8 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "请单击一个分区"
 
-#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:486
-#: standalone/drakbackup:2951 standalone/drakbackup:3011
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:481
+#: standalone/drakbackup:2936 standalone/drakbackup:2996
 #, c-format
 msgid "Details"
 msgstr "细节"
@@ -2123,7 +2131,7 @@ msgstr "HFS"
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:339 diskdrake/interactive.pm:1199
+#: diskdrake/hd_gtk.pm:339 diskdrake/interactive.pm:1200
 #, c-format
 msgid "Empty"
 msgstr "空"
@@ -2138,13 +2146,13 @@ msgstr "文件系统类型: "
 msgid "Use ``%s'' instead"
 msgstr "用“%s”代替"
 
-#: diskdrake/hd_gtk.pm:360 diskdrake/interactive.pm:467
+#: diskdrake/hd_gtk.pm:360 diskdrake/interactive.pm:468
 #, c-format
 msgid "Create"
 msgstr "新建"
 
 #: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:368
-#: diskdrake/interactive.pm:444 diskdrake/interactive.pm:620
+#: diskdrake/interactive.pm:444 diskdrake/interactive.pm:621
 #: diskdrake/removable.pm:25 diskdrake/removable.pm:48
 #: standalone/harddrake2:107 standalone/harddrake2:116
 #, c-format
@@ -2331,7 +2339,7 @@ msgstr "正在尝试恢复分区表"
 msgid "Detailed information"
 msgstr "详细信息"
 
-#: diskdrake/interactive.pm:446 diskdrake/interactive.pm:761
+#: diskdrake/interactive.pm:446 diskdrake/interactive.pm:762
 #, c-format
 msgid "Resize"
 msgstr "改变大小"
@@ -2371,37 +2379,37 @@ msgstr "修改 RAID"
 msgid "Use for loopback"
 msgstr "用于回环"
 
-#: diskdrake/interactive.pm:511
+#: diskdrake/interactive.pm:512
 #, c-format
 msgid "Create a new partition"
 msgstr "创建一个新分区"
 
-#: diskdrake/interactive.pm:514
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid "Start sector: "
 msgstr "开始扇区: "
 
-#: diskdrake/interactive.pm:516 diskdrake/interactive.pm:918
+#: diskdrake/interactive.pm:517 diskdrake/interactive.pm:919
 #, c-format
 msgid "Size in MB: "
 msgstr "大小(MB): "
 
-#: diskdrake/interactive.pm:517 diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:518 diskdrake/interactive.pm:920
 #, c-format
 msgid "Filesystem type: "
 msgstr "文件系统类型: "
 
-#: diskdrake/interactive.pm:522
+#: diskdrake/interactive.pm:523
 #, c-format
 msgid "Preference: "
 msgstr "首选项: "
 
-#: diskdrake/interactive.pm:525
+#: diskdrake/interactive.pm:526
 #, c-format
 msgid "Logical volume name "
 msgstr "逻辑卷标"
 
-#: diskdrake/interactive.pm:555
+#: diskdrake/interactive.pm:556
 #, c-format
 msgid ""
 "You can not create a new partition\n"
@@ -2412,43 +2420,43 @@ msgstr ""
 "(您超过了允许的主分区数量)。\n"
 "请先删除一个主分区, 然后创建一个扩展分区。"
 
-#: diskdrake/interactive.pm:585
+#: diskdrake/interactive.pm:586
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "删除回环(loopback)文件?"
 
-#: diskdrake/interactive.pm:604
+#: diskdrake/interactive.pm:605
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "在改变分区表 %s 的类型之后, 在这个分区上的所有资料将要被清除"
 
-#: diskdrake/interactive.pm:616
+#: diskdrake/interactive.pm:617
 #, c-format
 msgid "Change partition type"
 msgstr "更改分区类型"
 
-#: diskdrake/interactive.pm:617 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:618 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "您希望使用哪种文件系统?"
 
-#: diskdrake/interactive.pm:625
+#: diskdrake/interactive.pm:626
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "把 ext2 升级到 ext3"
 
-#: diskdrake/interactive.pm:654
+#: diskdrake/interactive.pm:655
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "您想把回环(loopback)文件 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:655
+#: diskdrake/interactive.pm:656
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "您想把设备 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:660
+#: diskdrake/interactive.pm:661
 #, c-format
 msgid ""
 "Can not unset mount point as this partition is used for loop back.\n"
@@ -2457,48 +2465,48 @@ msgstr ""
 "无法取消设定的挂载点, 因为该分区正用于回环。\n"
 "请先删除回环"
 
-#: diskdrake/interactive.pm:685
+#: diskdrake/interactive.pm:686
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "您想把 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:709 diskdrake/interactive.pm:792
+#: diskdrake/interactive.pm:710 diskdrake/interactive.pm:793
 #: install_interactive.pm:156 install_interactive.pm:188
 #, c-format
 msgid "Resizing"
 msgstr "改变大小"
 
-#: diskdrake/interactive.pm:709
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "计算 FAT 文件系统的边界"
 
-#: diskdrake/interactive.pm:749
+#: diskdrake/interactive.pm:750
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "无法更改此分区的大小"
 
-#: diskdrake/interactive.pm:754
+#: diskdrake/interactive.pm:755
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "应该先备份在这个分区上的所有数据"
 
-#: diskdrake/interactive.pm:756
+#: diskdrake/interactive.pm:757
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "改变分区 %s 的大小之后, 这个分区上现有的所有资料将被清除"
 
-#: diskdrake/interactive.pm:761
+#: diskdrake/interactive.pm:762
 #, c-format
 msgid "Choose the new size"
 msgstr "选择新的大小"
 
-#: diskdrake/interactive.pm:762
+#: diskdrake/interactive.pm:763
 #, c-format
 msgid "New size in MB: "
 msgstr "新大小(MB): "
 
-#: diskdrake/interactive.pm:805 install_interactive.pm:196
+#: diskdrake/interactive.pm:806 install_interactive.pm:196
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
@@ -2507,117 +2515,117 @@ msgstr ""
 "为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Windows(TM) 时可能\n"
 "会自动运行文件系统检查。"
 
-#: diskdrake/interactive.pm:843
+#: diskdrake/interactive.pm:844
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "选择加入一个已存在的 RAID"
 
-#: diskdrake/interactive.pm:845 diskdrake/interactive.pm:862
+#: diskdrake/interactive.pm:846 diskdrake/interactive.pm:863
 #, c-format
 msgid "new"
 msgstr "新建"
 
-#: diskdrake/interactive.pm:860
+#: diskdrake/interactive.pm:861
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "选择加入一个已存在的 LVM"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:867
 #, c-format
 msgid "LVM name?"
 msgstr "LVM 名称?"
 
-#: diskdrake/interactive.pm:903
+#: diskdrake/interactive.pm:904
 #, c-format
 msgid "This partition can not be used for loopback"
 msgstr "这个分区不能被用于回环"
 
-#: diskdrake/interactive.pm:916
+#: diskdrake/interactive.pm:917
 #, c-format
 msgid "Loopback"
 msgstr "回环"
 
-#: diskdrake/interactive.pm:917
+#: diskdrake/interactive.pm:918
 #, c-format
 msgid "Loopback file name: "
 msgstr "回环文件名: "
 
-#: diskdrake/interactive.pm:922
+#: diskdrake/interactive.pm:923
 #, c-format
 msgid "Give a file name"
 msgstr "给一个文件名"
 
-#: diskdrake/interactive.pm:925
+#: diskdrake/interactive.pm:926
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "文件已经被另一个回环使用, 请另外选择一个"
 
-#: diskdrake/interactive.pm:926
+#: diskdrake/interactive.pm:927
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "文件已经存在。使用现有的文件吗?"
 
-#: diskdrake/interactive.pm:949
+#: diskdrake/interactive.pm:950
 #, c-format
 msgid "Mount options"
 msgstr "挂载选项"
 
-#: diskdrake/interactive.pm:956
+#: diskdrake/interactive.pm:957
 #, c-format
 msgid "Various"
 msgstr "杂项"
 
-#: diskdrake/interactive.pm:1020
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "device"
 msgstr "设备"
 
-#: diskdrake/interactive.pm:1021
+#: diskdrake/interactive.pm:1022
 #, c-format
 msgid "level"
 msgstr "级别"
 
-#: diskdrake/interactive.pm:1022
+#: diskdrake/interactive.pm:1023
 #, c-format
 msgid "chunk size in KiB"
 msgstr "组块大小(KB)"
 
-#: diskdrake/interactive.pm:1039
+#: diskdrake/interactive.pm:1040
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "小心: 该操作有危险。"
 
-#: diskdrake/interactive.pm:1054
+#: diskdrake/interactive.pm:1055
 #, c-format
 msgid "What type of partitioning?"
 msgstr "何种分区类型?"
 
-#: diskdrake/interactive.pm:1092
+#: diskdrake/interactive.pm:1093
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "修改要等到重新启动后才能生效"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "驱动器 %s 的分区表将会写入磁盘中！"
 
-#: diskdrake/interactive.pm:1114
+#: diskdrake/interactive.pm:1115
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "格式化分区 %s 之后, 该分区上的所有数据都将丢失"
 
-#: diskdrake/interactive.pm:1130
+#: diskdrake/interactive.pm:1131
 #, c-format
 msgid "Move files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1130
+#: diskdrake/interactive.pm:1131
 #, c-format
 msgid "Hide files"
 msgstr "隐藏文件"
 
-#: diskdrake/interactive.pm:1131
+#: diskdrake/interactive.pm:1132
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2626,108 +2634,108 @@ msgstr ""
 "目录 %s 已经包含数据\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1142
+#: diskdrake/interactive.pm:1143
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1146
+#: diskdrake/interactive.pm:1147
 #, c-format
 msgid "Copying %s"
 msgstr "复制 %s"
 
-#: diskdrake/interactive.pm:1150
+#: diskdrake/interactive.pm:1151
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: diskdrake/interactive.pm:1164
+#: diskdrake/interactive.pm:1165
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "分区 %s 现在被识别为 %s"
 
-#: diskdrake/interactive.pm:1165
+#: diskdrake/interactive.pm:1166
 #, c-format
 msgid "Partitions have been renumbered: "
 msgstr "分区已被重新编号: "
 
-#: diskdrake/interactive.pm:1185 diskdrake/interactive.pm:1244
+#: diskdrake/interactive.pm:1186 diskdrake/interactive.pm:1245
 #, c-format
 msgid "Device: "
 msgstr "设备: "
 
-#: diskdrake/interactive.pm:1186
+#: diskdrake/interactive.pm:1187
 #, c-format
 msgid "Devfs name: "
 msgstr "Devfs 名称: "
 
-#: diskdrake/interactive.pm:1187
+#: diskdrake/interactive.pm:1188
 #, c-format
 msgid "Volume label: "
 msgstr "卷标: "
 
-#: diskdrake/interactive.pm:1188
+#: diskdrake/interactive.pm:1189
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS 下的盘符: %s(只是猜测)\n"
 
-#: diskdrake/interactive.pm:1192 diskdrake/interactive.pm:1201
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1193 diskdrake/interactive.pm:1202
+#: diskdrake/interactive.pm:1263
 #, c-format
 msgid "Type: "
 msgstr "类型: "
 
-#: diskdrake/interactive.pm:1196 install_steps_gtk.pm:300
+#: diskdrake/interactive.pm:1197 install_steps_gtk.pm:295
 #, c-format
 msgid "Name: "
 msgstr "名称: "
 
-#: diskdrake/interactive.pm:1203
+#: diskdrake/interactive.pm:1204
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "开始: 第 %s 扇区\n"
 
-#: diskdrake/interactive.pm:1204
+#: diskdrake/interactive.pm:1205
 #, c-format
 msgid "Size: %s"
 msgstr "大小: %s"
 
-#: diskdrake/interactive.pm:1206
+#: diskdrake/interactive.pm:1207
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s 扇区"
 
-#: diskdrake/interactive.pm:1208
+#: diskdrake/interactive.pm:1209
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "柱面 %d 到 %d\n"
 
-#: diskdrake/interactive.pm:1209
+#: diskdrake/interactive.pm:1210
 #, c-format
-msgid "Number of logical extents: %d"
-msgstr "逻辑扩展分区数: %d"
+msgid "Number of logical extents: %d\n"
+msgstr ""
 
-#: diskdrake/interactive.pm:1210
+#: diskdrake/interactive.pm:1211
 #, c-format
 msgid "Formatted\n"
 msgstr "已格式化\n"
 
-#: diskdrake/interactive.pm:1211
+#: diskdrake/interactive.pm:1212
 #, c-format
 msgid "Not formatted\n"
 msgstr "未格式化\n"
 
-#: diskdrake/interactive.pm:1212
+#: diskdrake/interactive.pm:1213
 #, c-format
 msgid "Mounted\n"
 msgstr "已挂载\n"
 
-#: diskdrake/interactive.pm:1213
+#: diskdrake/interactive.pm:1214
 #, c-format
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1215
+#: diskdrake/interactive.pm:1216
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2736,7 +2744,7 @@ msgstr ""
 "回环文件: \n"
 "   %s\n"
 
-#: diskdrake/interactive.pm:1216
+#: diskdrake/interactive.pm:1217
 #, c-format
 msgid ""
 "Partition booted by default\n"
@@ -2745,27 +2753,27 @@ msgstr ""
 "预设的启动分区\n"
 "    (给 MS-DOS 启动用的, 跟 lilo 无关)\n"
 
-#: diskdrake/interactive.pm:1218
+#: diskdrake/interactive.pm:1219
 #, c-format
 msgid "Level %s\n"
 msgstr "级别 %s\n"
 
-#: diskdrake/interactive.pm:1219
+#: diskdrake/interactive.pm:1220
 #, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "组块大小 %d KB\n"
 
-#: diskdrake/interactive.pm:1220
+#: diskdrake/interactive.pm:1221
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1222
+#: diskdrake/interactive.pm:1223
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "回环文件名称: %s"
 
-#: diskdrake/interactive.pm:1225
+#: diskdrake/interactive.pm:1226
 #, c-format
 msgid ""
 "\n"
@@ -2777,7 +2785,7 @@ msgstr ""
 "此分区很可能是驱动器分区。\n"
 "您最好请不要更改它。\n"
 
-#: diskdrake/interactive.pm:1228
+#: diskdrake/interactive.pm:1229
 #, c-format
 msgid ""
 "\n"
@@ -2789,73 +2797,73 @@ msgstr ""
 "该 Bootstrap 分区特别\n"
 "是保留给双重启动系统。\n"
 
-#: diskdrake/interactive.pm:1245
+#: diskdrake/interactive.pm:1246
 #, c-format
 msgid "Read-only"
 msgstr "只读"
 
-#: diskdrake/interactive.pm:1246
+#: diskdrake/interactive.pm:1247
 #, c-format
 msgid "Size: %s\n"
 msgstr "大小: %s\n"
 
-#: diskdrake/interactive.pm:1247
+#: diskdrake/interactive.pm:1248
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "硬盘参数: %s 柱面, %s 磁头, %s 扇区\n"
 
-#: diskdrake/interactive.pm:1248
+#: diskdrake/interactive.pm:1249
 #, c-format
 msgid "Info: "
 msgstr "信息: "
 
-#: diskdrake/interactive.pm:1249
+#: diskdrake/interactive.pm:1250
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVM 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1250
+#: diskdrake/interactive.pm:1251
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "分区表类型: %s\n"
 
-#: diskdrake/interactive.pm:1251
+#: diskdrake/interactive.pm:1252
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "通道 %d id %d\n"
 
-#: diskdrake/interactive.pm:1286
+#: diskdrake/interactive.pm:1287
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "文件系统加密密钥"
 
-#: diskdrake/interactive.pm:1287
+#: diskdrake/interactive.pm:1288
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "选择该文件系统的加密密钥"
 
-#: diskdrake/interactive.pm:1290
+#: diskdrake/interactive.pm:1291
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
 
-#: diskdrake/interactive.pm:1291
+#: diskdrake/interactive.pm:1292
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "两次加密密钥不符"
 
-#: diskdrake/interactive.pm:1294 network/netconnect.pm:1230
+#: diskdrake/interactive.pm:1295 network/netconnect.pm:1222
 #: standalone/drakconnect:430
 #, c-format
 msgid "Encryption key"
 msgstr "加密密钥"
 
-#: diskdrake/interactive.pm:1295
+#: diskdrake/interactive.pm:1296
 #, c-format
 msgid "Encryption key (again)"
 msgstr "加密密钥(再输入一次)"
 
-#: diskdrake/interactive.pm:1296 standalone/drakvpn:1031
+#: diskdrake/interactive.pm:1297 standalone/drakvpn:1031
 #: standalone/drakvpn:1116
 #, c-format
 msgid "Encryption algorithm"
@@ -2892,7 +2900,7 @@ msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr "要访问此主机, 请输入您的用户名, 密码和域名"
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3502
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3487
 #, c-format
 msgid "Username"
 msgstr "用户名"
@@ -3164,189 +3172,230 @@ msgstr "没有足够的空闲空间供自动分配"
 msgid "Nothing to do"
 msgstr "不做任何事"
 
-#: harddrake/data.pm:61 install_any.pm:1640
+#: harddrake/data.pm:62 install_any.pm:1639
 #, c-format
 msgid "Floppy"
 msgstr "软盘"
 
-#: harddrake/data.pm:71
+#: harddrake/data.pm:72
 #, c-format
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:87 install_any.pm:1641
+#: harddrake/data.pm:88 install_any.pm:1640
 #, c-format
 msgid "Hard Disk"
 msgstr "硬盘"
 
-#: harddrake/data.pm:96 install_any.pm:1642
+#: harddrake/data.pm:97 install_any.pm:1641
 #, c-format
 msgid "CDROM"
 msgstr "CDROM"
 
-#: harddrake/data.pm:106
+#: harddrake/data.pm:107
 #, c-format
 msgid "CD/DVD burners"
 msgstr "CD/DVD 刻录机"
 
-#: harddrake/data.pm:116
+#: harddrake/data.pm:117
 #, c-format
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:126 standalone/drakbackup:2059
+#: harddrake/data.pm:127 standalone/drakbackup:2034
 #, c-format
 msgid "Tape"
 msgstr "磁带机"
 
-#: harddrake/data.pm:135
+#: harddrake/data.pm:136
 #, c-format
 msgid "Videocard"
 msgstr "显示卡"
 
-#: harddrake/data.pm:145
+#: harddrake/data.pm:146
+#, c-format
+msgid "DVB card"
+msgstr ""
+
+#: harddrake/data.pm:154
 #, c-format
 msgid "Tvcard"
 msgstr "电视卡"
 
-#: harddrake/data.pm:154
+#: harddrake/data.pm:163
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "其它多媒体设备"
 
-#: harddrake/data.pm:163
+#: harddrake/data.pm:172
 #, c-format
 msgid "Soundcard"
 msgstr "声卡"
 
-#: harddrake/data.pm:176
+#: harddrake/data.pm:185
 #, c-format
 msgid "Webcam"
 msgstr "摄像头"
 
-#: harddrake/data.pm:190
+#: harddrake/data.pm:199
 #, c-format
 msgid "Processors"
 msgstr "处理器"
 
-#: harddrake/data.pm:200
+#: harddrake/data.pm:209
 #, c-format
 msgid "ISDN adapters"
 msgstr "ISDN 适配器"
 
-#: harddrake/data.pm:210
+#: harddrake/data.pm:220
+#, c-format
+msgid "USB sound devices"
+msgstr ""
+
+#: harddrake/data.pm:229
+#, c-format
+msgid "Radio cards"
+msgstr ""
+
+#: harddrake/data.pm:238
+#, c-format
+msgid "ATM network cards"
+msgstr ""
+
+#: harddrake/data.pm:247
+#, c-format
+msgid "WAN network cards"
+msgstr ""
+
+#: harddrake/data.pm:256
+#, c-format
+msgid "Bluetooth devices"
+msgstr ""
+
+#: harddrake/data.pm:265
 #, c-format
 msgid "Ethernetcard"
 msgstr "以太网卡"
 
-#: harddrake/data.pm:228 network/netconnect.pm:567
+#: harddrake/data.pm:283 network/netconnect.pm:575
 #, c-format
 msgid "Modem"
 msgstr "调制解调器"
 
-#: harddrake/data.pm:238
+#: harddrake/data.pm:293
 #, c-format
 msgid "ADSL adapters"
 msgstr "ADSL 适配器"
 
-#: harddrake/data.pm:252
+#: harddrake/data.pm:307
 #, c-format
 msgid "Memory"
 msgstr "内存"
 
-#: harddrake/data.pm:261
+#: harddrake/data.pm:316
 #, c-format
 msgid "AGP controllers"
 msgstr "AGP 控制器"
 
-#: harddrake/data.pm:270 help.pm:186 help.pm:855
+#: harddrake/data.pm:325 help.pm:186 help.pm:855
 #: install_steps_interactive.pm:979
 #, c-format
 msgid "Printer"
 msgstr "打印机"
 
-#: harddrake/data.pm:280
+#. -PO: these are joysticks controllers:
+#: harddrake/data.pm:339
 #, c-format
-msgid "Joystick"
-msgstr "游戏杆"
+msgid "Game port controllers"
+msgstr ""
 
-#: harddrake/data.pm:290
+#: harddrake/data.pm:348
 #, c-format
-msgid "(E)IDE/ATA controllers"
-msgstr "(E)IDE/ATA 控制器"
+msgid "Joystick"
+msgstr "游戏杆"
 
-#: harddrake/data.pm:299
+#: harddrake/data.pm:358
 #, c-format
 msgid "SATA controllers"
 msgstr "SATA 控制器"
 
-#: harddrake/data.pm:312
+#: harddrake/data.pm:367
 #, c-format
 msgid "RAID controllers"
 msgstr "RAID 控制器"
 
-#: harddrake/data.pm:325
+#: harddrake/data.pm:376
+#, c-format
+msgid "(E)IDE/ATA controllers"
+msgstr "(E)IDE/ATA 控制器"
+
+#: harddrake/data.pm:385
 #, c-format
 msgid "Firewire controllers"
 msgstr "火线控制器"
 
-#: harddrake/data.pm:334
+#: harddrake/data.pm:394
 #, c-format
 msgid "PCMCIA controllers"
 msgstr "PCMCIA 控制器"
 
-#: harddrake/data.pm:343
+#: harddrake/data.pm:403
 #, c-format
 msgid "SCSI controllers"
 msgstr "SCSI 控制器"
 
-#: harddrake/data.pm:352
+#: harddrake/data.pm:412
 #, c-format
 msgid "USB controllers"
 msgstr "USB 控制器"
 
-#: harddrake/data.pm:361
+#: harddrake/data.pm:421
 #, c-format
 msgid "USB ports"
 msgstr "USB 端口"
 
-#: harddrake/data.pm:370
+#: harddrake/data.pm:430
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus 控制器"
 
-#: harddrake/data.pm:379
+#: harddrake/data.pm:439
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "桥接和系统控制器"
 
-#: harddrake/data.pm:388 help.pm:855 install_steps_interactive.pm:118
+#: harddrake/data.pm:448 help.pm:855 install_steps_interactive.pm:118
 #: install_steps_interactive.pm:939 standalone/keyboarddrake:29
 #, c-format
 msgid "Keyboard"
 msgstr "键盘"
 
-#: harddrake/data.pm:401 help.pm:855 install_steps_interactive.pm:972
+#: harddrake/data.pm:461
+#, c-format
+msgid "Tablet and touchscreen"
+msgstr ""
+
+#: harddrake/data.pm:469 help.pm:855 install_steps_interactive.pm:972
 #, c-format
 msgid "Mouse"
 msgstr "鼠标"
 
-#: harddrake/data.pm:415
+#: harddrake/data.pm:483
 #, c-format
 msgid "UPS"
 msgstr "UPS"
 
-#: harddrake/data.pm:424
+#: harddrake/data.pm:492
 #, c-format
 msgid "Scanner"
 msgstr "扫描仪"
 
-#: harddrake/data.pm:434 standalone/harddrake2:444
+#: harddrake/data.pm:502 standalone/harddrake2:440
 #, c-format
 msgid "Unknown/Others"
 msgstr "未知/其它"
 
-#: harddrake/data.pm:463
+#: harddrake/data.pm:530
 #, c-format
 msgid "cpu # "
 msgstr "CPU # "
@@ -3439,19 +3488,19 @@ msgstr "驱动程序: "
 msgid "Trouble shooting"
 msgstr "疑难解答"
 
-#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1059
-#: network/ndiswrapper.pm:95 network/netconnect.pm:553
+#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1072
+#: network/ndiswrapper.pm:95 network/netconnect.pm:561
 #: printer/printerdrake.pm:1206 printer/printerdrake.pm:2230
 #: printer/printerdrake.pm:2316 printer/printerdrake.pm:2362
 #: printer/printerdrake.pm:2429 printer/printerdrake.pm:2464
 #: printer/printerdrake.pm:2773 printer/printerdrake.pm:2780
 #: printer/printerdrake.pm:3740 printer/printerdrake.pm:4069
-#: printer/printerdrake.pm:4193 printer/printerdrake.pm:5310
-#: standalone/drakTermServ:325 standalone/drakTermServ:1104
-#: standalone/drakTermServ:1165 standalone/drakTermServ:1810
-#: standalone/drakbackup:510 standalone/drakbackup:609 standalone/drakboot:165
+#: printer/printerdrake.pm:4193 printer/printerdrake.pm:5314
+#: standalone/drakTermServ:326 standalone/drakTermServ:1136
+#: standalone/drakTermServ:1197 standalone/drakTermServ:1862
+#: standalone/drakbackup:497 standalone/drakbackup:596 standalone/drakboot:125
 #: standalone/drakclock:224 standalone/drakconnect:1007
-#: standalone/drakfloppy:291 standalone/drakups:27 standalone/harddrake2:481
+#: standalone/drakfloppy:291 standalone/drakups:27 standalone/harddrake2:477
 #: standalone/scannerdrake:51 standalone/scannerdrake:940
 #, c-format
 msgid "Warning"
@@ -3656,7 +3705,7 @@ msgstr ""
 "版。如果您同意其中的全部条款, 请选中\"%s\"框。如果不同意, 单击\"%s\"按钮将重"
 "新启动您的计算机。"
 
-#: help.pm:14 install_steps_gtk.pm:556 install_steps_interactive.pm:92
+#: help.pm:14 install_steps_gtk.pm:551 install_steps_interactive.pm:92
 #: install_steps_interactive.pm:731 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
@@ -3735,22 +3784,16 @@ msgstr ""
 msgid "User name"
 msgstr "用户名"
 
-#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:237
-#: install_steps_gtk.pm:698 interactive.pm:433 interactive/newt.pm:319
-#: network/netconnect.pm:327 network/tools.pm:191 printer/printerdrake.pm:3678
-#: standalone/drakTermServ:382 standalone/drakbackup:3953
-#: standalone/drakbackup:4047 standalone/drakbackup:4064
-#: standalone/drakbackup:4082 ugtk2.pm:506
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:232
+#: install_steps_gtk.pm:693 interactive.pm:433 interactive/newt.pm:321
+#: network/netconnect.pm:335 network/tools.pm:191 printer/printerdrake.pm:3678
+#: standalone/drakTermServ:383 standalone/drakbackup:3938
+#: standalone/drakbackup:4032 standalone/drakbackup:4049
+#: standalone/drakbackup:4067 ugtk2.pm:506
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
-#: interactive.pm:394
-#, c-format
-msgid "Advanced"
-msgstr "高级"
-
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 #: help.pm:54
@@ -3952,7 +3995,7 @@ msgstr "开发"
 msgid "Graphical Environment"
 msgstr "图形环境"
 
-#: help.pm:146 install_steps_gtk.pm:235 install_steps_interactive.pm:642
+#: help.pm:146 install_steps_gtk.pm:230 install_steps_interactive.pm:642
 #, c-format
 msgid "Individual package selection"
 msgstr "选择单个软件包"
@@ -4061,9 +4104,9 @@ msgstr ""
 "节, 其中详细描述了如何设置新打印机。那里给出的界面与安装时所用的界面大体相"
 "同。"
 
-#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:611
-#: standalone/drakbackup:2341 standalone/drakbackup:2345
-#: standalone/drakbackup:2349 standalone/drakbackup:2353
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:606
+#: standalone/drakbackup:2325 standalone/drakbackup:2329
+#: standalone/drakbackup:2333 standalone/drakbackup:2337
 #, c-format
 msgid "Configure"
 msgstr "配置"
@@ -4613,11 +4656,11 @@ msgstr ""
 "\n"
 "如果您想要选择要检测磁盘上的坏块, 请单击单击\"%s\"。"
 
-#: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434
+#: help.pm:431 install_steps_gtk.pm:387 interactive.pm:434
 #: interactive/newt.pm:318 printer/printerdrake.pm:3676
-#: standalone/drakTermServ:361 standalone/drakbackup:3913
-#: standalone/drakbackup:3952 standalone/drakbackup:4063
-#: standalone/drakbackup:4078 ugtk2.pm:504
+#: standalone/drakTermServ:362 standalone/drakbackup:3898
+#: standalone/drakbackup:3937 standalone/drakbackup:4048
+#: standalone/drakbackup:4063 ugtk2.pm:504
 #, c-format
 msgid "Previous"
 msgstr "上一步"
@@ -4650,8 +4693,8 @@ msgstr ""
 "理位置较近的镜像。之后会出现一个可以下载的软件包选择树：复查选项, 然后单击\"%"
 "s\"来获取并安装选中的软件包, 要终止请单击\"%s\"。"
 
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:391
-#: install_steps_interactive.pm:156 standalone/drakbackup:4110
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:386
+#: install_steps_interactive.pm:156 standalone/drakbackup:4095
 #, c-format
 msgid "Install"
 msgstr "安装"
@@ -5326,7 +5369,7 @@ msgstr ""
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:765 printer/cups.pm:115 printer/data.pm:118
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:122
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
@@ -5534,8 +5577,8 @@ msgstr "ISDN 卡"
 msgid "Graphical Interface"
 msgstr "图形界面"
 
-#: help.pm:855 install_any.pm:1663 install_steps_interactive.pm:1057
-#: standalone/drakbackup:2044
+#: help.pm:855 install_any.pm:1662 install_steps_interactive.pm:1057
+#: standalone/drakbackup:2019
 #, c-format
 msgid "Network"
 msgstr "网络"
@@ -5611,7 +5654,7 @@ msgstr ""
 "无法读取与您的内核配套的内核模块(缺少文件 %s), 通常是因为启动软盘与安装介质不"
 "配套(请制作新的启动盘)"
 
-#: install2.pm:172
+#: install2.pm:169
 #, c-format
 msgid "You must also format %s"
 msgstr "您还必须格式化 %s"
@@ -5743,17 +5786,17 @@ msgstr ""
 msgid "Error reading file %s"
 msgstr "请取文件 %s 出错"
 
-#: install_any.pm:1560
+#: install_any.pm:1559
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "下列盘片已重命名:"
 
-#: install_any.pm:1562
+#: install_any.pm:1561
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s(以前的名称为 %s)"
 
-#: install_any.pm:1600
+#: install_any.pm:1599
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5761,42 +5804,42 @@ msgid ""
 msgstr ""
 "发生错误！新建文件系统时找不到可用的设备。请检查您的硬件以确定问题的原因"
 
-#: install_any.pm:1644
+#: install_any.pm:1643
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: install_any.pm:1644
+#: install_any.pm:1643
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: install_any.pm:1644
+#: install_any.pm:1643
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: install_any.pm:1667
+#: install_any.pm:1666
 #, c-format
 msgid "Please choose a media"
 msgstr "请选择介质"
 
-#: install_any.pm:1699
+#: install_any.pm:1698
 #, c-format
 msgid "Bad media %s"
 msgstr "无效的介质 %s"
 
-#: install_any.pm:1711
+#: install_any.pm:1710
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "文件已经存在。覆盖吗?"
 
-#: install_any.pm:1762
+#: install_any.pm:1761
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "无法在分区完成之前进行屏幕捕捉"
 
-#: install_any.pm:1769
+#: install_any.pm:1768
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "安装完成后, 所有的屏幕抓图都会保存到 %s 之中"
@@ -6334,106 +6377,103 @@ msgstr ""
 msgid "Entering step `%s'\n"
 msgstr "进入步骤“%s”\n"
 
-#: install_steps_gtk.pm:181
+#: install_steps_gtk.pm:176
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandriva Linux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"您的系统资源不足。您在安装 Mandriva Linux 时可能遇到问题。\n"
-"如果这样, 您可以尝试文本模式的安装。\n"
-"在从光盘启动后按“F1”键, 然后输入“text”。"
 
-#: install_steps_gtk.pm:228 install_steps_interactive.pm:624
+#: install_steps_gtk.pm:223 install_steps_interactive.pm:624
 #, c-format
 msgid "Package Group Selection"
 msgstr "程序组选择"
 
-#: install_steps_gtk.pm:254 install_steps_interactive.pm:567
+#: install_steps_gtk.pm:249 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "总共大小: %d / %d MB"
 
-#: install_steps_gtk.pm:299
+#: install_steps_gtk.pm:294
 #, c-format
 msgid "Bad package"
 msgstr "有错的软件包"
 
-#: install_steps_gtk.pm:301
+#: install_steps_gtk.pm:296
 #, c-format
 msgid "Version: "
 msgstr "版本: "
 
-#: install_steps_gtk.pm:302
+#: install_steps_gtk.pm:297
 #, c-format
 msgid "Size: "
 msgstr "大小: "
 
-#: install_steps_gtk.pm:302
+#: install_steps_gtk.pm:297
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:303
+#: install_steps_gtk.pm:298
 #, c-format
 msgid "Importance: "
 msgstr "重要程度: "
 
-#: install_steps_gtk.pm:336
+#: install_steps_gtk.pm:331
 #, c-format
 msgid "You can not select/unselect this package"
 msgstr "您不能改变这个软件包的选定"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:335
 #, c-format
 msgid "due to missing %s"
 msgstr "由于缺少 %s"
 
-#: install_steps_gtk.pm:341
+#: install_steps_gtk.pm:336
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由于不满足的 %s"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:337
 #, c-format
 msgid "trying to promote %s"
 msgstr "尝试推广 %s"
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:338
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: install_steps_gtk.pm:348
+#: install_steps_gtk.pm:343
 #, c-format
 msgid ""
 "You can not select this package as there is not enough space left to install "
 "it"
 msgstr "您不可以选择这个软件包。没有足够空间安装它。"
 
-#: install_steps_gtk.pm:351
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "即将安装下列软件包"
 
-#: install_steps_gtk.pm:352
+#: install_steps_gtk.pm:347
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "即将卸载下列软件包"
 
-#: install_steps_gtk.pm:376
+#: install_steps_gtk.pm:371
 #, c-format
 msgid "This is a mandatory package, it can not be unselected"
 msgstr "这个软件包是必需的, 不能取消选定"
 
-#: install_steps_gtk.pm:378
+#: install_steps_gtk.pm:373
 #, c-format
 msgid "You can not unselect this package. It is already installed"
 msgstr "您不可以取消选择这个软件包。它已经安装过了"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:376
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6442,78 +6482,78 @@ msgstr ""
 "这个软件包必须进行升级。\n"
 "您真的要删除它吗?"
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:379
 #, c-format
 msgid "You can not unselect this package. It must be upgraded"
 msgstr "您不能不选择这个软件包。它必须升级"
 
-#: install_steps_gtk.pm:389
+#: install_steps_gtk.pm:384
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "自动显示选中的软件包"
 
-#: install_steps_gtk.pm:394
+#: install_steps_gtk.pm:389
 #, c-format
 msgid "Load/Save selection"
 msgstr "装入/保存选择"
 
-#: install_steps_gtk.pm:395
+#: install_steps_gtk.pm:390
 #, c-format
 msgid "Updating package selection"
 msgstr "更新软件包选择"
 
-#: install_steps_gtk.pm:400
+#: install_steps_gtk.pm:395
 #, c-format
 msgid "Minimal install"
 msgstr "最小安装"
 
-#: install_steps_gtk.pm:414 install_steps_interactive.pm:483
+#: install_steps_gtk.pm:409 install_steps_interactive.pm:483
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "选择您想要安装的软件包"
 
-#: install_steps_gtk.pm:430 install_steps_interactive.pm:706
+#: install_steps_gtk.pm:425 install_steps_interactive.pm:706
 #, c-format
 msgid "Installing"
 msgstr "正在安装"
 
-#: install_steps_gtk.pm:437
+#: install_steps_gtk.pm:432
 #, c-format
 msgid "Estimating"
 msgstr "正在估计"
 
-#: install_steps_gtk.pm:486
+#: install_steps_gtk.pm:481
 #, c-format
 msgid "No details"
 msgstr "无细节"
 
-#: install_steps_gtk.pm:494
+#: install_steps_gtk.pm:489
 #, c-format
 msgid "Time remaining "
 msgstr "剩余时间"
 
-#: install_steps_gtk.pm:501
+#: install_steps_gtk.pm:496
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "请稍候, 正在准备安装..."
 
-#: install_steps_gtk.pm:516
+#: install_steps_gtk.pm:511
 #, c-format
 msgid "%d packages"
 msgstr "%d 个软件包"
 
-#: install_steps_gtk.pm:521
+#: install_steps_gtk.pm:516
 #, c-format
 msgid "Installing package %s"
 msgstr "正在安装软件包 %s"
 
-#: install_steps_gtk.pm:556 install_steps_interactive.pm:92
+#: install_steps_gtk.pm:551 install_steps_interactive.pm:92
 #: install_steps_interactive.pm:731
 #, c-format
 msgid "Refuse"
 msgstr "拒绝"
 
-#: install_steps_gtk.pm:560 install_steps_interactive.pm:735
+#: install_steps_gtk.pm:555 install_steps_interactive.pm:735
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -6526,29 +6566,29 @@ msgstr ""
 "请在驱动器中插入标有“%s”的光盘, 然后单击“确定”。\n"
 "如果您没有这张光盘, 请单击“取消”, 放弃安装这张光盘上的软件。"
 
-#: install_steps_gtk.pm:575 install_steps_interactive.pm:746
+#: install_steps_gtk.pm:570 install_steps_interactive.pm:746
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "排列软件包时出错: "
 
-#: install_steps_gtk.pm:575 install_steps_gtk.pm:579
+#: install_steps_gtk.pm:570 install_steps_gtk.pm:574
 #: install_steps_interactive.pm:746 install_steps_interactive.pm:750
 #, c-format
 msgid "Go on anyway?"
 msgstr "真的要继续?"
 
-#: install_steps_gtk.pm:579 install_steps_interactive.pm:750
+#: install_steps_gtk.pm:574 install_steps_interactive.pm:750
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "安装软件包时出错: "
 
-#: install_steps_gtk.pm:621 install_steps_interactive.pm:921
+#: install_steps_gtk.pm:616 install_steps_interactive.pm:921
 #: install_steps_interactive.pm:1073
 #, c-format
 msgid "not configured"
 msgstr "未配置"
 
-#: install_steps_gtk.pm:684
+#: install_steps_gtk.pm:679
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -6557,7 +6597,7 @@ msgstr ""
 "找到了下列安装介质。\n"
 "如果您想要跳过其中一些, 请不要选中。"
 
-#: install_steps_gtk.pm:693
+#: install_steps_gtk.pm:688
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -6569,7 +6609,7 @@ msgstr ""
 "然后，安装将会从硬盘继续进行。当系统安装完成后，软件包仍然保留，以供日后添加"
 "软件使用。"
 
-#: install_steps_gtk.pm:695
+#: install_steps_gtk.pm:690
 #, c-format
 msgid "Copy whole CDs"
 msgstr "复制整张光盘"
@@ -6766,8 +6806,8 @@ msgstr ""
 msgid "Load"
 msgstr "装入"
 
-#: install_steps_interactive.pm:497 standalone/drakbackup:3931
-#: standalone/drakbackup:4004 standalone/drakroam:206 standalone/logdrake:173
+#: install_steps_interactive.pm:497 standalone/drakbackup:3916
+#: standalone/drakbackup:3989 standalone/drakroam:210 standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "保存"
@@ -6871,8 +6911,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandriva Linux web site to get the list of available mirrors..."
-msgstr "正在连接 Mandriva Linux 网站以获得镜像网站列表..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
+msgstr ""
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -6912,7 +6952,7 @@ msgstr "概要"
 #: install_steps_interactive.pm:938 install_steps_interactive.pm:946
 #: install_steps_interactive.pm:964 install_steps_interactive.pm:971
 #: install_steps_interactive.pm:1125 services.pm:133
-#: standalone/drakbackup:1602
+#: standalone/drakbackup:1571
 #, c-format
 msgid "System"
 msgstr "系统"
@@ -7089,8 +7129,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandriva Linux Installation %s"
-msgstr "Mandriva Linux 安装 %s"
+msgid "Mandrivalinux Installation %s"
+msgstr ""
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -7104,8 +7144,8 @@ msgstr "  <Tab>/<Alt-Tab> 在项目间移动 | <空格> 选择 | <F12> 下个画
 msgid "Choose a file"
 msgstr "选择文件"
 
-#: interactive.pm:318 interactive/gtk.pm:489 standalone/drakbackup:1543
-#: standalone/drakfont:656 standalone/drakroam:214 standalone/drakups:301
+#: interactive.pm:318 interactive/gtk.pm:489 standalone/drakbackup:1512
+#: standalone/drakfont:656 standalone/drakroam:218 standalone/drakups:301
 #: standalone/drakups:361 standalone/drakups:381 standalone/drakvpn:333
 #: standalone/drakvpn:694
 #, c-format
@@ -7117,7 +7157,7 @@ msgstr "添加"
 msgid "Modify"
 msgstr "修改"
 
-#: interactive.pm:318 interactive/gtk.pm:489 standalone/drakroam:198
+#: interactive.pm:318 interactive/gtk.pm:489 standalone/drakroam:202
 #: standalone/drakups:303 standalone/drakups:363 standalone/drakups:383
 #: standalone/drakvpn:333 standalone/drakvpn:694
 #, c-format
@@ -7129,12 +7169,12 @@ msgstr "删除"
 msgid "Basic"
 msgstr "基本"
 
-#: interactive.pm:433 interactive/newt.pm:319 ugtk2.pm:506
+#: interactive.pm:433 interactive/newt.pm:321 ugtk2.pm:506
 #, c-format
 msgid "Finish"
 msgstr "完成"
 
-#: interactive/newt.pm:94
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "执行"
@@ -9161,18 +9201,18 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: lang.pm:1060
+#: lang.pm:1073
 #, c-format
 msgid "You should install the following packages: %s"
 msgstr "您应该安装下列软件包：%s"
 
 #. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
-#: lang.pm:1063 standalone/scannerdrake:135
+#: lang.pm:1076 standalone/scannerdrake:135
 #, c-format
 msgid ", "
 msgstr "、"
 
-#: lang.pm:1116
+#: lang.pm:1129
 #, c-format
 msgid "Welcome to %s"
 msgstr "欢迎使用 %s"
@@ -9377,9 +9417,9 @@ msgstr "GlidePoint"
 
 #: mouse.pm:36 network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
 #: network/modem.pm:85 network/modem.pm:99 network/modem.pm:104
-#: network/modem.pm:137 network/netconnect.pm:692 network/netconnect.pm:697
-#: network/netconnect.pm:709 network/netconnect.pm:714
-#: network/netconnect.pm:730 network/netconnect.pm:732
+#: network/modem.pm:137 network/netconnect.pm:700 network/netconnect.pm:705
+#: network/netconnect.pm:717 network/netconnect.pm:722
+#: network/netconnect.pm:738 network/netconnect.pm:740
 #, c-format
 msgid "Automatic"
 msgstr "自动"
@@ -9539,22 +9579,22 @@ msgstr "无"
 msgid "No mouse"
 msgstr "无鼠标"
 
-#: mouse.pm:299 mouse.pm:362 mouse.pm:371 mouse.pm:430
+#: mouse.pm:304 mouse.pm:367 mouse.pm:376 mouse.pm:435
 #, c-format
 msgid "Synaptics Touchpad"
 msgstr "Synaptics 触摸板"
 
-#: mouse.pm:556
+#: mouse.pm:561
 #, c-format
 msgid "Please test the mouse"
 msgstr "请测试您的鼠标"
 
-#: mouse.pm:558
+#: mouse.pm:563
 #, c-format
 msgid "To activate the mouse,"
 msgstr "要激活鼠标,"
 
-#: mouse.pm:559
+#: mouse.pm:564
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "请移动您的滚轮！"
@@ -9594,12 +9634,12 @@ msgstr "Sagem (使用 PPPoA) USB"
 msgid "Sagem (using DHCP) USB"
 msgstr "Sagem (使用 DHCP) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:898
+#: network/adsl.pm:35 network/netconnect.pm:906
 #, c-format
 msgid "Connect to the Internet"
 msgstr "连接到 Internet"
 
-#: network/adsl.pm:36 network/netconnect.pm:899
+#: network/adsl.pm:36 network/netconnect.pm:907
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
@@ -9610,7 +9650,7 @@ msgstr ""
 "有一些利用 PPTP, 还有极少数利用 DHCP。\n"
 "如果您没有把握, 就选择“PPPoE”"
 
-#: network/adsl.pm:41 network/netconnect.pm:903
+#: network/adsl.pm:41 network/netconnect.pm:911
 #, c-format
 msgid "ADSL connection type:"
 msgstr "ADSL 连接类型:"
@@ -9738,36 +9778,36 @@ msgstr "全部(无防火墙)"
 msgid "Other ports"
 msgstr "其它端口"
 
-#: network/isdn.pm:124 network/netconnect.pm:539 network/netconnect.pm:653
-#: network/netconnect.pm:656 network/netconnect.pm:814
-#: network/netconnect.pm:818
+#: network/isdn.pm:124 network/netconnect.pm:547 network/netconnect.pm:661
+#: network/netconnect.pm:664 network/netconnect.pm:822
+#: network/netconnect.pm:826
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "未列出 - 手动编辑"
 
-#: network/isdn.pm:167 network/netconnect.pm:471
+#: network/isdn.pm:167 network/netconnect.pm:479
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:167 network/netconnect.pm:471
+#: network/isdn.pm:167 network/netconnect.pm:479
 #, c-format
 msgid "I do not know"
 msgstr "我不知道"
 
-#: network/isdn.pm:168 network/netconnect.pm:471
+#: network/isdn.pm:168 network/netconnect.pm:479
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:169 network/netconnect.pm:471
+#: network/isdn.pm:169 network/netconnect.pm:479
 #, c-format
 msgid "USB"
 msgstr "USB"
 
 #: network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
-#: network/netconnect.pm:697 network/netconnect.pm:714
-#: network/netconnect.pm:730
+#: network/netconnect.pm:705 network/netconnect.pm:722
+#: network/netconnect.pm:738
 #, c-format
 msgid "Manual"
 msgstr "手动"
@@ -9797,15 +9837,17 @@ msgstr "无法装入 ndiswrapper 模块!"
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver ?"
-msgstr "所选的设备已经以 %s 驱动程序配置过。\n您真的想要使用 ndiswrapper 驱动程序吗?"
+msgstr ""
+"所选的设备已经以 %s 驱动程序配置过。\n"
+"您真的想要使用 ndiswrapper 驱动程序吗?"
 
 #: network/ndiswrapper.pm:101
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "找不到 ndiswrapper 接口!"
 
-#: network/netconnect.pm:91 network/netconnect.pm:568
-#: network/netconnect.pm:572
+#: network/netconnect.pm:91 network/netconnect.pm:576
+#: network/netconnect.pm:580
 #, c-format
 msgid "Manual choice"
 msgstr "手动选择"
@@ -9815,33 +9857,33 @@ msgstr "手动选择"
 msgid "Internal ISDN card"
 msgstr "内置 ISDN 卡"
 
-#: network/netconnect.pm:103 printer/printerdrake.pm:1418
+#: network/netconnect.pm:104 printer/printerdrake.pm:1418
 #: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "手工配置"
 
-#: network/netconnect.pm:104
+#: network/netconnect.pm:105
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "自动 IP(BOOTP/DHCP)"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "自动 IP(BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:109
+#: network/netconnect.pm:110
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "世界其它地区的协议"
 
-#: network/netconnect.pm:111 standalone/drakconnect:574
+#: network/netconnect.pm:112 standalone/drakconnect:574
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "欧洲协议(EDSS1)"
 
-#: network/netconnect.pm:112 standalone/drakconnect:575
+#: network/netconnect.pm:113 standalone/drakconnect:575
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -9850,183 +9892,188 @@ msgstr ""
 "世界其它地区的协议\n"
 "没有 D-信道(专线)"
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:153
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "阿尔卡特 Speedtouch USB 调制解调器"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:154
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB 调制解调器"
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:155
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan 调制解调器"
 
-#: network/netconnect.pm:151
+#: network/netconnect.pm:156
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus 调制解调器"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:160
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "动态主机配置协议(DHCP)"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:161
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "手工配置 TCP/IP"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:162
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "点对点隧道协议(PPTP)"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:163
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "以太网上的点对点协议(PPPoE)"
 
-#: network/netconnect.pm:159
+#: network/netconnect.pm:164
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "异步传输模式下的点对点协议(PPPoA)"
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:165
 #, c-format
 msgid "DSL over CAPI"
 msgstr "CAPI 上的 DSL"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "桥接以太网 LLC"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "桥接以太网 VC"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:171
 #, c-format
 msgid "Routed IP LLC"
 msgstr "路由 IP LLC"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:172
 #, c-format
 msgid "Routed IP VC"
 msgstr "路由 IP VC"
 
-#: network/netconnect.pm:168
+#: network/netconnect.pm:173
 #, c-format
 msgid "PPPoA LLC"
 msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:169
+#: network/netconnect.pm:174
 #, c-format
 msgid "PPPoA VC"
 msgstr "PPPoA VC"
 
-#: network/netconnect.pm:173 standalone/drakconnect:509
+#: network/netconnect.pm:178 standalone/drakconnect:509
 #, c-format
 msgid "Script-based"
 msgstr "基于脚本登录"
 
-#: network/netconnect.pm:174 standalone/drakconnect:509
+#: network/netconnect.pm:179 standalone/drakconnect:509
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:175 standalone/drakconnect:509
+#: network/netconnect.pm:180 standalone/drakconnect:509
 #, c-format
 msgid "Terminal-based"
 msgstr "基于终端"
 
-#: network/netconnect.pm:176 standalone/drakconnect:509
+#: network/netconnect.pm:181 standalone/drakconnect:509
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:177 standalone/drakconnect:509
+#: network/netconnect.pm:182 standalone/drakconnect:509
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:182
+#: network/netconnect.pm:187
 #, c-format
 msgid "Open WEP"
 msgstr "开放 WEP"
 
-#: network/netconnect.pm:183
+#: network/netconnect.pm:188
 #, c-format
 msgid "Restricted WEP"
 msgstr "限制 WEP"
 
-#: network/netconnect.pm:184
+#: network/netconnect.pm:189
 #, c-format
 msgid "WPA Pre-Shared Key"
 msgstr "WPA 预共享密钥"
 
-#: network/netconnect.pm:287 standalone/drakconnect:60
+#: network/netconnect.pm:294 standalone/drakconnect:60
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "网络和 Internet 配置"
 
-#: network/netconnect.pm:293
+#: network/netconnect.pm:300
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(在端口 %s 检测到)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:295
+#: network/netconnect.pm:302
 #, c-format
 msgid "(detected %s)"
 msgstr "(检测到 %s)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:302
 #, c-format
 msgid "(detected)"
 msgstr "(检测到)"
 
-#: network/netconnect.pm:297
+#: network/netconnect.pm:304
 #, c-format
-msgid "Modem connection"
-msgstr "调制解调器连接"
+msgid "LAN connection"
+msgstr "局域网连接"
 
-#: network/netconnect.pm:298
+#: network/netconnect.pm:305 network/netconnect.pm:324
 #, c-format
-msgid "ISDN connection"
-msgstr "ISDN 连接"
+msgid "Wireless connection"
+msgstr "无线连接"
 
-#: network/netconnect.pm:299
+#: network/netconnect.pm:306
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL 连接"
 
-#: network/netconnect.pm:300
+#: network/netconnect.pm:307
 #, c-format
 msgid "Cable connection"
 msgstr "有线电缆连接"
 
-#: network/netconnect.pm:301
+#: network/netconnect.pm:308
 #, c-format
-msgid "LAN connection"
-msgstr "局域网连接"
+msgid "ISDN connection"
+msgstr "ISDN 连接"
 
-#: network/netconnect.pm:302 network/netconnect.pm:316
+#: network/netconnect.pm:309
 #, c-format
-msgid "Wireless connection"
-msgstr "无线连接"
+msgid "Modem connection"
+msgstr "调制解调器连接"
+
+#: network/netconnect.pm:310
+#, c-format
+msgid "DVB connection"
+msgstr ""
 
-#: network/netconnect.pm:312
+#: network/netconnect.pm:320
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "选择您想要配置的连接"
 
-#: network/netconnect.pm:326
+#: network/netconnect.pm:334
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -10039,140 +10086,141 @@ msgstr ""
 "\n"
 "按“%s”继续。"
 
-#: network/netconnect.pm:334 network/netconnect.pm:949
+#: network/netconnect.pm:342 network/netconnect.pm:958
 #, c-format
 msgid "Connection Configuration"
 msgstr "连接配置"
 
-#: network/netconnect.pm:335 network/netconnect.pm:950
+#: network/netconnect.pm:343 network/netconnect.pm:959
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "请填写或选择下列项目"
 
-#: network/netconnect.pm:342 standalone/drakconnect:565
+#: network/netconnect.pm:350 standalone/drakconnect:565
 #, c-format
 msgid "Card IRQ"
 msgstr "网卡的 IRQ"
 
-#: network/netconnect.pm:343 standalone/drakconnect:566
+#: network/netconnect.pm:351 standalone/drakconnect:566
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "网卡内存(DMA)"
 
-#: network/netconnect.pm:344 standalone/drakconnect:567
+#: network/netconnect.pm:352 standalone/drakconnect:567
 #, c-format
 msgid "Card IO"
 msgstr "网卡 IO"
 
-#: network/netconnect.pm:345 standalone/drakconnect:568
+#: network/netconnect.pm:353 standalone/drakconnect:568
 #, c-format
 msgid "Card IO_0"
 msgstr "网卡 IO_0"
 
-#: network/netconnect.pm:346
+#: network/netconnect.pm:354
 #, c-format
 msgid "Card IO_1"
 msgstr "网卡 IO_1"
 
-#: network/netconnect.pm:347
+#: network/netconnect.pm:355
 #, c-format
 msgid "Your personal phone number"
 msgstr "您自己的电话号码"
 
-#: network/netconnect.pm:348 network/netconnect.pm:953
+#: network/netconnect.pm:356 network/netconnect.pm:962
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "服务商名称(如 provider.net)"
 
-#: network/netconnect.pm:349 standalone/drakconnect:504
+#: network/netconnect.pm:357 standalone/drakconnect:504
 #, c-format
 msgid "Provider phone number"
 msgstr "服务商电话号码"
 
-#: network/netconnect.pm:350
+#: network/netconnect.pm:358
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "服务商 DNS 1(可选)"
 
-#: network/netconnect.pm:351
+#: network/netconnect.pm:359
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "服务商 DNS 2(可选)"
 
-#: network/netconnect.pm:352 standalone/drakconnect:455
+#: network/netconnect.pm:360 standalone/drakconnect:455
 #, c-format
 msgid "Dialing mode"
 msgstr "拨号模式"
 
-#: network/netconnect.pm:353 standalone/drakconnect:460
+#: network/netconnect.pm:361 standalone/drakconnect:460
 #: standalone/drakconnect:528
 #, c-format
 msgid "Connection speed"
 msgstr "连接速率"
 
-#: network/netconnect.pm:354 standalone/drakconnect:465
+#: network/netconnect.pm:362 standalone/drakconnect:465
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "连接超时(秒)"
 
-#: network/netconnect.pm:357 network/netconnect.pm:378
-#: network/netconnect.pm:956 standalone/drakconnect:502
+#: network/netconnect.pm:365 network/netconnect.pm:386
+#: network/netconnect.pm:965 standalone/drakconnect:502
 #, c-format
 msgid "Account Login (user name)"
 msgstr "账户登录(用户名)"
 
-#: network/netconnect.pm:358 network/netconnect.pm:379
-#: network/netconnect.pm:957 standalone/drakconnect:503
+#: network/netconnect.pm:366 network/netconnect.pm:387
+#: network/netconnect.pm:966 standalone/drakconnect:503
 #, c-format
 msgid "Account Password"
 msgstr "账户密码"
 
-#: network/netconnect.pm:374
+#: network/netconnect.pm:382
 #, c-format
 msgid "Cable: account options"
 msgstr "光缆: 账户选项"
 
-#: network/netconnect.pm:377
+#: network/netconnect.pm:385
 #, c-format
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "使用 BPALogin (Telstra 需要)"
 
-#: network/netconnect.pm:411 network/netconnect.pm:767
-#: network/netconnect.pm:992
+#: network/netconnect.pm:419 network/netconnect.pm:775
+#: network/netconnect.pm:1004 network/netconnect.pm:1309
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "选择要配置的网卡: "
 
-#: network/netconnect.pm:413 network/netconnect.pm:461
-#: network/netconnect.pm:768 network/netconnect.pm:994 network/shorewall.pm:96
-#: standalone/drakconnect:720 standalone/drakgw:224 standalone/drakvpn:221
+#: network/netconnect.pm:421 network/netconnect.pm:469
+#: network/netconnect.pm:776 network/netconnect.pm:1006
+#: network/shorewall.pm:96 standalone/drakconnect:720 standalone/drakgw:224
+#: standalone/drakvpn:221
 #, c-format
 msgid "Net Device"
 msgstr "网络设备"
 
-#: network/netconnect.pm:414 network/netconnect.pm:422
+#: network/netconnect.pm:422 network/netconnect.pm:430
 #, c-format
 msgid "External ISDN modem"
 msgstr "外置 ISDN 调制解调器"
 
-#: network/netconnect.pm:460 standalone/harddrake2:215
+#: network/netconnect.pm:468 standalone/harddrake2:215
 #, c-format
 msgid "Select a device!"
 msgstr "请选择设备！"
 
-#: network/netconnect.pm:469 network/netconnect.pm:479
-#: network/netconnect.pm:489 network/netconnect.pm:522
-#: network/netconnect.pm:536
+#: network/netconnect.pm:477 network/netconnect.pm:487
+#: network/netconnect.pm:497 network/netconnect.pm:530
+#: network/netconnect.pm:544
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN 配置"
 
-#: network/netconnect.pm:470
+#: network/netconnect.pm:478
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "请问您适配卡的种类?"
 
-#: network/netconnect.pm:480
+#: network/netconnect.pm:488
 #, c-format
 msgid ""
 "\n"
@@ -10186,22 +10234,22 @@ msgstr ""
 "\n"
 "如果您的卡是 PCMCIA 卡, 您必须知道它的“irq”和“io”。\n"
 
-#: network/netconnect.pm:484
+#: network/netconnect.pm:492
 #, c-format
 msgid "Continue"
 msgstr "继续"
 
-#: network/netconnect.pm:484
+#: network/netconnect.pm:492
 #, c-format
 msgid "Abort"
 msgstr "中止"
 
-#: network/netconnect.pm:490
+#: network/netconnect.pm:498
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "下列哪个是您的 ISDN 卡?"
 
-#: network/netconnect.pm:508
+#: network/netconnect.pm:516
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -10211,25 +10259,25 @@ msgstr ""
 "此调制解调器适用 CAPI 驱动程序。此 CAPI 驱动程序比免费驱动程序提供更多的功能"
 "(比如发送传真)。您想要使用哪个驱动程序?"
 
-#: network/netconnect.pm:510 standalone/drakconnect:117 standalone/drakups:251
+#: network/netconnect.pm:518 standalone/drakconnect:117 standalone/drakups:251
 #: standalone/harddrake2:132
 #, c-format
 msgid "Driver"
 msgstr "驱动程序"
 
-#: network/netconnect.pm:522
+#: network/netconnect.pm:530
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "您将使用哪种协议?"
 
-#: network/netconnect.pm:524 standalone/drakconnect:117
+#: network/netconnect.pm:532 standalone/drakconnect:117
 #: standalone/drakconnect:311 standalone/drakconnect:573
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "协议"
 
-#: network/netconnect.pm:536
+#: network/netconnect.pm:544
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -10238,13 +10286,13 @@ msgstr ""
 "选择您的提供商。\n"
 "如果该提供商未被列出, 请选择“未列出”。"
 
-#: network/netconnect.pm:538 network/netconnect.pm:652
-#: network/netconnect.pm:813
+#: network/netconnect.pm:546 network/netconnect.pm:660
+#: network/netconnect.pm:821
 #, c-format
 msgid "Provider:"
 msgstr "服务商:"
 
-#: network/netconnect.pm:553
+#: network/netconnect.pm:561
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -10253,52 +10301,52 @@ msgstr ""
 "您的调制解调器不被系统支持。\n"
 "请看看 http://www.linmodems.org"
 
-#: network/netconnect.pm:565
+#: network/netconnect.pm:573
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "选择要配置的调制解调器:"
 
-#: network/netconnect.pm:619
+#: network/netconnect.pm:627
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "请选择您的调制解调器是连接到哪个串行端口。"
 
-#: network/netconnect.pm:650
+#: network/netconnect.pm:658
 #, c-format
 msgid "Select your provider:"
 msgstr "选择您的服务商:"
 
-#: network/netconnect.pm:674
+#: network/netconnect.pm:682
 #, c-format
 msgid "Dialup: account options"
 msgstr "拨号: 账户设置"
 
-#: network/netconnect.pm:677
+#: network/netconnect.pm:685
 #, c-format
 msgid "Connection name"
 msgstr "连接名称"
 
-#: network/netconnect.pm:678
+#: network/netconnect.pm:686
 #, c-format
 msgid "Phone number"
 msgstr "电话号码"
 
-#: network/netconnect.pm:679
+#: network/netconnect.pm:687
 #, c-format
 msgid "Login ID"
 msgstr "登录 ID"
 
-#: network/netconnect.pm:694 network/netconnect.pm:727
+#: network/netconnect.pm:702 network/netconnect.pm:735
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "拨号: IP 参数"
 
-#: network/netconnect.pm:697
+#: network/netconnect.pm:705
 #, c-format
 msgid "IP parameters"
 msgstr "IP 参数"
 
-#: network/netconnect.pm:698 network/netconnect.pm:1106
+#: network/netconnect.pm:706 network/netconnect.pm:1096
 #: printer/printerdrake.pm:460 standalone/drakconnect:117
 #: standalone/drakconnect:327 standalone/drakconnect:915
 #: standalone/drakups:286
@@ -10306,64 +10354,64 @@ msgstr "IP 参数"
 msgid "IP address"
 msgstr "IP 地址"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:707
 #, c-format
 msgid "Subnet mask"
 msgstr "子网掩码"
 
-#: network/netconnect.pm:711
+#: network/netconnect.pm:719
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "拨号: DNS 参数"
 
-#: network/netconnect.pm:714
+#: network/netconnect.pm:722
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:715
+#: network/netconnect.pm:723
 #, c-format
 msgid "Domain name"
 msgstr "域名"
 
-#: network/netconnect.pm:716 network/netconnect.pm:954
+#: network/netconnect.pm:724 network/netconnect.pm:963
 #: standalone/drakconnect:1033
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "首选 DNS 服务器(可选)"
 
-#: network/netconnect.pm:717 network/netconnect.pm:955
+#: network/netconnect.pm:725 network/netconnect.pm:964
 #: standalone/drakconnect:1034
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "备选 DNS 服务器(可选)"
 
-#: network/netconnect.pm:718
+#: network/netconnect.pm:726
 #, c-format
 msgid "Set hostname from IP"
 msgstr "由 IP 设置主机名"
 
-#: network/netconnect.pm:730 standalone/drakconnect:338
+#: network/netconnect.pm:738 standalone/drakconnect:338
 #, c-format
 msgid "Gateway"
 msgstr "网关"
 
-#: network/netconnect.pm:731
+#: network/netconnect.pm:739
 #, c-format
 msgid "Gateway IP address"
 msgstr "网关 IP 地址"
 
-#: network/netconnect.pm:767
+#: network/netconnect.pm:775
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSL 配置"
 
-#: network/netconnect.pm:811
+#: network/netconnect.pm:819
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "请选择您的 ADSL 提供商"
 
-#: network/netconnect.pm:832
+#: network/netconnect.pm:840
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10374,32 +10422,32 @@ msgstr ""
 "您可以通过软盘或您的 Windows 分区提供该微代码,\n"
 "或者现在跳过稍后再做。"
 
-#: network/netconnect.pm:836 network/netconnect.pm:841
+#: network/netconnect.pm:844 network/netconnect.pm:849
 #, c-format
 msgid "Use a floppy"
 msgstr "使用软盘"
 
-#: network/netconnect.pm:836 network/netconnect.pm:845
+#: network/netconnect.pm:844 network/netconnect.pm:853
 #, c-format
 msgid "Use my Windows partition"
 msgstr "使用我的 Windows 分区"
 
-#: network/netconnect.pm:836 network/netconnect.pm:848
+#: network/netconnect.pm:844 network/netconnect.pm:856
 #, c-format
 msgid "Do it later"
 msgstr "稍后再做"
 
-#: network/netconnect.pm:855
+#: network/netconnect.pm:863
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "固件复制失败, 文件 %s 未找到"
 
-#: network/netconnect.pm:862
+#: network/netconnect.pm:870
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "固件复制成功"
 
-#: network/netconnect.pm:877
+#: network/netconnect.pm:885
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10412,22 +10460,22 @@ msgstr ""
 "%s\n"
 "下载并将 mgmt.o 复制到 /usr/share/speedtouch"
 
-#: network/netconnect.pm:960
+#: network/netconnect.pm:968
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "虚拟路径 ID (VPI):"
 
-#: network/netconnect.pm:961
+#: network/netconnect.pm:969
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "虚拟电路 ID (VCI):"
 
-#: network/netconnect.pm:964
+#: network/netconnect.pm:972
 #, c-format
 msgid "Encapsulation:"
 msgstr "封装: "
 
-#: network/netconnect.pm:982
+#: network/netconnect.pm:994
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10439,61 +10487,40 @@ msgstr ""
 "\n"
 "您可以在此网站: http://eciadsl.flashtux.org/ 找到驱动程序。"
 
-#: network/netconnect.pm:994
+#: network/netconnect.pm:1006
 #, c-format
 msgid "Manually load a driver"
 msgstr "手动装入驱动程序"
 
-#: network/netconnect.pm:994
+#: network/netconnect.pm:1006
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "使用 Windows 驱动程序(通过 ndiswrapper)"
 
-#: network/netconnect.pm:1001 printer/printerdrake.pm:3741
+#: network/netconnect.pm:1013 network/netconnect.pm:1274
+#: network/netconnect.pm:1278 printer/printerdrake.pm:3741
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "无法安装 %s 软件包!"
 
-#: network/netconnect.pm:1027
-#, c-format
-msgid ""
-"WARNING: this device has been previously configured to connect to the "
-"Internet.\n"
-"Modifying the fields below will override this configuration.\n"
-"Do you really want to reconfigure this device?"
-msgstr ""
-"警告: 此设备已经先前被配置用于连接到 Internet。\n"
-"修改下面的输入框将覆盖此配置。\n"
-"您真的想要重新配置此设备吗?"
-
-#: network/netconnect.pm:1041 network/netconnect.pm:1520
-#, c-format
-msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"\n"
-msgstr ""
-"恭喜, 网络和 Internet 配置完成。\n"
-"\n"
-
-#: network/netconnect.pm:1058
+#: network/netconnect.pm:1048
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf 主机名解析"
 
-#: network/netconnect.pm:1059 network/netconnect.pm:1093
+#: network/netconnect.pm:1049 network/netconnect.pm:1083
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "配置网络设备 %s(驱动程序 %s)"
 
-#: network/netconnect.pm:1060
+#: network/netconnect.pm:1050
 #, c-format
 msgid ""
 "The following protocols can be used to configure a LAN connection. Please "
 "choose the one you want to use"
-msgstr ""
-"您可使用下列协议配置局域网连接。请选择您想要使用的协议"
+msgstr "您可使用下列协议配置局域网连接。请选择您想要使用的协议"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1084
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10504,186 +10531,186 @@ msgstr ""
 "下列项目要求以句点分隔十进制格式输入的 IP 地址。\n"
 "(例如, 1.2.3.4)"
 
-#: network/netconnect.pm:1101 standalone/drakconnect:384
+#: network/netconnect.pm:1091 standalone/drakconnect:384
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "从 DHCP 地址指定主机名"
 
-#: network/netconnect.pm:1102 standalone/drakconnect:386
+#: network/netconnect.pm:1092 standalone/drakconnect:386
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP 主机名"
 
-#: network/netconnect.pm:1107 standalone/drakconnect:332
+#: network/netconnect.pm:1097 standalone/drakconnect:332
 #: standalone/drakconnect:916 standalone/drakgw:320
 #, c-format
 msgid "Netmask"
 msgstr "子网掩码"
 
-#: network/netconnect.pm:1109 standalone/drakconnect:448
+#: network/netconnect.pm:1099 standalone/drakconnect:448
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "跟踪网卡标志(用于笔记本电脑)"
 
-#: network/netconnect.pm:1111 standalone/drakconnect:449
+#: network/netconnect.pm:1101 standalone/drakconnect:449
 #, c-format
 msgid "Network Hotplugging"
 msgstr "网络热插拔"
 
-#: network/netconnect.pm:1113 standalone/drakconnect:443
+#: network/netconnect.pm:1103 standalone/drakconnect:443
 #, c-format
 msgid "Start at boot"
 msgstr "开机时启动"
 
-#: network/netconnect.pm:1115 standalone/drakconnect:471
+#: network/netconnect.pm:1105 standalone/drakconnect:471
 #, c-format
 msgid "Metric"
 msgstr "度量衡"
 
-#: network/netconnect.pm:1117 standalone/drakconnect:380
+#: network/netconnect.pm:1107 standalone/drakconnect:380
 #: standalone/drakconnect:919
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP 客户端"
 
-#: network/netconnect.pm:1119 standalone/drakconnect:390
+#: network/netconnect.pm:1109 standalone/drakconnect:390
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP 超时(秒)"
 
-#: network/netconnect.pm:1120 standalone/drakconnect:393
+#: network/netconnect.pm:1110 standalone/drakconnect:393
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "从 DHCP 获取 DNS 服务器"
 
-#: network/netconnect.pm:1121 standalone/drakconnect:394
+#: network/netconnect.pm:1111 standalone/drakconnect:394
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "从 DHCP 获取 YP 服务器"
 
-#: network/netconnect.pm:1122 standalone/drakconnect:395
+#: network/netconnect.pm:1112 standalone/drakconnect:395
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "从 DHCP 获取 NTPD 服务器"
 
-#: network/netconnect.pm:1131 printer/printerdrake.pm:1672
+#: network/netconnect.pm:1121 printer/printerdrake.pm:1672
 #: standalone/drakconnect:683
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP 地址的格式应该是 1.2.3.4"
 
-#: network/netconnect.pm:1135 standalone/drakconnect:687
+#: network/netconnect.pm:1125 standalone/drakconnect:687
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "子网掩码的格式应该是 255.255.224.0"
 
-#: network/netconnect.pm:1139
+#: network/netconnect.pm:1129
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "警告: IP 地址 %s 通常是被保留的！"
 
-#: network/netconnect.pm:1144 standalone/drakTermServ:1731
-#: standalone/drakTermServ:1732 standalone/drakTermServ:1733
+#: network/netconnect.pm:1134 standalone/drakTermServ:1783
+#: standalone/drakTermServ:1784 standalone/drakTermServ:1785
 #, c-format
 msgid "%s already in use\n"
 msgstr "%s 已经被使用了\n"
 
-#: network/netconnect.pm:1177
+#: network/netconnect.pm:1167
 #, c-format
 msgid "Choose an ndiswrapper driver"
 msgstr "选择 ndiswrapper 驱动程序"
 
-#: network/netconnect.pm:1179
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Use the ndiswrapper driver %s"
 msgstr "使用 ndiswrapper 驱动程序 %s"
 
-#: network/netconnect.pm:1179
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Install a new driver"
 msgstr "安装新驱动程序"
 
-#: network/netconnect.pm:1191
+#: network/netconnect.pm:1181
 #, c-format
 msgid "Select a device:"
 msgstr "选择设备:"
 
-#: network/netconnect.pm:1216
+#: network/netconnect.pm:1208
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "请选择此网卡的无线参数:"
 
-#: network/netconnect.pm:1219 standalone/drakconnect:415
+#: network/netconnect.pm:1211 standalone/drakconnect:415
 #, c-format
 msgid "Operating Mode"
 msgstr "操作模式"
 
-#: network/netconnect.pm:1220
+#: network/netconnect.pm:1212
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: network/netconnect.pm:1220
+#: network/netconnect.pm:1212
 #, c-format
 msgid "Managed"
 msgstr "受控的"
 
-#: network/netconnect.pm:1220
+#: network/netconnect.pm:1212
 #, c-format
 msgid "Master"
 msgstr "主要的"
 
-#: network/netconnect.pm:1220
+#: network/netconnect.pm:1212
 #, c-format
 msgid "Repeater"
 msgstr "转发器"
 
-#: network/netconnect.pm:1220
+#: network/netconnect.pm:1212
 #, c-format
 msgid "Secondary"
 msgstr "次要的"
 
-#: network/netconnect.pm:1220
+#: network/netconnect.pm:1212
 #, c-format
 msgid "Auto"
 msgstr "自动"
 
-#: network/netconnect.pm:1222 standalone/drakconnect:416
+#: network/netconnect.pm:1214 standalone/drakconnect:416
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "网络名称(ESSID)"
 
-#: network/netconnect.pm:1223 standalone/drakconnect:417
+#: network/netconnect.pm:1215 standalone/drakconnect:417
 #, c-format
 msgid "Network ID"
 msgstr "网络 ID"
 
-#: network/netconnect.pm:1224 standalone/drakconnect:418
+#: network/netconnect.pm:1216 standalone/drakconnect:418
 #, c-format
 msgid "Operating frequency"
 msgstr "运行频率"
 
-#: network/netconnect.pm:1225 standalone/drakconnect:419
+#: network/netconnect.pm:1217 standalone/drakconnect:419
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "灵敏度阀值"
 
-#: network/netconnect.pm:1226 standalone/drakconnect:420
+#: network/netconnect.pm:1218 standalone/drakconnect:420
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "比特率(每秒比特数, b/s)"
 
-#: network/netconnect.pm:1227
+#: network/netconnect.pm:1219
 #, c-format
 msgid "Encryption mode"
 msgstr "加密模式"
 
-#: network/netconnect.pm:1231 standalone/drakconnect:431
+#: network/netconnect.pm:1223 standalone/drakconnect:431
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:1232
+#: network/netconnect.pm:1224
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10702,17 +10729,17 @@ msgstr ""
 "包\n"
 "的大小, 一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
 
-#: network/netconnect.pm:1239 standalone/drakconnect:432
+#: network/netconnect.pm:1231 standalone/drakconnect:432
 #, c-format
 msgid "Fragmentation"
 msgstr "块"
 
-#: network/netconnect.pm:1240 standalone/drakconnect:433
+#: network/netconnect.pm:1232 standalone/drakconnect:433
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "Iwconfig 命令的额外参数"
 
-#: network/netconnect.pm:1241
+#: network/netconnect.pm:1233
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10728,12 +10755,12 @@ msgstr ""
 "请参看 iwconfig(8) man page 中的更多信息。"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1248 standalone/drakconnect:434
+#: network/netconnect.pm:1240 standalone/drakconnect:434
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr "Iwspy 命令的额外参数"
 
-#: network/netconnect.pm:1249
+#: network/netconnect.pm:1241
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10751,12 +10778,12 @@ msgstr ""
 "\n"
 "请参看 iwpspy(8) man page 中的更多信息。"
 
-#: network/netconnect.pm:1257 standalone/drakconnect:435
+#: network/netconnect.pm:1250 standalone/drakconnect:435
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "Iwpriv 命令的额外参数"
 
-#: network/netconnect.pm:1258
+#: network/netconnect.pm:1251
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10785,7 +10812,7 @@ msgstr ""
 "\n"
 "请参看 iwpriv(8) man page 中的更多信息。"
 
-#: network/netconnect.pm:1273
+#: network/netconnect.pm:1266
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10794,14 +10821,44 @@ msgstr ""
 "频率应该有后缀 k, M 或 G(如“2.46G”代表 2.46 GHz 频率), 或者后带足够"
 "的“0”(零)。"
 
-#: network/netconnect.pm:1277
+#: network/netconnect.pm:1270
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr "速度应该有后缀 k, M 或 G(如“11M”代表 11M), 或者后带足够的“0”(零)。"
 
-#: network/netconnect.pm:1314
+#: network/netconnect.pm:1309
+#, c-format
+msgid "DVB configuration"
+msgstr ""
+
+#: network/netconnect.pm:1310
+#, c-format
+msgid "DVB Adapter"
+msgstr ""
+
+#: network/netconnect.pm:1328
+#, c-format
+msgid "DVB adapter settings"
+msgstr ""
+
+#: network/netconnect.pm:1331
+#, c-format
+msgid "Adapter card"
+msgstr ""
+
+#: network/netconnect.pm:1332
+#, c-format
+msgid "Net demux"
+msgstr ""
+
+#: network/netconnect.pm:1333
+#, c-format
+msgid "PID"
+msgstr ""
+
+#: network/netconnect.pm:1361
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10813,67 +10870,67 @@ msgstr ""
 "您的主机名称必需是个完全限定的名称, 例如“mybox.mylab.myco.com”。\n"
 "如果您有网关的话, 也请输入其 IP 地址。"
 
-#: network/netconnect.pm:1319
+#: network/netconnect.pm:1366
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr "最后, 您还应该至少输入您 DNS 服务器的 IP 地址。"
 
-#: network/netconnect.pm:1321 standalone/drakconnect:1032
+#: network/netconnect.pm:1368 standalone/drakconnect:1032
 #, c-format
 msgid "Host name (optional)"
 msgstr "主机名(可选)"
 
-#: network/netconnect.pm:1321
+#: network/netconnect.pm:1368
 #, c-format
 msgid "Host name"
 msgstr "主机名"
 
-#: network/netconnect.pm:1323
+#: network/netconnect.pm:1370
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS 服务器 1"
 
-#: network/netconnect.pm:1324
+#: network/netconnect.pm:1371
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS 服务器 2"
 
-#: network/netconnect.pm:1325
+#: network/netconnect.pm:1372
 #, c-format
 msgid "DNS server 3"
 msgstr "DNS 服务器 3"
 
-#: network/netconnect.pm:1326
+#: network/netconnect.pm:1373
 #, c-format
 msgid "Search domain"
 msgstr "搜索网域"
 
-#: network/netconnect.pm:1327
+#: network/netconnect.pm:1374
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "默认情况下, 搜索域名将会根据完全限定的主机名进行设定"
 
-#: network/netconnect.pm:1328
+#: network/netconnect.pm:1375
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "网关(如 %s)"
 
-#: network/netconnect.pm:1330
+#: network/netconnect.pm:1377
 #, c-format
 msgid "Gateway device"
 msgstr "网关设备"
 
-#: network/netconnect.pm:1339
+#: network/netconnect.pm:1386
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS 服务器的格式应该是 1.2.3.4"
 
-#: network/netconnect.pm:1344 standalone/drakconnect:692
+#: network/netconnect.pm:1391 standalone/drakconnect:692
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "网关地址的格式应该是 1.2.3.4"
 
-#: network/netconnect.pm:1357
+#: network/netconnect.pm:1404
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -10885,17 +10942,17 @@ msgstr ""
 "这将被您的计算机用于通知其未被网络管理的共享资源。\n"
 "大多数网络中不需要此设置。"
 
-#: network/netconnect.pm:1361
+#: network/netconnect.pm:1408
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf 主机名"
 
-#: network/netconnect.pm:1364
+#: network/netconnect.pm:1411
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf 主机名不能包含“.”"
 
-#: network/netconnect.pm:1374
+#: network/netconnect.pm:1421
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10906,57 +10963,57 @@ msgstr ""
 "选择您要使用的一种。\n"
 "\n"
 
-#: network/netconnect.pm:1376
+#: network/netconnect.pm:1423
 #, c-format
 msgid "Internet connection"
 msgstr "Internet 连接"
 
-#: network/netconnect.pm:1385
+#: network/netconnect.pm:1432
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "配置完成, 您想要应用设置吗?"
 
-#: network/netconnect.pm:1392
+#: network/netconnect.pm:1439
 #, c-format
 msgid "Do you want to allow users to start the connection?"
 msgstr "您是否希望允许用户启动连接?"
 
-#: network/netconnect.pm:1412
+#: network/netconnect.pm:1459
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "您是否希望一开机就启动连接?"
 
-#: network/netconnect.pm:1431
+#: network/netconnect.pm:1478
 #, c-format
 msgid "Automatically at boot"
 msgstr "开机时自动启动"
 
-#: network/netconnect.pm:1433
+#: network/netconnect.pm:1480
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "使用系统脱盘中的网络小程序"
 
-#: network/netconnect.pm:1435
+#: network/netconnect.pm:1482
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "手动(启动时仍会激活网卡)"
 
-#: network/netconnect.pm:1444
+#: network/netconnect.pm:1491
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "您想要如何拨打此连接?"
 
-#: network/netconnect.pm:1458
+#: network/netconnect.pm:1505
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "网络需要重新启动。您要重新启动吗?"
 
-#: network/netconnect.pm:1465 network/netconnect.pm:1536
+#: network/netconnect.pm:1512 network/netconnect.pm:1583
 #, c-format
 msgid "Network Configuration"
 msgstr "网络配置"
 
-#: network/netconnect.pm:1466
+#: network/netconnect.pm:1513
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -10967,27 +11024,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1475
+#: network/netconnect.pm:1522
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "您想要测试连接到 Internet 吗?"
 
-#: network/netconnect.pm:1483 standalone/drakconnect:1064
+#: network/netconnect.pm:1530 standalone/drakconnect:1064
 #, c-format
 msgid "Testing your connection..."
 msgstr "正在测试您的连接..."
 
-#: network/netconnect.pm:1503
+#: network/netconnect.pm:1550
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "您的系统现在正连接到 Internet。"
 
-#: network/netconnect.pm:1504
+#: network/netconnect.pm:1551
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "由于安全原因, 现在将断开连接。"
 
-#: network/netconnect.pm:1505
+#: network/netconnect.pm:1552
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -10996,14 +11053,23 @@ msgstr ""
 "看来系统没有连接到 Internet。\n"
 "请重新尝试配置您的连接。"
 
-#: network/netconnect.pm:1523
+#: network/netconnect.pm:1567
+#, c-format
+msgid ""
+"Congratulations, the network and Internet configuration is finished.\n"
+"\n"
+msgstr ""
+"恭喜, 网络和 Internet 配置完成。\n"
+"\n"
+
+#: network/netconnect.pm:1570
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
 "avoid any hostname-related problems."
 msgstr "建议重启动 X 环境以避免任何与主机名有关的问题。"
 
-#: network/netconnect.pm:1524
+#: network/netconnect.pm:1571
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
@@ -11014,7 +11080,7 @@ msgstr ""
 "请从网络监视器或者控制中心测试您的连接。如果您的连接不工作, 您可能想要重新配"
 "置。"
 
-#: network/netconnect.pm:1537
+#: network/netconnect.pm:1584
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -11025,7 +11091,7 @@ msgstr ""
 "由于您正在执行网络安装, 您的网络已经配置好了。\n"
 "单击“确定”保存配置, 或“取消”重新配置网络。\n"
 
-#: network/netconnect.pm:1575
+#: network/netconnect.pm:1622
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -11034,27 +11100,27 @@ msgstr ""
 "发生了意外错误: \n"
 "%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "代理服务器配置"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP 代理服务器"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP 代理服务器"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "代理服务器应该是 http://..."
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL 应该是以“ftp:”或“http:”开头"
@@ -11204,54 +11270,54 @@ msgstr "已在其它计算机上配置"
 msgid "On CUPS server \"%s\""
 msgstr "在 CUPS 服务器“%s”"
 
-#: printer/cups.pm:117 printer/printerdrake.pm:4761
-#: printer/printerdrake.pm:4771 printer/printerdrake.pm:4916
-#: printer/printerdrake.pm:4927 printer/printerdrake.pm:5137
+#: printer/cups.pm:117 printer/printerdrake.pm:4765
+#: printer/printerdrake.pm:4775 printer/printerdrake.pm:4920
+#: printer/printerdrake.pm:4931 printer/printerdrake.pm:5141
 #, c-format
 msgid " (Default)"
 msgstr "(默认)"
 
-#: printer/data.pm:56
+#: printer/data.pm:60
 #, c-format
 msgid "PDQ - Print, Do not Queue"
 msgstr "PDQ - 打印, 不排队"
 
-#: printer/data.pm:57
+#: printer/data.pm:61
 #, c-format
 msgid "PDQ"
 msgstr "PDQ"
 
-#: printer/data.pm:69
+#: printer/data.pm:73
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr "LPD - 行式打印向导"
 
-#: printer/data.pm:70
+#: printer/data.pm:74
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:91
+#: printer/data.pm:95
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - 新一代 LPR"
 
-#: printer/data.pm:92
+#: printer/data.pm:96
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:117
+#: printer/data.pm:121
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr "CUPS - 公共 Unix 打印系统"
 
-#: printer/data.pm:147
+#: printer/data.pm:151
 #, c-format
 msgid "CUPS - Common Unix Printing System (remote server)"
 msgstr "CUPS - 公共 Unix 打印系统(远程服务器)"
 
-#: printer/data.pm:148
+#: printer/data.pm:152
 #, c-format
 msgid "Remote CUPS"
 msgstr "远程 CUPS"
@@ -11315,7 +11381,7 @@ msgstr "建议"
 
 #: printer/main.pm:329 printer/main.pm:634 printer/main.pm:1671
 #: printer/main.pm:2706 printer/main.pm:2715 printer/printerdrake.pm:910
-#: printer/printerdrake.pm:2182 printer/printerdrake.pm:5174
+#: printer/printerdrake.pm:2182 printer/printerdrake.pm:5178
 #, c-format
 msgid "Unknown model"
 msgstr "未知型号"
@@ -11684,7 +11750,7 @@ msgstr ""
 "理上述几点。"
 
 #: printer/printerdrake.pm:138 printer/printerdrake.pm:506
-#: printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:4401
 #, c-format
 msgid "Remote CUPS server and no local CUPS daemon"
 msgstr "远程 CUPS 服务器且无本地 CUPS 守护程序"
@@ -11846,8 +11912,8 @@ msgstr "端口"
 msgid "On, Name or IP of remote server:"
 msgstr "开, 远程服务器的名称或 IP 地址:"
 
-#: printer/printerdrake.pm:514 printer/printerdrake.pm:4406
-#: printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:514 printer/printerdrake.pm:4410
+#: printer/printerdrake.pm:4476
 #, c-format
 msgid "CUPS server name or IP address missing."
 msgstr "缺少 CUPS 服务器名称或 IP 地址。"
@@ -11869,18 +11935,18 @@ msgstr "缺少 CUPS 服务器名称或 IP 地址。"
 #: printer/printerdrake.pm:4007 printer/printerdrake.pm:4079
 #: printer/printerdrake.pm:4100 printer/printerdrake.pm:4110
 #: printer/printerdrake.pm:4205 printer/printerdrake.pm:4300
-#: printer/printerdrake.pm:4306 printer/printerdrake.pm:4326
-#: printer/printerdrake.pm:4433 printer/printerdrake.pm:4542
-#: printer/printerdrake.pm:4562 printer/printerdrake.pm:4571
-#: printer/printerdrake.pm:4586 printer/printerdrake.pm:4784
-#: printer/printerdrake.pm:5236 printer/printerdrake.pm:5313
+#: printer/printerdrake.pm:4306 printer/printerdrake.pm:4330
+#: printer/printerdrake.pm:4437 printer/printerdrake.pm:4546
+#: printer/printerdrake.pm:4566 printer/printerdrake.pm:4575
+#: printer/printerdrake.pm:4590 printer/printerdrake.pm:4788
+#: printer/printerdrake.pm:5240 printer/printerdrake.pm:5317
 #: standalone/printerdrake:67 standalone/printerdrake:554
 #, c-format
 msgid "Printerdrake"
 msgstr "Drak 打印机"
 
 #: printer/printerdrake.pm:567 printer/printerdrake.pm:4008
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4547
 #, c-format
 msgid "Reading printer data..."
 msgstr "正在读取打印机数据..."
@@ -11910,7 +11976,7 @@ msgstr ""
 "\n"
 "不需要在这里配置远程的 CUPS 服务器上的打印机；这些打印机会被自动探测到。"
 
-#: printer/printerdrake.pm:620 printer/printerdrake.pm:4786
+#: printer/printerdrake.pm:620 printer/printerdrake.pm:4790
 #, c-format
 msgid ""
 "\n"
@@ -12124,7 +12190,7 @@ msgstr "如果您的打印机不在列表中, 请选择兼容的(参考打印机
 msgid "Configuring printer on %s..."
 msgstr "正在配置位于 %s 上的打印机..."
 
-#: printer/printerdrake.pm:885 printer/printerdrake.pm:4563
+#: printer/printerdrake.pm:885 printer/printerdrake.pm:4567
 #, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr "正在配置打印机“%s”..."
@@ -12132,7 +12198,7 @@ msgstr "正在配置打印机“%s”..."
 #: printer/printerdrake.pm:1051 printer/printerdrake.pm:1063
 #: printer/printerdrake.pm:1170 printer/printerdrake.pm:2191
 #: printer/printerdrake.pm:2206 printer/printerdrake.pm:2276
-#: printer/printerdrake.pm:4803 printer/printerdrake.pm:4973
+#: printer/printerdrake.pm:4807 printer/printerdrake.pm:4977
 #, c-format
 msgid "Add a new printer"
 msgstr "添加新打印机"
@@ -12551,12 +12617,12 @@ msgid "Remote printer name missing!"
 msgstr "没有找到远程打印机！"
 
 #: printer/printerdrake.pm:1515 printer/printerdrake.pm:1986
-#: printer/printerdrake.pm:2111 standalone/drakTermServ:445
-#: standalone/drakTermServ:740 standalone/drakTermServ:757
-#: standalone/drakTermServ:1469 standalone/drakTermServ:1477
-#: standalone/drakTermServ:1489 standalone/drakbackup:512
-#: standalone/drakbackup:618 standalone/drakbackup:653
-#: standalone/drakbackup:773 standalone/drakroam:385 standalone/harddrake2:261
+#: printer/printerdrake.pm:2111 standalone/drakTermServ:446
+#: standalone/drakTermServ:766 standalone/drakTermServ:782
+#: standalone/drakTermServ:1521 standalone/drakTermServ:1530
+#: standalone/drakTermServ:1542 standalone/drakbackup:499
+#: standalone/drakbackup:605 standalone/drakbackup:640
+#: standalone/drakbackup:741 standalone/drakroam:390 standalone/harddrake2:257
 #, c-format
 msgid "Information"
 msgstr "信息"
@@ -13426,7 +13492,7 @@ msgstr ""
 msgid "Did it work properly?"
 msgstr "工作正常?"
 
-#: printer/printerdrake.pm:3798 printer/printerdrake.pm:5175
+#: printer/printerdrake.pm:3798 printer/printerdrake.pm:5179
 #, c-format
 msgid "Raw printer"
 msgstr "原始打印机"
@@ -13959,17 +14025,17 @@ msgstr "正在删除 %s..."
 msgid "Could not remove the %s printing system!"
 msgstr "无法删除 %s 打印系统!"
 
-#: printer/printerdrake.pm:4326
+#: printer/printerdrake.pm:4330
 #, c-format
 msgid "Installing %s..."
 msgstr "正在安装 %s..."
 
-#: printer/printerdrake.pm:4330
+#: printer/printerdrake.pm:4334
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "无法安装 %s 打印系统!"
 
-#: printer/printerdrake.pm:4398
+#: printer/printerdrake.pm:4402
 #, c-format
 msgid ""
 "In this mode there is no local printing system, all printing requests go "
@@ -13981,7 +14047,7 @@ msgstr ""
 "意, 您以后将无法定义本地打印队列, 而且如果指定的服务器宕机的话, 将无法通过本"
 "机打印。"
 
-#: printer/printerdrake.pm:4400
+#: printer/printerdrake.pm:4404
 #, c-format
 msgid ""
 "Enter the host name or IP of your CUPS server and click OK if you want to "
@@ -13990,32 +14056,32 @@ msgstr ""
 "如果您想要使用此模式, 请输入您 CUPS 服务器的主机名或 IP 地址, 然后单击“确"
 "定”。否则请单击“退出”。”"
 
-#: printer/printerdrake.pm:4414
+#: printer/printerdrake.pm:4418
 #, c-format
 msgid "Name or IP of remote server:"
 msgstr "远程服务器的名称或 IP 地址:"
 
-#: printer/printerdrake.pm:4434
+#: printer/printerdrake.pm:4438
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "正在设置默认打印机..."
 
-#: printer/printerdrake.pm:4454
+#: printer/printerdrake.pm:4458
 #, c-format
 msgid "Local CUPS printing system or remote CUPS server?"
 msgstr "是本地 CUPS 打印系统还是远程 CUPS 服务器?"
 
-#: printer/printerdrake.pm:4455
+#: printer/printerdrake.pm:4459
 #, c-format
 msgid "The CUPS printing system can be used in two ways: "
 msgstr "CUPS 打印系统可以通过两种方式使用:"
 
-#: printer/printerdrake.pm:4457
+#: printer/printerdrake.pm:4461
 #, c-format
 msgid "1. The CUPS printing system can run locally. "
 msgstr "1. 在本地运行 CUPS 打印系统。"
 
-#: printer/printerdrake.pm:4458
+#: printer/printerdrake.pm:4462
 #, c-format
 msgid ""
 "Then locally connected printers can be used and remote printers on other "
@@ -14024,7 +14090,7 @@ msgstr ""
 "既可以使用本地连接的打印机, 也可以自动发现同一网络中安装在其它 CUPS 服务器上"
 "的远程打印机。"
 
-#: printer/printerdrake.pm:4459
+#: printer/printerdrake.pm:4463
 #, c-format
 msgid ""
 "Disadvantage of this approach is, that more resources on the local machine "
@@ -14036,12 +14102,12 @@ msgstr ""
 "后台运行 CUPS 守护程序, 这可能需要占用一些内存。此外还需要开放IPP 端口(号码 "
 "631)。"
 
-#: printer/printerdrake.pm:4461
+#: printer/printerdrake.pm:4465
 #, c-format
 msgid "2. All printing requests are immediately sent to a remote CUPS server. "
 msgstr "2. 全部打印请求立即发送给远程 CUPS 服务器。"
 
-#: printer/printerdrake.pm:4462
+#: printer/printerdrake.pm:4466
 #, c-format
 msgid ""
 "Here local resource occupation is reduced to a minimum. No CUPS daemon is "
@@ -14051,7 +14117,7 @@ msgstr ""
 "这样可将本地资源占用降低最低。既不启动 CUPS 守护程序, 也无需开放端口, 设置本"
 "地打印队列也无需软件架构支持, 这样内存和磁盘空间都基本上不会占用。"
 
-#: printer/printerdrake.pm:4463
+#: printer/printerdrake.pm:4467
 #, c-format
 msgid ""
 "Disadvantage is that it is not possible to define local printers then and if "
@@ -14060,48 +14126,48 @@ msgstr ""
 "缺点是, 以后无法定义本地打印机。而且如果指定的服务器宕机的话, 将无法通过本机"
 "打印。"
 
-#: printer/printerdrake.pm:4465
+#: printer/printerdrake.pm:4469
 #, c-format
 msgid "How should CUPS be set up on your machine?"
 msgstr "如何在您的计算机上设置 CUPS?"
 
-#: printer/printerdrake.pm:4469 printer/printerdrake.pm:4484
-#: printer/printerdrake.pm:4488 printer/printerdrake.pm:4494
+#: printer/printerdrake.pm:4473 printer/printerdrake.pm:4488
+#: printer/printerdrake.pm:4492 printer/printerdrake.pm:4498
 #, c-format
 msgid "Remote server, specify Name or IP here:"
 msgstr "远程服务器, 在此指定名称或 IP 地址:"
 
-#: printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4487
 #, c-format
 msgid "Local CUPS printing system"
 msgstr "本地 CUPS 打印系统"
 
-#: printer/printerdrake.pm:4522
+#: printer/printerdrake.pm:4526
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "选择打印机系统"
 
-#: printer/printerdrake.pm:4523
+#: printer/printerdrake.pm:4527
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "您需要使用哪种打印系统?"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4576
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "配置打印机“%s”失败"
 
-#: printer/printerdrake.pm:4587
+#: printer/printerdrake.pm:4591
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "正在安装 Foomatic..."
 
-#: printer/printerdrake.pm:4593
+#: printer/printerdrake.pm:4597
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr "无法安装 %s 软件包, %s 无法启动!"
 
-#: printer/printerdrake.pm:4785
+#: printer/printerdrake.pm:4789
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -14111,48 +14177,48 @@ msgstr ""
 "下列打印机已配置。双击打印机可更改其设置、将其设为默认打印机, 或者查看相关信"
 "息。"
 
-#: printer/printerdrake.pm:4815
+#: printer/printerdrake.pm:4819
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "显示可用的全部远程 CUPS 打印机"
 
-#: printer/printerdrake.pm:4816
+#: printer/printerdrake.pm:4820
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr "更新打印列表(显示所有可用的远程 CUPS 打印机)"
 
-#: printer/printerdrake.pm:4827
+#: printer/printerdrake.pm:4831
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPS 配置"
 
-#: printer/printerdrake.pm:4839
+#: printer/printerdrake.pm:4843
 #, c-format
 msgid "Change the printing system"
 msgstr "更改打印系统"
 
-#: printer/printerdrake.pm:4848
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "Normal Mode"
 msgstr "普通模式"
 
-#: printer/printerdrake.pm:4849
+#: printer/printerdrake.pm:4853
 #, c-format
 msgid "Expert Mode"
 msgstr "专家模式"
 
-#: printer/printerdrake.pm:5118 printer/printerdrake.pm:5176
-#: printer/printerdrake.pm:5255 printer/printerdrake.pm:5264
+#: printer/printerdrake.pm:5122 printer/printerdrake.pm:5180
+#: printer/printerdrake.pm:5259 printer/printerdrake.pm:5268
 #, c-format
 msgid "Printer options"
 msgstr "打印机选项"
 
-#: printer/printerdrake.pm:5154
+#: printer/printerdrake.pm:5158
 #, c-format
 msgid "Modify printer configuration"
 msgstr "修改打印机配置"
 
-#: printer/printerdrake.pm:5156
+#: printer/printerdrake.pm:5160
 #, c-format
 msgid ""
 "Printer %s%s\n"
@@ -14161,99 +14227,99 @@ msgstr ""
 "打印机 %s%s\n"
 "真的要修改吗?"
 
-#: printer/printerdrake.pm:5161
+#: printer/printerdrake.pm:5165
 #, c-format
 msgid "This printer is disabled"
 msgstr "此打印机已禁用"
 
-#: printer/printerdrake.pm:5163
+#: printer/printerdrake.pm:5167
 #, c-format
 msgid "Do it!"
 msgstr "执行！"
 
-#: printer/printerdrake.pm:5168 printer/printerdrake.pm:5223
+#: printer/printerdrake.pm:5172 printer/printerdrake.pm:5227
 #, c-format
 msgid "Printer connection type"
 msgstr "打印机连接类型"
 
-#: printer/printerdrake.pm:5169 printer/printerdrake.pm:5229
+#: printer/printerdrake.pm:5173 printer/printerdrake.pm:5233
 #, c-format
 msgid "Printer name, description, location"
 msgstr "打印机名称、描述、位置"
 
-#: printer/printerdrake.pm:5171 printer/printerdrake.pm:5248
+#: printer/printerdrake.pm:5175 printer/printerdrake.pm:5252
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "打印机厂家, 型号, 驱动"
 
-#: printer/printerdrake.pm:5172 printer/printerdrake.pm:5249
+#: printer/printerdrake.pm:5176 printer/printerdrake.pm:5253
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "打印机厂家, 型号"
 
-#: printer/printerdrake.pm:5178 printer/printerdrake.pm:5259
+#: printer/printerdrake.pm:5182 printer/printerdrake.pm:5263
 #, c-format
 msgid "Set this printer as the default"
 msgstr "设置该打印机为默认"
 
-#: printer/printerdrake.pm:5183 printer/printerdrake.pm:5265
-#: printer/printerdrake.pm:5267
+#: printer/printerdrake.pm:5187 printer/printerdrake.pm:5269
+#: printer/printerdrake.pm:5271
 #, c-format
 msgid "Enable Printer"
 msgstr "启用打印机"
 
-#: printer/printerdrake.pm:5186 printer/printerdrake.pm:5270
-#: printer/printerdrake.pm:5272
+#: printer/printerdrake.pm:5190 printer/printerdrake.pm:5274
+#: printer/printerdrake.pm:5276
 #, c-format
 msgid "Disable Printer"
 msgstr "禁用打印机"
 
-#: printer/printerdrake.pm:5187 printer/printerdrake.pm:5275
+#: printer/printerdrake.pm:5191 printer/printerdrake.pm:5279
 #, c-format
 msgid "Print test pages"
 msgstr "打印测试页"
 
-#: printer/printerdrake.pm:5188 printer/printerdrake.pm:5277
+#: printer/printerdrake.pm:5192 printer/printerdrake.pm:5281
 #, c-format
 msgid "Learn how to use this printer"
 msgstr "了解怎样使用此打印机"
 
-#: printer/printerdrake.pm:5189 printer/printerdrake.pm:5279
+#: printer/printerdrake.pm:5193 printer/printerdrake.pm:5283
 #, c-format
 msgid "Remove printer"
 msgstr "删除打印机"
 
-#: printer/printerdrake.pm:5237
+#: printer/printerdrake.pm:5241
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "删除旧打印机“%s”..."
 
-#: printer/printerdrake.pm:5268
+#: printer/printerdrake.pm:5272
 #, c-format
 msgid "Printer \"%s\" is now enabled."
 msgstr "打印机“%s”现已启用。"
 
-#: printer/printerdrake.pm:5273
+#: printer/printerdrake.pm:5277
 #, c-format
 msgid "Printer \"%s\" is now disabled."
 msgstr "打印机“%s”现已禁用。"
 
-#: printer/printerdrake.pm:5310
+#: printer/printerdrake.pm:5314
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "真的要删除打印机“%s”?"
 
-#: printer/printerdrake.pm:5314
+#: printer/printerdrake.pm:5318
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "正在删除打印机“%s”..."
 
-#: printer/printerdrake.pm:5338
+#: printer/printerdrake.pm:5342
 #, c-format
 msgid "Default printer"
 msgstr "默认打印机"
 
-#: printer/printerdrake.pm:5339
+#: printer/printerdrake.pm:5343
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "打印机“%s”设为缺省打印机。"
@@ -15403,7 +15469,7 @@ msgid ""
 "about this service, sorry."
 msgstr "没有该服务的附加信息。"
 
-#: services.pm:224 ugtk2.pm:1019
+#: services.pm:224 ugtk2.pm:1018
 #, c-format
 msgid "Info"
 msgstr "信息"
@@ -15418,12 +15484,12 @@ msgstr "请求时启动"
 msgid "On boot"
 msgstr "启动时"
 
-#: services.pm:244 standalone/drakroam:181
+#: services.pm:244 standalone/drakroam:185
 #, c-format
 msgid "Start"
 msgstr "启动"
 
-#: services.pm:244 standalone/drakroam:182
+#: services.pm:244 standalone/drakroam:186
 #, c-format
 msgid "Stop"
 msgstr "停止"
@@ -16653,7 +16719,7 @@ msgstr "Icewm, Window Maker, Enlightenment, Fvwm 等"
 msgid "Utilities"
 msgstr "工具"
 
-#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:382
 #, c-format
 msgid "SSH Server"
 msgstr "SSH 服务器"
@@ -16951,17 +17017,17 @@ msgstr "请注销, 然后同时按 Ctrl-Alt-BackSpace"
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "您需要注销后重新登录才能让更改生效"
 
-#: standalone/drakTermServ:74
+#: standalone/drakTermServ:75
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "没有终端服务器就无用"
 
-#: standalone/drakTermServ:106 standalone/drakTermServ:112
+#: standalone/drakTermServ:107 standalone/drakTermServ:113
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s 需要用户名...\n"
 
-#: standalone/drakTermServ:123
+#: standalone/drakTermServ:124
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -16970,77 +17036,77 @@ msgstr ""
 "%s: %s 需要主机名、MAC 地址、IP、nbi-image、代表瘦客户端的 0/1、代表本地配置"
 "的 0/1...\n"
 
-#: standalone/drakTermServ:129
+#: standalone/drakTermServ:130
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s 需要主机名...\n"
 
-#: standalone/drakTermServ:211 standalone/drakTermServ:214
+#: standalone/drakTermServ:212 standalone/drakTermServ:215
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "终端服务器配置"
 
-#: standalone/drakTermServ:220
+#: standalone/drakTermServ:221
 #, c-format
 msgid "Enable Server"
 msgstr "启用服务器"
 
-#: standalone/drakTermServ:226
+#: standalone/drakTermServ:227
 #, c-format
 msgid "Disable Server"
 msgstr "禁用服务器"
 
-#: standalone/drakTermServ:232
+#: standalone/drakTermServ:233
 #, c-format
 msgid "Start Server"
 msgstr "启动服务器"
 
-#: standalone/drakTermServ:238
+#: standalone/drakTermServ:239
 #, c-format
 msgid "Stop Server"
 msgstr "停止服务器"
 
-#: standalone/drakTermServ:247
+#: standalone/drakTermServ:248
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot 软盘/ISO"
 
-#: standalone/drakTermServ:251
+#: standalone/drakTermServ:252
 #, c-format
 msgid "Net Boot Images"
 msgstr "网络启动磁盘镜像"
 
-#: standalone/drakTermServ:258
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Add/Del Users"
 msgstr "添加/删除用户"
 
-#: standalone/drakTermServ:262
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Add/Del Clients"
 msgstr "添加/删除客户"
 
-#: standalone/drakTermServ:270
+#: standalone/drakTermServ:271
 #, c-format
 msgid "Images"
 msgstr "映像"
 
-#: standalone/drakTermServ:271
+#: standalone/drakTermServ:272
 #, c-format
 msgid "Clients/Users"
 msgstr "客户/用户"
 
-#: standalone/drakTermServ:289 standalone/drakbug:47
+#: standalone/drakTermServ:290 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "初次使用向导"
 
-#: standalone/drakTermServ:325 standalone/drakTermServ:326
+#: standalone/drakTermServ:326 standalone/drakTermServ:327
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr "%s 定义为 dm, 将 gdm 用户添加到 /etc/passwd$$CLIENT$$"
 
-#: standalone/drakTermServ:332
+#: standalone/drakTermServ:333
 #, c-format
 msgid ""
 "\n"
@@ -17077,27 +17143,27 @@ msgstr ""
 "    e) 要求您制作启动软盘。\n"
 "    f) 如果是瘦客户的话, 询问您是否想要重新启动 K 登陆管理器(KDM)。\n"
 
-#: standalone/drakTermServ:377
+#: standalone/drakTermServ:378
 #, c-format
 msgid "Cancel Wizard"
 msgstr "取消向导"
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:393
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "请保存 dhcpd 配置!"
 
-#: standalone/drakTermServ:420
+#: standalone/drakTermServ:421
 #, c-format
 msgid "Use thin clients."
 msgstr "使用瘦客户端。"
 
-#: standalone/drakTermServ:422
+#: standalone/drakTermServ:423
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr "将客户端的 X 键盘设置与服务器同步。"
 
-#: standalone/drakTermServ:424
+#: standalone/drakTermServ:425
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -17109,40 +17175,53 @@ msgstr ""
 "    “瘦”客户端会使用服务器的 CPU/内存, 只是使用客户端进行显示。\n"
 "    “胖”客户端将会使用自己的 CPU/内存, 但会使用服务器的文件系统。"
 
-#: standalone/drakTermServ:444
+#: standalone/drakTermServ:445
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "为全部内核创建网络引导映像"
 
-#: standalone/drakTermServ:445 standalone/drakTermServ:740
-#: standalone/drakTermServ:757
+#: standalone/drakTermServ:446 standalone/drakTermServ:766
+#: standalone/drakTermServ:782
 #, c-format
 msgid "This will take a few minutes."
 msgstr "这将花费几分钟。"
 
-#: standalone/drakTermServ:449 standalone/drakTermServ:468
+#: standalone/drakTermServ:455 standalone/drakTermServ:496
 #, c-format
 msgid "Done!"
 msgstr "完成！"
 
-#: standalone/drakTermServ:454
+#: standalone/drakTermServ:467 standalone/drakTermServ:847
+#, c-format
+msgid "%s failed"
+msgstr ""
+
+#: standalone/drakTermServ:476
+#, c-format
+msgid ""
+"Not enough space to create\n"
+"NBIs in %s.\n"
+"Needed: %d MB, Free: %d MB"
+msgstr ""
+
+#: standalone/drakTermServ:482
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr "将服务器用户列表与客户列表同步, 包括 root。"
 
-#: standalone/drakTermServ:474
+#: standalone/drakTermServ:502
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr "为了要启用为瘦客户所作的更改, 必须重新启动显示管理器。立即重新启动吗?"
 
-#: standalone/drakTermServ:509
+#: standalone/drakTermServ:537
 #, c-format
 msgid "Terminal Server Overview"
 msgstr "终端服务器概览"
 
-#: standalone/drakTermServ:510
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -17165,7 +17244,7 @@ msgstr ""
 "etherboot-pcimap.include, 与 dhcpd.conf 相关联, \n"
 "        \t您需要至少为一个完整的内核创建以太网启动镜像。"
 
-#: standalone/drakTermServ:516
+#: standalone/drakTermServ:544
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -17197,7 +17276,7 @@ msgstr ""
 "\t\t\t \n"
 "        \t\t一个可以支持无盘工作站典型的 dhcpd.conf 应该是这样:"
 
-#: standalone/drakTermServ:534
+#: standalone/drakTermServ:562
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -17250,7 +17329,7 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\t注意:在添加或更改客户端后您必须停止/启动服务器。"
 
-#: standalone/drakTermServ:554
+#: standalone/drakTermServ:582
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -17279,7 +17358,7 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\t这里的子网/掩码应该与您的网络相同。"
 
-#: standalone/drakTermServ:566
+#: standalone/drakTermServ:594
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -17295,7 +17374,7 @@ msgstr ""
 "        \t\t除了要在 /etc/shadow 中之外, 还应在 %s\n"
 "        \t\t中存有副本。drakTermServ 能够帮助您完成这一过程。"
 
-#: standalone/drakTermServ:570
+#: standalone/drakTermServ:598
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -17312,7 +17391,7 @@ msgstr ""
 "助您创建\n"
 "        \t\t这些文件。"
 
-#: standalone/drakTermServ:575
+#: standalone/drakTermServ:603
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -17344,7 +17423,7 @@ msgstr ""
 "        终端服务器这一特性。本地配置能够被关闭, 但\n"
 "        保留配置文件, 只要客户端机器被配置了的话。"
 
-#: standalone/drakTermServ:584
+#: standalone/drakTermServ:612
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -17396,7 +17475,7 @@ msgstr ""
 "更改\n"
 "        \t\t为 /var/lib/tftpboot, 这里正是 mkinitrd-net 存放映像的地点。"
 
-#: standalone/drakTermServ:605
+#: standalone/drakTermServ:633
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -17409,87 +17488,75 @@ msgid ""
 "        \tA basic example of creating a boot floppy for a 3Com 3c509 "
 "manually:\n"
 "        \t\t\n"
-"        \tcat /usr/lib/etherboot/floppyload.bin \\\n"
-"        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
-"        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
-msgstr ""
-"        - 创建 etherboot 启动软盘/光盘:\n"
-"        \t\t无法工作站需要在网卡上有 ROM 镜像, 或者启动软盘或光盘来初始化启动"
-"过程。\n"
-"        \t\t“Drak 终端服务”能够帮助您根据客户端计算机的网卡生成这些镜像。\n"
-"        \t\t\n"
-"        \t\t为 3Com 3c509 手工创建一张启动软盘的例子:\n"
-"        \t\t\n"
-"        \tcat /usr/lib/etherboot/floppyload.bin \\\n"
-"        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
-"        \t\t/usr/lib/etherboot/lzrom/3c509.lzrom > /dev/fd0"
+"        \tcat /usr/share/etherboot/zdsk/3c509.zdsk > /dev/fd0"
+msgstr ""
 
-#: standalone/drakTermServ:640
+#: standalone/drakTermServ:666
 #, c-format
 msgid "Boot Floppy"
 msgstr "启动软盘"
 
-#: standalone/drakTermServ:642
+#: standalone/drakTermServ:668
 #, c-format
 msgid "Boot ISO"
 msgstr "启动 ISO"
 
-#: standalone/drakTermServ:644
+#: standalone/drakTermServ:670
 #, c-format
 msgid "PXE Image"
 msgstr "PXE 映像"
 
-#: standalone/drakTermServ:705
+#: standalone/drakTermServ:731
 #, c-format
 msgid "Default kernel version"
 msgstr "默认内核版本"
 
-#: standalone/drakTermServ:708
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Create PXE images."
 msgstr "创建 PXE 映像。"
 
-#: standalone/drakTermServ:738
+#: standalone/drakTermServ:764
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "建造整个内核 -->"
 
-#: standalone/drakTermServ:746
+#: standalone/drakTermServ:771
 #, c-format
 msgid "No kernel selected!"
 msgstr "没有选择内核！"
 
-#: standalone/drakTermServ:749
+#: standalone/drakTermServ:774
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "建造单独的网卡 -->"
 
-#: standalone/drakTermServ:753
+#: standalone/drakTermServ:778
 #, c-format
 msgid "No NIC selected!"
 msgstr "没有选择网卡！"
 
-#: standalone/drakTermServ:756
+#: standalone/drakTermServ:781
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "建造全部内核 -->"
 
-#: standalone/drakTermServ:767
+#: standalone/drakTermServ:796
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- 删除"
 
-#: standalone/drakTermServ:772
+#: standalone/drakTermServ:801
 #, c-format
 msgid "No image selected!"
 msgstr "没有选择图像！"
 
-#: standalone/drakTermServ:775
+#: standalone/drakTermServ:804
 #, c-format
 msgid "Delete All NBIs"
 msgstr "删除所有 NBI"
 
-#: standalone/drakTermServ:901
+#: standalone/drakTermServ:933
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -17499,101 +17566,101 @@ msgstr ""
 "！！！表明系统数据库中的密码与终端服务器数据库中的密码不同。\n"
 "请删除/在终端服务器中重新添加用户后才能登录。"
 
-#: standalone/drakTermServ:906
+#: standalone/drakTermServ:938
 #, c-format
 msgid "Add User -->"
 msgstr "添加用户 -->"
 
-#: standalone/drakTermServ:912
+#: standalone/drakTermServ:944
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- 删除用户"
 
-#: standalone/drakTermServ:948
+#: standalone/drakTermServ:980
 #, c-format
 msgid "type: %s"
 msgstr "类型: %s"
 
-#: standalone/drakTermServ:952
+#: standalone/drakTermServ:984
 #, c-format
 msgid "local config: %s"
 msgstr "本地配置: %s"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:1014
 #, c-format
 msgid ""
 "Allow local hardware\n"
 "configuration."
 msgstr "允许本地硬件配置。"
 
-#: standalone/drakTermServ:991
+#: standalone/drakTermServ:1023
 #, c-format
 msgid "No net boot images created!"
 msgstr "没有创建网络启动镜像！"
 
-#: standalone/drakTermServ:1010
+#: standalone/drakTermServ:1042
 #, c-format
 msgid "Thin Client"
 msgstr "瘦客户端"
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:1046
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "允许瘦客户端"
 
-#: standalone/drakTermServ:1015
+#: standalone/drakTermServ:1047
 #, c-format
 msgid ""
 "Sync client X keyboard\n"
 " settings with server."
 msgstr "将客户端的 X 键盘设置与服务器同步。"
 
-#: standalone/drakTermServ:1016
+#: standalone/drakTermServ:1048
 #, c-format
 msgid "Add Client -->"
 msgstr "添加客户 -->"
 
-#: standalone/drakTermServ:1030
+#: standalone/drakTermServ:1062
 #, c-format
 msgid "type: fat"
 msgstr "类型: 胖"
 
-#: standalone/drakTermServ:1031
+#: standalone/drakTermServ:1063
 #, c-format
 msgid "type: thin"
 msgstr "类型: 瘦"
 
-#: standalone/drakTermServ:1038
+#: standalone/drakTermServ:1070
 #, c-format
 msgid "local config: false"
 msgstr "本机配置: 假"
 
-#: standalone/drakTermServ:1039
+#: standalone/drakTermServ:1071
 #, c-format
 msgid "local config: true"
 msgstr "本地配置: 真"
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1079
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- 编辑客户"
 
-#: standalone/drakTermServ:1073
+#: standalone/drakTermServ:1105
 #, c-format
 msgid "Disable Local Config"
 msgstr "禁用本地配置"
 
-#: standalone/drakTermServ:1080
+#: standalone/drakTermServ:1112
 #, c-format
 msgid "Delete Client"
 msgstr "删除客户"
 
-#: standalone/drakTermServ:1089
+#: standalone/drakTermServ:1121
 #, c-format
 msgid "dhcpd Config..."
 msgstr "dhcpd 配置..."
 
-#: standalone/drakTermServ:1104
+#: standalone/drakTermServ:1136
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -17602,77 +17669,77 @@ msgstr ""
 "需要重新启动显示管理器以便所有更改生效。\n"
 "(service dm restart - 控制台上)"
 
-#: standalone/drakTermServ:1149
+#: standalone/drakTermServ:1181
 #, c-format
 msgid "Thin clients will not work with autologin. Disable autologin?"
 msgstr "瘦客户无法使用自动登录。禁用自动登录吗?"
 
-#: standalone/drakTermServ:1165
+#: standalone/drakTermServ:1197
 #, c-format
 msgid "All clients will use %s"
 msgstr "全部客户都使用 %s"
 
-#: standalone/drakTermServ:1197
+#: standalone/drakTermServ:1231
 #, c-format
 msgid "Subnet:"
 msgstr "子网: "
 
-#: standalone/drakTermServ:1204
+#: standalone/drakTermServ:1238
 #, c-format
 msgid "Netmask:"
 msgstr "子网掩码: "
 
-#: standalone/drakTermServ:1211
+#: standalone/drakTermServ:1245
 #, c-format
 msgid "Routers:"
 msgstr "路由器: "
 
-#: standalone/drakTermServ:1218
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Subnet Mask:"
 msgstr "子网掩码: "
 
-#: standalone/drakTermServ:1225
+#: standalone/drakTermServ:1259
 #, c-format
 msgid "Broadcast Address:"
 msgstr "广播地址: "
 
-#: standalone/drakTermServ:1232
+#: standalone/drakTermServ:1266
 #, c-format
 msgid "Domain Name:"
 msgstr "域名: "
 
-#: standalone/drakTermServ:1240
+#: standalone/drakTermServ:1274
 #, c-format
 msgid "Name Servers:"
 msgstr "命名服务器: "
 
-#: standalone/drakTermServ:1251
+#: standalone/drakTermServ:1285
 #, c-format
 msgid "IP Range Start:"
 msgstr "IP 范围起点: "
 
-#: standalone/drakTermServ:1252
+#: standalone/drakTermServ:1286
 #, c-format
 msgid "IP Range End:"
 msgstr "IP 范围终点: "
 
-#: standalone/drakTermServ:1294
+#: standalone/drakTermServ:1328
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr "在已有配置中追加 TS 包含"
 
-#: standalone/drakTermServ:1296
+#: standalone/drakTermServ:1330
 #, c-format
 msgid "Write Config"
 msgstr "写入配置"
 
-#: standalone/drakTermServ:1312
+#: standalone/drakTermServ:1346
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "dhcpd 服务器配置"
 
-#: standalone/drakTermServ:1313
+#: standalone/drakTermServ:1347
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -17682,97 +17749,104 @@ msgstr ""
 "这些值中绝大多数会从您正在运行的系统\n"
 "中提取。若需要您可以进行修改。"
 
-#: standalone/drakTermServ:1316
+#: standalone/drakTermServ:1350
 #, c-format
-msgid "Dynamic IP Address Pool:"
-msgstr "动态 IP 地址池: "
+msgid ""
+"Dynamic IP Address Pool\n"
+"(needed for PXE clients):"
+msgstr ""
 
-#: standalone/drakTermServ:1463
+#: standalone/drakTermServ:1503
+#, c-format
+msgid "Write to %s failed!"
+msgstr ""
+
+#: standalone/drakTermServ:1515
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "请插入软盘: "
 
-#: standalone/drakTermServ:1467
+#: standalone/drakTermServ:1519
 #, c-format
 msgid "Could not access the floppy!"
 msgstr "无法访问软盘！"
 
-#: standalone/drakTermServ:1469
+#: standalone/drakTermServ:1521
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "现在可以取出软盘了"
 
-#: standalone/drakTermServ:1472
+#: standalone/drakTermServ:1524
 #, c-format
 msgid "No floppy drive available!"
 msgstr "没有可用的软盘驱动器！"
 
-#: standalone/drakTermServ:1477
+#: standalone/drakTermServ:1530
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "PXE 镜像是 %s/%s"
 
-#: standalone/drakTermServ:1479
+#: standalone/drakTermServ:1532
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "写入 %s/%s 出错"
 
-#: standalone/drakTermServ:1489
+#: standalone/drakTermServ:1542
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etherboot ISO 镜像是 %s"
 
-#: standalone/drakTermServ:1491
+#: standalone/drakTermServ:1544
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "发生错误！- mkisofs 安装了吗?"
 
-#: standalone/drakTermServ:1512
+#: standalone/drakTermServ:1565
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "需要先创建 /etc/dhcpd.conf 文件！"
 
-#: standalone/drakTermServ:1672
+#: standalone/drakTermServ:1724
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "%s 的密码在中断服务器中无效 - 正在重写...\n"
 
-#: standalone/drakTermServ:1685
+#: standalone/drakTermServ:1737
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s 不是用户...\n"
 
-#: standalone/drakTermServ:1686
+#: standalone/drakTermServ:1738
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s 已经是终端服务器用户了\n"
 
-#: standalone/drakTermServ:1688
+#: standalone/drakTermServ:1740
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "将 %s 添加到终端服务器失败！\n"
 
-#: standalone/drakTermServ:1690
+#: standalone/drakTermServ:1742
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s 已加入终端服务器\n"
 
-#: standalone/drakTermServ:1707
+#: standalone/drakTermServ:1759
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "已删除 %s...\n"
 
-#: standalone/drakTermServ:1709 standalone/drakTermServ:1782
+#: standalone/drakTermServ:1761 standalone/drakTermServ:1834
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s 未找到...\n"
 
-#: standalone/drakTermServ:1810
+#: standalone/drakTermServ:1862
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr "/etc/hosts.allow 和 /etc/hosts.deny 已经配置 - 无更改"
 
-#: standalone/drakTermServ:1950
+#: standalone/drakTermServ:2002
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "配置已更改 - 重新启动 clusternfs/dhcpd 吗?"
@@ -17896,57 +17970,47 @@ msgstr "添加项目"
 msgid "Remove the last item"
 msgstr "删除最后一项"
 
-#: standalone/drakbackup:88
-#, c-format
-msgid "hd"
-msgstr "硬盘"
-
-#: standalone/drakbackup:88
-#, c-format
-msgid "tape"
-msgstr "磁带机"
-
-#: standalone/drakbackup:152
+#: standalone/drakbackup:153
 #, c-format
 msgid ""
 "Expect is an extension to the TCL scripting language that allows interactive "
 "sessions without user intervention."
 msgstr "异常是 TCL 脚本语言的一种扩展, 允许免打扰的交互式会话。"
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr "在“Drak 备份”的配置中存储此系统的密码。"
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
 "the cdrw is erased before each backup."
 msgstr "对于多轨道 CD, 仅仅第一段会删除 cdrw。否则会在每次备份时删除 cdrw。"
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
 "whether incremental or differential mode is used."
 msgstr "此选项将保存已经更改的文件。具体的行为依赖于所用的是增量还是差异模式。"
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
 "last backup."
 msgstr "增量备份只备份那些自上次备份后更改或新建的文件。"
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
 "original 'base' backup."
 msgstr "差异备份只保存自上次“基本”备份后更改或新建的文件。"
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
 "This should be a local user or email address that you want the backup "
@@ -17955,7 +18019,14 @@ msgstr ""
 "这应该是以逗号分隔的本地用户或电子邮件列表, 备份结果将会发送给这些人。您还需"
 "要能够正常工作的邮件服务器。"
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
+#, c-format
+msgid ""
+"This should be the return address that you want the backup results sent "
+"from. Default is drakbakup."
+msgstr ""
+
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -17963,7 +18034,7 @@ msgid ""
 msgstr ""
 "在目录树顶层列出的 .backupignore 文件中列出的文件或通配符表将不会备份。"
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -17973,7 +18044,7 @@ msgstr ""
 "对于备份到其它介质, 文件仍然会先在硬盘上创建, 然后移动到其它介质。启用此选项"
 "将在备份完成后删除硬盘上的 tar 文件。"
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -17983,7 +18054,7 @@ msgstr ""
 "某些协议, 如 rsync, 可以在服务器后端配置。除了使用目录路径, 您还可以使用服务"
 "器路径的“模块”名。"
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:164
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
@@ -17992,27 +18063,27 @@ msgstr ""
 "自定义允许您指定您自己的天和时间。其它选项将使用 /etc/crontab 中的 run-"
 "parts。"
 
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
 msgstr "没有为 cron 操作选择介质。"
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr "没有为 cron 操作选择间隔。"
 
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr "非 root 用户还不能使用间隔 cron"
 
-#: standalone/drakbackup:462 standalone/logdrake:437
+#: standalone/drakbackup:465 standalone/logdrake:438
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr "“%s”既不是有效的电子邮件, 也不是已存在的本地用户!"
 
-#: standalone/drakbackup:466 standalone/logdrake:442
+#: standalone/drakbackup:469 standalone/logdrake:443
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -18020,22 +18091,22 @@ msgid ""
 msgstr ""
 "“%s”是本地用户, 但是您没有选择本地 SMTP, 所以您必须使用完整的电子邮件地址!"
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:478
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr "有效用户列表已经更改, 重写配置文件。"
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:480
 #, c-format
 msgid "Old user list:\n"
 msgstr "旧用户列表:\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:482
 #, c-format
 msgid "New user list:\n"
 msgstr "新用户列表:\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:511
 #, c-format
 msgid ""
 "\n"
@@ -18044,7 +18115,7 @@ msgstr ""
 "\n"
 "                       “Drak 备份”报告 \n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:512
 #, c-format
 msgid ""
 "\n"
@@ -18053,7 +18124,7 @@ msgstr ""
 "\n"
 "                       “Drak 备份”守护进程报告\n"
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:518
 #, c-format
 msgid ""
 "\n"
@@ -18065,13 +18136,13 @@ msgstr ""
 "                    “Drak 备份”报告细节\n"
 "\n"
 
-#: standalone/drakbackup:556 standalone/drakbackup:627
-#: standalone/drakbackup:683
+#: standalone/drakbackup:543 standalone/drakbackup:614
+#: standalone/drakbackup:670
 #, c-format
 msgid "Total progress"
 msgstr "总进度"
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:596
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -18084,42 +18155,42 @@ msgstr ""
 "如果您曾经做过这个步骤, 您可能需要\n"
 "从服务器的的 authorized_keys 删除该项目。"
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:605
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "生成密钥需要一些时间。"
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:612
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "无法 spawn %s。"
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:629
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "%s 上的端口 %s 没有密码提示"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:630
 #, c-format
 msgid "Bad password on %s"
 msgstr "%s 密码无效"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:631
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "没有权限把 %s 迁移到 %s"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:632
 #, c-format
 msgid "Can not find %s on %s"
 msgstr "没有 %s 在 %s 上"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:636
 #, c-format
 msgid "%s not responding"
 msgstr "%s 没有响应"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:640
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -18136,86 +18207,74 @@ msgstr ""
 "\n"
 "这样不会提问密码。"
 
-#: standalone/drakbackup:697
-#, c-format
-msgid "WebDAV remote site already in sync!"
-msgstr "WebDAV 远程站点已经同步！"
-
-#: standalone/drakbackup:701
-#, c-format
-msgid "WebDAV transfer failed!"
-msgstr "WebDAV 传输失败！"
-
-#: standalone/drakbackup:722
+#: standalone/drakbackup:690
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "驱动器里没有 CDR/DVDR"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:694
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "介质不像是可以写入的！"
 
-#: standalone/drakbackup:731
+#: standalone/drakbackup:699
 #, c-format
 msgid "Not erasable media!"
 msgstr "不可清除的介质！"
 
-#: standalone/drakbackup:773
+#: standalone/drakbackup:741
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "清空介质需要一些时间。"
 
-#: standalone/drakbackup:831
+#: standalone/drakbackup:799
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "没有适当的权限读写 CD。"
 
-#: standalone/drakbackup:858
+#: standalone/drakbackup:826
 #, c-format
 msgid "No tape in %s!"
 msgstr "%s 里没有磁带！"
 
-#: standalone/drakbackup:964
+#: standalone/drakbackup:932
 #, c-format
 msgid ""
-"Backup quota exceeded!\n"
+"Backup destination quota exceeded!\n"
 "%d MB used vs %d MB allocated."
 msgstr ""
-"达到了备份限额！\n"
-"使用了 %d MB, 而分配了 %d MB。"
 
-#: standalone/drakbackup:983 standalone/drakbackup:1016
+#: standalone/drakbackup:951 standalone/drakbackup:983
 #, c-format
 msgid "Backup system files..."
 msgstr "备份系统文件..."
 
-#: standalone/drakbackup:1017 standalone/drakbackup:1058
+#: standalone/drakbackup:984 standalone/drakbackup:1024
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "备份硬盘文件..."
 
-#: standalone/drakbackup:1057
+#: standalone/drakbackup:1023
 #, c-format
 msgid "Backup User files..."
 msgstr "备份用户文件..."
 
-#: standalone/drakbackup:1092
+#: standalone/drakbackup:1057
 #, c-format
 msgid "Backup Other files..."
 msgstr "备份其它文件..."
 
-#: standalone/drakbackup:1093
+#: standalone/drakbackup:1058
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "硬盘文件备份进度..."
 
-#: standalone/drakbackup:1098
+#: standalone/drakbackup:1063
 #, c-format
 msgid "No changes to backup!"
 msgstr "没有需要备份的修改！"
 
-#: standalone/drakbackup:1116 standalone/drakbackup:1140
+#: standalone/drakbackup:1080 standalone/drakbackup:1103
 #, c-format
 msgid ""
 "\n"
@@ -18226,7 +18285,7 @@ msgstr ""
 "“Drak 备份”使用 %s: \n"
 "\n"
 
-#: standalone/drakbackup:1125
+#: standalone/drakbackup:1089
 #, c-format
 msgid ""
 "\n"
@@ -18236,18 +18295,18 @@ msgstr ""
 "\n"
 "FTP 连接错误: 无法通过 FTP 传送您的备份文件。\n"
 
-#: standalone/drakbackup:1126
+#: standalone/drakbackup:1090
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr "通过 FTP 发送文件出错。请更正您的 FTP 配置。"
 
-#: standalone/drakbackup:1128
+#: standalone/drakbackup:1092
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "通过 FTP 发送的文件列表: %s\n"
 
-#: standalone/drakbackup:1145
+#: standalone/drakbackup:1108
 #, c-format
 msgid ""
 "\n"
@@ -18258,7 +18317,7 @@ msgstr ""
 "“Drak 备份”的光盘操作: \n"
 "\n"
 
-#: standalone/drakbackup:1150
+#: standalone/drakbackup:1113
 #, c-format
 msgid ""
 "\n"
@@ -18269,22 +18328,22 @@ msgstr ""
 "“Drak 备份”的磁带操作: \n"
 "\n"
 
-#: standalone/drakbackup:1159
+#: standalone/drakbackup:1122
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr "发送邮件出错。您的报告邮件没有发出。"
 
-#: standalone/drakbackup:1160
+#: standalone/drakbackup:1123
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr "发送电子邮件出错。\n"
 
-#: standalone/drakbackup:1190
+#: standalone/drakbackup:1153
 #, c-format
 msgid "Can not create catalog!"
 msgstr "无法创建 catalog！"
 
-#: standalone/drakbackup:1423
+#: standalone/drakbackup:1392
 #, c-format
 msgid ""
 "\n"
@@ -18293,262 +18352,268 @@ msgstr ""
 "\n"
 "请选中您需要的所有选项。\n"
 
-#: standalone/drakbackup:1424
+#: standalone/drakbackup:1393
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr "这些选项将备份和恢复您的 /etc 目录中的全部文件。\n"
 
-#: standalone/drakbackup:1425
+#: standalone/drakbackup:1394
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "备份系统文件。(/etc 目录)"
 
-#: standalone/drakbackup:1426 standalone/drakbackup:1490
-#: standalone/drakbackup:1556
+#: standalone/drakbackup:1395 standalone/drakbackup:1459
+#: standalone/drakbackup:1525
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr "使用增量/差异备份(不破坏老备份)"
 
-#: standalone/drakbackup:1428 standalone/drakbackup:1492
-#: standalone/drakbackup:1558
+#: standalone/drakbackup:1397 standalone/drakbackup:1461
+#: standalone/drakbackup:1527
 #, c-format
 msgid "Use Incremental Backups"
 msgstr "使用增量备份"
 
-#: standalone/drakbackup:1428 standalone/drakbackup:1492
-#: standalone/drakbackup:1558
+#: standalone/drakbackup:1397 standalone/drakbackup:1461
+#: standalone/drakbackup:1527
 #, c-format
 msgid "Use Differential Backups"
 msgstr "使用差异备份"
 
-#: standalone/drakbackup:1430
+#: standalone/drakbackup:1399
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "不包括关键文件(passwd, group, fstab)"
 
-#: standalone/drakbackup:1431
+#: standalone/drakbackup:1400
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
 msgstr "使用此选项您可把 /etc 目录恢复到任何以前的版本。"
 
-#: standalone/drakbackup:1462
+#: standalone/drakbackup:1431
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "请选择您希望备份的用户。"
 
-#: standalone/drakbackup:1489
+#: standalone/drakbackup:1458
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "不包括浏览器缓存"
 
-#: standalone/drakbackup:1543
+#: standalone/drakbackup:1512
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "选择文件或目录, 然后单击“确定”"
 
-#: standalone/drakbackup:1544 standalone/drakfont:657
+#: standalone/drakbackup:1513 standalone/drakfont:657
 #, c-format
 msgid "Remove Selected"
 msgstr "删除选中的"
 
-#: standalone/drakbackup:1607
+#: standalone/drakbackup:1576
 #, c-format
 msgid "Users"
 msgstr "用户"
 
-#: standalone/drakbackup:1627
+#: standalone/drakbackup:1596
 #, c-format
 msgid "Use network connection to backup"
 msgstr "使用网络连接作备份"
 
-#: standalone/drakbackup:1629
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Net Method:"
 msgstr "网络方法:"
 
-#: standalone/drakbackup:1633
+#: standalone/drakbackup:1602
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "把 Expect 用于 SSH"
 
-#: standalone/drakbackup:1634
+#: standalone/drakbackup:1603
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "创建/传送 SSH 的备份密钥"
 
-#: standalone/drakbackup:1636
+#: standalone/drakbackup:1605
 #, c-format
 msgid "Transfer Now"
 msgstr "现在传送"
 
-#: standalone/drakbackup:1638
+#: standalone/drakbackup:1607
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "其它(不是“Drak 备份”)密钥已经有了"
 
-#: standalone/drakbackup:1641
+#: standalone/drakbackup:1610
 #, c-format
 msgid "Host name or IP."
 msgstr "主机名或 IP。"
 
-#: standalone/drakbackup:1646
+#: standalone/drakbackup:1615
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "将备份放在该主机的目录(或模块)。"
 
-#: standalone/drakbackup:1658
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Remember this password"
 msgstr "记住密码"
 
-#: standalone/drakbackup:1674
+#: standalone/drakbackup:1643
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "需要主机名、用户名和密码！"
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1734
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "使用 CD/DVDROM 备份"
 
-#: standalone/drakbackup:1768
+#: standalone/drakbackup:1737
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "请选择您的 CD/DVD 设备"
 
-#: standalone/drakbackup:1773
+#: standalone/drakbackup:1742
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "请选择您的 CD/DVD 介质大小"
 
-#: standalone/drakbackup:1780
+#: standalone/drakbackup:1749
 #, c-format
 msgid "Multisession CD"
 msgstr "多轨道 CD"
 
-#: standalone/drakbackup:1782
+#: standalone/drakbackup:1751
 #, c-format
 msgid "CDRW media"
 msgstr "CDRW 介质"
 
-#: standalone/drakbackup:1788
+#: standalone/drakbackup:1757
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "清除您的 RW 介质(第一节)"
 
-#: standalone/drakbackup:1789
+#: standalone/drakbackup:1758
 #, c-format
 msgid " Erase Now "
 msgstr " 立即清除 "
 
-#: standalone/drakbackup:1795
+#: standalone/drakbackup:1764
 #, c-format
 msgid "DVD+RW media"
 msgstr "DVD+RW 介质"
 
-#: standalone/drakbackup:1797
+#: standalone/drakbackup:1766
 #, c-format
 msgid "DVD-R media"
 msgstr "DVD-R 介质"
 
-#: standalone/drakbackup:1799
+#: standalone/drakbackup:1768
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAM 设备"
 
-#: standalone/drakbackup:1830
+#: standalone/drakbackup:1799
 #, c-format
 msgid "No CD device defined!"
 msgstr "没有发现 CD 设备！"
 
-#: standalone/drakbackup:1872
+#: standalone/drakbackup:1841
 #, c-format
 msgid "Use tape to backup"
 msgstr "使用磁带备份"
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1844
 #, c-format
 msgid "Device name to use for backup"
 msgstr "用于备份的设备名"
 
-#: standalone/drakbackup:1881
+#: standalone/drakbackup:1850
 #, c-format
 msgid "Backup directly to tape"
 msgstr "直接备份到磁带"
 
-#: standalone/drakbackup:1887
+#: standalone/drakbackup:1856
 #, c-format
 msgid "Do not rewind tape after backup"
 msgstr "在备份后不倒带"
 
-#: standalone/drakbackup:1893
+#: standalone/drakbackup:1862
 #, c-format
 msgid "Erase tape before backup"
 msgstr "备份前清空磁带"
 
-#: standalone/drakbackup:1899
+#: standalone/drakbackup:1868
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "备份后弹出磁带"
 
-#: standalone/drakbackup:1973
+#: standalone/drakbackup:1944
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "请输入要保存的目录:"
 
-#: standalone/drakbackup:1977
+#: standalone/drakbackup:1948
 #, c-format
 msgid "Directory to save to"
 msgstr "要保存的目录"
 
-#: standalone/drakbackup:1983
+#: standalone/drakbackup:1953
+#, c-format
+msgid ""
+"Maximum disk space\n"
+" allocated for backups (MB)"
+msgstr ""
+
+#: standalone/drakbackup:1957
 #, c-format
 msgid ""
-"Maximum size\n"
-" allowed for Drakbackup (MB)"
+"Delete incremental or differential\n"
+" backups older than N days\n"
+" (0 is keep all backups) to save space"
 msgstr ""
-"允许“Drak 备份”\n"
-"  使用的最大空间(Mb)"
 
-#: standalone/drakbackup:2049
+#: standalone/drakbackup:2024
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CDROM / DVDROM"
 
-#: standalone/drakbackup:2054
+#: standalone/drakbackup:2029
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "硬盘 / NFS"
 
-#: standalone/drakbackup:2069 standalone/drakbackup:2070
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2044 standalone/drakbackup:2045
+#: standalone/drakbackup:2050
 #, c-format
 msgid "hourly"
 msgstr "每小时"
 
-#: standalone/drakbackup:2069 standalone/drakbackup:2071
-#: standalone/drakbackup:2076
+#: standalone/drakbackup:2044 standalone/drakbackup:2046
+#: standalone/drakbackup:2051
 #, c-format
 msgid "daily"
 msgstr "每日"
 
-#: standalone/drakbackup:2069 standalone/drakbackup:2072
-#: standalone/drakbackup:2077
+#: standalone/drakbackup:2044 standalone/drakbackup:2047
+#: standalone/drakbackup:2052
 #, c-format
 msgid "weekly"
 msgstr "每周"
 
-#: standalone/drakbackup:2069 standalone/drakbackup:2073
-#: standalone/drakbackup:2078
+#: standalone/drakbackup:2044 standalone/drakbackup:2048
+#: standalone/drakbackup:2053
 #, c-format
 msgid "monthly"
 msgstr "每月"
 
-#: standalone/drakbackup:2069 standalone/drakbackup:2074
-#: standalone/drakbackup:2079
+#: standalone/drakbackup:2044 standalone/drakbackup:2049
+#: standalone/drakbackup:2054
 #, c-format
 msgid "custom"
 msgstr "定制"
@@ -18556,7 +18621,7 @@ msgstr "定制"
 # calendar/gui/goto-dialog.glade.h:7
 # calendar/gui/goto-dialog.glade.h:7
 # calendar/gui/goto-dialog.glade.h:7
-#: standalone/drakbackup:2083
+#: standalone/drakbackup:2058
 #, c-format
 msgid "January"
 msgstr "一月"
@@ -18564,7 +18629,7 @@ msgstr "一月"
 # calendar/gui/goto-dialog.glade.h:4
 # calendar/gui/goto-dialog.glade.h:4
 # calendar/gui/goto-dialog.glade.h:4
-#: standalone/drakbackup:2083
+#: standalone/drakbackup:2058
 #, c-format
 msgid "February"
 msgstr "二月"
@@ -18572,7 +18637,7 @@ msgstr "二月"
 # calendar/gui/goto-dialog.glade.h:10
 # calendar/gui/goto-dialog.glade.h:10
 # calendar/gui/goto-dialog.glade.h:10
-#: standalone/drakbackup:2083
+#: standalone/drakbackup:2058
 #, c-format
 msgid "March"
 msgstr "三月"
@@ -18580,7 +18645,7 @@ msgstr "三月"
 # calendar/gui/goto-dialog.glade.h:1
 # calendar/gui/goto-dialog.glade.h:1
 # calendar/gui/goto-dialog.glade.h:1
-#: standalone/drakbackup:2084
+#: standalone/drakbackup:2059
 #, c-format
 msgid "April"
 msgstr "四月"
@@ -18588,7 +18653,7 @@ msgstr "四月"
 # calendar/gui/goto-dialog.glade.h:11
 # calendar/gui/goto-dialog.glade.h:11
 # calendar/gui/goto-dialog.glade.h:11
-#: standalone/drakbackup:2084
+#: standalone/drakbackup:2059
 #, c-format
 msgid "May"
 msgstr "五月"
@@ -18596,7 +18661,7 @@ msgstr "五月"
 # calendar/gui/goto-dialog.glade.h:9
 # calendar/gui/goto-dialog.glade.h:9
 # calendar/gui/goto-dialog.glade.h:9
-#: standalone/drakbackup:2084
+#: standalone/drakbackup:2059
 #, c-format
 msgid "June"
 msgstr "六月"
@@ -18604,7 +18669,7 @@ msgstr "六月"
 # calendar/gui/goto-dialog.glade.h:8
 # calendar/gui/goto-dialog.glade.h:8
 # calendar/gui/goto-dialog.glade.h:8
-#: standalone/drakbackup:2084
+#: standalone/drakbackup:2059
 #, c-format
 msgid "July"
 msgstr "七月"
@@ -18612,7 +18677,7 @@ msgstr "七月"
 # calendar/gui/goto-dialog.glade.h:2
 # calendar/gui/goto-dialog.glade.h:2
 # calendar/gui/goto-dialog.glade.h:2
-#: standalone/drakbackup:2084
+#: standalone/drakbackup:2059
 #, c-format
 msgid "August"
 msgstr "八月"
@@ -18620,7 +18685,7 @@ msgstr "八月"
 # calendar/gui/goto-dialog.glade.h:14
 # calendar/gui/goto-dialog.glade.h:14
 # calendar/gui/goto-dialog.glade.h:14
-#: standalone/drakbackup:2084
+#: standalone/drakbackup:2059
 #, c-format
 msgid "September"
 msgstr "九月"
@@ -18628,7 +18693,7 @@ msgstr "九月"
 # calendar/gui/goto-dialog.glade.h:13
 # calendar/gui/goto-dialog.glade.h:13
 # calendar/gui/goto-dialog.glade.h:13
-#: standalone/drakbackup:2085
+#: standalone/drakbackup:2060
 #, c-format
 msgid "October"
 msgstr "十月"
@@ -18636,7 +18701,7 @@ msgstr "十月"
 # calendar/gui/goto-dialog.glade.h:12
 # calendar/gui/goto-dialog.glade.h:12
 # calendar/gui/goto-dialog.glade.h:12
-#: standalone/drakbackup:2085
+#: standalone/drakbackup:2060
 #, c-format
 msgid "November"
 msgstr "十一月"
@@ -18644,7 +18709,7 @@ msgstr "十一月"
 # calendar/gui/goto-dialog.glade.h:3
 # calendar/gui/goto-dialog.glade.h:3
 # calendar/gui/goto-dialog.glade.h:3
-#: standalone/drakbackup:2085
+#: standalone/drakbackup:2060
 #, c-format
 msgid "December"
 msgstr "十二月"
@@ -18655,7 +18720,7 @@ msgstr "十二月"
 # calendar/gui/dialogs/recurrence-page.c:965
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 # calendar/gui/dialogs/recurrence-page.c:965
-#: standalone/drakbackup:2088
+#: standalone/drakbackup:2063
 #, c-format
 msgid "Sunday"
 msgstr "星期日"
@@ -18666,7 +18731,7 @@ msgstr "星期日"
 # calendar/gui/dialogs/recurrence-page.c:959
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 # calendar/gui/dialogs/recurrence-page.c:959
-#: standalone/drakbackup:2088
+#: standalone/drakbackup:2063
 #, c-format
 msgid "Monday"
 msgstr "星期一"
@@ -18677,7 +18742,7 @@ msgstr "星期一"
 # calendar/gui/dialogs/recurrence-page.c:960
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 # calendar/gui/dialogs/recurrence-page.c:960
-#: standalone/drakbackup:2088
+#: standalone/drakbackup:2063
 #, c-format
 msgid "Tuesday"
 msgstr "星期二"
@@ -18688,7 +18753,7 @@ msgstr "星期二"
 # calendar/gui/dialogs/recurrence-page.c:961
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 # calendar/gui/dialogs/recurrence-page.c:961
-#: standalone/drakbackup:2089
+#: standalone/drakbackup:2064
 #, c-format
 msgid "Wednesday"
 msgstr "星期三"
@@ -18699,7 +18764,7 @@ msgstr "星期三"
 # calendar/gui/dialogs/recurrence-page.c:962
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 # calendar/gui/dialogs/recurrence-page.c:962
-#: standalone/drakbackup:2089
+#: standalone/drakbackup:2064
 #, c-format
 msgid "Thursday"
 msgstr "星期四"
@@ -18710,7 +18775,7 @@ msgstr "星期四"
 # calendar/gui/dialogs/recurrence-page.c:963
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 # calendar/gui/dialogs/recurrence-page.c:963
-#: standalone/drakbackup:2089
+#: standalone/drakbackup:2064
 #, c-format
 msgid "Friday"
 msgstr "星期五"
@@ -18721,22 +18786,22 @@ msgstr "星期五"
 # calendar/gui/dialogs/recurrence-page.c:964
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
-#: standalone/drakbackup:2089
+#: standalone/drakbackup:2064
 #, c-format
 msgid "Saturday"
 msgstr "星期六"
 
-#: standalone/drakbackup:2121
+#: standalone/drakbackup:2096
 #, c-format
 msgid "Use daemon"
 msgstr "使用守护进程"
 
-#: standalone/drakbackup:2125
+#: standalone/drakbackup:2100
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "请选择每次备份的时间间隔"
 
-#: standalone/drakbackup:2131
+#: standalone/drakbackup:2106
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "自定义 setup/crontab 项: "
@@ -18744,7 +18809,7 @@ msgstr "自定义 setup/crontab 项: "
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: standalone/drakbackup:2136
+#: standalone/drakbackup:2111
 #, c-format
 msgid "Minute"
 msgstr "分钟"
@@ -18752,7 +18817,7 @@ msgstr "分钟"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2115
 #, c-format
 msgid "Hour"
 msgstr "小时"
@@ -18760,7 +18825,7 @@ msgstr "小时"
 # ui/evolution-calendar.xml.h:11
 # ui/evolution-calendar.xml.h:11
 # ui/evolution-calendar.xml.h:11
-#: standalone/drakbackup:2144
+#: standalone/drakbackup:2119
 #, c-format
 msgid "Day"
 msgstr "天"
@@ -18768,7 +18833,7 @@ msgstr "天"
 # ui/evolution-calendar.xml.h:20
 # ui/evolution-calendar.xml.h:20
 # ui/evolution-calendar.xml.h:20
-#: standalone/drakbackup:2148
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Month"
 msgstr "月"
@@ -18779,143 +18844,148 @@ msgstr "月"
 # calendar/gui/dialogs/recurrence-page.c:961
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 # calendar/gui/dialogs/recurrence-page.c:961
-#: standalone/drakbackup:2152
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Weekday"
 msgstr "平日"
 
-#: standalone/drakbackup:2158
+#: standalone/drakbackup:2133
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "请选择备份使用的介质。"
 
-#: standalone/drakbackup:2164
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "请确认 cron 守护程序包含在您的服务中。"
 
-#: standalone/drakbackup:2165
+#: standalone/drakbackup:2140
 #, c-format
 msgid ""
 "If your machine is not on all the time, you might want to install anacron."
 msgstr "如果您的计算机并不是时刻开机, 您可能想要安装 anacron。"
 
-#: standalone/drakbackup:2166
+#: standalone/drakbackup:2141
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr "请注意目前所有的“网络”介质都还要使用硬盘。"
 
-#: standalone/drakbackup:2213
+#: standalone/drakbackup:2188
 #, c-format
 msgid "Please choose the compression type"
 msgstr "请选择压缩类型"
 
-#: standalone/drakbackup:2217
+#: standalone/drakbackup:2192
 #, c-format
 msgid "Use .backupignore files"
 msgstr "使用 .backupignore 文件"
 
-#: standalone/drakbackup:2219
+#: standalone/drakbackup:2194
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "在每次备份后发送邮件报告给:"
 
-#: standalone/drakbackup:2225
+#: standalone/drakbackup:2200
+#, c-format
+msgid "Return address for sent mail:"
+msgstr ""
+
+#: standalone/drakbackup:2206
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "邮件的 SMTP 服务器:"
 
-#: standalone/drakbackup:2230
+#: standalone/drakbackup:2211
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "备份到其它介质之后删除硬盘上的 tar 文件。"
 
-#: standalone/drakbackup:2270
+#: standalone/drakbackup:2254
 #, c-format
 msgid "What"
 msgstr "内容"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2259
 #, c-format
 msgid "Where"
 msgstr "位置"
 
-#: standalone/drakbackup:2280
+#: standalone/drakbackup:2264
 #, c-format
 msgid "When"
 msgstr "时间"
 
-#: standalone/drakbackup:2285
+#: standalone/drakbackup:2269
 #, c-format
 msgid "More Options"
 msgstr "更多选项"
 
-#: standalone/drakbackup:2298
+#: standalone/drakbackup:2282
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "备份目的未配置..."
 
-#: standalone/drakbackup:2318 standalone/drakbackup:4241
+#: standalone/drakbackup:2302 standalone/drakbackup:4226
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "“Drak 备份”配置"
 
-#: standalone/drakbackup:2334
+#: standalone/drakbackup:2318
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "请选择您希望备份何处"
 
-#: standalone/drakbackup:2337
+#: standalone/drakbackup:2321
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr "用于准备全部介质备份的硬盘驱动器"
 
-#: standalone/drakbackup:2337
+#: standalone/drakbackup:2321
 #, c-format
 msgid "Across Network"
 msgstr "通过网络"
 
-#: standalone/drakbackup:2337
+#: standalone/drakbackup:2321
 #, c-format
 msgid "On CD-R"
 msgstr "在 CD-R 上"
 
-#: standalone/drakbackup:2337
+#: standalone/drakbackup:2321
 #, c-format
 msgid "On Tape Device"
 msgstr "在磁带机上"
 
-#: standalone/drakbackup:2383
+#: standalone/drakbackup:2367
 #, c-format
 msgid "Backup Users"
 msgstr "备份用户"
 
-#: standalone/drakbackup:2384
+#: standalone/drakbackup:2368
 #, c-format
 msgid " (Default is all users)"
 msgstr "(默认是所有用户)"
 
-#: standalone/drakbackup:2397
+#: standalone/drakbackup:2381
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "请选择您要备份的文件"
 
-#: standalone/drakbackup:2398
+#: standalone/drakbackup:2382
 #, c-format
 msgid "Backup System"
 msgstr "备份系统"
 
-#: standalone/drakbackup:2400
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Select user manually"
 msgstr "手工选择用户"
 
-#: standalone/drakbackup:2429
+#: standalone/drakbackup:2413
 #, c-format
 msgid "Please select data to backup..."
 msgstr "请选择需备份的数据..."
 
-#: standalone/drakbackup:2501
+#: standalone/drakbackup:2485
 #, c-format
 msgid ""
 "\n"
@@ -18924,7 +18994,7 @@ msgstr ""
 "\n"
 "备份来源: \n"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2486
 #, c-format
 msgid ""
 "\n"
@@ -18933,7 +19003,7 @@ msgstr ""
 "\n"
 "- 系统文件: \n"
 
-#: standalone/drakbackup:2504
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
@@ -18942,7 +19012,7 @@ msgstr ""
 "\n"
 "- 用户文件: \n"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2490
 #, c-format
 msgid ""
 "\n"
@@ -18951,7 +19021,7 @@ msgstr ""
 "\n"
 "- 其它文件: \n"
 
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2492
 #, c-format
 msgid ""
 "\n"
@@ -18960,12 +19030,17 @@ msgstr ""
 "\n"
 "- 保存在硬盘路径: %s\n"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2493
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\t限制磁盘使用为 %s MB\n"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2494
+#, c-format
+msgid "\tDelete backups older than %s day(s)\n"
+msgstr ""
+
+#: standalone/drakbackup:2497
 #, c-format
 msgid ""
 "\n"
@@ -18974,7 +19049,7 @@ msgstr ""
 "\n"
 "- 备份后删除硬盘的 tar 文件。\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2502
 #, c-format
 msgid ""
 "\n"
@@ -18983,22 +19058,22 @@ msgstr ""
 "\n"
 "- 刻录光盘"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2503
 #, c-format
 msgid "RW"
 msgstr "RW"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2504
 #, c-format
 msgid " on device: %s"
 msgstr " 使用设备: %s"
 
-#: standalone/drakbackup:2520
+#: standalone/drakbackup:2505
 #, c-format
 msgid " (multi-session)"
 msgstr "(多轨道)"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2506
 #, c-format
 msgid ""
 "\n"
@@ -19007,17 +19082,17 @@ msgstr ""
 "\n"
 "- 保存到磁带设备: %s"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2507
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\t删除=%s"
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\tBackup directly to Tape\n"
 msgstr "\t直接备份到磁带\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2511
 #, c-format
 msgid ""
 "\n"
@@ -19026,7 +19101,7 @@ msgstr ""
 "\n"
 "- 通过 %s 保存到主机: %s\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2512
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -19035,7 +19110,7 @@ msgstr ""
 "\t\t 用户名: %s\n"
 "\t\t 路径: %s \n"
 
-#: standalone/drakbackup:2528
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -19044,42 +19119,47 @@ msgstr ""
 "\n"
 "- 选项: \n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2514
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\t不包括系统文件\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\t使用 tar 和 bzip2 备份\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2517
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\t使用 tar 和 gzip 备份\n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\t只使用 tar 备份\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2520
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\t使用 .backupignore 文件\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2521
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\t发送邮件到 %s\n"
 
-#: standalone/drakbackup:2537
+#: standalone/drakbackup:2522
+#, c-format
+msgid "\tSend mail from %s\n"
+msgstr ""
+
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\t使用 SMTP 服务器 %s\n"
 
-#: standalone/drakbackup:2539
+#: standalone/drakbackup:2525
 #, c-format
 msgid ""
 "\n"
@@ -19088,47 +19168,42 @@ msgstr ""
 "\n"
 "- 守护进程, %s 通过: \n"
 
-#: standalone/drakbackup:2540
+#: standalone/drakbackup:2526
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-硬盘。\n"
 
-#: standalone/drakbackup:2541
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CD-R。\n"
 
-#: standalone/drakbackup:2542
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-磁带\n"
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-网络通过 FTP。\n"
 
-#: standalone/drakbackup:2544
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-网络通过 SSH。\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-网络通过 rsync。\n"
 
-#: standalone/drakbackup:2546
-#, c-format
-msgid "\t-Network by webdav.\n"
-msgstr "\t-通过 webdav 的网络。\n"
-
-#: standalone/drakbackup:2548
+#: standalone/drakbackup:2533
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "没有配置, 请选择向导或高级。\n"
 
-#: standalone/drakbackup:2553
+#: standalone/drakbackup:2538
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -19137,27 +19212,27 @@ msgstr ""
 "要恢复数据的清单: \n"
 "\n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2540
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- 恢复系统文件。\n"
 
-#: standalone/drakbackup:2557 standalone/drakbackup:2567
+#: standalone/drakbackup:2542 standalone/drakbackup:2552
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - 从日期: %s %s\n"
 
-#: standalone/drakbackup:2560
+#: standalone/drakbackup:2545
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- 恢复用户文件: \n"
 
-#: standalone/drakbackup:2565
+#: standalone/drakbackup:2550
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- 恢复其它文件: \n"
 
-#: standalone/drakbackup:2744
+#: standalone/drakbackup:2729
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -19166,127 +19241,127 @@ msgstr ""
 "已毁坏数据的清单: \n"
 "\n"
 
-#: standalone/drakbackup:2746
+#: standalone/drakbackup:2731
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "请取消选择并删除它。"
 
-#: standalone/drakbackup:2756
+#: standalone/drakbackup:2741
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "备份文件损坏了"
 
-#: standalone/drakbackup:2777
+#: standalone/drakbackup:2762
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "         您选择的全部数据已经              "
 
-#: standalone/drakbackup:2778
+#: standalone/drakbackup:2763
 #, c-format
 msgid "          Successfully Restored on %s       "
 msgstr "          成功的恢复到 %s       "
 
-#: standalone/drakbackup:2898
+#: standalone/drakbackup:2883
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "        恢复配置       "
 
-#: standalone/drakbackup:2926
+#: standalone/drakbackup:2911
 #, c-format
 msgid "OK to restore the other files."
 msgstr "即将恢复其它文件。"
 
-#: standalone/drakbackup:2942
+#: standalone/drakbackup:2927
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr "可恢复的用户清单(每个用户最近的数据是最重要的)"
 
-#: standalone/drakbackup:3007
+#: standalone/drakbackup:2992
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "请选择需要恢复的日期:"
 
-#: standalone/drakbackup:3044
+#: standalone/drakbackup:3029
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "从硬盘恢复"
 
-#: standalone/drakbackup:3046
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "请输入存储备份的目录"
 
-#: standalone/drakbackup:3050
+#: standalone/drakbackup:3035
 #, c-format
 msgid "Directory with backups"
 msgstr "存有备份的目录"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3089
 #, c-format
 msgid "Select another media to restore from"
 msgstr "请选择另外的介质用以恢复"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Other Media"
 msgstr "其它介质"
 
-#: standalone/drakbackup:3111
+#: standalone/drakbackup:3096
 #, c-format
 msgid "Restore system"
 msgstr "恢复系统"
 
-#: standalone/drakbackup:3112
+#: standalone/drakbackup:3097
 #, c-format
 msgid "Restore Users"
 msgstr "恢复用户文件"
 
-#: standalone/drakbackup:3113
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore Other"
 msgstr "恢复其它文件"
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "选择将要恢复到的路径(/ 除外)"
 
-#: standalone/drakbackup:3119 standalone/drakbackup:3401
+#: standalone/drakbackup:3104 standalone/drakbackup:3386
 #, c-format
 msgid "Path To Restore To"
 msgstr "恢复到的路径"
 
-#: standalone/drakbackup:3122
+#: standalone/drakbackup:3107
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "恢复前做新的备份(只适用于增量备份。)"
 
-#: standalone/drakbackup:3124
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "恢复前删除用户目录。"
 
-#: standalone/drakbackup:3209
+#: standalone/drakbackup:3194
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr "要搜索的文件名文字(空字符串将匹配全部): "
 
-#: standalone/drakbackup:3212
+#: standalone/drakbackup:3197
 #, c-format
 msgid "Search Backups"
 msgstr "搜索备份"
 
-#: standalone/drakbackup:3230
+#: standalone/drakbackup:3215
 #, c-format
 msgid "No matches found..."
 msgstr "没有发现匹配项..."
 
-#: standalone/drakbackup:3234
+#: standalone/drakbackup:3219
 #, c-format
 msgid "Restore Selected"
 msgstr "恢复选中文件"
 
-#: standalone/drakbackup:3369
+#: standalone/drakbackup:3354
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
@@ -19295,7 +19370,7 @@ msgstr ""
 "点击日期/时间可查看备份文件。\n"
 "Ctrl+单击文件可选择多个文件。"
 
-#: standalone/drakbackup:3375
+#: standalone/drakbackup:3360
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -19304,7 +19379,7 @@ msgstr ""
 "恢复选中的\n"
 "目录项"
 
-#: standalone/drakbackup:3384
+#: standalone/drakbackup:3369
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -19313,17 +19388,17 @@ msgstr ""
 "恢复选中的\n"
 "文件"
 
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3446
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "在 %s 没有发现备份文件。"
 
-#: standalone/drakbackup:3474
+#: standalone/drakbackup:3459
 #, c-format
 msgid "Restore From CD"
 msgstr "从光盘恢复"
 
-#: standalone/drakbackup:3474
+#: standalone/drakbackup:3459
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -19332,229 +19407,229 @@ msgstr ""
 "请把卷标为 %s 的光盘插入\n"
 "到加载于 /mnt/cdrom 的光盘驱动器"
 
-#: standalone/drakbackup:3476
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "光盘卷标不对。这张盘的卷标是 %s。"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3471
 #, c-format
 msgid "Restore From Tape"
 msgstr "从磁带恢复"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3471
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr "请把卷标为 %s 的磁带装进磁带机 %s"
 
-#: standalone/drakbackup:3488
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "磁带卷标不对。这盘磁带的卷标是 %s。"
 
-#: standalone/drakbackup:3499
+#: standalone/drakbackup:3484
 #, c-format
 msgid "Restore Via Network"
 msgstr "通过网络恢复"
 
-#: standalone/drakbackup:3499
+#: standalone/drakbackup:3484
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "恢复使用的网络协议: %s"
 
-#: standalone/drakbackup:3500
+#: standalone/drakbackup:3485
 #, c-format
 msgid "Host Name"
 msgstr "主机名"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Host Path or Module"
 msgstr "主机路径和模块"
 
-#: standalone/drakbackup:3508
+#: standalone/drakbackup:3493
 #, c-format
 msgid "Password required"
 msgstr "需要密码"
 
-#: standalone/drakbackup:3514
+#: standalone/drakbackup:3499
 #, c-format
 msgid "Username required"
 msgstr "需要用户名"
 
-#: standalone/drakbackup:3517
+#: standalone/drakbackup:3502
 #, c-format
 msgid "Hostname required"
 msgstr "需要主机名"
 
-#: standalone/drakbackup:3522
+#: standalone/drakbackup:3507
 #, c-format
 msgid "Path or Module required"
 msgstr "要求提供路径或模块"
 
-#: standalone/drakbackup:3535
+#: standalone/drakbackup:3520
 #, c-format
 msgid "Files Restored..."
 msgstr "文件已恢复..."
 
-#: standalone/drakbackup:3538
+#: standalone/drakbackup:3523
 #, c-format
 msgid "Restore Failed..."
 msgstr "恢复失败..."
 
-#: standalone/drakbackup:3556
+#: standalone/drakbackup:3541
 #, c-format
 msgid "%s not retrieved..."
 msgstr "%s 未获取..."
 
-#: standalone/drakbackup:3777 standalone/drakbackup:3846
+#: standalone/drakbackup:3762 standalone/drakbackup:3831
 #, c-format
 msgid "Search for files to restore"
 msgstr "搜索要恢复的文件"
 
-#: standalone/drakbackup:3781
+#: standalone/drakbackup:3766
 #, c-format
 msgid "Restore all backups"
 msgstr "恢复所有备份"
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3774
 #, c-format
 msgid "Custom Restore"
 msgstr "定制恢复"
 
-#: standalone/drakbackup:3793 standalone/drakbackup:3842
+#: standalone/drakbackup:3778 standalone/drakbackup:3827
 #, c-format
 msgid "Restore From Catalog"
 msgstr "从目录恢复"
 
-#: standalone/drakbackup:3814
+#: standalone/drakbackup:3799
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "无法找到要恢复的数据...\n"
 
-#: standalone/drakbackup:3815
+#: standalone/drakbackup:3800
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "查证得 %s 是正确的路径"
 
-#: standalone/drakbackup:3816
+#: standalone/drakbackup:3801
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " 而且 CD 盘在驱动器中"
 
-#: standalone/drakbackup:3818
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr "备份在未加载的介质中 - 使用目录来恢复"
 
-#: standalone/drakbackup:3834
+#: standalone/drakbackup:3819
 #, c-format
 msgid "CD in place - continue."
 msgstr "光盘就绪 - 继续。"
 
-#: standalone/drakbackup:3839
+#: standalone/drakbackup:3824
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "浏览新的恢复仓库。"
 
-#: standalone/drakbackup:3840
+#: standalone/drakbackup:3825
 #, c-format
 msgid "Directory To Restore From"
 msgstr "恢复来自目录"
 
-#: standalone/drakbackup:3876
+#: standalone/drakbackup:3861
 #, c-format
 msgid "Restore Progress"
 msgstr "恢复进展"
 
-#: standalone/drakbackup:3987
+#: standalone/drakbackup:3972
 #, c-format
 msgid "Build Backup"
 msgstr "创建备份"
 
-#: standalone/drakbackup:4020 standalone/drakbackup:4340
+#: standalone/drakbackup:4005 standalone/drakbackup:4325
 #, c-format
 msgid "Restore"
 msgstr "恢复"
 
-#: standalone/drakbackup:4108 standalone/harddrake2:481
+#: standalone/drakbackup:4093 standalone/harddrake2:477
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "下列软件包需要安装: \n"
 
-#: standalone/drakbackup:4135
+#: standalone/drakbackup:4120
 #, c-format
 msgid "Please select data to restore..."
 msgstr "请选择要恢复的数据..."
 
-#: standalone/drakbackup:4175
+#: standalone/drakbackup:4160
 #, c-format
 msgid "Backup system files"
 msgstr "备份系统文件"
 
-#: standalone/drakbackup:4178
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup user files"
 msgstr "备份用户文件"
 
-#: standalone/drakbackup:4181
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup other files"
 msgstr "备份其它文件"
 
-#: standalone/drakbackup:4184 standalone/drakbackup:4218
+#: standalone/drakbackup:4169 standalone/drakbackup:4203
 #, c-format
 msgid "Total Progress"
 msgstr "总进展"
 
-#: standalone/drakbackup:4210
+#: standalone/drakbackup:4195
 #, c-format
 msgid "Sending files by FTP"
 msgstr "通过 FTP 发送文件"
 
-#: standalone/drakbackup:4213
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files..."
 msgstr "正在发送文件..."
 
-#: standalone/drakbackup:4283
+#: standalone/drakbackup:4268
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "现在从配置文件备份"
 
-#: standalone/drakbackup:4288
+#: standalone/drakbackup:4273
 #, c-format
 msgid "View Backup Configuration."
 msgstr "查看备份配置。"
 
-#: standalone/drakbackup:4314
+#: standalone/drakbackup:4299
 #, c-format
 msgid "Wizard Configuration"
 msgstr "向导配置"
 
-#: standalone/drakbackup:4319
+#: standalone/drakbackup:4304
 #, c-format
 msgid "Advanced Configuration"
 msgstr "高级配置"
 
-#: standalone/drakbackup:4324
+#: standalone/drakbackup:4309
 #, c-format
 msgid "View Configuration"
 msgstr "查看配置"
 
-#: standalone/drakbackup:4328
+#: standalone/drakbackup:4313
 #, c-format
 msgid "View Last Log"
 msgstr "查看上次的日志"
 
-#: standalone/drakbackup:4333
+#: standalone/drakbackup:4318
 #, c-format
 msgid "Backup Now"
 msgstr "立即备份"
 
-#: standalone/drakbackup:4337
+#: standalone/drakbackup:4322
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -19563,22 +19638,12 @@ msgstr ""
 "没有找到配置文件\n"
 "请单击向导或高级。"
 
-#: standalone/drakbackup:4357 standalone/drakbackup:4360
+#: standalone/drakbackup:4342 standalone/drakbackup:4345
 #, c-format
 msgid "Drakbackup"
 msgstr "Drak 备份"
 
-#: standalone/drakboot:64
-#, c-format
-msgid "Graphical boot theme selection"
-msgstr "图形化启动主题选择"
-
-#: standalone/drakboot:64
-#, c-format
-msgid "System mode"
-msgstr "系统模式"
-
-#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:189
+#: standalone/drakboot:76 standalone/drakfloppy:47 standalone/harddrake2:189
 #: standalone/harddrake2:190 standalone/harddrake2:191 standalone/logdrake:70
 #: standalone/printerdrake:138 standalone/printerdrake:139
 #: standalone/printerdrake:140
@@ -19586,33 +19651,33 @@ msgstr "系统模式"
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
+#: standalone/drakboot:77 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/文件(F)/退出(_Q)"
 
-#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:191
+#: standalone/drakboot:77 standalone/drakfloppy:48 standalone/harddrake2:191
 #: standalone/logdrake:76 standalone/printerdrake:140
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: standalone/drakboot:148
+#: standalone/drakboot:117
 #, c-format
-msgid "Install themes"
-msgstr "安装主题"
+msgid "Text only"
+msgstr ""
 
-#: standalone/drakboot:149
+#: standalone/drakboot:118
 #, c-format
-msgid "Create new theme"
-msgstr "创建新主题"
+msgid "Verbose"
+msgstr ""
 
-#: standalone/drakboot:161
+#: standalone/drakboot:119
 #, c-format
-msgid "Use graphical boot"
-msgstr "使用图形化引导"
+msgid "Silent"
+msgstr ""
 
-#: standalone/drakboot:166
+#: standalone/drakboot:126
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
@@ -19621,17 +19686,27 @@ msgstr ""
 "您的系统引导程序并不位于帧缓存模式。要激活图形化引导程序, 请在引导程序配置工"
 "具中选择图形视频模式。"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:127
 #, c-format
 msgid "Do you want to configure it now?"
 msgstr "您想要现在配置吗?"
 
-#: standalone/drakboot:177
+#: standalone/drakboot:136
+#, c-format
+msgid "Install themes"
+msgstr "安装主题"
+
+#: standalone/drakboot:138
+#, c-format
+msgid "Graphical boot theme selection"
+msgstr "图形化启动主题选择"
+
+#: standalone/drakboot:143
 #, c-format
 msgid "Theme"
 msgstr "主题"
 
-#: standalone/drakboot:180
+#: standalone/drakboot:146
 #, c-format
 msgid ""
 "Display theme\n"
@@ -19640,32 +19715,42 @@ msgstr ""
 "在控制台\n"
 "显示主题"
 
-#: standalone/drakboot:189
+#: standalone/drakboot:151
 #, c-format
-msgid "Launch the graphical environment when your system starts"
-msgstr "系统启动时进入图形环境"
+msgid "Create new theme"
+msgstr "创建新主题"
 
-#: standalone/drakboot:197
+#: standalone/drakboot:183
+#, c-format
+msgid "Default user"
+msgstr "默认用户"
+
+#: standalone/drakboot:184
+#, c-format
+msgid "Default desktop"
+msgstr "默认桌面"
+
+#: standalone/drakboot:187
 #, c-format
 msgid "No, I do not want autologin"
 msgstr "否, 不要自动登录"
 
-#: standalone/drakboot:198
+#: standalone/drakboot:188
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "是, 以指定用户的身份自动登录到指定桌面"
 
-#: standalone/drakboot:201
+#: standalone/drakboot:195
 #, c-format
-msgid "Default user"
-msgstr "默认用户"
+msgid "System mode"
+msgstr "系统模式"
 
-#: standalone/drakboot:202
+#: standalone/drakboot:198
 #, c-format
-msgid "Default desktop"
-msgstr "默认桌面"
+msgid "Launch the graphical environment when your system starts"
+msgstr "系统启动时进入图形环境"
 
-#: standalone/drakboot:310
+#: standalone/drakboot:264
 #, c-format
 msgid ""
 "Please choose a video mode, it will be applied to each of the boot entries "
@@ -19888,7 +19973,7 @@ msgid "Network configuration (%d adapters)"
 msgstr "网络配置(%d 网卡)"
 
 #: standalone/drakconnect:97 standalone/drakconnect:822
-#: standalone/drakroam:159
+#: standalone/drakroam:163
 #, c-format
 msgid "Gateway:"
 msgstr "网关: "
@@ -19970,7 +20055,7 @@ msgstr "搜索域"
 msgid "static"
 msgstr "静态"
 
-#: standalone/drakconnect:362 standalone/drakroam:140
+#: standalone/drakconnect:362 standalone/drakroam:144
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
@@ -20185,7 +20270,7 @@ msgstr ""
 "请从 Mandriva Linux 控制中心运行“%s”助手"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
-#: standalone/drakconnect:1010 standalone/net_applet:62
+#: standalone/drakconnect:1010 standalone/drakroam:42 standalone/net_applet:62
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "设置新的网络连接(局域网、ISDN、ADSL……)"
@@ -20385,109 +20470,109 @@ msgstr ""
 "\n"
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 
-#: standalone/drakfont:182
+#: standalone/drakfont:183
 #, c-format
 msgid "Search installed fonts"
 msgstr "搜索已安装的字体"
 
-#: standalone/drakfont:184
+#: standalone/drakfont:185
 #, c-format
 msgid "Unselect fonts installed"
 msgstr "不选已安装的文件"
 
-#: standalone/drakfont:207
+#: standalone/drakfont:208
 #, c-format
 msgid "parse all fonts"
 msgstr "分析所有字体"
 
-#: standalone/drakfont:209
+#: standalone/drakfont:210
 #, c-format
 msgid "No fonts found"
 msgstr "找不到字体"
 
-#: standalone/drakfont:217 standalone/drakfont:259 standalone/drakfont:326
-#: standalone/drakfont:359 standalone/drakfont:367 standalone/drakfont:393
-#: standalone/drakfont:411 standalone/drakfont:425
+#: standalone/drakfont:218 standalone/drakfont:260 standalone/drakfont:327
+#: standalone/drakfont:360 standalone/drakfont:368 standalone/drakfont:394
+#: standalone/drakfont:412 standalone/drakfont:426
 #, c-format
 msgid "done"
 msgstr "完成"
 
-#: standalone/drakfont:222
+#: standalone/drakfont:223
 #, c-format
 msgid "Could not find any font in your mounted partitions"
 msgstr "在已挂载的分区中找不到任何字体"
 
-#: standalone/drakfont:257
+#: standalone/drakfont:258
 #, c-format
 msgid "Reselect correct fonts"
 msgstr "重新选择正确字体"
 
-#: standalone/drakfont:260
+#: standalone/drakfont:261
 #, c-format
 msgid "Could not find any font.\n"
 msgstr "找不到任何字体。\n"
 
-#: standalone/drakfont:270
+#: standalone/drakfont:271
 #, c-format
 msgid "Search for fonts in installed list"
 msgstr "在安装记录中查找字体"
 
-#: standalone/drakfont:295
+#: standalone/drakfont:296
 #, c-format
 msgid "%s fonts conversion"
 msgstr "%s 字体转换"
 
-#: standalone/drakfont:324
+#: standalone/drakfont:325
 #, c-format
 msgid "Fonts copy"
 msgstr "复制字体"
 
-#: standalone/drakfont:327
+#: standalone/drakfont:328
 #, c-format
 msgid "True Type fonts installation"
 msgstr "TrueType 字体安装"
 
-#: standalone/drakfont:334
+#: standalone/drakfont:335
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr "正在运行 ttmkfdir, 请稍候..."
 
-#: standalone/drakfont:335
+#: standalone/drakfont:336
 #, c-format
 msgid "True Type install done"
 msgstr "TrueType 字体安装完成"
 
-#: standalone/drakfont:341 standalone/drakfont:356
+#: standalone/drakfont:342 standalone/drakfont:357
 #, c-format
 msgid "type1inst building"
 msgstr "正在构造 type1inst"
 
-#: standalone/drakfont:350
+#: standalone/drakfont:351
 #, c-format
 msgid "Ghostscript referencing"
 msgstr "Ghostscript 引用"
 
-#: standalone/drakfont:360
+#: standalone/drakfont:361
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr "删除临时文件"
 
-#: standalone/drakfont:363
+#: standalone/drakfont:364
 #, c-format
 msgid "Restart XFS"
 msgstr "重新启动 XFS"
 
-#: standalone/drakfont:409 standalone/drakfont:419
+#: standalone/drakfont:410 standalone/drakfont:420
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "删除字体文件"
 
-#: standalone/drakfont:421
+#: standalone/drakfont:422
 #, c-format
 msgid "xfs restart"
 msgstr "重新启动 xfs"
 
-#: standalone/drakfont:429
+#: standalone/drakfont:430
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -21131,7 +21216,7 @@ msgstr "自定义和系统设置"
 msgid "Editable"
 msgstr "可编辑"
 
-#: standalone/drakperm:49 standalone/drakperm:329
+#: standalone/drakperm:49 standalone/drakperm:324
 #, c-format
 msgid "Path"
 msgstr "路径"
@@ -21146,7 +21231,7 @@ msgstr "用户"
 msgid "Group"
 msgstr "组"
 
-#: standalone/drakperm:49 standalone/drakperm:341
+#: standalone/drakperm:49 standalone/drakperm:336
 #, c-format
 msgid "Permissions"
 msgstr "权限"
@@ -21336,7 +21421,7 @@ msgstr "选中后, 无法更改所有者和组"
 msgid "Path selection"
 msgstr "选择路径"
 
-#: standalone/drakperm:335
+#: standalone/drakperm:330
 #, c-format
 msgid "Property"
 msgstr "属性"
@@ -21456,115 +21541,122 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "auto_install.cfg 文件的位置"
 
-#: standalone/drakroam:137
+#: standalone/drakroam:41
+#, c-format
+msgid ""
+"You do not have any wireless interface.\n"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+msgstr ""
+
+#: standalone/drakroam:141
 #, c-format
 msgid "ESSID"
 msgstr "ESSID"
 
-#: standalone/drakroam:138 standalone/drakvpn:1143
+#: standalone/drakroam:142 standalone/drakvpn:1143
 #, c-format
 msgid "Mode"
 msgstr "模式"
 
-#: standalone/drakroam:139 standalone/harddrake2:96
+#: standalone/drakroam:143 standalone/harddrake2:96
 #, c-format
 msgid "Channel"
 msgstr "通道"
 
-#: standalone/drakroam:141
+#: standalone/drakroam:145
 #, c-format
 msgid "Key"
 msgstr "密钥"
 
-#: standalone/drakroam:157
+#: standalone/drakroam:161
 #, c-format
 msgid "Network:"
 msgstr "网络:"
 
-#: standalone/drakroam:158
+#: standalone/drakroam:162
 #, c-format
 msgid "IP:"
 msgstr "IP:"
 
-#: standalone/drakroam:160
+#: standalone/drakroam:164
 #, c-format
 msgid "Mode:"
 msgstr "模式："
 
-#: standalone/drakroam:161
+#: standalone/drakroam:165
 #, c-format
 msgid "Encryption:"
 msgstr "加密:"
 
-#: standalone/drakroam:162
+#: standalone/drakroam:166
 #, c-format
 msgid "Signal:"
 msgstr "信号:"
 
-#: standalone/drakroam:176
+#: standalone/drakroam:180
 #, c-format
 msgid "Roaming"
 msgstr "漫游"
 
-#: standalone/drakroam:179 standalone/drakroam:258
+#: standalone/drakroam:183 standalone/drakroam:266
 #, c-format
 msgid "Roaming: %s"
 msgstr "漫游：%s"
 
-#: standalone/drakroam:179 standalone/drakroam:257 standalone/drakvpn:1061
+#: standalone/drakroam:183 standalone/drakroam:265 standalone/drakvpn:1061
 #: standalone/drakvpn:1077 standalone/drakvpn:1090
 #, c-format
 msgid "off"
 msgstr "关"
 
-#: standalone/drakroam:186
+#: standalone/drakroam:190
 #, c-format
 msgid "Scan interval (sec): "
 msgstr "扫描间隔(秒): "
 
-#: standalone/drakroam:189
+#: standalone/drakroam:193
 #, c-format
 msgid "Set"
 msgstr "设置"
 
-#: standalone/drakroam:194
+#: standalone/drakroam:198
 #, c-format
 msgid "Known Networks (Drag up/down or edit)"
 msgstr "已知网络(上下拖曳或编辑)"
 
-#: standalone/drakroam:202
+#: standalone/drakroam:206
 #, c-format
 msgid "Connect"
 msgstr "连接"
 
-#: standalone/drakroam:210
+#: standalone/drakroam:214
 #, c-format
 msgid "Available Networks"
 msgstr "可用的网络"
 
-#: standalone/drakroam:221
+#: standalone/drakroam:229
 #, c-format
 msgid "Rescan"
 msgstr "重新扫描"
 
-#: standalone/drakroam:225
+#: standalone/drakroam:233
 #, c-format
 msgid "Status"
 msgstr "状态"
 
-#: standalone/drakroam:232
+#: standalone/drakroam:240
 #, c-format
 msgid "Disconnect"
 msgstr "断开"
 
 #. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:233 standalone/net_applet:90
+#: standalone/drakroam:241 standalone/net_applet:90
 #: standalone/printerdrake:238
 #, c-format
 msgid "Refresh"
 msgstr "刷新"
 
-#: standalone/drakroam:257 standalone/drakvpn:1061 standalone/drakvpn:1077
+#: standalone/drakroam:265 standalone/drakvpn:1061 standalone/drakvpn:1077
 #: standalone/drakvpn:1090
 #, c-format
 msgid "on"
@@ -21770,7 +21862,7 @@ msgstr ""
 "注意: 如果您的声卡是 ISA 即插即用的, 您需要使用 sndconfig 程序。只需在控制台"
 "中输入“alsaconf”或“sndconfig”。"
 
-#: standalone/draksplash:21
+#: standalone/draksplash:26
 #, c-format
 msgid ""
 "package 'ImageMagick' is required to be able to complete configuration.\n"
@@ -21779,167 +21871,113 @@ msgstr ""
 "要正常工作需要软件包 ImageMagick。\n"
 "请单击“确定”安装 ImageMagick 或“取消”退出"
 
-#: standalone/draksplash:68
-#, c-format
-msgid "first step creation"
-msgstr "第一步创建"
-
-#: standalone/draksplash:71
-#, c-format
-msgid "final resolution"
-msgstr "最终分辨率"
-
-#: standalone/draksplash:72
-#, c-format
-msgid "choose image file"
-msgstr "选择图像文件"
-
-#: standalone/draksplash:73
-#, c-format
-msgid "Theme name"
-msgstr "主题名称"
-
-#: standalone/draksplash:78
-#, c-format
-msgid "Browse"
-msgstr "浏览"
-
-#: standalone/draksplash:93 standalone/draksplash:158
-#, c-format
-msgid "Configure bootsplash picture"
-msgstr "配置开机画面图片"
-
-#: standalone/draksplash:96
+#: standalone/draksplash:32
 #, c-format
 msgid ""
 "x coordinate of text box\n"
 "in number of characters"
 msgstr "文本框的 X 坐标, 按字符数计算"
 
-#: standalone/draksplash:97
+#: standalone/draksplash:33
 #, c-format
 msgid ""
 "y coordinate of text box\n"
 "in number of characters"
 msgstr "文本框的 Y 坐标, 按字符数计算"
 
-#: standalone/draksplash:98
+#: standalone/draksplash:34
 #, c-format
 msgid "text width"
 msgstr "文本宽度"
 
-#: standalone/draksplash:99
+#: standalone/draksplash:35
 #, c-format
 msgid "text box height"
 msgstr "文本框高度"
 
-#: standalone/draksplash:100
+#: standalone/draksplash:36
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
 "of its upper left corner"
 msgstr "进度条的左上角的 X 坐标"
 
-#: standalone/draksplash:101
+#: standalone/draksplash:37
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
 "of its upper left corner"
 msgstr "进度条的左上角的 Y 坐标"
 
-#: standalone/draksplash:102
+#: standalone/draksplash:38
 #, c-format
 msgid "the width of the progress bar"
 msgstr "进度条的宽度"
 
-#: standalone/draksplash:103
+#: standalone/draksplash:39
 #, c-format
 msgid "the height of the progress bar"
 msgstr "进度条的高度"
 
-#: standalone/draksplash:104
+#: standalone/draksplash:56 standalone/draksplash:61
 #, c-format
-msgid "the color of the progress bar"
-msgstr "进度条的颜色"
+msgid "Choose progress bar color"
+msgstr ""
 
-#: standalone/draksplash:119
+#: standalone/draksplash:57 standalone/draksplash:62
 #, c-format
-msgid "Preview"
-msgstr "预览"
+msgid "Choose picture"
+msgstr ""
 
-#: standalone/draksplash:121
+#: standalone/draksplash:58
 #, c-format
-msgid "Save theme"
-msgstr "保存主题"
+msgid "Silent bootsplash"
+msgstr ""
 
-#: standalone/draksplash:122
+#: standalone/draksplash:63
 #, c-format
-msgid "Choose color"
-msgstr "选择颜色"
+msgid "Verbose bootsplash"
+msgstr ""
 
-#: standalone/draksplash:125
+#: standalone/draksplash:65
 #, c-format
 msgid "Display logo on Console"
 msgstr "在控制台显示 LOGO"
 
-#: standalone/draksplash:126
+#: standalone/draksplash:68
 #, c-format
-msgid "Make kernel message quiet by default"
-msgstr "默认设定内核消息不显示"
+msgid "Console bootsplash"
+msgstr ""
 
-#: standalone/draksplash:161 standalone/draksplash:316
-#: standalone/draksplash:460
+#: standalone/draksplash:74
 #, c-format
-msgid "Notice"
-msgstr "注意"
+msgid "Theme name"
+msgstr "主题名称"
 
-#: standalone/draksplash:161 standalone/draksplash:316
+#: standalone/draksplash:77
 #, c-format
-msgid "This theme does not yet have a bootsplash in %s!"
-msgstr "这个主题的 %s 里面还没有任何开机画面！"
+msgid "final resolution"
+msgstr "最终分辨率"
 
-#: standalone/draksplash:167
+#: standalone/draksplash:82
 #, c-format
-msgid "choose image"
-msgstr "选择图像"
+msgid "Save theme"
+msgstr "保存主题"
 
-#: standalone/draksplash:217
+#: standalone/draksplash:130
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "保存开机画面主题..."
 
-#: standalone/draksplash:441
-#, c-format
-msgid "ProgressBar color selection"
-msgstr "进度条颜色选择"
-
-#: standalone/draksplash:460
-#, c-format
-msgid "You must choose an image file first!"
-msgstr "您必须先选择一个图像文件！"
-
-#: standalone/draksplash:465
-#, c-format
-msgid "Generating preview..."
-msgstr "正在生成预览..."
-
-#. -PO:  First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:503
+#: standalone/draksplash:145
 #, c-format
-msgid "%s BootSplash (%s) preview"
-msgstr "%s 启动画面(%s)预览"
+msgid "choose image"
+msgstr "选择图像"
 
-#. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/draksplash:509
+#: standalone/draksplash:162
 #, c-format
-msgid ""
-"The image \"%s\" cannot be load due to the following issue:\n"
-"\n"
-"<span foreground=\"Red\">%s</span>"
-msgstr ""
-"无法装入图像“%s”, 原因是:\n"
-"\n"
-"<span foreground=\"Red\">%s</span>"
+msgid "ProgressBar color selection"
+msgstr "进度条颜色选择"
 
 #: standalone/drakups:74
 #, c-format
@@ -21979,13 +22017,13 @@ msgstr ""
 msgid "Autodetection"
 msgstr "自动检测"
 
-#: standalone/drakups:101 standalone/harddrake2:236
+#: standalone/drakups:101 standalone/harddrake2:244
 #, c-format
 msgid "Detection in progress"
 msgstr "检测进行中"
 
-#: standalone/drakups:120 standalone/drakups:159 standalone/logdrake:449
-#: standalone/logdrake:455
+#: standalone/drakups:120 standalone/drakups:159 standalone/logdrake:450
+#: standalone/logdrake:456
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
@@ -24092,7 +24130,7 @@ msgstr "图形桌面使用鼠标的协议"
 
 #: standalone/harddrake2:127 standalone/harddrake2:136
 #: standalone/harddrake2:143 standalone/harddrake2:151
-#: standalone/harddrake2:321
+#: standalone/harddrake2:317
 #, c-format
 msgid "Identification"
 msgstr "标识"
@@ -24219,85 +24257,85 @@ msgstr ""
 "tvignaud@mandriva.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:243
+#: standalone/harddrake2:240
 #, c-format
 msgid "Harddrake2"
 msgstr "Drak 硬件配置"
 
-#: standalone/harddrake2:258
+#: standalone/harddrake2:254
 #, c-format
 msgid "Detected hardware"
 msgstr "检测到的硬件"
 
-#: standalone/harddrake2:263
+#: standalone/harddrake2:259
 #, c-format
 msgid "Configure module"
 msgstr "配置模块"
 
-#: standalone/harddrake2:270
+#: standalone/harddrake2:266
 #, c-format
 msgid "Run config tool"
 msgstr "运行配置工具"
 
-#: standalone/harddrake2:308 standalone/net_monitor:108
+#: standalone/harddrake2:304 standalone/net_monitor:108
 #: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "未知"
 
-#: standalone/harddrake2:309 standalone/printerdrake:298
+#: standalone/harddrake2:305 standalone/printerdrake:298
 #: standalone/printerdrake:336
 #, c-format
 msgid "Unknown"
 msgstr "未知"
 
-#: standalone/harddrake2:329
+#: standalone/harddrake2:325
 #, c-format
 msgid "Misc"
 msgstr "杂项"
 
-#: standalone/harddrake2:344
+#: standalone/harddrake2:340
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
 msgstr "单击左侧树中的设备, 就可在此显示其信息。"
 
-#: standalone/harddrake2:396
+#: standalone/harddrake2:392
 #, c-format
 msgid "secondary"
 msgstr "次要"
 
-#: standalone/harddrake2:396
+#: standalone/harddrake2:392
 #, c-format
 msgid "primary"
 msgstr "主"
 
-#: standalone/harddrake2:400
+#: standalone/harddrake2:396
 #, c-format
 msgid "burner"
 msgstr "刻录机"
 
-#: standalone/harddrake2:400
+#: standalone/harddrake2:396
 #, c-format
 msgid "DVD"
 msgstr "DVD"
 
-#: standalone/harddrake2:546 standalone/harddrake2:549
+#: standalone/harddrake2:542 standalone/harddrake2:545
 #, c-format
 msgid "Upload the hardware list"
 msgstr "上传硬件列表"
 
-#: standalone/harddrake2:551
+#: standalone/harddrake2:547
 #, c-format
 msgid "Account:"
 msgstr "账户："
 
-#: standalone/harddrake2:552
+#: standalone/harddrake2:548
 #, c-format
 msgid "Password:"
 msgstr "密码："
 
-#: standalone/harddrake2:553
+#: standalone/harddrake2:549
 #, c-format
 msgid "Hostname:"
 msgstr "主机名："
@@ -24317,7 +24355,7 @@ msgstr "您是否想要 BackSpace 在控制台起 Delete 的作用?"
 msgid "LocaleDrake"
 msgstr "Drak 语言设置"
 
-#: standalone/localedrake:67
+#: standalone/localedrake:68
 #, c-format
 msgid "The change is done, but to be effective you must logout"
 msgstr "修改已经完成, 不过您必须退出登录修改才会生效"
@@ -24455,7 +24493,7 @@ msgstr "日历"
 msgid "Content of the file"
 msgstr "文件内容"
 
-#: standalone/logdrake:162 standalone/logdrake:399
+#: standalone/logdrake:162 standalone/logdrake:400
 #, c-format
 msgid "Mail alert"
 msgstr "邮件提醒"
@@ -24465,62 +24503,62 @@ msgstr "邮件提醒"
 msgid "The alert wizard has failed unexpectedly:"
 msgstr "提醒向导意外失败:"
 
-#: standalone/logdrake:221
+#: standalone/logdrake:222
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "请等待, 正在分析文件: %s"
 
-#: standalone/logdrake:376
+#: standalone/logdrake:377
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache WWW 服务器"
 
-#: standalone/logdrake:377
+#: standalone/logdrake:378
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "域名解析器"
 
-#: standalone/logdrake:378
+#: standalone/logdrake:379
 #, c-format
 msgid "Ftp Server"
 msgstr "FTP 服务器"
 
-#: standalone/logdrake:379
+#: standalone/logdrake:380
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix 邮件服务"
 
-#: standalone/logdrake:380
+#: standalone/logdrake:381
 #, c-format
 msgid "Samba Server"
 msgstr "Samba 服务器"
 
-#: standalone/logdrake:382
+#: standalone/logdrake:383
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin 服务"
 
-#: standalone/logdrake:383
+#: standalone/logdrake:384
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd 服务"
 
-#: standalone/logdrake:394
+#: standalone/logdrake:395
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "配置邮件提醒系统"
 
-#: standalone/logdrake:395
+#: standalone/logdrake:396
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "停止邮件提醒系统"
 
-#: standalone/logdrake:402
+#: standalone/logdrake:403
 #, c-format
 msgid "Mail alert configuration"
 msgstr "邮件提醒设定"
 
-#: standalone/logdrake:403
+#: standalone/logdrake:404
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -24531,66 +24569,66 @@ msgstr ""
 "\n"
 "您可以在这里配置提醒。\n"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:407
 #, c-format
 msgid "What do you want to do?"
 msgstr "您想做什么?"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:414
 #, c-format
 msgid "Services settings"
 msgstr "服务设置"
 
-#: standalone/logdrake:414
+#: standalone/logdrake:415
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr "如果选中的服务中有任何一个停止运行, 您将收到提醒"
 
-#: standalone/logdrake:421
+#: standalone/logdrake:422
 #, c-format
 msgid "Load setting"
 msgstr "负载设置"
 
-#: standalone/logdrake:422
+#: standalone/logdrake:423
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "当负载超过这个值时您会收到一个警报"
 
-#: standalone/logdrake:423
+#: standalone/logdrake:424
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "负载"
 
-#: standalone/logdrake:428
+#: standalone/logdrake:429
 #, c-format
 msgid "Alert configuration"
 msgstr "提醒配置"
 
-#: standalone/logdrake:429
+#: standalone/logdrake:430
 #, c-format
 msgid "Please enter your email address below "
 msgstr "请在下面输入您的电子邮件地址 "
 
-#: standalone/logdrake:430
+#: standalone/logdrake:431
 #, c-format
 msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr "请输入您想使用的 SMTP 服务器的名称(或 IP 地址)"
 
-#: standalone/logdrake:449
+#: standalone/logdrake:450
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "向导已经成功配置了邮件提醒。"
 
-#: standalone/logdrake:455
+#: standalone/logdrake:456
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "向导已经成功禁用了邮件提醒。"
 
-#: standalone/logdrake:514
+#: standalone/logdrake:515
 #, c-format
 msgid "Save as.."
 msgstr "另存为..."
@@ -25511,7 +25549,7 @@ msgstr "添加了一些设备: %s\n"
 msgid "- %s was added\n"
 msgstr "- %s 已添加\n"
 
-#: standalone/service_harddrake:204
+#: standalone/service_harddrake:203
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "硬件检测进行中"
@@ -25616,47 +25654,47 @@ msgstr "安装更新"
 msgid "Exit install"
 msgstr "退出安装"
 
-#: ugtk2.pm:909
+#: ugtk2.pm:908
 #, c-format
 msgid "Is this correct?"
 msgstr "这样正确吗?"
 
-#: ugtk2.pm:969
+#: ugtk2.pm:968
 #, c-format
 msgid "No file chosen"
 msgstr "未选择文件"
 
-#: ugtk2.pm:971
+#: ugtk2.pm:970
 #, c-format
 msgid "You have chosen a file, not a directory"
 msgstr "您选择了文件，而非目录"
 
-#: ugtk2.pm:973
+#: ugtk2.pm:972
 #, c-format
 msgid "You have chosen a directory, not a file"
 msgstr "您选择了目录，而非文件"
 
-#: ugtk2.pm:975
+#: ugtk2.pm:974
 #, c-format
 msgid "No such directory"
 msgstr "无此目录"
 
-#: ugtk2.pm:975
+#: ugtk2.pm:974
 #, c-format
 msgid "No such file"
 msgstr "非本地文件"
 
-#: ugtk2.pm:1056
+#: ugtk2.pm:1055
 #, c-format
 msgid "Expand Tree"
 msgstr "展开树"
 
-#: ugtk2.pm:1057
+#: ugtk2.pm:1056
 #, c-format
 msgid "Collapse Tree"
 msgstr "折叠树"
 
-#: ugtk2.pm:1058
+#: ugtk2.pm:1057
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "切换清单显示/分组排序"
@@ -25675,3 +25713,142 @@ msgstr ""
 msgid "Installation failed"
 msgstr "安装失败"
 
+#~ msgid "Number of logical extents: %d"
+#~ msgstr "逻辑扩展分区数: %d"
+
+#~ msgid ""
+#~ "Your system is low on resources. You may have some problem installing\n"
+#~ "Mandriva Linux. If that occurs, you can try a text install instead. For "
+#~ "this,\n"
+#~ "press `F1' when booting on CDROM, then enter `text'."
+#~ msgstr ""
+#~ "您的系统资源不足。您在安装 Mandriva Linux 时可能遇到问题。\n"
+#~ "如果这样, 您可以尝试文本模式的安装。\n"
+#~ "在从光盘启动后按“F1”键, 然后输入“text”。"
+
+#~ msgid ""
+#~ "Contacting Mandriva Linux web site to get the list of available mirrors..."
+#~ msgstr "正在连接 Mandriva Linux 网站以获得镜像网站列表..."
+
+#~ msgid "Mandriva Linux Installation %s"
+#~ msgstr "Mandriva Linux 安装 %s"
+
+#~ msgid ""
+#~ "WARNING: this device has been previously configured to connect to the "
+#~ "Internet.\n"
+#~ "Modifying the fields below will override this configuration.\n"
+#~ "Do you really want to reconfigure this device?"
+#~ msgstr ""
+#~ "警告: 此设备已经先前被配置用于连接到 Internet。\n"
+#~ "修改下面的输入框将覆盖此配置。\n"
+#~ "您真的想要重新配置此设备吗?"
+
+#~ msgid ""
+#~ "        - Create etherboot floppies/CDs:\n"
+#~ "        \tThe diskless client machines need either ROM images on the NIC, "
+#~ "or a boot floppy\n"
+#~ "        \tor CD to initiate the boot sequence.  drakTermServ will help "
+#~ "generate these\n"
+#~ "        \timages, based on the NIC in the client machine.\n"
+#~ "        \t\t\n"
+#~ "        \tA basic example of creating a boot floppy for a 3Com 3c509 "
+#~ "manually:\n"
+#~ "        \t\t\n"
+#~ "        \tcat /usr/lib/etherboot/floppyload.bin \\\n"
+#~ "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
+#~ "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
+#~ msgstr ""
+#~ "        - 创建 etherboot 启动软盘/光盘:\n"
+#~ "        \t\t无法工作站需要在网卡上有 ROM 镜像, 或者启动软盘或光盘来初始化"
+#~ "启动过程。\n"
+#~ "        \t\t“Drak 终端服务”能够帮助您根据客户端计算机的网卡生成这些镜"
+#~ "像。\n"
+#~ "        \t\t\n"
+#~ "        \t\t为 3Com 3c509 手工创建一张启动软盘的例子:\n"
+#~ "        \t\t\n"
+#~ "        \tcat /usr/lib/etherboot/floppyload.bin \\\n"
+#~ "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
+#~ "        \t\t/usr/lib/etherboot/lzrom/3c509.lzrom > /dev/fd0"
+
+#~ msgid "Dynamic IP Address Pool:"
+#~ msgstr "动态 IP 地址池: "
+
+#~ msgid "hd"
+#~ msgstr "硬盘"
+
+#~ msgid "tape"
+#~ msgstr "磁带机"
+
+#~ msgid "WebDAV remote site already in sync!"
+#~ msgstr "WebDAV 远程站点已经同步！"
+
+#~ msgid "WebDAV transfer failed!"
+#~ msgstr "WebDAV 传输失败！"
+
+#~ msgid ""
+#~ "Backup quota exceeded!\n"
+#~ "%d MB used vs %d MB allocated."
+#~ msgstr ""
+#~ "达到了备份限额！\n"
+#~ "使用了 %d MB, 而分配了 %d MB。"
+
+#~ msgid ""
+#~ "Maximum size\n"
+#~ " allowed for Drakbackup (MB)"
+#~ msgstr ""
+#~ "允许“Drak 备份”\n"
+#~ "  使用的最大空间(Mb)"
+
+#~ msgid "\t-Network by webdav.\n"
+#~ msgstr "\t-通过 webdav 的网络。\n"
+
+#~ msgid "Use graphical boot"
+#~ msgstr "使用图形化引导"
+
+#~ msgid "first step creation"
+#~ msgstr "第一步创建"
+
+#~ msgid "choose image file"
+#~ msgstr "选择图像文件"
+
+#~ msgid "Browse"
+#~ msgstr "浏览"
+
+#~ msgid "Configure bootsplash picture"
+#~ msgstr "配置开机画面图片"
+
+#~ msgid "the color of the progress bar"
+#~ msgstr "进度条的颜色"
+
+#~ msgid "Preview"
+#~ msgstr "预览"
+
+#~ msgid "Choose color"
+#~ msgstr "选择颜色"
+
+#~ msgid "Make kernel message quiet by default"
+#~ msgstr "默认设定内核消息不显示"
+
+#~ msgid "Notice"
+#~ msgstr "注意"
+
+#~ msgid "This theme does not yet have a bootsplash in %s!"
+#~ msgstr "这个主题的 %s 里面还没有任何开机画面！"
+
+#~ msgid "You must choose an image file first!"
+#~ msgstr "您必须先选择一个图像文件！"
+
+#~ msgid "Generating preview..."
+#~ msgstr "正在生成预览..."
+
+#~ msgid "%s BootSplash (%s) preview"
+#~ msgstr "%s 启动画面(%s)预览"
+
+#~ msgid ""
+#~ "The image \"%s\" cannot be load due to the following issue:\n"
+#~ "\n"
+#~ "<span foreground=\"Red\">%s</span>"
+#~ msgstr ""
+#~ "无法装入图像“%s”, 原因是:\n"
+#~ "\n"
+#~ "<span foreground=\"Red\">%s</span>"
author	Thierry Vignaud <tvignaud@mandriva.org>	2005-05-19 08:37:55 +0000
committer	Thierry Vignaud <tvignaud@mandriva.org>	2005-05-19 08:37:55 +0000
commit	d21399ea877ea9c0fa1e342f0ea319df1b76a8c7 (patch)
tree	37a4c762f819973f604b1beca49317e491cdd759 /perl-install/share/po/zh_CN.po
parent	4b83d153ddfeb3ea6f6ce9965ef298c915c6fab6 (diff)
download	drakx-backup-do-not-use-d21399ea877ea9c0fa1e342f0ea319df1b76a8c7.tar drakx-backup-do-not-use-d21399ea877ea9c0fa1e342f0ea319df1b76a8c7.tar.gz drakx-backup-do-not-use-d21399ea877ea9c0fa1e342f0ea319df1b76a8c7.tar.bz2 drakx-backup-do-not-use-d21399ea877ea9c0fa1e342f0ea319df1b76a8c7.tar.xz drakx-backup-do-not-use-d21399ea877ea9c0fa1e342f0ea319df1b76a8c7.zip