sync with copyright bumping

1 files changed, 2484 insertions, 1922 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index 26cbd651b..df9d3d82e 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-07-27 17:26+0200\n"
+"POT-Creation-Date: 2005-08-25 15:00+0200\n"
 "PO-Revision-Date: 2005-08-01 05:03+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -72,7 +72,7 @@ msgstr ""
 "请单击按钮重新启动计算机, 拔出该密钥盘之后, 去掉写保护后再插入, \n"
 "然后再次调用 Mandriva Move。"
 
-#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1319
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
 msgid "Reboot"
 msgstr "重新启动"
@@ -163,70 +163,73 @@ msgstr "请稍候, 正在检测并配置设备..."
 #: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/interactive.pm:230
 #: diskdrake/interactive.pm:243 diskdrake/interactive.pm:404
 #: diskdrake/interactive.pm:422 diskdrake/interactive.pm:558
-#: diskdrake/interactive.pm:563 diskdrake/smbnfs_gtk.pm:41 fsedit.pm:209
-#: install_any.pm:1730 install_any.pm:1782 install_steps.pm:81
-#: install_steps_interactive.pm:37 interactive/http.pm:117
+#: diskdrake/interactive.pm:563 diskdrake/smbnfs_gtk.pm:41 do_pkgs.pm:19
+#: do_pkgs.pm:37 fsedit.pm:209 install_any.pm:1730 install_any.pm:1782
+#: install_steps.pm:81 install_steps_interactive.pm:37 interactive/http.pm:117
 #: interactive/http.pm:118 network/ndiswrapper.pm:27 network/ndiswrapper.pm:42
 #: network/ndiswrapper.pm:89 network/ndiswrapper.pm:101
-#: network/netconnect.pm:819 network/netconnect.pm:923
-#: network/netconnect.pm:927 network/netconnect.pm:931
-#: network/netconnect.pm:936 network/netconnect.pm:1066
-#: network/netconnect.pm:1070 network/netconnect.pm:1074
-#: network/netconnect.pm:1078 network/netconnect.pm:1186
-#: network/netconnect.pm:1191 network/netconnect.pm:1211
-#: network/netconnect.pm:1364 network/thirdparty.pm:266
-#: network/thirdparty.pm:273 network/thirdparty.pm:309
-#: network/thirdparty.pm:311 network/thirdparty.pm:332
-#: network/thirdparty.pm:356 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
-#: printer/printerdrake.pm:514 printer/printerdrake.pm:641
-#: printer/printerdrake.pm:1352 printer/printerdrake.pm:1399
-#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1481
-#: printer/printerdrake.pm:1485 printer/printerdrake.pm:1499
-#: printer/printerdrake.pm:1591 printer/printerdrake.pm:1672
-#: printer/printerdrake.pm:1676 printer/printerdrake.pm:1680
-#: printer/printerdrake.pm:1729 printer/printerdrake.pm:1787
-#: printer/printerdrake.pm:1791 printer/printerdrake.pm:1805
-#: printer/printerdrake.pm:1920 printer/printerdrake.pm:1924
-#: printer/printerdrake.pm:1967 printer/printerdrake.pm:2042
-#: printer/printerdrake.pm:2060 printer/printerdrake.pm:2069
-#: printer/printerdrake.pm:2078 printer/printerdrake.pm:2089
-#: printer/printerdrake.pm:2153 printer/printerdrake.pm:2247
-#: printer/printerdrake.pm:2767 printer/printerdrake.pm:3042
-#: printer/printerdrake.pm:3048 printer/printerdrake.pm:3596
-#: printer/printerdrake.pm:3600 printer/printerdrake.pm:3604
-#: printer/printerdrake.pm:4064 printer/printerdrake.pm:4305
-#: printer/printerdrake.pm:4329 printer/printerdrake.pm:4406
-#: printer/printerdrake.pm:4472 printer/printerdrake.pm:4592
-#: standalone/drakTermServ:393 standalone/drakTermServ:467
-#: standalone/drakTermServ:476 standalone/drakTermServ:771
-#: standalone/drakTermServ:778 standalone/drakTermServ:801
-#: standalone/drakTermServ:848 standalone/drakTermServ:1056
-#: standalone/drakTermServ:1536 standalone/drakTermServ:1552
-#: standalone/drakTermServ:1557 standalone/drakTermServ:1565
-#: standalone/drakTermServ:1577 standalone/drakTermServ:1598
-#: standalone/drakauth:36 standalone/drakbackup:498 standalone/drakbackup:612
-#: standalone/drakbackup:1090 standalone/drakbackup:1122
-#: standalone/drakbackup:1645 standalone/drakbackup:1801
-#: standalone/drakbackup:2415 standalone/drakbackup:4104
-#: standalone/drakbackup:4324 standalone/drakclock:124
-#: standalone/drakconnect:672 standalone/drakconnect:676
-#: standalone/drakconnect:681 standalone/drakconnect:696
+#: network/netconnect.pm:918 network/netconnect.pm:922
+#: network/netconnect.pm:926 network/netconnect.pm:931
+#: network/netconnect.pm:1074 network/netconnect.pm:1078
+#: network/netconnect.pm:1196 network/netconnect.pm:1201
+#: network/netconnect.pm:1221 network/netconnect.pm:1374
+#: network/thirdparty.pm:266 network/thirdparty.pm:273
+#: network/thirdparty.pm:309 network/thirdparty.pm:311
+#: network/thirdparty.pm:332 network/thirdparty.pm:356
+#: 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 printer/printerdrake.pm:514
+#: printer/printerdrake.pm:686 printer/printerdrake.pm:690
+#: printer/printerdrake.pm:772 printer/printerdrake.pm:1575
+#: printer/printerdrake.pm:1622 printer/printerdrake.pm:1659
+#: printer/printerdrake.pm:1704 printer/printerdrake.pm:1708
+#: printer/printerdrake.pm:1722 printer/printerdrake.pm:1814
+#: printer/printerdrake.pm:1895 printer/printerdrake.pm:1899
+#: printer/printerdrake.pm:1903 printer/printerdrake.pm:1952
+#: printer/printerdrake.pm:2010 printer/printerdrake.pm:2014
+#: printer/printerdrake.pm:2028 printer/printerdrake.pm:2148
+#: printer/printerdrake.pm:2152 printer/printerdrake.pm:2195
+#: printer/printerdrake.pm:2270 printer/printerdrake.pm:2288
+#: printer/printerdrake.pm:2297 printer/printerdrake.pm:2306
+#: printer/printerdrake.pm:2317 printer/printerdrake.pm:2381
+#: printer/printerdrake.pm:2476 printer/printerdrake.pm:3025
+#: printer/printerdrake.pm:3309 printer/printerdrake.pm:3315
+#: printer/printerdrake.pm:3879 printer/printerdrake.pm:3883
+#: printer/printerdrake.pm:3887 printer/printerdrake.pm:4348
+#: printer/printerdrake.pm:4589 printer/printerdrake.pm:4613
+#: printer/printerdrake.pm:4690 printer/printerdrake.pm:4756
+#: printer/printerdrake.pm:4876 standalone/drakTermServ:394
+#: standalone/drakTermServ:464 standalone/drakTermServ:473
+#: standalone/drakTermServ:774 standalone/drakTermServ:781
+#: standalone/drakTermServ:802 standalone/drakTermServ:849
+#: standalone/drakTermServ:1095 standalone/drakTermServ:1572
+#: standalone/drakTermServ:1588 standalone/drakTermServ:1593
+#: standalone/drakTermServ:1601 standalone/drakTermServ:1613
+#: standalone/drakTermServ:1634 standalone/drakauth:36
+#: standalone/drakbackup:498 standalone/drakbackup:612
+#: standalone/drakbackup:1093 standalone/drakbackup:1125
+#: standalone/drakbackup:1648 standalone/drakbackup:1804
+#: standalone/drakbackup:2429 standalone/drakbackup:4118
+#: standalone/drakbackup:4338 standalone/drakclock:124
+#: standalone/drakconnect:676 standalone/drakconnect:680
+#: standalone/drakconnect:685 standalone/drakconnect:700
 #: standalone/drakfont:210 standalone/drakfont:223 standalone/drakfont:261
-#: standalone/drakgw:50 standalone/drakgw:188 standalone/drakgw:217
-#: standalone/drakgw:258 standalone/drakgw:292 standalone/drakgw:394
-#: standalone/drakhosts:246 standalone/drakhosts:253 standalone/drakhosts:260
-#: standalone/draknfs:597 standalone/draknfs:604 standalone/draknfs:611
-#: standalone/drakroam:41 standalone/draksplash:15 standalone/draksplash:159
-#: standalone/drakxtv:107 standalone/finish-install:49 standalone/logdrake:168
-#: standalone/logdrake:437 standalone/logdrake:442 standalone/net_applet:160
-#: standalone/scannerdrake:59 standalone/scannerdrake:202
-#: standalone/scannerdrake:261 standalone/scannerdrake:715
-#: standalone/scannerdrake:726 standalone/scannerdrake:865
-#: standalone/scannerdrake:876 standalone/scannerdrake:946 wizards.pm:95
-#: wizards.pm:99 wizards.pm:121
+#: standalone/drakgw:50 standalone/drakgw:188 standalone/drakhosts:98
+#: standalone/drakhosts:248 standalone/drakhosts:255 standalone/drakhosts:262
+#: standalone/draknfs:306 standalone/draknfs:598 standalone/draknfs:605
+#: standalone/draknfs:612 standalone/drakroam:41 standalone/draksambashare:251
+#: standalone/draksambashare:255 standalone/draksambashare:258
+#: standalone/draksambashare:261 standalone/draksambashare:325
+#: standalone/draksambashare:430 standalone/draksambashare:601
+#: standalone/draksambashare:609 standalone/draksambashare:616
+#: standalone/draksplash:150 standalone/drakxtv:107
+#: standalone/finish-install:49 standalone/logdrake:168
+#: standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59
+#: standalone/scannerdrake:202 standalone/scannerdrake:261
+#: standalone/scannerdrake:715 standalone/scannerdrake:726
+#: standalone/scannerdrake:865 standalone/scannerdrake:876
+#: standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr "错误"
@@ -304,8 +307,8 @@ msgid "No CDROM support"
 msgstr "无 CDROM 支持"
 
 #: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:92
-#: diskdrake/interactive.pm:1046 diskdrake/interactive.pm:1056
-#: diskdrake/interactive.pm:1109
+#: diskdrake/interactive.pm:1052 diskdrake/interactive.pm:1062
+#: diskdrake/interactive.pm:1115
 #, c-format
 msgid "Read carefully!"
 msgstr "请仔细阅读！"
@@ -457,17 +460,18 @@ msgstr ""
 "使用 Xorg %s, 您的显示卡可以得到 3D 硬件加速支持。\n"
 "注意这是试验阶段的支持, 它可能会使您的电脑失去反应。"
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:963
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:964
 #, c-format
 msgid "Custom"
 msgstr "自定义"
 
 #: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
-#: install_steps_interactive.pm:85 install_steps_interactive.pm:1319
-#: printer/printerdrake.pm:744 printer/printerdrake.pm:4401
-#: printer/printerdrake.pm:4853 standalone/drakhosts:263 standalone/drakids:69
-#: standalone/drakids:77 standalone/draksplash:85 standalone/logdrake:173
-#: standalone/net_applet:81 standalone/scannerdrake:477
+#: install_steps_interactive.pm:85 install_steps_interactive.pm:1320
+#: printer/printerdrake.pm:882 printer/printerdrake.pm:899
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:5140
+#: standalone/drakhosts:265 standalone/drakids:62 standalone/drakids:71
+#: standalone/drakids:79 standalone/draksplash:81 standalone/logdrake:173
+#: standalone/net_applet:84 standalone/scannerdrake:477
 #, c-format
 msgid "Quit"
 msgstr "退出"
@@ -482,7 +486,7 @@ msgstr "显示卡"
 msgid "Monitor"
 msgstr "显示器"
 
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:286
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:287
 #, c-format
 msgid "Resolution"
 msgstr "分辨率"
@@ -494,7 +498,8 @@ msgstr "测试"
 
 #: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:448
 #: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:79
-#: standalone/drakfont:491 standalone/drakfont:553
+#: printer/printerdrake.pm:1125 standalone/drakfont:491
+#: standalone/drakfont:553
 #, c-format
 msgid "Options"
 msgstr "选项"
@@ -605,65 +610,65 @@ msgstr "1 千 6 百万色(24 位)"
 msgid "Resolutions"
 msgstr "分辨率"
 
-#: Xconfig/resolution_and_depth.pm:308 diskdrake/hd_gtk.pm:336
-#: install_steps_gtk.pm:284 mouse.pm:168 services.pm:162
-#: standalone/drakbackup:1583 standalone/drakperm:250
+#: Xconfig/resolution_and_depth.pm:309 diskdrake/hd_gtk.pm:336
+#: install_steps_gtk.pm:288 mouse.pm:168 services.pm:162
+#: standalone/drakbackup:1586 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "其它"
 
-#: Xconfig/resolution_and_depth.pm:357
+#: Xconfig/resolution_and_depth.pm:358
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "选择屏幕分辨率以及颜色深度"
 
-#: Xconfig/resolution_and_depth.pm:358
+#: Xconfig/resolution_and_depth.pm:359
 #, c-format
 msgid "Graphics card: %s"
 msgstr "显示卡: %s"
 
-#: Xconfig/resolution_and_depth.pm:372 interactive.pm:432
-#: interactive/gtk.pm:807 interactive/http.pm:103 interactive/http.pm:156
+#: Xconfig/resolution_and_depth.pm:373 interactive.pm:432
+#: interactive/gtk.pm:811 interactive/http.pm:103 interactive/http.pm:156
 #: 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:200 standalone/drakTermServ:518
-#: standalone/drakbackup:1347 standalone/drakbackup:3961
-#: standalone/drakbackup:4021 standalone/drakbackup:4065
-#: standalone/drakconnect:158 standalone/drakconnect:848
-#: standalone/drakconnect:935 standalone/drakconnect:1031
-#: standalone/drakfont:574 standalone/drakfont:586 standalone/drakroam:392
-#: standalone/draksplash:169 standalone/drakups:212 standalone/net_monitor:340
+#: standalone/drakTermServ:195 standalone/drakTermServ:515
+#: standalone/drakbackup:1350 standalone/drakbackup:3975
+#: standalone/drakbackup:4035 standalone/drakbackup:4079
+#: standalone/drakconnect:158 standalone/drakconnect:852
+#: standalone/drakconnect:939 standalone/drakconnect:1030
+#: standalone/drakfont:574 standalone/drakfont:584 standalone/drakroam:392
+#: standalone/draksplash:161 standalone/drakups:212 standalone/net_monitor:340
 #: ugtk2.pm:412 ugtk2.pm:510 ugtk2.pm:916 ugtk2.pm:939
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: Xconfig/resolution_and_depth.pm:372 diskdrake/smbnfs_gtk.pm:80 help.pm:89
-#: help.pm:444 install_steps_gtk.pm:480 install_steps_interactive.pm:422
-#: install_steps_interactive.pm:831 interactive.pm:433 interactive/gtk.pm:811
+#: Xconfig/resolution_and_depth.pm:373 diskdrake/smbnfs_gtk.pm:80 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:485 install_steps_interactive.pm:423
+#: install_steps_interactive.pm:832 interactive.pm:433 interactive/gtk.pm:815
 #: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:318
 #: interactive/newt.pm:428 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3676
-#: standalone/drakautoinst:215 standalone/drakbackup:1347
-#: standalone/drakbackup:3887 standalone/drakbackup:3891
-#: standalone/drakbackup:3949 standalone/drakconnect:157
-#: standalone/drakconnect:933 standalone/drakconnect:1030
-#: standalone/drakfont:586 standalone/drakfont:664 standalone/drakfont:741
-#: standalone/draksplash:169 standalone/drakups:219 standalone/logdrake:173
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3959
+#: standalone/drakautoinst:215 standalone/drakbackup:1350
+#: standalone/drakbackup:3901 standalone/drakbackup:3905
+#: standalone/drakbackup:3963 standalone/drakconnect:157
+#: standalone/drakconnect:937 standalone/drakconnect:1029
+#: standalone/drakfont:584 standalone/drakfont:662 standalone/drakfont:739
+#: standalone/draksplash:161 standalone/drakups:219 standalone/logdrake:173
 #: standalone/net_monitor:339 ugtk2.pm:406 ugtk2.pm:508 ugtk2.pm:517
 #: ugtk2.pm:916
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: Xconfig/resolution_and_depth.pm:372 diskdrake/hd_gtk.pm:150
-#: install_steps_gtk.pm:228 install_steps_gtk.pm:629 interactive.pm:527
-#: interactive/gtk.pm:677 interactive/gtk.pm:679 standalone/drakTermServ:285
-#: standalone/drakbackup:3883 standalone/drakbug:105
+#: Xconfig/resolution_and_depth.pm:373 diskdrake/hd_gtk.pm:150
+#: install_steps_gtk.pm:232 install_steps_gtk.pm:634 interactive.pm:527
+#: interactive/gtk.pm:681 interactive/gtk.pm:683 standalone/drakTermServ:284
+#: standalone/drakbackup:3897 standalone/drakbug:105
 #: standalone/drakconnect:153 standalone/drakconnect:236
 #: standalone/drakfont:509 standalone/draknfs:208 standalone/drakperm:133
-#: standalone/draksec:336 standalone/draksec:338 standalone/draksec:356
-#: standalone/draksec:358 ugtk2.pm:1048 ugtk2.pm:1049
+#: standalone/draksambashare:213 standalone/draksec:336 standalone/draksec:338
+#: standalone/draksec:356 standalone/draksec:358 ugtk2.pm:1048 ugtk2.pm:1049
 #, c-format
 msgid "Help"
 msgstr "帮助"
@@ -799,17 +804,17 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "您的电视信号是什么制式?"
 
-#: Xconfig/xfree.pm:646
+#: Xconfig/xfree.pm:647
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "其它"
 
-#: any.pm:142 harddrake/sound.pm:190 interactive.pm:470 pkgs.pm:458
+#: any.pm:142 harddrake/sound.pm:192 interactive.pm:470 pkgs.pm:460
 #: standalone/drakconnect:160 standalone/drakconnect:635 standalone/draksec:68
 #: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:246
-#: standalone/service_harddrake:206
+#: standalone/service_harddrake:207
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
@@ -886,7 +891,7 @@ msgstr "根分区的第一扇区"
 msgid "On Floppy"
 msgstr "在软盘上"
 
-#: any.pm:236 help.pm:739 printer/printerdrake.pm:4061
+#: any.pm:236 help.pm:739 printer/printerdrake.pm:4345
 #, c-format
 msgid "Skip"
 msgstr "跳过"
@@ -927,7 +932,7 @@ msgstr "没有密码不能使用“限定命令行选项”"
 msgid "The passwords do not match"
 msgstr "两次密码不符"
 
-#: any.pm:276 any.pm:609 authentication.pm:181 diskdrake/interactive.pm:1306
+#: any.pm:276 any.pm:609 authentication.pm:181 diskdrake/interactive.pm:1326
 #, c-format
 msgid "Please try again"
 msgstr "请再试一次"
@@ -962,10 +967,10 @@ msgstr "强制无 APIC"
 msgid "Force No Local APIC"
 msgstr "强制无本地 APIC"
 
-#: any.pm:292 any.pm:643 authentication.pm:186 diskdrake/smbnfs_gtk.pm:179
-#: network/netconnect.pm:573 printer/printerdrake.pm:1663
-#: printer/printerdrake.pm:1784 standalone/drakbackup:1627
-#: standalone/drakbackup:3490 standalone/drakups:299
+#: any.pm:292 any.pm:643 authentication.pm:186 diskdrake/smbnfs_gtk.pm:180
+#: network/netconnect.pm:571 printer/printerdrake.pm:1886
+#: printer/printerdrake.pm:2007 standalone/drakbackup:1630
+#: standalone/drakbackup:3504 standalone/drakups:299
 #, c-format
 msgid "Password"
 msgstr "密码"
@@ -1227,8 +1232,8 @@ msgstr ""
 #: any.pm:629 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:154
 #: diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:81 help.pm:530
 #: interactive/http.pm:151 printer/printerdrake.pm:197
-#: printer/printerdrake.pm:382 printer/printerdrake.pm:4853
-#: standalone/drakbackup:2703 standalone/scannerdrake:668
+#: printer/printerdrake.pm:382 printer/printerdrake.pm:5140
+#: standalone/drakbackup:2717 standalone/scannerdrake:668
 #: standalone/scannerdrake:818
 #, c-format
 msgid "Done"
@@ -1244,7 +1249,7 @@ msgstr "接受用户"
 msgid "Real name"
 msgstr "真实姓名"
 
-#: any.pm:642 standalone/drakbackup:1622
+#: any.pm:642 standalone/drakbackup:1625
 #, c-format
 msgid "Login name"
 msgstr "登录名"
@@ -1314,56 +1319,56 @@ msgstr "默认使用 Unicode"
 msgid "All languages"
 msgstr "全部语言"
 
-#: any.pm:835 help.pm:566 help.pm:855 install_steps_interactive.pm:952
+#: any.pm:832 help.pm:566 help.pm:855 install_steps_interactive.pm:953
 #, c-format
 msgid "Country / Region"
 msgstr "国家/地区"
 
-#: any.pm:836
+#: any.pm:833
 #, c-format
 msgid "Please choose your country."
 msgstr "请选择您的国家/地区。"
 
-#: any.pm:838
+#: any.pm:835
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "在此列出了可用的全部国家/地区"
 
-#: any.pm:839
+#: any.pm:836
 #, c-format
 msgid "Other Countries"
 msgstr "其它国家"
 
-#: any.pm:839 help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
+#: any.pm:836 help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
 #: interactive.pm:393
 #, c-format
 msgid "Advanced"
 msgstr "高级"
 
-#: any.pm:847
+#: any.pm:844
 #, c-format
 msgid "Input method:"
 msgstr "输入法:"
 
-#: any.pm:848 install_any.pm:421 network/netconnect.pm:154
-#: network/netconnect.pm:314 network/netconnect.pm:319
-#: network/netconnect.pm:1177 printer/printerdrake.pm:105
-#: printer/printerdrake.pm:2199
+#: any.pm:847 install_any.pm:421 network/netconnect.pm:153
+#: network/netconnect.pm:309 network/netconnect.pm:314
+#: network/netconnect.pm:1187 printer/printerdrake.pm:105
+#: printer/printerdrake.pm:2428
 #, c-format
 msgid "None"
 msgstr "无"
 
-#: any.pm:963
+#: any.pm:964
 #, c-format
 msgid "No sharing"
 msgstr "禁止共享"
 
-#: any.pm:963
+#: any.pm:964
 #, c-format
 msgid "Allow all users"
 msgstr "允许所有用户使用"
 
-#: any.pm:967
+#: any.pm:968
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1376,42 +1381,42 @@ msgstr ""
 "选择允许, 用户将只需在 Konqueror 和 Nautilus 中单击“共享”即可开放共享。\n"
 "“自定义”允许按照不同用户细分设置。\n"
 
-#: any.pm:979
+#: any.pm:980
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 传统的 Unix 文件共享系统, Mac 和 Windows 上支持较少。"
 
-#: any.pm:982
+#: any.pm:983
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
 "systems."
 msgstr "SMB: Windows、MacOS X 和其它现代 Linux 系统所用的文件共享系统。"
 
-#: any.pm:990
+#: any.pm:991
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
 
-#: any.pm:1015
+#: any.pm:1016
 #, c-format
 msgid "Launch userdrake"
 msgstr "运行“Drak 用户管理”"
 
-#: any.pm:1015 printer/printerdrake.pm:3900 printer/printerdrake.pm:3903
-#: printer/printerdrake.pm:3904 printer/printerdrake.pm:3905
-#: printer/printerdrake.pm:5162 standalone/drakTermServ:295
-#: standalone/drakbackup:4083 standalone/drakbug:126 standalone/drakfont:497
+#: any.pm:1016 printer/printerdrake.pm:4184 printer/printerdrake.pm:4187
+#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4189
+#: printer/printerdrake.pm:5452 standalone/drakTermServ:294
+#: standalone/drakbackup:4097 standalone/drakbug:126 standalone/drakfont:497
 #: standalone/drakroam:242 standalone/net_monitor:118
-#: standalone/printerdrake:548
+#: standalone/printerdrake:565
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: any.pm:1017
+#: any.pm:1018
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1561,14 +1566,14 @@ msgstr "安全层(SASL/Kerberos)"
 msgid "Authentication Active Directory"
 msgstr "验证活动目录"
 
-#: authentication.pm:111 authentication.pm:150 diskdrake/smbnfs_gtk.pm:180
+#: authentication.pm:111 authentication.pm:150 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "域"
 
 #: authentication.pm:113 diskdrake/dav.pm:63 help.pm:146
 #: printer/printerdrake.pm:141 share/compssUsers.pl:82
-#: standalone/drakTermServ:270
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Server"
 msgstr "服务器"
@@ -1689,7 +1694,7 @@ msgstr "无密码"
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "这个密码太简单了(至少要有 %d 个字符)"
 
-#: authentication.pm:188 network/netconnect.pm:319 network/netconnect.pm:574
+#: authentication.pm:188 network/netconnect.pm:314 network/netconnect.pm:572
 #: standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:481
 #, c-format
 msgid "Authentication"
@@ -1751,21 +1756,21 @@ msgstr "/boot 中没有足够空间"
 msgid "You can not install the bootloader on a %s partition\n"
 msgstr "%s 分区不能安装启动引导程序\n"
 
-#: bootloader.pm:1448
+#: bootloader.pm:1454
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr "必须更新您的启动引导程序配置, 因为分区已经重新编号"
 
-#: bootloader.pm:1461
+#: bootloader.pm:1467
 #, c-format
 msgid ""
 "The bootloader can not be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
 
-#: bootloader.pm:1462
+#: bootloader.pm:1468
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "重新安装启动引导程序"
@@ -2052,12 +2057,12 @@ msgid "Server: "
 msgstr "服务器: "
 
 #: diskdrake/dav.pm:110 diskdrake/interactive.pm:521
-#: diskdrake/interactive.pm:1188 diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1208 diskdrake/interactive.pm:1286
 #, c-format
 msgid "Mount point: "
 msgstr "挂载点: "
 
-#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1273
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1293
 #, c-format
 msgid "Options: %s"
 msgstr "选项: %s"
@@ -2103,8 +2108,8 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "请单击一个分区"
 
-#: diskdrake/hd_gtk.pm:205 diskdrake/smbnfs_gtk.pm:62 install_steps_gtk.pm:482
-#: standalone/drakbackup:2938 standalone/drakbackup:2998
+#: diskdrake/hd_gtk.pm:205 diskdrake/smbnfs_gtk.pm:62 install_steps_gtk.pm:487
+#: standalone/drakbackup:2952 standalone/drakbackup:3012
 #, c-format
 msgid "Details"
 msgstr "细节"
@@ -2144,7 +2149,7 @@ msgstr "HFS"
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:336 diskdrake/interactive.pm:1203
+#: diskdrake/hd_gtk.pm:336 diskdrake/interactive.pm:1223
 #, c-format
 msgid "Empty"
 msgstr "空"
@@ -2174,7 +2179,7 @@ msgstr "类型"
 
 #. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
 #: diskdrake/hd_gtk.pm:359 diskdrake/interactive.pm:455
-#: standalone/drakperm:123 standalone/printerdrake:236
+#: standalone/drakperm:123 standalone/printerdrake:246
 #, c-format
 msgid "Delete"
 msgstr "删除"
@@ -2234,7 +2239,7 @@ msgstr "退出而不保存分区表吗?"
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "您想要保存 /etc/fstab 修改吗?"
 
-#: diskdrake/interactive.pm:292 install_steps_interactive.pm:329
+#: diskdrake/interactive.pm:292 install_steps_interactive.pm:330
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "对分区表的更改要等到重新启动后才能生效"
@@ -2261,7 +2266,7 @@ msgid "Auto allocate"
 msgstr "自动分配"
 
 #: diskdrake/interactive.pm:312 help.pm:530 help.pm:566 help.pm:606
-#: help.pm:855 install_steps_interactive.pm:121
+#: help.pm:855 install_steps_interactive.pm:122
 #, c-format
 msgid "More"
 msgstr "更多"
@@ -2402,12 +2407,12 @@ msgstr "创建一个新分区"
 msgid "Start sector: "
 msgstr "开始扇区: "
 
-#: diskdrake/interactive.pm:519 diskdrake/interactive.pm:926
+#: diskdrake/interactive.pm:519 diskdrake/interactive.pm:929
 #, c-format
 msgid "Size in MB: "
 msgstr "大小(MB): "
 
-#: diskdrake/interactive.pm:520 diskdrake/interactive.pm:927
+#: diskdrake/interactive.pm:520 diskdrake/interactive.pm:930
 #, c-format
 msgid "Filesystem type: "
 msgstr "文件系统类型: "
@@ -2528,27 +2533,27 @@ msgstr ""
 "为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Windows(TM) 时可能\n"
 "会自动运行文件系统检查。"
 
-#: diskdrake/interactive.pm:840
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "选择加入一个已存在的 RAID"
 
-#: diskdrake/interactive.pm:842 diskdrake/interactive.pm:859
+#: diskdrake/interactive.pm:845 diskdrake/interactive.pm:862
 #, c-format
 msgid "new"
 msgstr "新建"
 
-#: diskdrake/interactive.pm:857
+#: diskdrake/interactive.pm:860
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "选择加入一个已存在的 LVM"
 
-#: diskdrake/interactive.pm:863
+#: diskdrake/interactive.pm:866
 #, c-format
 msgid "LVM name?"
 msgstr "LVM 名称?"
 
-#: diskdrake/interactive.pm:891
+#: diskdrake/interactive.pm:894
 #, c-format
 msgid ""
 "Physical volume %s is still in use.\n"
@@ -2557,102 +2562,103 @@ msgstr ""
 "物理卷 %s 仍在使用中。\n"
 "您是否想要将此卷上已用的物理扩展分区移动到其它卷上？"
 
-#: diskdrake/interactive.pm:893
+#: diskdrake/interactive.pm:896
 #, c-format
 msgid "Moving physical extents"
 msgstr "移动物理扩展分区"
 
-#: diskdrake/interactive.pm:911
+#: diskdrake/interactive.pm:914
 #, c-format
 msgid "This partition can not be used for loopback"
 msgstr "这个分区不能被用于回环"
 
-#: diskdrake/interactive.pm:924
+#: diskdrake/interactive.pm:927
 #, c-format
 msgid "Loopback"
 msgstr "回环"
 
-#: diskdrake/interactive.pm:925
+#: diskdrake/interactive.pm:928
 #, c-format
 msgid "Loopback file name: "
 msgstr "回环文件名: "
 
-#: diskdrake/interactive.pm:930
+#: diskdrake/interactive.pm:933
 #, c-format
 msgid "Give a file name"
 msgstr "给一个文件名"
 
-#: diskdrake/interactive.pm:933
+#: diskdrake/interactive.pm:936
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "文件已经被另一个回环使用, 请另外选择一个"
 
-#: diskdrake/interactive.pm:934
+#: diskdrake/interactive.pm:937
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "文件已经存在。使用现有的文件吗?"
 
-#: diskdrake/interactive.pm:957
+#: diskdrake/interactive.pm:960
 #, c-format
 msgid "Mount options"
 msgstr "挂载选项"
 
-#: diskdrake/interactive.pm:964
+#: diskdrake/interactive.pm:967
 #, c-format
 msgid "Various"
 msgstr "杂项"
 
-#: diskdrake/interactive.pm:1028
+#: diskdrake/interactive.pm:1034
 #, c-format
 msgid "device"
 msgstr "设备"
 
-#: diskdrake/interactive.pm:1029
+#: diskdrake/interactive.pm:1035
 #, c-format
 msgid "level"
 msgstr "级别"
 
-#: diskdrake/interactive.pm:1030
+#: diskdrake/interactive.pm:1036
 #, c-format
 msgid "chunk size in KiB"
 msgstr "组块大小(KB)"
 
-#: diskdrake/interactive.pm:1047
+#: diskdrake/interactive.pm:1053
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "小心: 该操作有危险。"
 
-#: diskdrake/interactive.pm:1062
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "What type of partitioning?"
 msgstr "何种分区类型?"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1106
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "修改要等到重新启动后才能生效"
 
-#: diskdrake/interactive.pm:1109
+#: diskdrake/interactive.pm:1115
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "驱动器 %s 的分区表将会写入磁盘中！"
 
-#: diskdrake/interactive.pm:1118
+#: diskdrake/interactive.pm:1138
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "格式化分区 %s 之后, 该分区上的所有数据都将丢失"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1154
 #, c-format
 msgid "Move files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1154 standalone/draksambashare:69
+#: standalone/draksambashare:543
 #, c-format
 msgid "Hide files"
 msgstr "隐藏文件"
 
-#: diskdrake/interactive.pm:1135
+#: diskdrake/interactive.pm:1155
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2661,108 +2667,108 @@ msgstr ""
 "目录 %s 已经包含数据\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1146
+#: diskdrake/interactive.pm:1166
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1150
+#: diskdrake/interactive.pm:1170
 #, c-format
 msgid "Copying %s"
 msgstr "复制 %s"
 
-#: diskdrake/interactive.pm:1154
+#: diskdrake/interactive.pm:1174
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: diskdrake/interactive.pm:1168
+#: diskdrake/interactive.pm:1188
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "分区 %s 现在被识别为 %s"
 
-#: diskdrake/interactive.pm:1169
+#: diskdrake/interactive.pm:1189
 #, c-format
 msgid "Partitions have been renumbered: "
 msgstr "分区已被重新编号: "
 
-#: diskdrake/interactive.pm:1189 diskdrake/interactive.pm:1251
+#: diskdrake/interactive.pm:1209 diskdrake/interactive.pm:1271
 #, c-format
 msgid "Device: "
 msgstr "设备: "
 
-#: diskdrake/interactive.pm:1190
+#: diskdrake/interactive.pm:1210
 #, c-format
 msgid "Devfs name: "
 msgstr "Devfs 名称: "
 
-#: diskdrake/interactive.pm:1191
+#: diskdrake/interactive.pm:1211
 #, c-format
 msgid "Volume label: "
 msgstr "卷标: "
 
-#: diskdrake/interactive.pm:1192
+#: diskdrake/interactive.pm:1212
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS 下的盘符: %s(只是猜测)\n"
 
-#: diskdrake/interactive.pm:1196 diskdrake/interactive.pm:1205
-#: diskdrake/interactive.pm:1269
+#: diskdrake/interactive.pm:1216 diskdrake/interactive.pm:1225
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid "Type: "
 msgstr "类型: "
 
-#: diskdrake/interactive.pm:1200 install_steps_gtk.pm:296
+#: diskdrake/interactive.pm:1220 install_steps_gtk.pm:300
 #, c-format
 msgid "Name: "
 msgstr "名称: "
 
-#: diskdrake/interactive.pm:1207
+#: diskdrake/interactive.pm:1227
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "开始: 第 %s 扇区\n"
 
-#: diskdrake/interactive.pm:1208
+#: diskdrake/interactive.pm:1228
 #, c-format
 msgid "Size: %s"
 msgstr "大小: %s"
 
-#: diskdrake/interactive.pm:1210
+#: diskdrake/interactive.pm:1230
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s 扇区"
 
-#: diskdrake/interactive.pm:1212
+#: diskdrake/interactive.pm:1232
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "柱面 %d 到 %d\n"
 
-#: diskdrake/interactive.pm:1213
+#: diskdrake/interactive.pm:1233
 #, c-format
 msgid "Number of logical extents: %d\n"
 msgstr "逻辑分区数：%d\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1234
 #, c-format
 msgid "Formatted\n"
 msgstr "已格式化\n"
 
-#: diskdrake/interactive.pm:1215
+#: diskdrake/interactive.pm:1235
 #, c-format
 msgid "Not formatted\n"
 msgstr "未格式化\n"
 
-#: diskdrake/interactive.pm:1216
+#: diskdrake/interactive.pm:1236
 #, c-format
 msgid "Mounted\n"
 msgstr "已挂载\n"
 
-#: diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1237
 #, c-format
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1222
+#: diskdrake/interactive.pm:1242
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2771,7 +2777,7 @@ msgstr ""
 "回环文件: \n"
 "   %s\n"
 
-#: diskdrake/interactive.pm:1223
+#: diskdrake/interactive.pm:1243
 #, c-format
 msgid ""
 "Partition booted by default\n"
@@ -2780,27 +2786,27 @@ msgstr ""
 "预设的启动分区\n"
 "    (给 MS-DOS 启动用的, 跟 lilo 无关)\n"
 
-#: diskdrake/interactive.pm:1225
+#: diskdrake/interactive.pm:1245
 #, c-format
 msgid "Level %s\n"
 msgstr "级别 %s\n"
 
-#: diskdrake/interactive.pm:1226
+#: diskdrake/interactive.pm:1246
 #, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "组块大小 %d KB\n"
 
-#: diskdrake/interactive.pm:1227
+#: diskdrake/interactive.pm:1247
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1229
+#: diskdrake/interactive.pm:1249
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "回环文件名称: %s"
 
-#: diskdrake/interactive.pm:1232
+#: diskdrake/interactive.pm:1252
 #, c-format
 msgid ""
 "\n"
@@ -2812,7 +2818,7 @@ msgstr ""
 "此分区很可能是驱动器分区。\n"
 "您最好请不要更改它。\n"
 
-#: diskdrake/interactive.pm:1235
+#: diskdrake/interactive.pm:1255
 #, c-format
 msgid ""
 "\n"
@@ -2824,73 +2830,73 @@ msgstr ""
 "该 Bootstrap 分区特别\n"
 "是保留给双重启动系统。\n"
 
-#: diskdrake/interactive.pm:1252
+#: diskdrake/interactive.pm:1272
 #, c-format
 msgid "Read-only"
 msgstr "只读"
 
-#: diskdrake/interactive.pm:1253
+#: diskdrake/interactive.pm:1273
 #, c-format
 msgid "Size: %s\n"
 msgstr "大小: %s\n"
 
-#: diskdrake/interactive.pm:1254
+#: diskdrake/interactive.pm:1274
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "硬盘参数: %s 柱面, %s 磁头, %s 扇区\n"
 
-#: diskdrake/interactive.pm:1255
+#: diskdrake/interactive.pm:1275
 #, c-format
 msgid "Info: "
 msgstr "信息: "
 
-#: diskdrake/interactive.pm:1256
+#: diskdrake/interactive.pm:1276
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVM 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1277
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "分区表类型: %s\n"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1278
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "通道 %d id %d\n"
 
-#: diskdrake/interactive.pm:1301
+#: diskdrake/interactive.pm:1321
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "文件系统加密密钥"
 
-#: diskdrake/interactive.pm:1302
+#: diskdrake/interactive.pm:1322
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "选择该文件系统的加密密钥"
 
-#: diskdrake/interactive.pm:1305
+#: diskdrake/interactive.pm:1325
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
 
-#: diskdrake/interactive.pm:1306
+#: diskdrake/interactive.pm:1326
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "两次加密密钥不符"
 
-#: diskdrake/interactive.pm:1309 network/netconnect.pm:1022
+#: diskdrake/interactive.pm:1329 network/netconnect.pm:1025
 #: standalone/drakconnect:419
 #, c-format
 msgid "Encryption key"
 msgstr "加密密钥"
 
-#: diskdrake/interactive.pm:1310
+#: diskdrake/interactive.pm:1330
 #, c-format
 msgid "Encryption key (again)"
 msgstr "加密密钥(再输入一次)"
 
-#: diskdrake/interactive.pm:1311 standalone/drakvpn:1017
+#: diskdrake/interactive.pm:1332 standalone/drakvpn:1017
 #: standalone/drakvpn:1102
 #, c-format
 msgid "Encryption algorithm"
@@ -2901,83 +2907,88 @@ msgstr "加密算法"
 msgid "Change type"
 msgstr "更改类型"
 
-#: diskdrake/smbnfs_gtk.pm:162
+#: diskdrake/smbnfs_gtk.pm:163
 #, c-format
 msgid "Can not login using username %s (bad password?)"
 msgstr "不能使用用户名 %s 登录(密码错误?)"
 
-#: diskdrake/smbnfs_gtk.pm:166 diskdrake/smbnfs_gtk.pm:175
+#: diskdrake/smbnfs_gtk.pm:167 diskdrake/smbnfs_gtk.pm:176
 #, c-format
 msgid "Domain Authentication Required"
 msgstr "需要域认证"
 
-#: diskdrake/smbnfs_gtk.pm:167
+#: diskdrake/smbnfs_gtk.pm:168
 #, c-format
 msgid "Which username"
 msgstr "哪个用户名"
 
-#: diskdrake/smbnfs_gtk.pm:167
+#: diskdrake/smbnfs_gtk.pm:168
 #, c-format
 msgid "Another one"
 msgstr "另一个"
 
-#: diskdrake/smbnfs_gtk.pm:176
+#: diskdrake/smbnfs_gtk.pm:177
 #, c-format
 msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr "要访问此主机, 请输入您的用户名, 密码和域名"
 
-#: diskdrake/smbnfs_gtk.pm:178 standalone/drakbackup:3489
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3503
 #, c-format
 msgid "Username"
 msgstr "用户名"
 
-#: diskdrake/smbnfs_gtk.pm:204
+#: diskdrake/smbnfs_gtk.pm:205
 #, c-format
 msgid "Search servers"
 msgstr "搜索服务器"
 
-#: diskdrake/smbnfs_gtk.pm:209
+#: diskdrake/smbnfs_gtk.pm:210
 #, c-format
 msgid "Search new servers"
 msgstr "搜索新服务器"
 
-#: do_pkgs.pm:16 do_pkgs.pm:31
+#: do_pkgs.pm:16 do_pkgs.pm:34
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "需要安装软件包 %s。您同意安装吗?"
 
-#: do_pkgs.pm:21 do_pkgs.pm:36
+#: do_pkgs.pm:19 do_pkgs.pm:37 printer/printerdrake.pm:4025
+#, c-format
+msgid "Could not install the %s package!"
+msgstr "无法安装 %s 软件包!"
+
+#: do_pkgs.pm:24 do_pkgs.pm:42
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "无法找到必需的软件包 %s"
 
-#: do_pkgs.pm:182
+#: do_pkgs.pm:187
 #, c-format
 msgid "Installing packages..."
 msgstr "正在安装软件包..."
 
-#: do_pkgs.pm:227
+#: do_pkgs.pm:232
 #, c-format
 msgid "Removing packages..."
 msgstr "正在删除软件包..."
 
-#: fs/format.pm:57 fs/format.pm:64
+#: fs/format.pm:58 fs/format.pm:65
 #, c-format
 msgid "Formatting partition %s"
 msgstr "正在格式化分区 %s"
 
-#: fs/format.pm:61
+#: fs/format.pm:62
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "正在创建和格式化文件 %s"
 
-#: fs/format.pm:114
+#: fs/format.pm:115
 #, c-format
 msgid "I do not know how to format %s in type %s"
 msgstr "不知道如何将 %s 格式化成 %s 类型"
 
-#: fs/format.pm:119 fs/format.pm:121
+#: fs/format.pm:120 fs/format.pm:122
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s 格式化 %s 失败"
@@ -2987,37 +2998,42 @@ msgstr "%s 格式化 %s 失败"
 msgid "Circular mounts %s\n"
 msgstr "循环装载 %s\n"
 
-#: fs/mount.pm:72
+#: fs/mount.pm:74
 #, c-format
 msgid "Mounting partition %s"
 msgstr "正在挂载分区 %s"
 
-#: fs/mount.pm:73
+#: fs/mount.pm:75
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "将分区 %s 挂载于目录 %s 失败"
 
-#: fs/mount.pm:78 fs/mount.pm:95
+#: fs/mount.pm:80 fs/mount.pm:97
 #, c-format
 msgid "Checking %s"
 msgstr "正在检查 %s"
 
-#: fs/mount.pm:111 partition_table.pm:385
+#: fs/mount.pm:113 partition_table.pm:385
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "卸载 %s 出错: %s"
 
-#: fs/mount.pm:140
+#: fs/mount.pm:142
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr "正在启用 swap 分区 %s"
 
 #: fs/mount_options.pm:111
+#, fuzzy, c-format
+msgid "Use an encrypted file system"
+msgstr "挂载点 %s 不能使用用加密的文件系统"
+
+#: fs/mount_options.pm:113
 #, c-format
 msgid "Enable group disk quota accounting and optionally enforce limits"
 msgstr "启用群组磁盘配额记账及可选强制限制"
 
-#: fs/mount_options.pm:113
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -3026,7 +3042,7 @@ msgstr ""
 "不在此文件系统更新 inode 访问次数\n"
 "(例如, 为了加速对新闻服务器的新闻池的访问)"
 
-#: fs/mount_options.pm:116
+#: fs/mount_options.pm:118
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -3035,12 +3051,12 @@ msgstr ""
 "只能显式装载。\n"
 "(即, -a 选项将不会装载文件系统)"
 
-#: fs/mount_options.pm:119
+#: fs/mount_options.pm:121
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr "不解释文件系统中的字符或特殊块设备。"
 
-#: fs/mount_options.pm:121
+#: fs/mount_options.pm:123
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -3051,7 +3067,7 @@ msgstr ""
 "此选项对于特定服务器可能非常有用, 比如服务器所包含的文件系统中包含其它\n"
 "架构的二进制文件。"
 
-#: fs/mount_options.pm:125
+#: fs/mount_options.pm:127
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -3061,17 +3077,17 @@ msgstr ""
 "不允许 set-user-identifier 或 set-group-identifier 位生效。\n"
 "(这可能比较安全, 如果您安装了 suidperl(1) 则不太安全。)"
 
-#: fs/mount_options.pm:129
+#: fs/mount_options.pm:131
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "以只读装载文件系统。"
 
-#: fs/mount_options.pm:131
+#: fs/mount_options.pm:133
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "所有到文件系统的输入/输出都应该是同步完成的。"
 
-#: fs/mount_options.pm:135
+#: fs/mount_options.pm:137
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -3085,28 +3101,27 @@ msgstr ""
 "再次拆卸文件系统。此选项意味着选项 noexec, nosuid 以及 nodev(除非在选项\n"
 "行中用单独的选项 user, exec, dev, suid 加以覆盖)。"
 
-#: fs/mount_options.pm:141
-#, c-format
-msgid ""
-"Enable user disk quota accounting enabled, and optionally enforce limits"
+#: fs/mount_options.pm:143
+#, fuzzy, c-format
+msgid "Enable user disk quota accounting, and optionally enforce limits"
 msgstr "启用用户磁盘配额记账及可选强制限制"
 
-#: fs/mount_options.pm:143
+#: fs/mount_options.pm:145
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "给普通用户以写权限"
 
-#: fs/mount_options.pm:145
+#: fs/mount_options.pm:147
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "给普通用户以只读权限"
 
-#: fs/type.pm:375
+#: fs/type.pm:376
 #, c-format
 msgid "You can not use JFS for partitions smaller than 16MB"
 msgstr "您不能把 JFS(日志文件系统)用于小于 16 MB 的分区"
 
-#: fs/type.pm:376
+#: fs/type.pm:377
 #, c-format
 msgid "You can not use ReiserFS for partitions smaller than 32MB"
 msgstr "您不能把 ReiserFS 用于小于 32 MB 的分区"
@@ -3241,7 +3256,7 @@ msgstr "CD/DVD 刻录机"
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:127 standalone/drakbackup:2036
+#: harddrake/data.pm:127 standalone/drakbackup:2050
 #, c-format
 msgid "Tape"
 msgstr "磁带机"
@@ -3316,7 +3331,7 @@ msgstr "蓝牙设备"
 msgid "Ethernetcard"
 msgstr "以太网卡"
 
-#: harddrake/data.pm:282 network/netconnect.pm:488
+#: harddrake/data.pm:282 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "调制解调器"
@@ -3337,7 +3352,7 @@ msgid "AGP controllers"
 msgstr "AGP 控制器"
 
 #: harddrake/data.pm:324 help.pm:186 help.pm:855
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:985
 #, c-format
 msgid "Printer"
 msgstr "打印机"
@@ -3403,8 +3418,8 @@ msgstr "SMBus 控制器"
 msgid "Bridges and system controllers"
 msgstr "桥接和系统控制器"
 
-#: harddrake/data.pm:447 help.pm:855 install_steps_interactive.pm:117
-#: install_steps_interactive.pm:944 standalone/keyboarddrake:29
+#: harddrake/data.pm:447 help.pm:855 install_steps_interactive.pm:118
+#: install_steps_interactive.pm:945 standalone/keyboarddrake:29
 #, c-format
 msgid "Keyboard"
 msgstr "键盘"
@@ -3414,7 +3429,7 @@ msgstr "键盘"
 msgid "Tablet and touchscreen"
 msgstr "手写板和触摸屏"
 
-#: harddrake/data.pm:469 help.pm:855 install_steps_interactive.pm:977
+#: harddrake/data.pm:469 help.pm:855 install_steps_interactive.pm:978
 #, c-format
 msgid "Mouse"
 msgstr "鼠标"
@@ -3439,30 +3454,30 @@ msgstr "未知/其它"
 msgid "cpu # "
 msgstr "CPU # "
 
-#: harddrake/sound.pm:190 standalone/drakconnect:162
+#: harddrake/sound.pm:192 standalone/drakconnect:162
 #: standalone/drakconnect:637
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "请稍候...正在应用配置"
 
-#: harddrake/sound.pm:226
+#: harddrake/sound.pm:228
 #, c-format
 msgid "No alternative driver"
 msgstr "没有替代的驱动程序"
 
-#: harddrake/sound.pm:227
+#: harddrake/sound.pm:229
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
 "currently uses \"%s\""
 msgstr "没有已知的 OSS/ALSA 替代驱动程序可以用在您的声卡(%s)上, 现正使用“%s”"
 
-#: harddrake/sound.pm:233
+#: harddrake/sound.pm:235
 #, c-format
 msgid "Sound configuration"
 msgstr "声音配置"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:237
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3473,7 +3488,7 @@ msgstr ""
 #. -PO: here the first %s is either "OSS" or "ALSA", 
 #. -PO: the second %s is the name of the current driver
 #. -PO: and the third %s is the name of the default driver
-#: harddrake/sound.pm:240
+#: harddrake/sound.pm:242
 #, c-format
 msgid ""
 "\n"
@@ -3485,7 +3500,7 @@ msgstr ""
 "\n"
 "您的声卡现在正在使用 %s“%s”驱动程序(其默认驱动程序为“%s”)"
 
-#: harddrake/sound.pm:242
+#: harddrake/sound.pm:244
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3517,35 +3532,35 @@ msgstr ""
 "- 与旧的 OSS 兼容的 API\n"
 "- 新的 ALSA API 带来许多增强特性, 但这需要使用 ALSA 库。\n"
 
-#: harddrake/sound.pm:256 harddrake/sound.pm:341 standalone/drakups:146
+#: harddrake/sound.pm:258 harddrake/sound.pm:343 standalone/drakups:146
 #, c-format
 msgid "Driver:"
 msgstr "驱动程序: "
 
-#: harddrake/sound.pm:261
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Trouble shooting"
 msgstr "疑难解答"
 
-#: harddrake/sound.pm:269 keyboard.pm:391 lang.pm:1078
-#: network/ndiswrapper.pm:95 network/netconnect.pm:467
-#: 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:4189 printer/printerdrake.pm:5310
-#: standalone/drakTermServ:326 standalone/drakTermServ:1169
-#: standalone/drakTermServ:1230 standalone/drakTermServ:1895
-#: standalone/drakbackup:497 standalone/drakbackup:596 standalone/drakboot:125
-#: standalone/drakclock:224 standalone/drakconnect:969 standalone/drakups:27
-#: standalone/harddrake2:480 standalone/scannerdrake:51
+#: harddrake/sound.pm:271 keyboard.pm:391 network/ndiswrapper.pm:95
+#: network/netconnect.pm:463 printer/printerdrake.pm:1429
+#: printer/printerdrake.pm:2459 printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2604 printer/printerdrake.pm:2671
+#: printer/printerdrake.pm:2706 printer/printerdrake.pm:3031
+#: printer/printerdrake.pm:3038 printer/printerdrake.pm:4024
+#: printer/printerdrake.pm:4353 printer/printerdrake.pm:4473
+#: printer/printerdrake.pm:5613 standalone/drakTermServ:326
+#: standalone/drakTermServ:1205 standalone/drakTermServ:1266
+#: standalone/drakTermServ:1931 standalone/drakbackup:497
+#: standalone/drakbackup:596 standalone/drakboot:125 standalone/drakclock:224
+#: standalone/drakconnect:973 standalone/drakups:27 standalone/harddrake2:479
+#: standalone/localedrake:43 standalone/scannerdrake:51
 #: standalone/scannerdrake:940
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: harddrake/sound.pm:269
+#: harddrake/sound.pm:271
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3560,12 +3575,12 @@ msgstr ""
 "\n"
 "新的“%s”驱动程序仅会在下此启动时使用。"
 
-#: harddrake/sound.pm:277
+#: harddrake/sound.pm:279
 #, c-format
 msgid "No open source driver"
 msgstr "没有开放源代码的驱动程序"
 
-#: harddrake/sound.pm:278
+#: harddrake/sound.pm:280
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3574,33 +3589,33 @@ msgstr ""
 "没有已知的 OSS/ALSA 替代驱动程序可以用在您的(%s)声卡上, 不过在“%s”有一个专有"
 "的驱动程序。"
 
-#: harddrake/sound.pm:281
+#: harddrake/sound.pm:283
 #, c-format
 msgid "No known driver"
 msgstr "没有已知驱动程序"
 
-#: harddrake/sound.pm:282
+#: harddrake/sound.pm:284
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "没有已知的驱动程序可以用在您的声卡(%s)上"
 
-#: harddrake/sound.pm:286
+#: harddrake/sound.pm:288
 #, c-format
 msgid "Unknown driver"
 msgstr "未知的驱动程序"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:289
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "错误: 您的“%s”声卡驱动程序未被列出"
 
-#: harddrake/sound.pm:301
+#: harddrake/sound.pm:303
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "声音疑难解决"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:304
+#: harddrake/sound.pm:306
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3639,18 +3654,18 @@ msgstr ""
 "\n"
 "- “/sbin/fuser -v /dev/dsp”将会告诉您哪个程序使用声卡。\n"
 
-#: harddrake/sound.pm:330
+#: harddrake/sound.pm:332
 #, c-format
 msgid "Let me pick any driver"
 msgstr "让我挑选任意驱动"
 
-#: harddrake/sound.pm:333
+#: harddrake/sound.pm:335
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "选择其它驱动"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:336
+#: harddrake/sound.pm:338
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3664,8 +3679,8 @@ msgstr ""
 "\n"
 "当前为您的声卡“%s”使用的是“%s”驱动程序 "
 
-#: harddrake/v4l.pm:12 standalone/net_applet:63 standalone/net_applet:64
-#: standalone/net_applet:66
+#: harddrake/v4l.pm:12 standalone/net_applet:66 standalone/net_applet:67
+#: standalone/net_applet:69
 #, c-format
 msgid "Auto-detect"
 msgstr "自动检测"
@@ -3685,7 +3700,7 @@ msgstr "未知|CPH05X (bt878) [很多厂家] "
 msgid "Unknown|CPH06X (bt878) [many vendors]"
 msgstr "未知|CPH06X (bt878) [很多厂家]"
 
-#: harddrake/v4l.pm:392
+#: harddrake/v4l.pm:394
 #, c-format
 msgid ""
 "For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
@@ -3697,37 +3712,37 @@ msgstr ""
 "如果自动检测不适合您的卡, 您可以在这里强制设定正确的调协器及卡的类型。只有必"
 "要时才设置电视卡参数。"
 
-#: harddrake/v4l.pm:395
+#: harddrake/v4l.pm:397
 #, c-format
 msgid "Card model:"
 msgstr "卡的型号: "
 
-#: harddrake/v4l.pm:396
+#: harddrake/v4l.pm:398
 #, c-format
 msgid "Tuner type:"
 msgstr "调谐器类型: "
 
-#: harddrake/v4l.pm:397
+#: harddrake/v4l.pm:399
 #, c-format
 msgid "Number of capture buffers:"
 msgstr "捕获缓冲区数量: "
 
-#: harddrake/v4l.pm:397
+#: harddrake/v4l.pm:399
 #, c-format
 msgid "number of capture buffers for mmap'ed capture"
 msgstr "用于 mmap 捕获的缓冲区数量"
 
-#: harddrake/v4l.pm:399
+#: harddrake/v4l.pm:401
 #, c-format
 msgid "PLL setting:"
 msgstr "PLL 设置: "
 
-#: harddrake/v4l.pm:400
+#: harddrake/v4l.pm:402
 #, c-format
 msgid "Radio support:"
 msgstr "无线电支持: "
 
-#: harddrake/v4l.pm:400
+#: harddrake/v4l.pm:402
 #, c-format
 msgid "enable radio support"
 msgstr "启用无线电支持"
@@ -3744,8 +3759,8 @@ msgstr ""
 "版。如果您同意其中的全部条款, 请选中\"%s\"框。如果不同意, 单击\"%s\"按钮将重"
 "新启动您的计算机。"
 
-#: help.pm:14 install_steps_gtk.pm:552 install_steps_interactive.pm:91
-#: install_steps_interactive.pm:735 standalone/drakautoinst:214
+#: help.pm:14 install_steps_gtk.pm:557 install_steps_interactive.pm:91
+#: install_steps_interactive.pm:736 standalone/drakautoinst:214
 #, c-format
 msgid "Accept"
 msgstr "接受"
@@ -3818,17 +3833,17 @@ msgstr ""
 "登录到系统。如果您对此特性感兴趣(也不考虑太多的本地安全性), 请选择希望的用户"
 "和窗口管理器, 然后单击\"%s\"。如果您对此特性不感兴趣, 请不要选中\"%s\"框。"
 
-#: help.pm:51 printer/printerdrake.pm:1662 printer/printerdrake.pm:1783
+#: help.pm:51 printer/printerdrake.pm:1885 printer/printerdrake.pm:2006
 #, c-format
 msgid "User name"
 msgstr "用户名"
 
-#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:233
-#: install_steps_gtk.pm:694 interactive.pm:432 interactive/newt.pm:321
-#: network/thirdparty.pm:322 printer/printerdrake.pm:3678
-#: standalone/drakTermServ:383 standalone/drakbackup:3940
-#: standalone/drakbackup:4034 standalone/drakbackup:4051
-#: standalone/drakbackup:4069 ugtk2.pm:510
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:237
+#: install_steps_gtk.pm:699 interactive.pm:432 interactive/newt.pm:321
+#: network/thirdparty.pm:322 printer/printerdrake.pm:3961
+#: standalone/drakTermServ:384 standalone/drakbackup:3954
+#: standalone/drakbackup:4048 standalone/drakbackup:4065
+#: standalone/drakbackup:4083 ugtk2.pm:510
 #, c-format
 msgid "Next"
 msgstr "下一步"
@@ -4039,7 +4054,7 @@ msgstr "开发"
 msgid "Graphical Environment"
 msgstr "图形环境"
 
-#: help.pm:146 install_steps_gtk.pm:231 install_steps_interactive.pm:642
+#: help.pm:146 install_steps_gtk.pm:235 install_steps_interactive.pm:643
 #, c-format
 msgid "Individual package selection"
 msgstr "选择单个软件包"
@@ -4049,7 +4064,7 @@ msgstr "选择单个软件包"
 msgid "Upgrade"
 msgstr "升级"
 
-#: help.pm:146 install_steps_interactive.pm:600
+#: help.pm:146 install_steps_interactive.pm:601
 #, c-format
 msgid "With X"
 msgstr "安装 X"
@@ -4130,17 +4145,16 @@ msgstr ""
 "建的那张软盘。参看最后一步的第二条提示, 其中描述了如何创建这样的软盘。"
 
 #: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:904
-#: interactive.pm:157 modules/interactive.pm:71 standalone/drakbackup:2503
-#: standalone/draksec:54 standalone/harddrake2:309 standalone/net_applet:374
-#: ugtk2.pm:915 wizards.pm:156
+#: interactive.pm:157 modules/interactive.pm:71 standalone/drakbackup:2517
+#: standalone/draksec:54 standalone/harddrake2:309 ugtk2.pm:915 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "否"
 
 #: help.pm:180 help.pm:285 help.pm:444 install_any.pm:904 interactive.pm:157
-#: modules/interactive.pm:71 printer/printerdrake.pm:743
-#: standalone/drakbackup:2503 standalone/draksec:55 standalone/harddrake2:308
-#: standalone/net_applet:378 ugtk2.pm:915 wizards.pm:156
+#: modules/interactive.pm:71 printer/printerdrake.pm:883
+#: printer/printerdrake.pm:898 standalone/drakbackup:2517
+#: standalone/draksec:55 standalone/harddrake2:308 ugtk2.pm:915 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "是"
@@ -4164,9 +4178,9 @@ msgstr ""
 "节, 其中详细描述了如何设置新打印机。那里给出的界面与安装时所用的界面大体相"
 "同。"
 
-#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:607
-#: standalone/drakbackup:2327 standalone/drakbackup:2331
-#: standalone/drakbackup:2335 standalone/drakbackup:2339
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:612
+#: standalone/drakbackup:2341 standalone/drakbackup:2345
+#: standalone/drakbackup:2349 standalone/drakbackup:2353
 #, c-format
 msgid "Configure"
 msgstr "配置"
@@ -4236,7 +4250,7 @@ msgstr ""
 "Internet。最好选择地理位置离您较近的时间服务器。此选项还会自动安装时间服务"
 "器, 这样您局域网中的其它计算机都能够进行自动校时了。"
 
-#: help.pm:217 install_steps_interactive.pm:879
+#: help.pm:217 install_steps_interactive.pm:880
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "您的系统时钟设定为 GMT"
@@ -4657,17 +4671,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr "生成自动安装软盘"
 
-#: help.pm:409 install_steps_interactive.pm:1330
+#: help.pm:409 install_steps_interactive.pm:1331
 #, c-format
 msgid "Replay"
 msgstr "重现"
 
-#: help.pm:409 install_steps_interactive.pm:1330
+#: help.pm:409 install_steps_interactive.pm:1331
 #, c-format
 msgid "Automated"
 msgstr "自动"
 
-#: help.pm:409 install_steps_interactive.pm:1333
+#: help.pm:409 install_steps_interactive.pm:1334
 #, c-format
 msgid "Save packages selection"
 msgstr "保存软件包选择"
@@ -4716,11 +4730,11 @@ msgstr ""
 "\n"
 "如果您想要选择要检测磁盘上的坏块, 请单击单击\"%s\"。"
 
-#: help.pm:431 install_steps_gtk.pm:388 interactive.pm:433
-#: interactive/newt.pm:318 printer/printerdrake.pm:3676
-#: standalone/drakTermServ:362 standalone/drakbackup:3900
-#: standalone/drakbackup:3939 standalone/drakbackup:4050
-#: standalone/drakbackup:4065 ugtk2.pm:508
+#: help.pm:431 install_steps_gtk.pm:392 interactive.pm:433
+#: interactive/newt.pm:318 printer/printerdrake.pm:3959
+#: standalone/drakTermServ:363 standalone/drakbackup:3914
+#: standalone/drakbackup:3953 standalone/drakbackup:4064
+#: standalone/drakbackup:4079 ugtk2.pm:508
 #, c-format
 msgid "Previous"
 msgstr "上一步"
@@ -4753,8 +4767,8 @@ msgstr ""
 "理位置较近的镜像。之后会出现一个可以下载的软件包选择树：复查选项, 然后单击\"%"
 "s\"来获取并安装选中的软件包, 要终止请单击\"%s\"。"
 
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:387
-#: install_steps_interactive.pm:155 standalone/drakbackup:4097
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:391
+#: install_steps_interactive.pm:156 standalone/drakbackup:4111
 #, c-format
 msgid "Install"
 msgstr "安装"
@@ -5429,7 +5443,7 @@ msgstr ""
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:765 printer/cups.pm:115 printer/data.pm:122
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:121
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
@@ -5484,8 +5498,8 @@ msgstr ""
 "\"%s\"：如果在您的系统中检测到了声卡, 则会在此处显示。如果您发现在此显示的声"
 "卡与您系统中实际安装的声卡并不相同, 您可以单击该按钮选择不同的驱动程序。"
 
-#: help.pm:788 help.pm:855 install_steps_interactive.pm:1011
-#: install_steps_interactive.pm:1028
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1012
+#: install_steps_interactive.pm:1029
 #, c-format
 msgid "Sound card"
 msgstr "声卡"
@@ -5617,12 +5631,12 @@ msgstr ""
 " * \"%s\"：在此您可以精确调整要在您的计算机上运行哪些服务。如果您要将此计算机"
 "用作服务器, 那么应该复查这一设置。"
 
-#: help.pm:855 install_steps_interactive.pm:970 standalone/drakclock:100
+#: help.pm:855 install_steps_interactive.pm:971 standalone/drakclock:100
 #, c-format
 msgid "Timezone"
 msgstr "时区"
 
-#: help.pm:855 install_steps_interactive.pm:1044
+#: help.pm:855 install_steps_interactive.pm:1045
 #, c-format
 msgid "TV card"
 msgstr "电视卡"
@@ -5637,33 +5651,33 @@ msgstr "ISDN 卡"
 msgid "Graphical Interface"
 msgstr "图形界面"
 
-#: help.pm:855 install_any.pm:1688 install_steps_interactive.pm:1062
-#: standalone/drakbackup:2021
+#: help.pm:855 install_any.pm:1688 install_steps_interactive.pm:1063
+#: standalone/drakbackup:2035
 #, c-format
 msgid "Network"
 msgstr "网络"
 
-#: help.pm:855 install_steps_interactive.pm:1074
+#: help.pm:855 install_steps_interactive.pm:1075
 #, c-format
 msgid "Proxies"
 msgstr "代理服务器"
 
-#: help.pm:855 install_steps_interactive.pm:1085
+#: help.pm:855 install_steps_interactive.pm:1086
 #, c-format
 msgid "Security Level"
 msgstr "安全级别"
 
-#: help.pm:855 install_steps_interactive.pm:1099
+#: help.pm:855 install_steps_interactive.pm:1100
 #, c-format
 msgid "Firewall"
 msgstr "防火墙"
 
-#: help.pm:855 install_steps_interactive.pm:1115
+#: help.pm:855 install_steps_interactive.pm:1116
 #, c-format
 msgid "Bootloader"
 msgstr "引导程序"
 
-#: help.pm:855 install_steps_interactive.pm:1128 services.pm:193
+#: help.pm:855 install_steps_interactive.pm:1129 services.pm:193
 #, c-format
 msgid "Services"
 msgstr "服务"
@@ -5738,8 +5752,8 @@ msgstr ""
 "\n"
 "您是否有要配置的赠品安装介质?"
 
-#: install_any.pm:421 printer/printerdrake.pm:3022
-#: printer/printerdrake.pm:3029 standalone/scannerdrake:182
+#: install_any.pm:421 printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3296 standalone/scannerdrake:182
 #: standalone/scannerdrake:190 standalone/scannerdrake:241
 #: standalone/scannerdrake:248
 #, c-format
@@ -6472,7 +6486,7 @@ msgstr ""
 msgid "Entering step `%s'\n"
 msgstr "进入步骤“%s”\n"
 
-#: install_steps_gtk.pm:177
+#: install_steps_gtk.pm:181
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -6484,94 +6498,94 @@ msgstr ""
 "如果您真的遇到问题的话，可以试试文本安装。要进入文本安装，请在启动时按“F1”，"
 "然后输入“text”。"
 
-#: install_steps_gtk.pm:224 install_steps_interactive.pm:624
+#: install_steps_gtk.pm:228 install_steps_interactive.pm:625
 #, c-format
 msgid "Package Group Selection"
 msgstr "程序组选择"
 
-#: install_steps_gtk.pm:250 install_steps_interactive.pm:567
+#: install_steps_gtk.pm:254 install_steps_interactive.pm:568
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "总共大小: %d / %d MB"
 
-#: install_steps_gtk.pm:295
+#: install_steps_gtk.pm:299
 #, c-format
 msgid "Bad package"
 msgstr "有错的软件包"
 
-#: install_steps_gtk.pm:297
+#: install_steps_gtk.pm:301
 #, c-format
 msgid "Version: "
 msgstr "版本: "
 
-#: install_steps_gtk.pm:298
+#: install_steps_gtk.pm:302
 #, c-format
 msgid "Size: "
 msgstr "大小: "
 
-#: install_steps_gtk.pm:298
+#: install_steps_gtk.pm:302
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:299
+#: install_steps_gtk.pm:303
 #, c-format
 msgid "Importance: "
 msgstr "重要程度: "
 
-#: install_steps_gtk.pm:332
+#: install_steps_gtk.pm:336
 #, c-format
 msgid "You can not select/unselect this package"
 msgstr "您不能改变这个软件包的选定"
 
-#: install_steps_gtk.pm:336
+#: install_steps_gtk.pm:340
 #, c-format
 msgid "due to missing %s"
 msgstr "由于缺少 %s"
 
-#: install_steps_gtk.pm:337
+#: install_steps_gtk.pm:341
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由于不满足的 %s"
 
-#: install_steps_gtk.pm:338
+#: install_steps_gtk.pm:342
 #, c-format
 msgid "trying to promote %s"
 msgstr "尝试推广 %s"
 
-#: install_steps_gtk.pm:339
+#: install_steps_gtk.pm:343
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:348
 #, c-format
 msgid ""
 "You can not select this package as there is not enough space left to install "
 "it"
 msgstr "您不可以选择这个软件包。没有足够空间安装它。"
 
-#: install_steps_gtk.pm:347
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "即将安装下列软件包"
 
-#: install_steps_gtk.pm:348
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "即将卸载下列软件包"
 
-#: install_steps_gtk.pm:372
+#: install_steps_gtk.pm:376
 #, c-format
 msgid "This is a mandatory package, it can not be unselected"
 msgstr "这个软件包是必需的, 不能取消选定"
 
-#: install_steps_gtk.pm:374
+#: install_steps_gtk.pm:378
 #, c-format
 msgid "You can not unselect this package. It is already installed"
 msgstr "您不可以取消选择这个软件包。它已经安装过了"
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:381
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6580,78 +6594,78 @@ msgstr ""
 "这个软件包必须进行升级。\n"
 "您真的要删除它吗?"
 
-#: install_steps_gtk.pm:380
+#: install_steps_gtk.pm:384
 #, c-format
 msgid "You can not unselect this package. It must be upgraded"
 msgstr "您不能不选择这个软件包。它必须升级"
 
-#: install_steps_gtk.pm:385
+#: install_steps_gtk.pm:389
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "自动显示选中的软件包"
 
-#: install_steps_gtk.pm:390
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "Load/Save selection"
 msgstr "装入/保存选择"
 
-#: install_steps_gtk.pm:391
+#: install_steps_gtk.pm:395
 #, c-format
 msgid "Updating package selection"
 msgstr "更新软件包选择"
 
-#: install_steps_gtk.pm:396
+#: install_steps_gtk.pm:400
 #, c-format
 msgid "Minimal install"
 msgstr "最小安装"
 
-#: install_steps_gtk.pm:410 install_steps_interactive.pm:483
+#: install_steps_gtk.pm:414 install_steps_interactive.pm:484
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "选择您想要安装的软件包"
 
-#: install_steps_gtk.pm:426 install_steps_interactive.pm:710
+#: install_steps_gtk.pm:430 install_steps_interactive.pm:711
 #, c-format
 msgid "Installing"
 msgstr "正在安装"
 
-#: install_steps_gtk.pm:433
+#: install_steps_gtk.pm:437
 #, c-format
 msgid "Estimating"
 msgstr "正在估计"
 
-#: install_steps_gtk.pm:482
+#: install_steps_gtk.pm:487
 #, c-format
 msgid "No details"
 msgstr "无细节"
 
-#: install_steps_gtk.pm:490
+#: install_steps_gtk.pm:495
 #, c-format
 msgid "Time remaining "
 msgstr "剩余时间"
 
-#: install_steps_gtk.pm:497
+#: install_steps_gtk.pm:502
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "请稍候, 正在准备安装..."
 
-#: install_steps_gtk.pm:512
+#: install_steps_gtk.pm:517
 #, c-format
 msgid "%d packages"
 msgstr "%d 个软件包"
 
-#: install_steps_gtk.pm:517
+#: install_steps_gtk.pm:522
 #, c-format
 msgid "Installing package %s"
 msgstr "正在安装软件包 %s"
 
-#: install_steps_gtk.pm:552 install_steps_interactive.pm:91
-#: install_steps_interactive.pm:735
+#: install_steps_gtk.pm:557 install_steps_interactive.pm:91
+#: install_steps_interactive.pm:736
 #, c-format
 msgid "Refuse"
 msgstr "拒绝"
 
-#: install_steps_gtk.pm:556 install_steps_interactive.pm:739
+#: install_steps_gtk.pm:561 install_steps_interactive.pm:740
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -6664,29 +6678,29 @@ msgstr ""
 "请在驱动器中插入标有“%s”的光盘, 然后单击“确定”。\n"
 "如果您没有这张光盘, 请单击“取消”, 放弃安装这张光盘上的软件。"
 
-#: install_steps_gtk.pm:571 install_steps_interactive.pm:750
+#: install_steps_gtk.pm:576 install_steps_interactive.pm:751
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "排列软件包时出错: "
 
-#: install_steps_gtk.pm:571 install_steps_gtk.pm:575
-#: install_steps_interactive.pm:750 install_steps_interactive.pm:754
+#: install_steps_gtk.pm:576 install_steps_gtk.pm:580
+#: install_steps_interactive.pm:751 install_steps_interactive.pm:755
 #, c-format
 msgid "Go on anyway?"
 msgstr "真的要继续?"
 
-#: install_steps_gtk.pm:575 install_steps_interactive.pm:754
+#: install_steps_gtk.pm:580 install_steps_interactive.pm:755
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "安装软件包时出错: "
 
-#: install_steps_gtk.pm:617 install_steps_interactive.pm:926
-#: install_steps_interactive.pm:1075
+#: install_steps_gtk.pm:622 install_steps_interactive.pm:927
+#: install_steps_interactive.pm:1076
 #, c-format
 msgid "not configured"
 msgstr "未配置"
 
-#: install_steps_gtk.pm:680
+#: install_steps_gtk.pm:685
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -6695,7 +6709,7 @@ msgstr ""
 "找到了下列安装介质。\n"
 "如果您想要跳过其中一些, 请不要选中。"
 
-#: install_steps_gtk.pm:689
+#: install_steps_gtk.pm:694
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -6707,7 +6721,7 @@ msgstr ""
 "然后，安装将会从硬盘继续进行。当系统安装完成后，软件包仍然保留，以供日后添加"
 "软件使用。"
 
-#: install_steps_gtk.pm:691
+#: install_steps_gtk.pm:696
 #, c-format
 msgid "Copy whole CDs"
 msgstr "复制整张光盘"
@@ -6722,102 +6736,102 @@ msgstr "许可协议"
 msgid "Release Notes"
 msgstr "版本通告"
 
-#: install_steps_interactive.pm:118
+#: install_steps_interactive.pm:119
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "请选择您使用的键盘布局。"
 
-#: install_steps_interactive.pm:120
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "在此列出了可用的全部键盘"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:151
 #, c-format
 msgid "Install/Upgrade"
 msgstr "安装/升级"
 
-#: install_steps_interactive.pm:151
+#: install_steps_interactive.pm:152
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "现在要新装还是升级?"
 
-#: install_steps_interactive.pm:157
+#: install_steps_interactive.pm:158
 #, c-format
 msgid "Upgrade %s"
 msgstr "升级 %s"
 
-#: install_steps_interactive.pm:168
+#: install_steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s 的加密密钥"
 
-#: install_steps_interactive.pm:185
+#: install_steps_interactive.pm:186
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "请选择您的鼠标类型。"
 
-#: install_steps_interactive.pm:194 standalone/mousedrake:46
+#: install_steps_interactive.pm:195 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "鼠标端口"
 
-#: install_steps_interactive.pm:195 standalone/mousedrake:47
+#: install_steps_interactive.pm:196 standalone/mousedrake:47
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "请选择您的鼠标是连接到那个串行口。"
 
-#: install_steps_interactive.pm:205
+#: install_steps_interactive.pm:206
 #, c-format
 msgid "Buttons emulation"
 msgstr "鼠标键模拟"
 
-#: install_steps_interactive.pm:207
+#: install_steps_interactive.pm:208
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "两键模拟"
 
-#: install_steps_interactive.pm:208
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "模拟三键"
 
-#: install_steps_interactive.pm:229
+#: install_steps_interactive.pm:230
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:229
+#: install_steps_interactive.pm:230
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr "正在配置 PCMCIA 卡..."
 
-#: install_steps_interactive.pm:236
+#: install_steps_interactive.pm:237
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: install_steps_interactive.pm:236
+#: install_steps_interactive.pm:237
 #, c-format
 msgid "Configuring IDE"
 msgstr "配置 IDE"
 
-#: install_steps_interactive.pm:256
+#: install_steps_interactive.pm:257
 #, c-format
 msgid "No partition available"
 msgstr "没有可用的硬盘分区"
 
-#: install_steps_interactive.pm:259
+#: install_steps_interactive.pm:260
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "正在扫描各个分区以查找挂载点"
 
-#: install_steps_interactive.pm:266
+#: install_steps_interactive.pm:267
 #, c-format
 msgid "Choose the mount points"
 msgstr "选择挂载点"
 
-#: install_steps_interactive.pm:312
+#: install_steps_interactive.pm:313
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -6826,7 +6840,7 @@ msgstr ""
 "无法创建启动空间(1MB)！安装将继续, 但如需启动系统, 您可用“Drak 磁盘管理”创建"
 "启动分区"
 
-#: install_steps_interactive.pm:317
+#: install_steps_interactive.pm:318
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -6836,61 +6850,61 @@ msgstr ""
 "您需要创建一个 PPC PReP 启动空间！安装将继续, 但如需启动系统, 您可用“Drak 磁"
 "盘管理”创建启动分区"
 
-#: install_steps_interactive.pm:353
+#: install_steps_interactive.pm:354
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "选择您要格式化的分区"
 
-#: install_steps_interactive.pm:355
+#: install_steps_interactive.pm:356
 #, c-format
 msgid "Check bad blocks?"
 msgstr "是否检查坏磁块?"
 
-#: install_steps_interactive.pm:383
+#: install_steps_interactive.pm:384
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
 "you can lose data)"
 msgstr "检查文件系统 %s 失败。您想修复错误吗?(注意, 有可能丢失数据)"
 
-#: install_steps_interactive.pm:386
+#: install_steps_interactive.pm:387
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr "交换空间太少, 无法完成安装, 请扩大交换分区。"
 
-#: install_steps_interactive.pm:393
+#: install_steps_interactive.pm:394
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr "正在寻找可安装的程序并重建 rpm 数据库..."
 
-#: install_steps_interactive.pm:394 install_steps_interactive.pm:452
+#: install_steps_interactive.pm:395 install_steps_interactive.pm:453
 #, c-format
 msgid "Looking for available packages..."
 msgstr "正在寻找可安装的程序..."
 
-#: install_steps_interactive.pm:397
+#: install_steps_interactive.pm:398
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "正在查找已经安装过的软件包..."
 
-#: install_steps_interactive.pm:401
+#: install_steps_interactive.pm:402
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "正在寻找可升级的程序..."
 
-#: install_steps_interactive.pm:421 install_steps_interactive.pm:830
+#: install_steps_interactive.pm:422 install_steps_interactive.pm:831
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "选择一个镜像网站来取得软件包"
 
-#: install_steps_interactive.pm:461
+#: install_steps_interactive.pm:462
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
 "> %d)"
 msgstr "您的系统所剩余的空间不够进行安装或升级(%d > %d)"
 
-#: install_steps_interactive.pm:495
+#: install_steps_interactive.pm:496
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -6899,55 +6913,55 @@ msgstr ""
 "请选择装入或保存软件包选择息。\n"
 "格式与自动安装生成的文件一样。"
 
-#: install_steps_interactive.pm:497
+#: install_steps_interactive.pm:498
 #, c-format
 msgid "Load"
 msgstr "装入"
 
-#: install_steps_interactive.pm:497 standalone/drakbackup:3918
-#: standalone/drakbackup:3991 standalone/drakroam:210 standalone/logdrake:172
+#: install_steps_interactive.pm:498 standalone/drakbackup:3932
+#: standalone/drakbackup:4005 standalone/drakroam:210 standalone/logdrake:172
 #, c-format
 msgid "Save"
 msgstr "保存"
 
-#: install_steps_interactive.pm:505
+#: install_steps_interactive.pm:506
 #, c-format
 msgid "Bad file"
 msgstr "文件有错"
 
-#: install_steps_interactive.pm:581
+#: install_steps_interactive.pm:582
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "您选择的超过可用空间"
 
-#: install_steps_interactive.pm:596
+#: install_steps_interactive.pm:597
 #, c-format
 msgid "Type of install"
 msgstr "安装类型"
 
-#: install_steps_interactive.pm:597
+#: install_steps_interactive.pm:598
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr "您没有选择任何的组件, 请选择最小安装:"
 
-#: install_steps_interactive.pm:601
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "安装基础文档(建议!)"
 
-#: install_steps_interactive.pm:602
+#: install_steps_interactive.pm:603
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "真正最小安装(注意没有 urpmi 包管理工具)"
 
-#: install_steps_interactive.pm:641 standalone/drakxtv:52
+#: install_steps_interactive.pm:642 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "全部"
 
-#: install_steps_interactive.pm:680
+#: install_steps_interactive.pm:681
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -6958,17 +6972,17 @@ msgstr ""
 "如果您没有其中任何一张, 单击“取消”。\n"
 "如果您缺少其中一张, 清除它的选中标记, 然后单击“确认”。"
 
-#: install_steps_interactive.pm:685
+#: install_steps_interactive.pm:686
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "标为 %s 的光盘"
 
-#: install_steps_interactive.pm:710
+#: install_steps_interactive.pm:711
 #, c-format
 msgid "Preparing installation"
 msgstr "正在准备安装"
 
-#: install_steps_interactive.pm:719
+#: install_steps_interactive.pm:720
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -6977,17 +6991,17 @@ msgstr ""
 "正在安装软件包 %s \n"
 "%d%%"
 
-#: install_steps_interactive.pm:768
+#: install_steps_interactive.pm:769
 #, c-format
 msgid "Post-install configuration"
 msgstr "安装后的配置"
 
-#: install_steps_interactive.pm:775
+#: install_steps_interactive.pm:776
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "请确定更新模块介质位于驱动器 %s"
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -7006,147 +7020,147 @@ msgstr ""
 "\n"
 "您是否要安装升级包?"
 
-#: install_steps_interactive.pm:825
+#: install_steps_interactive.pm:826
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "正在连接 Mandriva Linux 网站获得可用镜像的列表..."
 
-#: install_steps_interactive.pm:844
+#: install_steps_interactive.pm:845
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "正在连接镜像网站以取得可供安装的软件包的列表..."
 
-#: install_steps_interactive.pm:848
+#: install_steps_interactive.pm:849
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "无法连接镜像 %s"
 
-#: install_steps_interactive.pm:848
+#: install_steps_interactive.pm:849
 #, c-format
 msgid "Would you like to try again?"
 msgstr "您是否想要再试一次?"
 
-#: install_steps_interactive.pm:875 standalone/drakclock:45
+#: install_steps_interactive.pm:876 standalone/drakclock:45
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您所在的时区?"
 
-#: install_steps_interactive.pm:880
+#: install_steps_interactive.pm:881
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自动时间同步(使用 NTP)"
 
-#: install_steps_interactive.pm:888
+#: install_steps_interactive.pm:889
 #, c-format
 msgid "NTP Server"
 msgstr "NTP 服务器"
 
-#: install_steps_interactive.pm:930 steps.pm:30
+#: install_steps_interactive.pm:931 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "概要"
 
-#: install_steps_interactive.pm:943 install_steps_interactive.pm:951
-#: install_steps_interactive.pm:969 install_steps_interactive.pm:976
-#: install_steps_interactive.pm:1127 services.pm:133
-#: standalone/drakbackup:1573
+#: install_steps_interactive.pm:944 install_steps_interactive.pm:952
+#: install_steps_interactive.pm:970 install_steps_interactive.pm:977
+#: install_steps_interactive.pm:1128 services.pm:133
+#: standalone/drakbackup:1576
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: install_steps_interactive.pm:983 install_steps_interactive.pm:1010
-#: install_steps_interactive.pm:1027 install_steps_interactive.pm:1043
-#: install_steps_interactive.pm:1054
+#: install_steps_interactive.pm:984 install_steps_interactive.pm:1011
+#: install_steps_interactive.pm:1028 install_steps_interactive.pm:1044
+#: install_steps_interactive.pm:1055
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: install_steps_interactive.pm:989 install_steps_interactive.pm:998
+#: install_steps_interactive.pm:990 install_steps_interactive.pm:999
 #, c-format
 msgid "Remote CUPS server"
 msgstr "远程 CUPS 服务器"
 
-#: install_steps_interactive.pm:989
+#: install_steps_interactive.pm:990
 #, c-format
 msgid "No printer"
 msgstr "没有打印机"
 
-#: install_steps_interactive.pm:1031
+#: install_steps_interactive.pm:1032
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "您有 ISA 声卡吗?"
 
-#: install_steps_interactive.pm:1033
+#: install_steps_interactive.pm:1034
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "安装之后运行“alsaconf”或“sndconfig”来配置您的声卡"
 
-#: install_steps_interactive.pm:1035
+#: install_steps_interactive.pm:1036
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "没有检测到声卡。请在安装之后尝试“Drak 硬件配置”。"
 
-#: install_steps_interactive.pm:1055
+#: install_steps_interactive.pm:1056
 #, c-format
 msgid "Graphical interface"
 msgstr "图形界面"
 
-#: install_steps_interactive.pm:1061 install_steps_interactive.pm:1073
+#: install_steps_interactive.pm:1062 install_steps_interactive.pm:1074
 #, c-format
 msgid "Network & Internet"
 msgstr "网络和 Internet"
 
-#: install_steps_interactive.pm:1075
+#: install_steps_interactive.pm:1076
 #, c-format
 msgid "configured"
 msgstr "已配置"
 
-#: install_steps_interactive.pm:1084 install_steps_interactive.pm:1098
+#: install_steps_interactive.pm:1085 install_steps_interactive.pm:1099
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "安全"
 
-#: install_steps_interactive.pm:1103
+#: install_steps_interactive.pm:1104
 #, c-format
 msgid "activated"
 msgstr "已激活"
 
-#: install_steps_interactive.pm:1103
+#: install_steps_interactive.pm:1104
 #, c-format
 msgid "disabled"
 msgstr "已禁用"
 
-#: install_steps_interactive.pm:1114
+#: install_steps_interactive.pm:1115
 #, c-format
 msgid "Boot"
 msgstr "启动"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1118
+#: install_steps_interactive.pm:1119 printer/printerdrake.pm:974
 #, c-format
 msgid "%s on %s"
 msgstr "位于 %2$s 上的 %1$s"
 
-#: install_steps_interactive.pm:1132 services.pm:175
+#: install_steps_interactive.pm:1133 services.pm:175
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "服务: %2$d 项已注册, %1$d 项已激活"
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1143
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "您还没有配置过 X。您真的想要这样吗?"
 
-#: install_steps_interactive.pm:1223
+#: install_steps_interactive.pm:1224
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "正在准备引导程序..."
 
-#: install_steps_interactive.pm:1233
+#: install_steps_interactive.pm:1234
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -7158,12 +7172,12 @@ msgstr ""
 "续, 不过您需要使用 BootX 或其它方式启动您的机器。根文件系统的内核参数是："
 "root=%s"
 
-#: install_steps_interactive.pm:1239
+#: install_steps_interactive.pm:1240
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "您要使用 aboot 吗?"
 
-#: install_steps_interactive.pm:1242
+#: install_steps_interactive.pm:1243
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7172,29 +7186,29 @@ msgstr ""
 "安装 aboot 时出错, \n"
 "强迫安装会毁坏第一个分区, 要继续吗?"
 
-#: install_steps_interactive.pm:1259
+#: install_steps_interactive.pm:1260
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr "在此安全级别中, 只有管理员才能访问 Windows 分区中的文件。"
 
-#: install_steps_interactive.pm:1288 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1289 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "请在驱动器 %s 中插入一张空白软盘"
 
-#: install_steps_interactive.pm:1293
+#: install_steps_interactive.pm:1294
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "请插入另外一张软盘, 作为驱动程序盘"
 
-#: install_steps_interactive.pm:1295
+#: install_steps_interactive.pm:1296
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "正在创建自动安装软盘..."
 
-#: install_steps_interactive.pm:1307
+#: install_steps_interactive.pm:1308
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7205,12 +7219,12 @@ msgstr ""
 "\n"
 "您真的要现在退出吗?"
 
-#: install_steps_interactive.pm:1323
+#: install_steps_interactive.pm:1324
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "生成自动安装软盘"
 
-#: install_steps_interactive.pm:1325
+#: install_steps_interactive.pm:1326
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7242,24 +7256,25 @@ msgstr "  <Tab>/<Alt-Tab> 在项目间移动 | <空格> 选择 | <F12> 下个画
 msgid "Choose a file"
 msgstr "选择文件"
 
-#: interactive.pm:317 interactive/gtk.pm:505 standalone/drakbackup:1514
-#: standalone/drakfont:656 standalone/drakhosts:242 standalone/draknfs:593
-#: standalone/drakroam:218 standalone/drakups:301 standalone/drakups:361
-#: standalone/drakups:381 standalone/drakvpn:319 standalone/drakvpn:680
+#: interactive.pm:317 interactive/gtk.pm:507 standalone/drakbackup:1517
+#: standalone/drakfont:654 standalone/drakhosts:244 standalone/draknfs:594
+#: standalone/drakroam:218 standalone/draksambashare:595
+#: standalone/drakups:301 standalone/drakups:361 standalone/drakups:381
+#: standalone/drakvpn:319 standalone/drakvpn:680
 #, c-format
 msgid "Add"
 msgstr "添加"
 
-#: interactive.pm:317 interactive/gtk.pm:505 standalone/drakhosts:249
-#: standalone/draknfs:600
+#: interactive.pm:317 interactive/gtk.pm:507 standalone/drakhosts:251
+#: standalone/draknfs:601 standalone/draksambashare:605
 #, c-format
 msgid "Modify"
 msgstr "修改"
 
-#: interactive.pm:317 interactive/gtk.pm:505 standalone/drakhosts:256
-#: standalone/draknfs:607 standalone/drakroam:202 standalone/drakups:303
-#: standalone/drakups:363 standalone/drakups:383 standalone/drakvpn:319
-#: standalone/drakvpn:680
+#: interactive.pm:317 interactive/gtk.pm:507 standalone/drakhosts:258
+#: standalone/draknfs:608 standalone/drakroam:202
+#: standalone/draksambashare:612 standalone/drakups:303 standalone/drakups:363
+#: standalone/drakups:383 standalone/drakvpn:319 standalone/drakvpn:680
 #, c-format
 msgid "Remove"
 msgstr "删除"
@@ -9301,18 +9316,7 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: lang.pm:1079
-#, 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:1082 standalone/scannerdrake:135
-#, c-format
-msgid ", "
-msgstr "、"
-
-#: lang.pm:1135
+#: lang.pm:1122
 #, c-format
 msgid "Welcome to %s"
 msgstr "欢迎使用 %s"
@@ -9337,7 +9341,7 @@ msgstr "请先删除逻辑卷\n"
 msgid "The bootloader can't handle /boot on multiple physicals volumes"
 msgstr "引导程序无法识别多个物理卷上的 /boot"
 
-#: modules/interactive.pm:21 standalone/drakconnect:1028
+#: modules/interactive.pm:21 standalone/drakconnect:1027
 #, c-format
 msgid "Parameters"
 msgstr "参数"
@@ -9526,10 +9530,10 @@ msgid "GlidePoint"
 msgstr "GlidePoint"
 
 #: mouse.pm:36 network/modem.pm:47 network/modem.pm:48 network/modem.pm:49
-#: network/modem.pm:73 network/modem.pm:87 network/modem.pm:92
-#: network/modem.pm:125 network/netconnect.pm:585 network/netconnect.pm:590
-#: network/netconnect.pm:602 network/netconnect.pm:607
-#: network/netconnect.pm:623 network/netconnect.pm:625
+#: network/modem.pm:68 network/modem.pm:82 network/modem.pm:87
+#: network/modem.pm:120 network/netconnect.pm:583 network/netconnect.pm:588
+#: network/netconnect.pm:600 network/netconnect.pm:605
+#: network/netconnect.pm:621 network/netconnect.pm:623
 #, c-format
 msgid "Automatic"
 msgstr "自动"
@@ -9832,36 +9836,76 @@ msgstr "全部(无防火墙)"
 msgid "Other ports"
 msgstr "其它端口"
 
-#: network/isdn.pm:117 network/netconnect.pm:459 network/netconnect.pm:546
-#: network/netconnect.pm:549 network/netconnect.pm:692
-#: network/netconnect.pm:696
+#: network/ifw.pm:136
+#, c-format
+msgid "Port scanning"
+msgstr "端口扫描"
+
+#: network/ifw.pm:137
+#, c-format
+msgid "Service attack"
+msgstr "服务攻击"
+
+#: network/ifw.pm:138
+#, c-format
+msgid "Password cracking"
+msgstr "密码破解"
+
+#: network/ifw.pm:139
+#, c-format
+msgid "\"%s\" attack"
+msgstr ""
+
+#: network/ifw.pm:141
+#, c-format
+msgid "A port scanning attack has been attempted by %s."
+msgstr "%s 试图进行端口扫描攻击。"
+
+#: network/ifw.pm:142
+#, c-format
+msgid "The %s service has been attacked by %s."
+msgstr "%s 服务已被 %s 攻击。"
+
+#: network/ifw.pm:143
+#, c-format
+msgid "A password cracking attack has been attempted by %s."
+msgstr "%s 正在尝试密码破解攻击。"
+
+#: network/ifw.pm:144
+#, fuzzy, c-format
+msgid "A \"%s\" attack has been attempted by %s"
+msgstr "%s 试图进行端口扫描攻击。"
+
+#: network/isdn.pm:117 network/netconnect.pm:455 network/netconnect.pm:544
+#: network/netconnect.pm:547 network/netconnect.pm:690
+#: network/netconnect.pm:694
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "未列出 - 手动编辑"
 
-#: network/isdn.pm:160 network/netconnect.pm:391
+#: network/isdn.pm:160 network/netconnect.pm:387
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:160 network/netconnect.pm:391
+#: network/isdn.pm:160 network/netconnect.pm:387
 #, c-format
 msgid "I do not know"
 msgstr "我不知道"
 
-#: network/isdn.pm:161 network/netconnect.pm:391
+#: network/isdn.pm:161 network/netconnect.pm:387
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:162 network/netconnect.pm:391
+#: network/isdn.pm:162 network/netconnect.pm:387
 #, c-format
 msgid "USB"
 msgstr "USB"
 
 #: network/modem.pm:47 network/modem.pm:48 network/modem.pm:49
-#: network/netconnect.pm:590 network/netconnect.pm:607
-#: network/netconnect.pm:623
+#: network/netconnect.pm:588 network/netconnect.pm:605
+#: network/netconnect.pm:621
 #, c-format
 msgid "Manual"
 msgstr "手动"
@@ -9900,8 +9944,8 @@ msgstr ""
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "找不到 ndiswrapper 接口!"
 
-#: network/netconnect.pm:69 network/netconnect.pm:489
-#: network/netconnect.pm:496
+#: network/netconnect.pm:69 network/netconnect.pm:485
+#: network/netconnect.pm:492
 #, c-format
 msgid "Manual choice"
 msgstr "手动选择"
@@ -9911,7 +9955,7 @@ msgstr "手动选择"
 msgid "Internal ISDN card"
 msgstr "内置 ISDN 卡"
 
-#: network/netconnect.pm:80 printer/printerdrake.pm:1418 standalone/drakups:75
+#: network/netconnect.pm:80 printer/printerdrake.pm:1641 standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "手工配置"
@@ -9945,305 +9989,305 @@ msgstr ""
 "世界其它地区的协议\n"
 "没有 D-信道(专线)"
 
-#: network/netconnect.pm:121 network/thirdparty.pm:184
+#: network/netconnect.pm:120 network/thirdparty.pm:184
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "阿尔卡特 Speedtouch USB 调制解调器"
 
-#: network/netconnect.pm:122
+#: network/netconnect.pm:121
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB 调制解调器"
 
-#: network/netconnect.pm:123
+#: network/netconnect.pm:122
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan 调制解调器"
 
-#: network/netconnect.pm:124
+#: network/netconnect.pm:123
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus 调制解调器"
 
-#: network/netconnect.pm:128
+#: network/netconnect.pm:127
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "动态主机配置协议(DHCP)"
 
-#: network/netconnect.pm:129
+#: network/netconnect.pm:128
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "手工配置 TCP/IP"
 
-#: network/netconnect.pm:130
+#: network/netconnect.pm:129
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "点对点隧道协议(PPTP)"
 
-#: network/netconnect.pm:131
+#: network/netconnect.pm:130
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "以太网上的点对点协议(PPPoE)"
 
-#: network/netconnect.pm:132
+#: network/netconnect.pm:131
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "异步传输模式下的点对点协议(PPPoA)"
 
-#: network/netconnect.pm:133
+#: network/netconnect.pm:132
 #, c-format
 msgid "DSL over CAPI"
 msgstr "CAPI 上的 DSL"
 
-#: network/netconnect.pm:137
+#: network/netconnect.pm:136
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "桥接以太网 LLC"
 
-#: network/netconnect.pm:138
+#: network/netconnect.pm:137
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "桥接以太网 VC"
 
-#: network/netconnect.pm:139
+#: network/netconnect.pm:138
 #, c-format
 msgid "Routed IP LLC"
 msgstr "路由 IP LLC"
 
-#: network/netconnect.pm:140
+#: network/netconnect.pm:139
 #, c-format
 msgid "Routed IP VC"
 msgstr "路由 IP VC"
 
-#: network/netconnect.pm:141
+#: network/netconnect.pm:140
 #, c-format
 msgid "PPPoA LLC"
 msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:142
+#: network/netconnect.pm:141
 #, c-format
 msgid "PPPoA VC"
 msgstr "PPPoA VC"
 
-#: network/netconnect.pm:146 standalone/drakconnect:498
+#: network/netconnect.pm:145 standalone/drakconnect:498
 #, c-format
 msgid "Script-based"
 msgstr "基于脚本登录"
 
-#: network/netconnect.pm:147 standalone/drakconnect:498
+#: network/netconnect.pm:146 standalone/drakconnect:498
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:148 standalone/drakconnect:498
+#: network/netconnect.pm:147 standalone/drakconnect:498
 #, c-format
 msgid "Terminal-based"
 msgstr "基于终端"
 
-#: network/netconnect.pm:149 standalone/drakconnect:498
+#: network/netconnect.pm:148 standalone/drakconnect:498
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:150 standalone/drakconnect:498
+#: network/netconnect.pm:149 standalone/drakconnect:498
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:154
 #, c-format
 msgid "Open WEP"
 msgstr "开放 WEP"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:155
 #, c-format
 msgid "Restricted WEP"
 msgstr "限制 WEP"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:156
 #, c-format
 msgid "WPA Pre-Shared Key"
 msgstr "WPA 预共享密钥"
 
-#: network/netconnect.pm:247 standalone/drakconnect:56
+#: network/netconnect.pm:242 standalone/drakconnect:56
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "网络和 Internet 配置"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:248
 #, c-format
 msgid "LAN connection"
 msgstr "局域网连接"
 
-#: network/netconnect.pm:254 network/netconnect.pm:273
+#: network/netconnect.pm:249 network/netconnect.pm:268
 #, c-format
 msgid "Wireless connection"
 msgstr "无线连接"
 
-#: network/netconnect.pm:255
+#: network/netconnect.pm:250
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL 连接"
 
-#: network/netconnect.pm:256
+#: network/netconnect.pm:251
 #, c-format
 msgid "Cable connection"
 msgstr "有线电缆连接"
 
-#: network/netconnect.pm:257
+#: network/netconnect.pm:252
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN 连接"
 
-#: network/netconnect.pm:258
+#: network/netconnect.pm:253
 #, c-format
 msgid "Modem connection"
 msgstr "调制解调器连接"
 
-#: network/netconnect.pm:259
+#: network/netconnect.pm:254
 #, c-format
 msgid "DVB connection"
 msgstr "DVB 连接"
 
-#: network/netconnect.pm:269
+#: network/netconnect.pm:264
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "选择您想要配置的连接"
 
-#: network/netconnect.pm:284 network/netconnect.pm:771
+#: network/netconnect.pm:279 network/netconnect.pm:769
 #, c-format
 msgid "Connection Configuration"
 msgstr "连接配置"
 
-#: network/netconnect.pm:284 network/netconnect.pm:772
+#: network/netconnect.pm:279 network/netconnect.pm:770
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "请填写或选择下列项目"
 
-#: network/netconnect.pm:287
+#: network/netconnect.pm:282
 #, c-format
 msgid "Your personal phone number"
 msgstr "您自己的电话号码"
 
-#: network/netconnect.pm:288 network/netconnect.pm:775
+#: network/netconnect.pm:283 network/netconnect.pm:773
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "服务商名称(如 provider.net)"
 
-#: network/netconnect.pm:289 standalone/drakconnect:493
+#: network/netconnect.pm:284 standalone/drakconnect:493
 #, c-format
 msgid "Provider phone number"
 msgstr "服务商电话号码"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:285
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "服务商 DNS 1(可选)"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:286
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "服务商 DNS 2(可选)"
 
-#: network/netconnect.pm:292 standalone/drakconnect:444
+#: network/netconnect.pm:287 standalone/drakconnect:444
 #, c-format
 msgid "Dialing mode"
 msgstr "拨号模式"
 
-#: network/netconnect.pm:293 standalone/drakconnect:449
+#: network/netconnect.pm:288 standalone/drakconnect:449
 #: standalone/drakconnect:517
 #, c-format
 msgid "Connection speed"
 msgstr "连接速率"
 
-#: network/netconnect.pm:294 standalone/drakconnect:454
+#: network/netconnect.pm:289 standalone/drakconnect:454
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "连接超时(秒)"
 
-#: network/netconnect.pm:295 network/netconnect.pm:320
-#: network/netconnect.pm:778 standalone/drakconnect:491
+#: network/netconnect.pm:290 network/netconnect.pm:315
+#: network/netconnect.pm:776 standalone/drakconnect:491
 #, c-format
 msgid "Account Login (user name)"
 msgstr "账户登录(用户名)"
 
-#: network/netconnect.pm:296 network/netconnect.pm:321
-#: network/netconnect.pm:779 standalone/drakconnect:492
+#: network/netconnect.pm:291 network/netconnect.pm:316
+#: network/netconnect.pm:777 standalone/drakconnect:492
 #, c-format
 msgid "Account Password"
 msgstr "账户密码"
 
-#: network/netconnect.pm:297 standalone/drakconnect:554
+#: network/netconnect.pm:292 standalone/drakconnect:554
 #, c-format
 msgid "Card IRQ"
 msgstr "网卡的 IRQ"
 
-#: network/netconnect.pm:298 standalone/drakconnect:555
+#: network/netconnect.pm:293 standalone/drakconnect:555
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "网卡内存(DMA)"
 
-#: network/netconnect.pm:299 standalone/drakconnect:556
+#: network/netconnect.pm:294 standalone/drakconnect:556
 #, c-format
 msgid "Card IO"
 msgstr "网卡 IO"
 
-#: network/netconnect.pm:300 standalone/drakconnect:557
+#: network/netconnect.pm:295 standalone/drakconnect:557
 #, c-format
 msgid "Card IO_0"
 msgstr "网卡 IO_0"
 
-#: network/netconnect.pm:301
+#: network/netconnect.pm:296
 #, c-format
 msgid "Card IO_1"
 msgstr "网卡 IO_1"
 
-#: network/netconnect.pm:316
+#: network/netconnect.pm:311
 #, c-format
 msgid "Cable: account options"
 msgstr "光缆: 账户选项"
 
-#: network/netconnect.pm:319
+#: network/netconnect.pm:314
 #, c-format
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "使用 BPALogin (Telstra 需要)"
 
-#: network/netconnect.pm:344 network/netconnect.pm:659
-#: network/netconnect.pm:810 network/netconnect.pm:1110
+#: network/netconnect.pm:340 network/netconnect.pm:657
+#: network/netconnect.pm:808 network/netconnect.pm:1120
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "选择要配置的网卡: "
 
-#: network/netconnect.pm:346 network/netconnect.pm:381
-#: network/netconnect.pm:660 network/netconnect.pm:812 network/shorewall.pm:69
-#: standalone/drakconnect:709
+#: network/netconnect.pm:342 network/netconnect.pm:377
+#: network/netconnect.pm:658 network/netconnect.pm:810 network/shorewall.pm:69
+#: standalone/drakconnect:713
 #, c-format
 msgid "Net Device"
 msgstr "网络设备"
 
-#: network/netconnect.pm:347 network/netconnect.pm:352
+#: network/netconnect.pm:343 network/netconnect.pm:348
 #, c-format
 msgid "External ISDN modem"
 msgstr "外置 ISDN 调制解调器"
 
-#: network/netconnect.pm:380 standalone/harddrake2:216
+#: network/netconnect.pm:376 standalone/harddrake2:216
 #, c-format
 msgid "Select a device!"
 msgstr "请选择设备！"
 
-#: network/netconnect.pm:389 network/netconnect.pm:399
-#: network/netconnect.pm:409 network/netconnect.pm:442
-#: network/netconnect.pm:456
+#: network/netconnect.pm:385 network/netconnect.pm:395
+#: network/netconnect.pm:405 network/netconnect.pm:438
+#: network/netconnect.pm:452
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN 配置"
 
-#: network/netconnect.pm:390
+#: network/netconnect.pm:386
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "请问您适配卡的种类?"
 
-#: network/netconnect.pm:400
+#: network/netconnect.pm:396
 #, c-format
 msgid ""
 "\n"
@@ -10257,22 +10301,22 @@ msgstr ""
 "\n"
 "如果您的卡是 PCMCIA 卡, 您必须知道它的“irq”和“io”。\n"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:400
 #, c-format
 msgid "Continue"
 msgstr "继续"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:400
 #, c-format
 msgid "Abort"
 msgstr "中止"
 
-#: network/netconnect.pm:410
+#: network/netconnect.pm:406
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "下列哪个是您的 ISDN 卡?"
 
-#: network/netconnect.pm:428
+#: network/netconnect.pm:424
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -10282,25 +10326,25 @@ msgstr ""
 "此调制解调器适用 CAPI 驱动程序。此 CAPI 驱动程序比免费驱动程序提供更多的功能"
 "(比如发送传真)。您想要使用哪个驱动程序?"
 
-#: network/netconnect.pm:430 standalone/drakconnect:109 standalone/drakups:251
+#: network/netconnect.pm:426 standalone/drakconnect:109 standalone/drakups:251
 #: standalone/harddrake2:133
 #, c-format
 msgid "Driver"
 msgstr "驱动程序"
 
-#: network/netconnect.pm:442
+#: network/netconnect.pm:438
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "您将使用哪种协议?"
 
-#: network/netconnect.pm:444 standalone/drakconnect:109
-#: standalone/drakconnect:300 standalone/drakconnect:562 standalone/drakids:25
-#: standalone/drakvpn:1128
+#: network/netconnect.pm:440 standalone/drakconnect:109
+#: standalone/drakconnect:300 standalone/drakconnect:562
+#: standalone/drakids:196 standalone/drakvpn:1128
 #, c-format
 msgid "Protocol"
 msgstr "协议"
 
-#: network/netconnect.pm:456
+#: network/netconnect.pm:452
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -10309,13 +10353,13 @@ msgstr ""
 "选择您的提供商。\n"
 "如果该提供商未被列出, 请选择“未列出”。"
 
-#: network/netconnect.pm:458 network/netconnect.pm:545
-#: network/netconnect.pm:691
+#: network/netconnect.pm:454 network/netconnect.pm:543
+#: network/netconnect.pm:689
 #, c-format
 msgid "Provider:"
 msgstr "服务商:"
 
-#: network/netconnect.pm:467
+#: network/netconnect.pm:463
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -10324,122 +10368,122 @@ msgstr ""
 "您的调制解调器不被系统支持。\n"
 "请看看 http://www.linmodems.org"
 
-#: network/netconnect.pm:486
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "选择要配置的调制解调器:"
 
-#: network/netconnect.pm:514
+#: network/netconnect.pm:512
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "请选择您的调制解调器是连接到哪个串行端口。"
 
-#: network/netconnect.pm:543
+#: network/netconnect.pm:541
 #, c-format
 msgid "Select your provider:"
 msgstr "选择您的服务商:"
 
-#: network/netconnect.pm:567
+#: network/netconnect.pm:565
 #, c-format
 msgid "Dialup: account options"
 msgstr "拨号: 账户设置"
 
-#: network/netconnect.pm:570
+#: network/netconnect.pm:568
 #, c-format
 msgid "Connection name"
 msgstr "连接名称"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:569
 #, c-format
 msgid "Phone number"
 msgstr "电话号码"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:570
 #, c-format
 msgid "Login ID"
 msgstr "登录 ID"
 
-#: network/netconnect.pm:587 network/netconnect.pm:620
+#: network/netconnect.pm:585 network/netconnect.pm:618
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "拨号: IP 参数"
 
-#: network/netconnect.pm:590
+#: network/netconnect.pm:588
 #, c-format
 msgid "IP parameters"
 msgstr "IP 参数"
 
-#: network/netconnect.pm:591 network/netconnect.pm:899
+#: network/netconnect.pm:589 network/netconnect.pm:894
 #: printer/printerdrake.pm:460 standalone/drakconnect:109
-#: standalone/drakconnect:316 standalone/drakconnect:878
-#: standalone/drakhosts:194 standalone/drakups:286
+#: standalone/drakconnect:316 standalone/drakconnect:882
+#: standalone/drakhosts:198 standalone/drakups:286
 #, c-format
 msgid "IP address"
 msgstr "IP 地址"
 
-#: network/netconnect.pm:592
+#: network/netconnect.pm:590
 #, c-format
 msgid "Subnet mask"
 msgstr "子网掩码"
 
-#: network/netconnect.pm:604
+#: network/netconnect.pm:602
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "拨号: DNS 参数"
 
-#: network/netconnect.pm:607
+#: network/netconnect.pm:605
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:608
+#: network/netconnect.pm:606
 #, c-format
 msgid "Domain name"
 msgstr "域名"
 
-#: network/netconnect.pm:609 network/netconnect.pm:776
-#: standalone/drakconnect:993
+#: network/netconnect.pm:607 network/netconnect.pm:774
+#: standalone/drakconnect:992
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "首选 DNS 服务器(可选)"
 
-#: network/netconnect.pm:610 network/netconnect.pm:777
-#: standalone/drakconnect:994
+#: network/netconnect.pm:608 network/netconnect.pm:775
+#: standalone/drakconnect:993
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "备选 DNS 服务器(可选)"
 
-#: network/netconnect.pm:611
+#: network/netconnect.pm:609
 #, c-format
 msgid "Set hostname from IP"
 msgstr "由 IP 设置主机名"
 
-#: network/netconnect.pm:623 standalone/drakconnect:327
+#: network/netconnect.pm:621 standalone/drakconnect:327
 #, c-format
 msgid "Gateway"
 msgstr "网关"
 
-#: network/netconnect.pm:624
+#: network/netconnect.pm:622
 #, c-format
 msgid "Gateway IP address"
 msgstr "网关 IP 地址"
 
-#: network/netconnect.pm:659
+#: network/netconnect.pm:657
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSL 配置"
 
-#: network/netconnect.pm:689
+#: network/netconnect.pm:687
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "请选择您的 ADSL 提供商"
 
-#: network/netconnect.pm:719
+#: network/netconnect.pm:717
 #, c-format
 msgid "Connect to the Internet"
 msgstr "连接到 Internet"
 
-#: network/netconnect.pm:720
+#: network/netconnect.pm:718
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
@@ -10450,62 +10494,54 @@ msgstr ""
 "有一些利用 PPTP, 还有极少数利用 DHCP。\n"
 "如果您没有把握, 就选择“PPPoE”"
 
-#: network/netconnect.pm:724
+#: network/netconnect.pm:722
 #, c-format
 msgid "ADSL connection type:"
 msgstr "ADSL 连接类型:"
 
-#: network/netconnect.pm:781
+#: network/netconnect.pm:779
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "虚拟路径 ID (VPI):"
 
-#: network/netconnect.pm:782
+#: network/netconnect.pm:780
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "虚拟电路 ID (VCI):"
 
-#: network/netconnect.pm:785
+#: network/netconnect.pm:783
 #, c-format
 msgid "Encapsulation:"
 msgstr "封装: "
 
-#: network/netconnect.pm:812
+#: network/netconnect.pm:810
 #, c-format
 msgid "Manually load a driver"
 msgstr "手动装入驱动程序"
 
-#: network/netconnect.pm:812
+#: network/netconnect.pm:810
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "使用 Windows 驱动程序(通过 ndiswrapper)"
 
-#: network/netconnect.pm:819 network/netconnect.pm:1074
-#: network/netconnect.pm:1078 printer/printerdrake.pm:3741
-#: standalone/drakgw:217 standalone/drakgw:258 standalone/drakgw:292
-#: standalone/drakgw:394
-#, c-format
-msgid "Could not install the %s package!"
-msgstr "无法安装 %s 软件包!"
-
-#: network/netconnect.pm:855
+#: network/netconnect.pm:850
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf 主机名解析"
 
-#: network/netconnect.pm:856 network/netconnect.pm:886
+#: network/netconnect.pm:851 network/netconnect.pm:881
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "配置网络设备 %s(驱动程序 %s)"
 
-#: network/netconnect.pm:857
+#: network/netconnect.pm:852
 #, c-format
 msgid ""
 "The following protocols can be used to configure a LAN connection. Please "
 "choose the one you want to use"
 msgstr "您可使用下列协议配置局域网连接。请选择您想要使用的协议"
 
-#: network/netconnect.pm:887
+#: network/netconnect.pm:882
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10516,186 +10552,196 @@ msgstr ""
 "下列项目要求以句点分隔十进制格式输入的 IP 地址。\n"
 "(例如, 1.2.3.4)"
 
-#: network/netconnect.pm:894 standalone/drakconnect:373
+#: network/netconnect.pm:889 standalone/drakconnect:373
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "从 DHCP 地址指定主机名"
 
-#: network/netconnect.pm:895 standalone/drakconnect:375
+#: network/netconnect.pm:890 standalone/drakconnect:375
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP 主机名"
 
-#: network/netconnect.pm:900 standalone/drakconnect:321
-#: standalone/drakconnect:879 standalone/drakgw:181
+#: network/netconnect.pm:895 standalone/drakconnect:321
+#: standalone/drakconnect:883 standalone/drakgw:181
 #, c-format
 msgid "Netmask"
 msgstr "子网掩码"
 
-#: network/netconnect.pm:902 standalone/drakconnect:437
+#: network/netconnect.pm:897 standalone/drakconnect:437
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "跟踪网卡标志(用于笔记本电脑)"
 
-#: network/netconnect.pm:904 standalone/drakconnect:438
+#: network/netconnect.pm:898 standalone/drakconnect:438
 #, c-format
 msgid "Network Hotplugging"
 msgstr "网络热插拔"
 
-#: network/netconnect.pm:906 standalone/drakconnect:432
+#: network/netconnect.pm:900 standalone/drakconnect:432
 #, c-format
 msgid "Start at boot"
 msgstr "开机时启动"
 
-#: network/netconnect.pm:908 standalone/drakconnect:460
+#: network/netconnect.pm:902 standalone/drakconnect:460
 #, c-format
 msgid "Metric"
 msgstr "度量衡"
 
-#: network/netconnect.pm:910 standalone/drakconnect:369
-#: standalone/drakconnect:882
+#: network/netconnect.pm:903
+#, c-format
+msgid "Enable IPv6 to IPv4 tunnel"
+msgstr ""
+
+#: network/netconnect.pm:905 standalone/drakconnect:369
+#: standalone/drakconnect:886
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP 客户端"
 
-#: network/netconnect.pm:912 standalone/drakconnect:379
+#: network/netconnect.pm:907 standalone/drakconnect:379
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP 超时(秒)"
 
-#: network/netconnect.pm:913 standalone/drakconnect:382
+#: network/netconnect.pm:908 standalone/drakconnect:382
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "从 DHCP 获取 DNS 服务器"
 
-#: network/netconnect.pm:914 standalone/drakconnect:383
+#: network/netconnect.pm:909 standalone/drakconnect:383
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "从 DHCP 获取 YP 服务器"
 
-#: network/netconnect.pm:915 standalone/drakconnect:384
+#: network/netconnect.pm:910 standalone/drakconnect:384
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "从 DHCP 获取 NTPD 服务器"
 
-#: network/netconnect.pm:923 printer/printerdrake.pm:1672
-#: standalone/drakconnect:672
+#: network/netconnect.pm:918 printer/printerdrake.pm:1895
+#: standalone/drakconnect:676
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP 地址的格式应该是 1.2.3.4"
 
-#: network/netconnect.pm:927 standalone/drakconnect:676
+#: network/netconnect.pm:922 standalone/drakconnect:680
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "子网掩码的格式应该是 255.255.224.0"
 
-#: network/netconnect.pm:931
+#: network/netconnect.pm:926
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "警告: IP 地址 %s 通常是被保留的！"
 
-#: network/netconnect.pm:936 standalone/drakTermServ:1816
-#: standalone/drakTermServ:1817 standalone/drakTermServ:1818
+#: network/netconnect.pm:931 standalone/drakTermServ:1852
+#: standalone/drakTermServ:1853 standalone/drakTermServ:1854
 #, c-format
 msgid "%s already in use\n"
 msgstr "%s 已经被使用了\n"
 
-#: network/netconnect.pm:969
+#: network/netconnect.pm:971
 #, c-format
 msgid "Choose an ndiswrapper driver"
 msgstr "选择 ndiswrapper 驱动程序"
 
-#: network/netconnect.pm:971
+#: network/netconnect.pm:973
 #, c-format
 msgid "Use the ndiswrapper driver %s"
 msgstr "使用 ndiswrapper 驱动程序 %s"
 
-#: network/netconnect.pm:971
+#: network/netconnect.pm:973
 #, c-format
 msgid "Install a new driver"
 msgstr "安装新驱动程序"
 
-#: network/netconnect.pm:983
+#: network/netconnect.pm:985
 #, c-format
 msgid "Select a device:"
 msgstr "选择设备:"
 
-#: network/netconnect.pm:1008
+#: network/netconnect.pm:1014
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "请选择此网卡的无线参数:"
 
-#: network/netconnect.pm:1011 standalone/drakconnect:404
+#: network/netconnect.pm:1017 standalone/drakconnect:404
 #, c-format
 msgid "Operating Mode"
 msgstr "操作模式"
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1018
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1018
 #, c-format
 msgid "Managed"
 msgstr "受控的"
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1018
 #, c-format
 msgid "Master"
 msgstr "主要的"
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1018
 #, c-format
 msgid "Repeater"
 msgstr "转发器"
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1018
 #, c-format
 msgid "Secondary"
 msgstr "次要的"
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1018
 #, c-format
 msgid "Auto"
 msgstr "自动"
 
-#: network/netconnect.pm:1014 standalone/drakconnect:405
+#: network/netconnect.pm:1021 standalone/drakconnect:405
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "网络名称(ESSID)"
 
-#: network/netconnect.pm:1015 standalone/drakconnect:406
+#: network/netconnect.pm:1022
+#, c-format
+msgid "Encryption mode"
+msgstr "加密模式"
+
+#: network/netconnect.pm:1026
+#, c-format
+msgid "Allow access point roaming"
+msgstr ""
+
+#: network/netconnect.pm:1027 standalone/drakconnect:406
 #, c-format
 msgid "Network ID"
 msgstr "网络 ID"
 
-#: network/netconnect.pm:1016 standalone/drakconnect:407
+#: network/netconnect.pm:1028 standalone/drakconnect:407
 #, c-format
 msgid "Operating frequency"
 msgstr "运行频率"
 
-#: network/netconnect.pm:1017 standalone/drakconnect:408
+#: network/netconnect.pm:1029 standalone/drakconnect:408
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "灵敏度阀值"
 
-#: network/netconnect.pm:1018 standalone/drakconnect:409
+#: network/netconnect.pm:1030 standalone/drakconnect:409
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "比特率(每秒比特数, b/s)"
 
-#: network/netconnect.pm:1019
-#, c-format
-msgid "Encryption mode"
-msgstr "加密模式"
-
-#: network/netconnect.pm:1023 standalone/drakconnect:420
+#: network/netconnect.pm:1031 standalone/drakconnect:420
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:1024
+#: network/netconnect.pm:1032
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10714,17 +10760,17 @@ msgstr ""
 "包\n"
 "的大小, 一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
 
-#: network/netconnect.pm:1031 standalone/drakconnect:421
+#: network/netconnect.pm:1039 standalone/drakconnect:421
 #, c-format
 msgid "Fragmentation"
 msgstr "块"
 
-#: network/netconnect.pm:1032 standalone/drakconnect:422
+#: network/netconnect.pm:1040 standalone/drakconnect:422
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "Iwconfig 命令的额外参数"
 
-#: network/netconnect.pm:1033
+#: network/netconnect.pm:1041
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10740,12 +10786,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:1040 standalone/drakconnect:423
+#: network/netconnect.pm:1048 standalone/drakconnect:423
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr "Iwspy 命令的额外参数"
 
-#: network/netconnect.pm:1041
+#: network/netconnect.pm:1049
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10763,12 +10809,12 @@ msgstr ""
 "\n"
 "请参看 iwpspy(8) man page 中的更多信息。"
 
-#: network/netconnect.pm:1050 standalone/drakconnect:424
+#: network/netconnect.pm:1058 standalone/drakconnect:424
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "Iwpriv 命令的额外参数"
 
-#: network/netconnect.pm:1051
+#: network/netconnect.pm:1059
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10797,7 +10843,7 @@ msgstr ""
 "\n"
 "请参看 iwpriv(8) man page 中的更多信息。"
 
-#: network/netconnect.pm:1066
+#: network/netconnect.pm:1074
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10806,44 +10852,44 @@ msgstr ""
 "频率应该有后缀 k, M 或 G(如“2.46G”代表 2.46 GHz 频率), 或者后带足够"
 "的“0”(零)。"
 
-#: network/netconnect.pm:1070
+#: network/netconnect.pm:1078
 #, 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:1110
+#: network/netconnect.pm:1120
 #, c-format
 msgid "DVB configuration"
 msgstr "DVB 配置"
 
-#: network/netconnect.pm:1111
+#: network/netconnect.pm:1121
 #, c-format
 msgid "DVB Adapter"
 msgstr "DVB 适配器"
 
-#: network/netconnect.pm:1128
+#: network/netconnect.pm:1138
 #, c-format
 msgid "DVB adapter settings"
 msgstr "DVB 适配器设置"
 
-#: network/netconnect.pm:1131
+#: network/netconnect.pm:1141
 #, c-format
 msgid "Adapter card"
 msgstr "适配卡"
 
-#: network/netconnect.pm:1132
+#: network/netconnect.pm:1142
 #, c-format
 msgid "Net demux"
 msgstr "网络互斥"
 
-#: network/netconnect.pm:1133
+#: network/netconnect.pm:1143
 #, c-format
 msgid "PID"
 msgstr "PID"
 
-#: network/netconnect.pm:1161
+#: network/netconnect.pm:1171
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10855,67 +10901,67 @@ msgstr ""
 "您的主机名称必需是个完全限定的名称, 例如“mybox.mylab.myco.com”。\n"
 "如果您有网关的话, 也请输入其 IP 地址。"
 
-#: network/netconnect.pm:1166
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr "最后, 您还应该至少输入您 DNS 服务器的 IP 地址。"
 
-#: network/netconnect.pm:1168 standalone/drakconnect:992
+#: network/netconnect.pm:1178 standalone/drakconnect:991
 #, c-format
 msgid "Host name (optional)"
 msgstr "主机名(可选)"
 
-#: network/netconnect.pm:1168 standalone/drakhosts:194
+#: network/netconnect.pm:1178 standalone/drakhosts:198
 #, c-format
 msgid "Host name"
 msgstr "主机名"
 
-#: network/netconnect.pm:1170
+#: network/netconnect.pm:1180
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS 服务器 1"
 
-#: network/netconnect.pm:1171
+#: network/netconnect.pm:1181
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS 服务器 2"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1182
 #, c-format
 msgid "DNS server 3"
 msgstr "DNS 服务器 3"
 
-#: network/netconnect.pm:1173
+#: network/netconnect.pm:1183
 #, c-format
 msgid "Search domain"
 msgstr "搜索网域"
 
-#: network/netconnect.pm:1174
+#: network/netconnect.pm:1184
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "默认情况下, 搜索域名将会根据完全限定的主机名进行设定"
 
-#: network/netconnect.pm:1175
+#: network/netconnect.pm:1185
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "网关(如 %s)"
 
-#: network/netconnect.pm:1177
+#: network/netconnect.pm:1187
 #, c-format
 msgid "Gateway device"
 msgstr "网关设备"
 
-#: network/netconnect.pm:1186
+#: network/netconnect.pm:1196
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS 服务器的格式应该是 1.2.3.4"
 
-#: network/netconnect.pm:1191 standalone/drakconnect:681
+#: network/netconnect.pm:1201 standalone/drakconnect:685
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "网关地址的格式应该是 1.2.3.4"
 
-#: network/netconnect.pm:1204
+#: network/netconnect.pm:1214
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -10927,67 +10973,67 @@ msgstr ""
 "这将被您的计算机用于通知其未被网络管理的共享资源。\n"
 "大多数网络中不需要此设置。"
 
-#: network/netconnect.pm:1208
+#: network/netconnect.pm:1218
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf 主机名"
 
-#: network/netconnect.pm:1211
+#: network/netconnect.pm:1221
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf 主机名不能包含“.”"
 
-#: network/netconnect.pm:1221
+#: network/netconnect.pm:1231
 #, c-format
 msgid "Do you want to allow users to start the connection?"
 msgstr "您是否希望允许用户启动连接?"
 
-#: network/netconnect.pm:1234
+#: network/netconnect.pm:1244
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "您是否希望一开机就启动连接?"
 
-#: network/netconnect.pm:1249
+#: network/netconnect.pm:1259
 #, c-format
 msgid "Automatically at boot"
 msgstr "开机时自动启动"
 
-#: network/netconnect.pm:1251
+#: network/netconnect.pm:1261
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "使用系统脱盘中的网络小程序"
 
-#: network/netconnect.pm:1253
+#: network/netconnect.pm:1263
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "手动(启动时仍会激活网卡)"
 
-#: network/netconnect.pm:1262
+#: network/netconnect.pm:1272
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "您想要如何拨打此连接?"
 
-#: network/netconnect.pm:1275
+#: network/netconnect.pm:1285
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "您想要测试连接到 Internet 吗?"
 
-#: network/netconnect.pm:1283 standalone/drakconnect:1024
+#: network/netconnect.pm:1293 standalone/drakconnect:1023
 #, c-format
 msgid "Testing your connection..."
 msgstr "正在测试您的连接..."
 
-#: network/netconnect.pm:1303
+#: network/netconnect.pm:1313
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "您的系统现在正连接到 Internet。"
 
-#: network/netconnect.pm:1304
+#: network/netconnect.pm:1314
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "由于安全原因, 现在将断开连接。"
 
-#: network/netconnect.pm:1305
+#: network/netconnect.pm:1315
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -10996,7 +11042,7 @@ msgstr ""
 "看来系统没有连接到 Internet。\n"
 "请重新尝试配置您的连接。"
 
-#: network/netconnect.pm:1320
+#: network/netconnect.pm:1330
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -11005,14 +11051,14 @@ msgstr ""
 "恭喜, 网络和 Internet 配置完成。\n"
 "\n"
 
-#: network/netconnect.pm:1323
+#: network/netconnect.pm:1333
 #, 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:1324
+#: network/netconnect.pm:1334
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
@@ -11023,28 +11069,28 @@ msgstr ""
 "请从网络监视器或者控制中心测试您的连接。如果您的连接不工作, 您可能想要重新配"
 "置。"
 
-#: network/netconnect.pm:1335
+#: network/netconnect.pm:1345
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(在端口 %s 检测到)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:1337
+#: network/netconnect.pm:1347
 #, c-format
 msgid "(detected %s)"
 msgstr "(检测到 %s)"
 
-#: network/netconnect.pm:1337
+#: network/netconnect.pm:1347
 #, c-format
 msgid "(detected)"
 msgstr "(检测到)"
 
-#: network/netconnect.pm:1338
+#: network/netconnect.pm:1348
 #, c-format
 msgid "Network Configuration"
 msgstr "网络配置"
 
-#: network/netconnect.pm:1339
+#: network/netconnect.pm:1349
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -11055,12 +11101,12 @@ msgstr ""
 "由于您正在执行网络安装, 您的网络已经配置好了。\n"
 "单击“确定”保存配置, 或“取消”重新配置网络。\n"
 
-#: network/netconnect.pm:1342
+#: network/netconnect.pm:1352
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "网络需要重新启动。您要重新启动吗?"
 
-#: network/netconnect.pm:1343
+#: network/netconnect.pm:1353
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -11071,7 +11117,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1344
+#: network/netconnect.pm:1354
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -11084,12 +11130,12 @@ msgstr ""
 "\n"
 "按“%s”继续。"
 
-#: network/netconnect.pm:1345
+#: network/netconnect.pm:1355
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "配置完成, 您想要应用设置吗?"
 
-#: network/netconnect.pm:1346
+#: network/netconnect.pm:1356
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -11100,12 +11146,12 @@ msgstr ""
 "选择您要使用的一种。\n"
 "\n"
 
-#: network/netconnect.pm:1347
+#: network/netconnect.pm:1357
 #, c-format
 msgid "Internet connection"
 msgstr "Internet 连接"
 
-#: network/netconnect.pm:1364
+#: network/netconnect.pm:1374
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -11114,27 +11160,27 @@ msgstr ""
 "发生了意外错误: \n"
 "%s"
 
-#: network/network.pm:390
+#: network/network.pm:397
 #, c-format
 msgid "Proxies configuration"
 msgstr "代理服务器配置"
 
-#: network/network.pm:391
+#: network/network.pm:398
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP 代理服务器"
 
-#: network/network.pm:392
+#: network/network.pm:399
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP 代理服务器"
 
-#: network/network.pm:395
+#: network/network.pm:402
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "代理服务器应该是 http://..."
 
-#: network/network.pm:396
+#: network/network.pm:403
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL 应该是以“ftp:”或“http:”开头"
@@ -11310,7 +11356,7 @@ msgstr "错误的备份文件"
 msgid "Error writing to file %s"
 msgstr "写入文件 %s 出错"
 
-#: partition_table/raw.pm:252
+#: partition_table/raw.pm:253
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -11347,7 +11393,7 @@ msgstr "一般"
 msgid "maybe"
 msgstr "或许有用"
 
-#: pkgs.pm:458
+#: pkgs.pm:460
 #, c-format
 msgid "Downloading file %s..."
 msgstr "正在下载文件 %s..."
@@ -11362,7 +11408,7 @@ msgstr "(在 %s)"
 msgid "(on this machine)"
 msgstr "(在本机上)"
 
-#: printer/cups.pm:115 standalone/printerdrake:188
+#: printer/cups.pm:115 standalone/printerdrake:198
 #, c-format
 msgid "Configured on other machines"
 msgstr "已在其它计算机上配置"
@@ -11372,44 +11418,44 @@ 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:5048
+#: printer/printerdrake.pm:5058 printer/printerdrake.pm:5203
+#: printer/printerdrake.pm:5214 printer/printerdrake.pm:5427
 #, c-format
 msgid " (Default)"
 msgstr "(默认)"
 
-#: printer/data.pm:60
+#: printer/data.pm:59
 #, c-format
 msgid "PDQ - Print, Do not Queue"
 msgstr "PDQ - 打印, 不排队"
 
-#: printer/data.pm:61
+#: printer/data.pm:60
 #, c-format
 msgid "PDQ"
 msgstr "PDQ"
 
-#: printer/data.pm:73
+#: printer/data.pm:72
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr "LPD - 行式打印向导"
 
-#: printer/data.pm:74
+#: printer/data.pm:73
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:95
+#: printer/data.pm:94
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - 新一代 LPR"
 
-#: printer/data.pm:96
+#: printer/data.pm:95
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:121
+#: printer/data.pm:120
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr "CUPS - 公共 Unix 打印系统"
@@ -11445,8 +11491,8 @@ msgstr "远程打印机"
 msgid "Printer on remote CUPS server"
 msgstr "远程 CUPS 服务器的打印机"
 
-#: printer/main.pm:30 printer/printerdrake.pm:1150
-#: printer/printerdrake.pm:1695
+#: printer/main.pm:30 printer/printerdrake.pm:1373
+#: printer/printerdrake.pm:1918
 #, c-format
 msgid "Printer on remote lpd server"
 msgstr "远程 lpd 服务器的打印机"
@@ -11457,8 +11503,8 @@ msgid "Network printer (TCP/Socket)"
 msgstr "网络打印机(TCP/Socket)"
 
 #: printer/main.pm:32
-#, c-format
-msgid "Printer on SMB/Windows 95/98/NT server"
+#, fuzzy, c-format
+msgid "Printer on SMB/Windows server"
 msgstr "SMB/Windows 95/98/NT 服务器上的打印机"
 
 #: printer/main.pm:33
@@ -11466,7 +11512,7 @@ msgstr "SMB/Windows 95/98/NT 服务器上的打印机"
 msgid "Printer on NetWare server"
 msgstr "NetWare 服务器上的打印机"
 
-#: printer/main.pm:34 printer/printerdrake.pm:1699
+#: printer/main.pm:34 printer/printerdrake.pm:1922
 #, c-format
 msgid "Enter a printer device URI"
 msgstr "输入打印机设备 URI"
@@ -11476,237 +11522,238 @@ msgstr "输入打印机设备 URI"
 msgid "Pipe job into a command"
 msgstr "作业管道定向到命令"
 
-#: printer/main.pm:45
+#: printer/main.pm:46
 #, c-format
 msgid "recommended"
 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/main.pm:330 printer/main.pm:686 printer/main.pm:1776
+#: printer/main.pm:2917 printer/main.pm:2926 printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1133 printer/printerdrake.pm:2410
+#: printer/printerdrake.pm:5464
 #, c-format
 msgid "Unknown model"
 msgstr "未知型号"
 
-#: printer/main.pm:354 standalone/printerdrake:187
+#: printer/main.pm:355 standalone/printerdrake:197
 #, c-format
 msgid "Configured on this machine"
 msgstr "已在本机上配置"
 
-#: printer/main.pm:360 printer/printerdrake.pm:1239
+#: printer/main.pm:361 printer/printerdrake.pm:1462
 #, c-format
 msgid " on parallel port #%s"
 msgstr " 位于并行口 #%s"
 
-#: printer/main.pm:363 printer/printerdrake.pm:1242
+#: printer/main.pm:364 printer/printerdrake.pm:1465
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", USB 打印机 #%s"
 
-#: printer/main.pm:365
+#: printer/main.pm:366
 #, c-format
 msgid ", USB printer"
 msgstr ", USB 打印机"
 
-#: printer/main.pm:369
+#: printer/main.pm:370
 #, c-format
 msgid ", HP printer on a parallel port"
 msgstr "，并行端口上的惠普打印机"
 
-#: printer/main.pm:371
+#: printer/main.pm:372
 #, c-format
 msgid ", HP printer on USB"
 msgstr ", USB 上的惠普打印机"
 
-#: printer/main.pm:373
+#: printer/main.pm:374
 #, c-format
 msgid ", HP printer on HP JetDirect"
 msgstr ", HP JetDirect 上的惠普打印机"
 
-#: printer/main.pm:375
+#: printer/main.pm:376
 #, c-format
 msgid ", HP printer"
 msgstr ", 惠普打印机"
 
-#: printer/main.pm:381
+#: printer/main.pm:382
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", 并行端口上的一体机 #%s"
 
-#: printer/main.pm:384
+#: printer/main.pm:385
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", 并行端口上的一体机"
 
-#: printer/main.pm:386
+#: printer/main.pm:387
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", USB 端口上的一体机"
 
-#: printer/main.pm:388
+#: printer/main.pm:389
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", HP JetDirect 上的一体机"
 
-#: printer/main.pm:390
+#: printer/main.pm:391
 #, c-format
 msgid ", multi-function device"
 msgstr ", 一体机"
 
-#: printer/main.pm:394
+#: printer/main.pm:395
 #, c-format
 msgid ", printing to %s"
 msgstr ", 打印到 %s"
 
-#: printer/main.pm:397
+#: printer/main.pm:398
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr "LPD 服务器“%s”上的打印机“%s”"
 
-#: printer/main.pm:400
+#: printer/main.pm:401
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", TCP/IP 主机“%s”, 端口 %s"
 
-#: printer/main.pm:405
+#: printer/main.pm:406
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr "SMB/Windows 服务器“%s”上的共享“%s”"
 
-#: printer/main.pm:410
+#: printer/main.pm:411
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr "Novell 打印服务器“%s”上的打印机“%s”"
 
-#: printer/main.pm:413
+#: printer/main.pm:414
 #, c-format
 msgid ", using command %s"
 msgstr ", 使用命令 %s"
 
-#: printer/main.pm:428
+#: printer/main.pm:429
 #, c-format
 msgid "Parallel port #%s"
 msgstr "并行端口 #%s"
 
-#: printer/main.pm:431 printer/printerdrake.pm:1260
-#: printer/printerdrake.pm:1287 printer/printerdrake.pm:1305
+#: printer/main.pm:432 printer/printerdrake.pm:1483
+#: printer/printerdrake.pm:1510 printer/printerdrake.pm:1528
 #, c-format
 msgid "USB printer #%s"
 msgstr "USB 打印机 #%s"
 
-#: printer/main.pm:433
+#: printer/main.pm:434
 #, c-format
 msgid "USB printer"
 msgstr "USB 打印机"
 
-#: printer/main.pm:437
+#: printer/main.pm:438
 #, c-format
 msgid "HP printer on a parallel port"
 msgstr "并行端口上的惠普打印机"
 
-#: printer/main.pm:439
+#: printer/main.pm:440
 #, c-format
 msgid "HP printer on USB"
 msgstr "USB 上的惠普打印机"
 
-#: printer/main.pm:441
+#: printer/main.pm:442
 #, c-format
 msgid "HP printer on HP JetDirect"
 msgstr "HP JetDirect 上的惠普打印机"
 
-#: printer/main.pm:443
+#: printer/main.pm:444
 #, c-format
 msgid "HP printer"
 msgstr "惠普打印机"
 
-#: printer/main.pm:449
+#: printer/main.pm:450
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "并行端口 #%s 上的一体机"
 
-#: printer/main.pm:452
+#: printer/main.pm:453
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "并行端口上的一体机"
 
-#: printer/main.pm:454
+#: printer/main.pm:455
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "USB 端口上的一体机"
 
-#: printer/main.pm:456
+#: printer/main.pm:457
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "HP JetDirect 上的一体机"
 
-#: printer/main.pm:458
+#: printer/main.pm:459
 #, c-format
 msgid "Multi-function device"
 msgstr "一体机"
 
-#: printer/main.pm:462
+#: printer/main.pm:463
 #, c-format
 msgid "Prints into %s"
 msgstr "打印到 %s"
 
-#: printer/main.pm:465
+#: printer/main.pm:466
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "LPD 服务器“%s”上的打印机“%s”"
 
-#: printer/main.pm:468
+#: printer/main.pm:469
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "TCP/IP 主机“%s”, 端口 %s"
 
-#: printer/main.pm:473
+#: printer/main.pm:474
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "SMB/Windows 服务器“%s”上的共享“%s”"
 
-#: printer/main.pm:478
+#: printer/main.pm:479
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Novell 服务器“%s”上的打印机“%s”"
 
-#: printer/main.pm:481
+#: printer/main.pm:482
 #, c-format
 msgid "Uses command %s"
 msgstr "使用命令 %s"
 
-#: printer/main.pm:483
+#: printer/main.pm:484
 #, c-format
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:631 printer/printerdrake.pm:856
-#: printer/printerdrake.pm:2953
+#: printer/main.pm:683 printer/printerdrake.pm:1060
+#: printer/printerdrake.pm:3220
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr "直接打印输出(不使用驱动程序)"
 
-#: printer/main.pm:1181 printer/printerdrake.pm:211
+#: printer/main.pm:1274 printer/printerdrake.pm:211
 #: printer/printerdrake.pm:223
 #, c-format
 msgid "Local network(s)"
 msgstr "局域网"
 
-#: printer/main.pm:1183 printer/printerdrake.pm:227
+#: printer/main.pm:1276 printer/printerdrake.pm:227
 #, c-format
 msgid "Interface \"%s\""
 msgstr "网卡“%s”"
 
-#: printer/main.pm:1185
+#: printer/main.pm:1278
 #, c-format
 msgid "Network %s"
 msgstr "网络 %s"
 
-#: printer/main.pm:1187
+#: printer/main.pm:1280
 #, c-format
 msgid "Host %s"
 msgstr "主机 %s"
 
-#: printer/main.pm:1216
+#: printer/main.pm:1309
 #, c-format
 msgid "%s (Port %s)"
 msgstr "%s(端口 %s)"
@@ -11852,7 +11899,7 @@ msgstr ""
 "理上述几点。"
 
 #: printer/printerdrake.pm:138 printer/printerdrake.pm:506
-#: printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:4681
 #, c-format
 msgid "Remote CUPS server and no local CUPS daemon"
 msgstr "远程 CUPS 服务器且无本地 CUPS 守护程序"
@@ -11991,7 +12038,7 @@ msgstr "缺少服务器 IP！"
 msgid "The entered IP is not correct.\n"
 msgstr "输入的 IP 不正确。\n"
 
-#: printer/printerdrake.pm:440 printer/printerdrake.pm:1924
+#: printer/printerdrake.pm:440 printer/printerdrake.pm:2152
 #, c-format
 msgid "The port number should be an integer!"
 msgstr "端口须为数字！"
@@ -12001,7 +12048,7 @@ msgstr "端口须为数字！"
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr "此服务器已经位于列表中, 无法再次添加。\n"
 
-#: printer/printerdrake.pm:462 printer/printerdrake.pm:1951
+#: printer/printerdrake.pm:462 printer/printerdrake.pm:2179
 #: standalone/drakups:251 standalone/harddrake2:52
 #, c-format
 msgid "Port"
@@ -12014,41 +12061,42 @@ 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:4690
+#: printer/printerdrake.pm:4756
 #, c-format
 msgid "CUPS server name or IP address missing."
 msgstr "缺少 CUPS 服务器名称或 IP 地址。"
 
 #: printer/printerdrake.pm:566 printer/printerdrake.pm:586
-#: printer/printerdrake.pm:680 printer/printerdrake.pm:746
-#: printer/printerdrake.pm:773 printer/printerdrake.pm:832
-#: printer/printerdrake.pm:874 printer/printerdrake.pm:884
-#: printer/printerdrake.pm:2011 printer/printerdrake.pm:2225
-#: printer/printerdrake.pm:2257 printer/printerdrake.pm:2305
-#: printer/printerdrake.pm:2357 printer/printerdrake.pm:2374
-#: printer/printerdrake.pm:2418 printer/printerdrake.pm:2458
-#: printer/printerdrake.pm:2508 printer/printerdrake.pm:2542
-#: printer/printerdrake.pm:2552 printer/printerdrake.pm:2804
-#: printer/printerdrake.pm:2809 printer/printerdrake.pm:2948
-#: printer/printerdrake.pm:3059 printer/printerdrake.pm:3656
-#: printer/printerdrake.pm:3722 printer/printerdrake.pm:3771
-#: printer/printerdrake.pm:3774 printer/printerdrake.pm:3906
-#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4079
-#: printer/printerdrake.pm:4100 printer/printerdrake.pm:4110
-#: printer/printerdrake.pm:4201 printer/printerdrake.pm:4296
-#: printer/printerdrake.pm:4302 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
-#: standalone/printerdrake:67 standalone/printerdrake:555
+#: printer/printerdrake.pm:811 printer/printerdrake.pm:880
+#: printer/printerdrake.pm:901 printer/printerdrake.pm:927
+#: printer/printerdrake.pm:1036 printer/printerdrake.pm:1078
+#: printer/printerdrake.pm:1088 printer/printerdrake.pm:1123
+#: printer/printerdrake.pm:2239 printer/printerdrake.pm:2454
+#: printer/printerdrake.pm:2486 printer/printerdrake.pm:2547
+#: printer/printerdrake.pm:2599 printer/printerdrake.pm:2616
+#: printer/printerdrake.pm:2660 printer/printerdrake.pm:2700
+#: printer/printerdrake.pm:2750 printer/printerdrake.pm:2784
+#: printer/printerdrake.pm:2794 printer/printerdrake.pm:3062
+#: printer/printerdrake.pm:3067 printer/printerdrake.pm:3215
+#: printer/printerdrake.pm:3326 printer/printerdrake.pm:3939
+#: printer/printerdrake.pm:4006 printer/printerdrake.pm:4055
+#: printer/printerdrake.pm:4058 printer/printerdrake.pm:4190
+#: printer/printerdrake.pm:4291 printer/printerdrake.pm:4363
+#: printer/printerdrake.pm:4384 printer/printerdrake.pm:4394
+#: printer/printerdrake.pm:4485 printer/printerdrake.pm:4580
+#: printer/printerdrake.pm:4586 printer/printerdrake.pm:4610
+#: printer/printerdrake.pm:4717 printer/printerdrake.pm:4826
+#: printer/printerdrake.pm:4846 printer/printerdrake.pm:4855
+#: printer/printerdrake.pm:4870 printer/printerdrake.pm:5071
+#: printer/printerdrake.pm:5533 printer/printerdrake.pm:5616
+#: standalone/printerdrake:73 standalone/printerdrake:572
 #, c-format
 msgid "Printerdrake"
 msgstr "Drak 打印机"
 
-#: printer/printerdrake.pm:567 printer/printerdrake.pm:4008
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:567 printer/printerdrake.pm:4292
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Reading printer data..."
 msgstr "正在读取打印机数据..."
@@ -12058,17 +12106,113 @@ msgstr "正在读取打印机数据..."
 msgid "Restarting CUPS..."
 msgstr "正在重新启动 CUPS..."
 
-#: printer/printerdrake.pm:614 printer/printerdrake.pm:634
+#: printer/printerdrake.pm:614
+#, c-format
+msgid "Allow pop-up windows, canceling setup and package installation possible"
+msgstr ""
+
+#: printer/printerdrake.pm:616
+#, c-format
+msgid ""
+"No pop-up windows, canceling setup and package installation not possible"
+msgstr ""
+
+#: printer/printerdrake.pm:622
+#, fuzzy, c-format
+msgid "Printer auto administration"
+msgstr "打印机自动检测"
+
+#: printer/printerdrake.pm:623
+#, c-format
+msgid ""
+"Here you can configure printer administration tasks which should be done "
+"automatically."
+msgstr ""
+
+#: printer/printerdrake.pm:626
+#, fuzzy, c-format
+msgid "Do automatic configuration of new printers"
+msgstr "使用自动重新配置(DHCP)"
+
+#: printer/printerdrake.pm:627 printer/printerdrake.pm:641
+#, fuzzy, c-format
+msgid "when a USB printer is connected and turned on"
+msgstr "(请确认您的打印机已经连接好并且接通了电源)。\n"
+
+#: printer/printerdrake.pm:630
+#, fuzzy, c-format
+msgid "when Printerdrake is started"
+msgstr "此打印机已禁用"
+
+#: printer/printerdrake.pm:634
+#, c-format
+msgid "Mode for automatic printer setup:"
+msgstr ""
+
+#: printer/printerdrake.pm:640
+#, fuzzy, c-format
+msgid "Re-enable disabled printers"
+msgstr "可用打印机"
+
+#: printer/printerdrake.pm:644
+#, fuzzy, c-format
+msgid "when the printing system is started"
+msgstr "更改打印系统"
+
+#: printer/printerdrake.pm:680
+#, fuzzy, c-format
+msgid "Communication error handling for the printer \"%s\""
+msgstr "使用/维护打印机“%s”"
+
+#: printer/printerdrake.pm:682
+#, c-format
+msgid ""
+"Here you can configure how errors during the communication between your "
+"computer and the printer \"%s\" should be handled (for example if the "
+"printer is not turned on)."
+msgstr ""
+
+#: printer/printerdrake.pm:686
+#, fuzzy, c-format
+msgid "The number of retries should be an integer number of at least 1!"
+msgstr "端口须为数字！"
+
+#: printer/printerdrake.pm:690
+#, fuzzy, c-format
+msgid "The delay between retries should be a positive integer number!"
+msgstr "超时必须是正整数！"
+
+#: printer/printerdrake.pm:701
+#, fuzzy, c-format
+msgid "Do not disable the printer"
+msgstr "禁用打印机"
+
+#: printer/printerdrake.pm:704
+#, c-format
+msgid "Retry infinitely often"
+msgstr ""
+
+#: printer/printerdrake.pm:707
+#, fuzzy, c-format
+msgid "Number of retries"
+msgstr "按钮数目"
+
+#: printer/printerdrake.pm:712
+#, c-format
+msgid "Delay between retries (in sec)"
+msgstr ""
+
+#: printer/printerdrake.pm:745 printer/printerdrake.pm:765
 #, c-format
 msgid "Select Printer Connection"
 msgstr "选择打印机连接"
 
-#: printer/printerdrake.pm:615
+#: printer/printerdrake.pm:746
 #, c-format
 msgid "How is the printer connected?"
 msgstr "打印机是如何连接的?"
 
-#: printer/printerdrake.pm:617
+#: printer/printerdrake.pm:748
 #, c-format
 msgid ""
 "\n"
@@ -12078,7 +12222,7 @@ msgstr ""
 "\n"
 "不需要在这里配置远程的 CUPS 服务器上的打印机；这些打印机会被自动探测到。"
 
-#: printer/printerdrake.pm:620 printer/printerdrake.pm:4786
+#: printer/printerdrake.pm:751 printer/printerdrake.pm:5073
 #, c-format
 msgid ""
 "\n"
@@ -12088,23 +12232,23 @@ msgstr ""
 "\n"
 "警告：没有激活的局域网连接, 远程打印机既没法检测也没法测试！"
 
-#: printer/printerdrake.pm:627
+#: printer/printerdrake.pm:758
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr "打印机自动检测(本地, TCP/Socket、SMB 打印机和设备 URI)"
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:760
 #, c-format
 msgid "Modify timeout for network printer auto-detection"
 msgstr "修改网络打印机自动检测的超时"
 
-#: printer/printerdrake.pm:635
+#: printer/printerdrake.pm:766
 #, c-format
 msgid "Enter the timeout for network printer auto-detection (in msec) here. "
 msgstr "在此输入网络打印机自动检测的超时(以毫秒计)。"
 
-#: printer/printerdrake.pm:637
+#: printer/printerdrake.pm:768
 #, c-format
 msgid ""
 "The longer you choose the timeout, the more reliable the detections of "
@@ -12114,27 +12258,27 @@ msgstr ""
 "您所选的超时越长，网络打印机的监测就越可靠，但是扫描速度也会越慢，尤其是当网"
 "络中有很多本机中安装防火墙的机器时。"
 
-#: printer/printerdrake.pm:641
+#: printer/printerdrake.pm:772
 #, c-format
 msgid "The timeout must be a positive integer number!"
 msgstr "超时必须是正整数！"
 
-#: printer/printerdrake.pm:680
+#: printer/printerdrake.pm:811
 #, c-format
 msgid "Checking your system..."
 msgstr "正在检查您的系统..."
 
-#: printer/printerdrake.pm:697
+#: printer/printerdrake.pm:829
 #, c-format
 msgid "and one unknown printer"
 msgstr "和一台未知的打印机"
 
-#: printer/printerdrake.pm:699
+#: printer/printerdrake.pm:831
 #, c-format
 msgid "and %d unknown printers"
 msgstr "和 %d 台未知的打印机"
 
-#: printer/printerdrake.pm:703
+#: printer/printerdrake.pm:835
 #, c-format
 msgid ""
 "The following printers\n"
@@ -12147,7 +12291,7 @@ msgstr ""
 "%s%s\n"
 "直接连接在您的系统"
 
-#: printer/printerdrake.pm:705
+#: printer/printerdrake.pm:837
 #, c-format
 msgid ""
 "The following printer\n"
@@ -12160,7 +12304,7 @@ msgstr ""
 "%s%s\n"
 "直接连接在您的系统"
 
-#: printer/printerdrake.pm:706
+#: printer/printerdrake.pm:838
 #, c-format
 msgid ""
 "The following printer\n"
@@ -12173,7 +12317,7 @@ msgstr ""
 "%s%s\n"
 "直接连接在您的系统"
 
-#: printer/printerdrake.pm:710
+#: printer/printerdrake.pm:842
 #, c-format
 msgid ""
 "\n"
@@ -12182,7 +12326,7 @@ msgstr ""
 "\n"
 "有一个未知的打印机直接连接在您的系统"
 
-#: printer/printerdrake.pm:711
+#: printer/printerdrake.pm:843
 #, c-format
 msgid ""
 "\n"
@@ -12191,40 +12335,40 @@ msgstr ""
 "\n"
 "有 %d 个未知的打印机直接连接在您的系统"
 
-#: printer/printerdrake.pm:714
+#: printer/printerdrake.pm:846
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "没有发现打印机直接连接在您的机器上"
 
-#: printer/printerdrake.pm:717
+#: printer/printerdrake.pm:849
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr "(请确认您的打印机已经连接好并且接通了电源)。\n"
 
-#: printer/printerdrake.pm:730
+#: printer/printerdrake.pm:862
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
 "printers in the local network?\n"
 msgstr "您想激活上述打印机的打印功能, 还是要使用局域网的打印机来打印?\n"
 
-#: printer/printerdrake.pm:731
+#: printer/printerdrake.pm:863
 #, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr "您想使用局域网的打印机来打印吗?\n"
 
-#: printer/printerdrake.pm:733
+#: printer/printerdrake.pm:865
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "您是否希望在上述的打印机上进行打印?\n"
 
-#: printer/printerdrake.pm:734
+#: printer/printerdrake.pm:866
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr "您确定要在这台机器上设置打印吗?\n"
 
-#: printer/printerdrake.pm:735
+#: printer/printerdrake.pm:867
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -12233,42 +12377,85 @@ msgstr ""
 "注意:根据不同的打印机型号和打印系统, 需要安装附加的软件, 最多会需要 %d MB 空"
 "间。"
 
-#: printer/printerdrake.pm:774
+#: printer/printerdrake.pm:884
+#, c-format
+msgid "Do not do automatic printer setup and do not do it again"
+msgstr ""
+
+#: printer/printerdrake.pm:928
 #, c-format
 msgid "Searching for new printers..."
 msgstr "正在搜索新的打印机..."
 
-#: printer/printerdrake.pm:833
+#: printer/printerdrake.pm:989
 #, c-format
-msgid "Found printer on %s..."
-msgstr "在 %s 上找到了打印机..."
+msgid "Do not do automatic printer setup again"
+msgstr ""
+
+#: printer/printerdrake.pm:996
+#, fuzzy, c-format
+msgid "New printers found"
+msgstr "没有发现打印机！"
 
-#: printer/printerdrake.pm:858
+#: printer/printerdrake.pm:997
+#, fuzzy, c-format
+msgid "New printer found"
+msgstr "没有发现打印机！"
+
+#: printer/printerdrake.pm:999
+#, c-format
+msgid ""
+"The following new printers were found and Printerdrake can automatically set "
+"them up for you. If you do not want to have all of them set up, unselect the "
+"ones which should be skipped, or click \"Cancel\" to set up none of them.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:1000
+#, c-format
+msgid ""
+"The following new printer was found and printerdrake can automatically set "
+"it up for you. If you do not want to have it set up, unselect it, or click "
+"\"Cancel\".\n"
+msgstr ""
+
+#: printer/printerdrake.pm:1001
+#, c-format
+msgid ""
+"Note that for certain printer models additional packages need to be "
+"installed. So keep your installation media handy.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:1037 printer/printerdrake.pm:1079
+#, c-format
+msgid "Configuring printer on %s..."
+msgstr "正在配置位于 %s 上的打印机..."
+
+#: printer/printerdrake.pm:1062
 #, c-format
 msgid "("
 msgstr "("
 
-#: printer/printerdrake.pm:859
+#: printer/printerdrake.pm:1063
 #, c-format
 msgid " on "
 msgstr " 位于 "
 
-#: printer/printerdrake.pm:860 standalone/scannerdrake:137
+#: printer/printerdrake.pm:1064 standalone/scannerdrake:137
 #, c-format
 msgid ")"
 msgstr ")"
 
-#: printer/printerdrake.pm:865 printer/printerdrake.pm:2960
+#: printer/printerdrake.pm:1069 printer/printerdrake.pm:3227
 #, c-format
 msgid "Printer model selection"
 msgstr "打印机型号选择"
 
-#: printer/printerdrake.pm:866 printer/printerdrake.pm:2961
+#: printer/printerdrake.pm:1070 printer/printerdrake.pm:3228
 #, c-format
 msgid "Which printer model do you have?"
 msgstr "您的打印机的型号是什么?"
 
-#: printer/printerdrake.pm:867
+#: printer/printerdrake.pm:1071
 #, c-format
 msgid ""
 "\n"
@@ -12280,32 +12467,54 @@ msgstr ""
 "\n"
 "“Drak 打印机”无法确定您的打印机 %s 是什么型号的。请从列表中选择正确的型号。"
 
-#: printer/printerdrake.pm:870 printer/printerdrake.pm:2966
+#: printer/printerdrake.pm:1074 printer/printerdrake.pm:3233
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
 "similar one."
 msgstr "如果您的打印机不在列表中, 请选择兼容的(参考打印机手册)或类似的型号。"
 
-#: printer/printerdrake.pm:875
-#, c-format
-msgid "Configuring printer on %s..."
-msgstr "正在配置位于 %s 上的打印机..."
-
-#: printer/printerdrake.pm:885 printer/printerdrake.pm:4563
+#: printer/printerdrake.pm:1089 printer/printerdrake.pm:4847
 #, c-format
 msgid "Configuring printer \"%s\"..."
 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:1124
+#, c-format
+msgid ""
+"Now you have turned off automatic printer setup.\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:1125
+#, c-format
+msgid ""
+"You can turn it back on again by choosing \"%s\" -> \"%s\" in Printerdrake's "
+"main menu. "
+msgstr ""
+
+#: printer/printerdrake.pm:1125
+#, fuzzy, c-format
+msgid "Configure Auto Administration"
+msgstr "远程管理"
+
+#: printer/printerdrake.pm:1126
+#, c-format
+msgid ""
+"There you can also choose in which situation automatic printer setup is done "
+"(On Printerdrake startup, on printing system startup, when connecting a new "
+"USB printer)."
+msgstr ""
+
+#: printer/printerdrake.pm:1274 printer/printerdrake.pm:1286
+#: printer/printerdrake.pm:1393 printer/printerdrake.pm:2420
+#: printer/printerdrake.pm:2435 printer/printerdrake.pm:2507
+#: printer/printerdrake.pm:5090 printer/printerdrake.pm:5263
 #, c-format
 msgid "Add a new printer"
 msgstr "添加新打印机"
 
-#: printer/printerdrake.pm:1052
+#: printer/printerdrake.pm:1275
 #, c-format
 msgid ""
 "\n"
@@ -12326,7 +12535,7 @@ msgstr ""
 "它会询问所有必要的信息以进行打印机设置, 并允许您访问所有可用的打印机驱动程"
 "序、驱动程序选项和打印机连接类型。"
 
-#: printer/printerdrake.pm:1065
+#: printer/printerdrake.pm:1288
 #, c-format
 msgid ""
 "\n"
@@ -12361,7 +12570,7 @@ msgstr ""
 "\n"
 "一切准备就绪后请单击“下一步”。如果您不想现在设置打印机, 请单击“取消”。"
 
-#: printer/printerdrake.pm:1074
+#: printer/printerdrake.pm:1297
 #, c-format
 msgid ""
 "\n"
@@ -12385,7 +12594,7 @@ msgstr ""
 "\n"
 "一切准备就绪后请单击“下一步”。如果您不想现在设置打印机, 请单击“取消”。"
 
-#: printer/printerdrake.pm:1082
+#: printer/printerdrake.pm:1305
 #, c-format
 msgid ""
 "\n"
@@ -12419,7 +12628,7 @@ msgstr ""
 "\n"
 "一切准备就绪后请单击“下一步”。如果您不想现在设置打印机, 请单击“取消”。"
 
-#: printer/printerdrake.pm:1091
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid ""
 "\n"
@@ -12444,27 +12653,27 @@ msgstr ""
 "\n"
 "准备好就单击“下一步”, 如果您不想现在配置打印机就单击“取消”。"
 
-#: printer/printerdrake.pm:1142
+#: printer/printerdrake.pm:1365
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "自动探测这台机器连接的打印机"
 
-#: printer/printerdrake.pm:1145
+#: printer/printerdrake.pm:1368
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "自动探测直接连接到局域网的打印机"
 
-#: printer/printerdrake.pm:1148
+#: printer/printerdrake.pm:1371
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "自动检测运行 Microsoft Windows 的机器连接的打印机"
 
-#: printer/printerdrake.pm:1151
+#: printer/printerdrake.pm:1374
 #, c-format
 msgid "No auto-detection"
 msgstr "不自动检测"
 
-#: printer/printerdrake.pm:1171
+#: printer/printerdrake.pm:1394
 #, c-format
 msgid ""
 "\n"
@@ -12485,71 +12694,71 @@ msgstr ""
 "如果以后要添加、删除打印机, 改变打印机名字, 或者需要修改默认打印参数(送纸器、"
 "输出质量等), 请在“%s 控制中心”的“硬件”部分选择“打印机”。"
 
-#: printer/printerdrake.pm:1207 printer/printerdrake.pm:1437
-#: printer/printerdrake.pm:1500 printer/printerdrake.pm:1592
-#: printer/printerdrake.pm:1730 printer/printerdrake.pm:1806
-#: printer/printerdrake.pm:1968 printer/printerdrake.pm:2061
-#: printer/printerdrake.pm:2070 printer/printerdrake.pm:2079
-#: printer/printerdrake.pm:2090 printer/printerdrake.pm:2231
-#: printer/printerdrake.pm:2317 printer/printerdrake.pm:2363
-#: printer/printerdrake.pm:2430 printer/printerdrake.pm:2465
+#: printer/printerdrake.pm:1430 printer/printerdrake.pm:1660
+#: printer/printerdrake.pm:1723 printer/printerdrake.pm:1815
+#: printer/printerdrake.pm:1953 printer/printerdrake.pm:2029
+#: printer/printerdrake.pm:2196 printer/printerdrake.pm:2289
+#: printer/printerdrake.pm:2298 printer/printerdrake.pm:2307
+#: printer/printerdrake.pm:2318 printer/printerdrake.pm:2460
+#: printer/printerdrake.pm:2559 printer/printerdrake.pm:2605
+#: printer/printerdrake.pm:2672 printer/printerdrake.pm:2707
 #, c-format
 msgid "Could not install the %s packages!"
 msgstr "无法安装 %s 软件包!"
 
-#: printer/printerdrake.pm:1209
+#: printer/printerdrake.pm:1432
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr "跳过 Windows/SMB 服务器自动检测"
 
-#: printer/printerdrake.pm:1215 printer/printerdrake.pm:1360
-#: printer/printerdrake.pm:1598 printer/printerdrake.pm:1855
+#: printer/printerdrake.pm:1438 printer/printerdrake.pm:1583
+#: printer/printerdrake.pm:1821 printer/printerdrake.pm:2083
 #, c-format
 msgid "Printer auto-detection"
 msgstr "打印机自动检测"
 
-#: printer/printerdrake.pm:1215
+#: printer/printerdrake.pm:1438
 #, c-format
 msgid "Detecting devices..."
 msgstr "正在检测设备..."
 
-#: printer/printerdrake.pm:1245
+#: printer/printerdrake.pm:1468
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", 网络打印机“%s”, 端口 %s"
 
-#: printer/printerdrake.pm:1248
+#: printer/printerdrake.pm:1471
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", 打印机“%s”在 SMB/Windows 服务器“%s” 上"
 
-#: printer/printerdrake.pm:1252
+#: printer/printerdrake.pm:1475
 #, c-format
 msgid "Detected %s"
 msgstr "检测到 %s"
 
-#: printer/printerdrake.pm:1257 printer/printerdrake.pm:1284
-#: printer/printerdrake.pm:1302
+#: printer/printerdrake.pm:1480 printer/printerdrake.pm:1507
+#: printer/printerdrake.pm:1525
 #, c-format
 msgid "Printer on parallel port #%s"
 msgstr "并行端口打印机 #%s"
 
-#: printer/printerdrake.pm:1263
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "网络打印机“%s”, 端口 %s"
 
-#: printer/printerdrake.pm:1266
+#: printer/printerdrake.pm:1489
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "打印机“%s”在 SMB/Windows 服务器打印机“%s”上"
 
-#: printer/printerdrake.pm:1347
+#: printer/printerdrake.pm:1570
 #, c-format
 msgid "Local Printer"
 msgstr "本机打印机"
 
-#: printer/printerdrake.pm:1348
+#: printer/printerdrake.pm:1571
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -12561,64 +12770,64 @@ msgstr ""
 "lp0, /dev/lp1, ..., 相当于 LPT1:, LPT2:, ..., 第一个 USB 打印机:/dev/usb/"
 "lp0, 第二个 USB 打印机:/dev/usb/lp1, ...)。"
 
-#: printer/printerdrake.pm:1352
+#: printer/printerdrake.pm:1575
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "您需要输入打印机设备名或一文件名！"
 
-#: printer/printerdrake.pm:1361
+#: printer/printerdrake.pm:1584
 #, c-format
 msgid "No printer found!"
 msgstr "没有发现打印机！"
 
-#: printer/printerdrake.pm:1369
+#: printer/printerdrake.pm:1592
 #, c-format
 msgid "Local Printers"
 msgstr "本机打印机"
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1593
 #, c-format
 msgid "Available printers"
 msgstr "可用打印机"
 
-#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1383
+#: printer/printerdrake.pm:1597 printer/printerdrake.pm:1606
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr "下列打印机被自动检测到了。"
 
-#: printer/printerdrake.pm:1376
+#: printer/printerdrake.pm:1599
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
 "the input line"
 msgstr "如果您要使用的打印机不在其中, 请在输入栏输入一个设备名或文件名"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1600
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr "或者, 您可以在输入行指定一个设备名/文件名"
 
-#: printer/printerdrake.pm:1378 printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1601 printer/printerdrake.pm:1610
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr "下面所列为自动检测到的打印机"
 
-#: printer/printerdrake.pm:1380
+#: printer/printerdrake.pm:1603
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
 "name in the input line"
 msgstr "请选择要设置的打印机或输入一个设备名或文件名到输入栏"
 
-#: printer/printerdrake.pm:1381
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
 "device name/file name in the input line"
 msgstr "请选择打印机的任务, 或者输入一个设备名或文件名到输入栏"
 
-#: printer/printerdrake.pm:1385
+#: printer/printerdrake.pm:1608
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12628,12 +12837,12 @@ msgstr ""
 "打印机的设置会完全自动工作。如果您的打印机没有被正确检测或者您想定制打印机设"
 "置, 选择“手工设置”。"
 
-#: printer/printerdrake.pm:1386
+#: printer/printerdrake.pm:1609
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "现在, 没有两种供选择的选项"
 
-#: printer/printerdrake.pm:1389
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12644,24 +12853,24 @@ msgstr ""
 "请选择您希望设置的打印机。设置打印机将完全自动工作。如果您的打印机没有被正确"
 "检测或者您想定制打印机设置, 选择“手工设置”。"
 
-#: printer/printerdrake.pm:1390
+#: printer/printerdrake.pm:1613
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "请选择将执行任务的打印机。"
 
-#: printer/printerdrake.pm:1392
+#: printer/printerdrake.pm:1615
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
 "name/file name in the input line"
 msgstr "请选择您打印机使用的端口或输入栏内填入一合法设备或文件"
 
-#: printer/printerdrake.pm:1393
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "请选择您的打印机是连接到哪个端口。"
 
-#: printer/printerdrake.pm:1395
+#: printer/printerdrake.pm:1618
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12670,26 +12879,26 @@ msgstr ""
 "(并行口: /dev/lp0, /dev/lp1, ..., 相当于 LPT1:, LPT2:, ..., 第一个 USB 设备"
 "口: /dev/usb/lp0, 第二个 USB 设备口: /dev/usb/lp1, ...)。"
 
-#: printer/printerdrake.pm:1399
+#: printer/printerdrake.pm:1622
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "您必须选择/输入一台打印机/设备！"
 
-#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1502
-#: printer/printerdrake.pm:1594 printer/printerdrake.pm:1732
-#: printer/printerdrake.pm:1808 printer/printerdrake.pm:1970
-#: printer/printerdrake.pm:2063 printer/printerdrake.pm:2072
-#: printer/printerdrake.pm:2081 printer/printerdrake.pm:2092
+#: printer/printerdrake.pm:1662 printer/printerdrake.pm:1725
+#: printer/printerdrake.pm:1817 printer/printerdrake.pm:1955
+#: printer/printerdrake.pm:2031 printer/printerdrake.pm:2198
+#: printer/printerdrake.pm:2291 printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2309 printer/printerdrake.pm:2320
 #, c-format
 msgid "Aborting"
 msgstr "中止"
 
-#: printer/printerdrake.pm:1475
+#: printer/printerdrake.pm:1698
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "远程 lpd 打印机选项"
 
-#: printer/printerdrake.pm:1476
+#: printer/printerdrake.pm:1699
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -12698,64 +12907,65 @@ msgstr ""
 "要使用一个远程的 lpd 打印队列, 您需要指定打印服务器的\n"
 "主机名和打印任务要送往的打印队列的名字。"
 
-#: printer/printerdrake.pm:1477
+#: printer/printerdrake.pm:1700
 #, c-format
 msgid "Remote host name"
 msgstr "远程主机名"
 
-#: printer/printerdrake.pm:1478
+#: printer/printerdrake.pm:1701
 #, c-format
 msgid "Remote printer name"
 msgstr "远程打印机名"
 
-#: printer/printerdrake.pm:1481
+#: printer/printerdrake.pm:1704
 #, c-format
 msgid "Remote host name missing!"
 msgstr "未找到远程主机！"
 
-#: printer/printerdrake.pm:1485
+#: printer/printerdrake.pm:1708
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "没有找到远程打印机！"
 
-#: printer/printerdrake.pm:1515 printer/printerdrake.pm:1986
-#: printer/printerdrake.pm:2111 standalone/drakTermServ:446
-#: standalone/drakTermServ:766 standalone/drakTermServ:782
-#: standalone/drakTermServ:1554 standalone/drakTermServ:1563
-#: standalone/drakTermServ:1575 standalone/drakbackup:499
+#: printer/printerdrake.pm:1738 printer/printerdrake.pm:2214
+#: printer/printerdrake.pm:2339 standalone/drakTermServ:447
+#: standalone/drakTermServ:769 standalone/drakTermServ:785
+#: standalone/drakTermServ:1590 standalone/drakTermServ:1599
+#: standalone/drakTermServ:1611 standalone/drakbackup:499
 #: standalone/drakbackup:605 standalone/drakbackup:640
-#: standalone/drakbackup:741 standalone/drakroam:390 standalone/harddrake2:259
+#: standalone/drakbackup:741 standalone/drakroam:390
+#: standalone/draksambashare:424 standalone/harddrake2:259
 #, c-format
 msgid "Information"
 msgstr "信息"
 
-#: printer/printerdrake.pm:1515 printer/printerdrake.pm:1986
-#: printer/printerdrake.pm:2111
+#: printer/printerdrake.pm:1738 printer/printerdrake.pm:2214
+#: printer/printerdrake.pm:2339
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "检测到型号: %s %s"
 
-#: printer/printerdrake.pm:1598 printer/printerdrake.pm:1855
+#: printer/printerdrake.pm:1821 printer/printerdrake.pm:2083
 #, c-format
 msgid "Scanning network..."
 msgstr "正在扫描网络..."
 
-#: printer/printerdrake.pm:1610 printer/printerdrake.pm:1631
+#: printer/printerdrake.pm:1833 printer/printerdrake.pm:1854
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", 打印机“%s”在服务器“%s”上"
 
-#: printer/printerdrake.pm:1613 printer/printerdrake.pm:1634
+#: printer/printerdrake.pm:1836 printer/printerdrake.pm:1857
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "服务器“%2$s”上的打印机“%1$s”"
 
-#: printer/printerdrake.pm:1655
+#: printer/printerdrake.pm:1878
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB(Windows 9x/NT)打印机选项"
 
-#: printer/printerdrake.pm:1656
+#: printer/printerdrake.pm:1879
 #, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -12769,7 +12979,7 @@ msgstr ""
 "址, \n"
 "以及有权访问打印机的用户名, 工作组和密码, 当然还有打印机的共享名。"
 
-#: printer/printerdrake.pm:1657
+#: printer/printerdrake.pm:1880
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12778,47 +12988,47 @@ msgstr ""
 "如果自动检测发现了想要的打印机, 只要从列表中选择它, 然后添加用户名、密码, 以"
 "及可能需要的网络组名。"
 
-#: printer/printerdrake.pm:1659
+#: printer/printerdrake.pm:1882
 #, c-format
 msgid "SMB server host"
 msgstr "SMB 服务器主机"
 
-#: printer/printerdrake.pm:1660
+#: printer/printerdrake.pm:1883
 #, c-format
 msgid "SMB server IP"
 msgstr "SMB 服务器 IP"
 
-#: printer/printerdrake.pm:1661
+#: printer/printerdrake.pm:1884 standalone/draksambashare:543
 #, c-format
 msgid "Share name"
 msgstr "共享名"
 
-#: printer/printerdrake.pm:1664
+#: printer/printerdrake.pm:1887
 #, c-format
 msgid "Workgroup"
 msgstr "工作组"
 
-#: printer/printerdrake.pm:1666
+#: printer/printerdrake.pm:1889
 #, c-format
 msgid "Auto-detected"
 msgstr "自动检测到"
 
-#: printer/printerdrake.pm:1676
+#: printer/printerdrake.pm:1899
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "输入服务器名或服务器的IP！"
 
-#: printer/printerdrake.pm:1680
+#: printer/printerdrake.pm:1903
 #, c-format
 msgid "Samba share name missing!"
 msgstr "缺少 Samba 共享名！"
 
-#: printer/printerdrake.pm:1686
+#: printer/printerdrake.pm:1909
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "安全警告！"
 
-#: printer/printerdrake.pm:1687
+#: printer/printerdrake.pm:1910
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -12855,7 +13065,7 @@ msgstr ""
 "向导按照“%s”连接方式配置打印机。\n"
 "\n"
 
-#: printer/printerdrake.pm:1697
+#: printer/printerdrake.pm:1920
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -12867,7 +13077,7 @@ msgstr ""
 "向导按照“%s”连接方式配置打印机。\n"
 "\n"
 
-#: printer/printerdrake.pm:1700
+#: printer/printerdrake.pm:1923
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -12879,12 +13089,12 @@ msgstr ""
 "\n"
 "您坚持要继续这样配置打印机吗?"
 
-#: printer/printerdrake.pm:1779
+#: printer/printerdrake.pm:2002
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "NetWare 打印机选项"
 
-#: printer/printerdrake.pm:1780
+#: printer/printerdrake.pm:2003
 #, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -12896,42 +13106,42 @@ msgstr ""
 "与它的 TCP/IP 主机名不同！), 以及有权访问打印机的用户名和密码, 当然还有打\n"
 "印机的打印队列名。"
 
-#: printer/printerdrake.pm:1781
+#: printer/printerdrake.pm:2004
 #, c-format
 msgid "Printer Server"
 msgstr "打印机服务器"
 
-#: printer/printerdrake.pm:1782
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Print Queue Name"
 msgstr "打印队列名"
 
-#: printer/printerdrake.pm:1787
+#: printer/printerdrake.pm:2010
 #, c-format
 msgid "NCP server name missing!"
 msgstr "NCP 服务器未找到"
 
-#: printer/printerdrake.pm:1791
+#: printer/printerdrake.pm:2014
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "NCP 队列名未找到！"
 
-#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1888
+#: printer/printerdrake.pm:2095 printer/printerdrake.pm:2116
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", 主机“%s”, 端口 %s"
 
-#: printer/printerdrake.pm:1870 printer/printerdrake.pm:1891
+#: printer/printerdrake.pm:2098 printer/printerdrake.pm:2119
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr "主机“%s”, 端口 %s"
 
-#: printer/printerdrake.pm:1913
+#: printer/printerdrake.pm:2141
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "TCP/Socket 打印机选项"
 
-#: printer/printerdrake.pm:1915
+#: printer/printerdrake.pm:2143
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
@@ -12940,7 +13150,7 @@ msgstr ""
 "从自动检测到的打印机列表中选择一个, 或者在输入域中输入主机名或 IP, 以及可选的"
 "端口号(默认是 9100)。"
 
-#: printer/printerdrake.pm:1916
+#: printer/printerdrake.pm:2144
 #, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -12952,27 +13162,27 @@ msgstr ""
 "(默认是 9100)。HP JetDirect 打印服务器通常用端口 9100, 其它服务器可能用其它的"
 "端口。请查阅您的硬件手册。"
 
-#: printer/printerdrake.pm:1920
+#: printer/printerdrake.pm:2148
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "缺少打印机主机名或 IP 地址！"
 
-#: printer/printerdrake.pm:1949
+#: printer/printerdrake.pm:2177
 #, c-format
 msgid "Printer host name or IP"
 msgstr "打印机主机名或 IP 地址"
 
-#: printer/printerdrake.pm:2012
+#: printer/printerdrake.pm:2240
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr "正在刷新设备 URI 列表..."
 
-#: printer/printerdrake.pm:2015 printer/printerdrake.pm:2017
+#: printer/printerdrake.pm:2243 printer/printerdrake.pm:2245
 #, c-format
 msgid "Printer Device URI"
 msgstr "打印机设备 URI"
 
-#: printer/printerdrake.pm:2016
+#: printer/printerdrake.pm:2244
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -12982,17 +13192,17 @@ msgstr ""
 "您可以直接使用 URI 访问打印机。URI 必须符合 CUPS 或 Foomatic 规定。但注意不是"
 "所有的打印队列(spooler)都支持 URI。"
 
-#: printer/printerdrake.pm:2042
+#: printer/printerdrake.pm:2270
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "必须输入有效的 URI！"
 
-#: printer/printerdrake.pm:2147
+#: printer/printerdrake.pm:2375
 #, c-format
 msgid "Pipe into command"
 msgstr "管道命令"
 
-#: printer/printerdrake.pm:2148
+#: printer/printerdrake.pm:2376
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
@@ -13000,17 +13210,17 @@ msgid ""
 msgstr ""
 "您可在此指定任意的命令行, 打印任务将通过该命令行构成的管道再送到打印机。"
 
-#: printer/printerdrake.pm:2149
+#: printer/printerdrake.pm:2377
 #, c-format
 msgid "Command line"
 msgstr "命令行"
 
-#: printer/printerdrake.pm:2153
+#: printer/printerdrake.pm:2381
 #, c-format
 msgid "A command line must be entered!"
 msgstr "必须输入命令行！"
 
-#: printer/printerdrake.pm:2192
+#: printer/printerdrake.pm:2421
 #, c-format
 msgid ""
 "On many HP printers there are special functions available, maintenance (ink "
@@ -13022,14 +13232,14 @@ msgstr ""
 "水容量检查)，喷头清理，打印头对齐等等)，在一体机上进行扫描，内置读卡器的打印"
 "机可以直接访问存储卡。"
 
-#: printer/printerdrake.pm:2194
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "To access these extra functions on your HP printer, it must be set up with "
 "the appropriate software: "
 msgstr "要访问您惠普打印机的这些额外功能，您必须安装相应的软件："
 
-#: printer/printerdrake.pm:2195
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid ""
 "Either with the newer HPLIP which allows printer maintenance through the "
@@ -13039,7 +13249,7 @@ msgstr ""
 "第一个可选项是使用较新的 HPLIP，它允许通过使用简便的图形化应用程序对打印机进"
 "行维护，但该工具只支持较新的 PhotoSmart 型号。"
 
-#: printer/printerdrake.pm:2196
+#: printer/printerdrake.pm:2425
 #, c-format
 msgid ""
 "or with the older HPOJ which allows only scanner and memory card access, but "
@@ -13048,26 +13258,26 @@ msgstr ""
 "第二个可选项是使用较早版本的 HPOJ，它只只能允许使用扫描仪和存储卡访问，但它的"
 "适应情况比 HPLIP 更广。"
 
-#: printer/printerdrake.pm:2198
+#: printer/printerdrake.pm:2427
 #, c-format
 msgid "What is your choice (choose \"None\" for non-HP printers)? "
 msgstr "请进行选择(选择“无”表示您没有惠普打印机):"
 
-#: printer/printerdrake.pm:2199 printer/printerdrake.pm:2200
-#: printer/printerdrake.pm:2226 printer/printerdrake.pm:2232
-#: printer/printerdrake.pm:2258
+#: printer/printerdrake.pm:2428 printer/printerdrake.pm:2429
+#: printer/printerdrake.pm:2455 printer/printerdrake.pm:2461
+#: printer/printerdrake.pm:2487
 #, c-format
 msgid "HPLIP"
 msgstr "HPLIP"
 
-#: printer/printerdrake.pm:2199 printer/printerdrake.pm:2202
-#: printer/printerdrake.pm:2358 printer/printerdrake.pm:2364
-#: printer/printerdrake.pm:2375
+#: printer/printerdrake.pm:2428 printer/printerdrake.pm:2431
+#: printer/printerdrake.pm:2600 printer/printerdrake.pm:2606
+#: printer/printerdrake.pm:2617
 #, c-format
 msgid "HPOJ"
 msgstr "HPOJ"
 
-#: printer/printerdrake.pm:2207
+#: printer/printerdrake.pm:2436
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -13078,98 +13288,98 @@ msgstr ""
 "1100/1200/1220/3000/3200/3300/4345, DeskJet 450, Sony IJP-V100), 惠普 "
 "PhotoSmart 或 HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:2226 printer/printerdrake.pm:2358
+#: printer/printerdrake.pm:2455 printer/printerdrake.pm:2600
 #, c-format
 msgid "Installing %s package..."
 msgstr "正在安装 %s 包..."
 
-#: printer/printerdrake.pm:2233 printer/printerdrake.pm:2365
+#: printer/printerdrake.pm:2462 printer/printerdrake.pm:2607
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr "打印将只能在 %s 上进行。"
 
-#: printer/printerdrake.pm:2248
+#: printer/printerdrake.pm:2477
 #, c-format
 msgid "Could not remove your old HPOJ configuration file %s for your %s! "
 msgstr "无法为您的 %2$s 删除旧的 HPOJ 配置文件 %1$s!"
 
-#: printer/printerdrake.pm:2250
+#: printer/printerdrake.pm:2479
 #, c-format
 msgid "Please remove the file manually and restart HPOJ."
 msgstr "请手动删除文件，并重新启动 HPOJ。"
 
-#: printer/printerdrake.pm:2258 printer/printerdrake.pm:2375
+#: printer/printerdrake.pm:2487 printer/printerdrake.pm:2617
 #, c-format
 msgid "Checking device and configuring %s..."
 msgstr "正在检查并配置 %s..."
 
-#: printer/printerdrake.pm:2277
+#: printer/printerdrake.pm:2508
 #, c-format
 msgid "Which printer do you want to set up with HPLIP?"
 msgstr "您想使用 HPLIP 设置哪个打印机?"
 
-#: printer/printerdrake.pm:2306 printer/printerdrake.pm:2419
+#: printer/printerdrake.pm:2548 printer/printerdrake.pm:2661
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "正在安装 SANE 包..."
 
-#: printer/printerdrake.pm:2319 printer/printerdrake.pm:2432
+#: printer/printerdrake.pm:2561 printer/printerdrake.pm:2674
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr "不可能在 %s 上扫描。"
 
-#: printer/printerdrake.pm:2334
+#: printer/printerdrake.pm:2576
 #, c-format
 msgid "Using and Maintaining your %s"
 msgstr "使用并维护您的 %s"
 
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2701
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "正在安装 mtools 包..."
 
-#: printer/printerdrake.pm:2467
+#: printer/printerdrake.pm:2709
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr "%s 上的照片存储卡不可能访问。"
 
-#: printer/printerdrake.pm:2483
+#: printer/printerdrake.pm:2725
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "正在扫描您的惠普一体机"
 
-#: printer/printerdrake.pm:2492
+#: printer/printerdrake.pm:2734
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "您的惠普一体机的照片存储卡访问"
 
-#: printer/printerdrake.pm:2509
+#: printer/printerdrake.pm:2751
 #, c-format
 msgid "Configuring device..."
 msgstr "正在配置设备..."
 
-#: printer/printerdrake.pm:2543
+#: printer/printerdrake.pm:2785
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "正在配置打印机端口适用于 CUPS..."
 
-#: printer/printerdrake.pm:2552 printer/printerdrake.pm:2805
-#: printer/printerdrake.pm:2949
+#: printer/printerdrake.pm:2794 printer/printerdrake.pm:3063
+#: printer/printerdrake.pm:3216
 #, c-format
 msgid "Reading printer database..."
 msgstr "正在读取打印机数据库..."
 
-#: printer/printerdrake.pm:2763
+#: printer/printerdrake.pm:3021
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "输入打印机名称和注释"
 
-#: printer/printerdrake.pm:2767 printer/printerdrake.pm:4064
+#: printer/printerdrake.pm:3025 printer/printerdrake.pm:4348
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr "打印机名称可以包含字母、数字和下划线"
 
-#: printer/printerdrake.pm:2773 printer/printerdrake.pm:4069
+#: printer/printerdrake.pm:3031 printer/printerdrake.pm:4353
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -13178,7 +13388,7 @@ msgstr ""
 "打印机“%s”已经存在, \n"
 "您真的想要覆盖其配置吗?"
 
-#: printer/printerdrake.pm:2780
+#: printer/printerdrake.pm:3038
 #, c-format
 msgid ""
 "The printer name \"%s\" has more than 12 characters which can make the "
@@ -13188,7 +13398,7 @@ msgstr ""
 "打印机名称“%s”多于十二个字符，这可能在 Windows 客户中使得打印机无法访问。您真"
 "的想要使用此名称吗？"
 
-#: printer/printerdrake.pm:2789
+#: printer/printerdrake.pm:3047
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -13197,35 +13407,35 @@ msgstr ""
 "每台打印机需要一个名字(如“printer”)。打印机描述和位置是可选项, 它们仅仅供用户"
 "识别之用。"
 
-#: printer/printerdrake.pm:2790
+#: printer/printerdrake.pm:3048
 #, c-format
 msgid "Name of printer"
 msgstr "打印机名称"
 
-#: printer/printerdrake.pm:2791 standalone/drakconnect:592
-#: standalone/harddrake2:39 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:3049 standalone/drakconnect:592
+#: standalone/harddrake2:39 standalone/printerdrake:222
+#: standalone/printerdrake:229
 #, c-format
 msgid "Description"
 msgstr "描述"
 
-#: printer/printerdrake.pm:2792 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:3050 standalone/printerdrake:222
+#: standalone/printerdrake:229
 #, c-format
 msgid "Location"
 msgstr "位置"
 
-#: printer/printerdrake.pm:2810
+#: printer/printerdrake.pm:3068
 #, c-format
 msgid "Preparing printer database..."
 msgstr "正在准备打印机数据..."
 
-#: printer/printerdrake.pm:2927
+#: printer/printerdrake.pm:3194
 #, c-format
 msgid "Your printer model"
 msgstr "您的打印机型号"
 
-#: printer/printerdrake.pm:2928
+#: printer/printerdrake.pm:3195
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -13248,18 +13458,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2933 printer/printerdrake.pm:2936
+#: printer/printerdrake.pm:3200 printer/printerdrake.pm:3203
 #, c-format
 msgid "The model is correct"
 msgstr "型号正确"
 
-#: printer/printerdrake.pm:2934 printer/printerdrake.pm:2935
-#: printer/printerdrake.pm:2938
+#: printer/printerdrake.pm:3201 printer/printerdrake.pm:3202
+#: printer/printerdrake.pm:3205
 #, c-format
 msgid "Select model manually"
 msgstr "手工选择型号"
 
-#: printer/printerdrake.pm:2962
+#: printer/printerdrake.pm:3229
 #, c-format
 msgid ""
 "\n"
@@ -13273,12 +13483,12 @@ msgstr ""
 "请检查“Drak 打印机”用自动检测选择的型号是否与您的打印机一致。如果选中的是不正"
 "确的型号或“原始打印机”, 请从列表中选择正确的型号。"
 
-#: printer/printerdrake.pm:2981
+#: printer/printerdrake.pm:3248
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "安装制造商提供的 PPD 文件"
 
-#: printer/printerdrake.pm:3013
+#: printer/printerdrake.pm:3280
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -13287,19 +13497,19 @@ msgstr ""
 "每台 PostScript 打印机都随机赠送了一个 PPD 文件, 其中描述了打印机的选项和特"
 "性。"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3281
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
 "delivered with the printer."
 msgstr "此文件通常位于随机的赠送的 Windows 和 Mac 驱动程序光盘中。"
 
-#: printer/printerdrake.pm:3015
+#: printer/printerdrake.pm:3282
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr "您还可以在制造商的网站找到 PPD 文件。"
 
-#: printer/printerdrake.pm:3016
+#: printer/printerdrake.pm:3283
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
@@ -13307,7 +13517,7 @@ msgid ""
 msgstr ""
 "如果您的计算机上安装了 Windows, 您也可以在您的 Windows 分区上找到 PPD 文件。"
 
-#: printer/printerdrake.pm:3017
+#: printer/printerdrake.pm:3284
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -13317,58 +13527,58 @@ msgstr ""
 "在设置打印机时安装打印机的 PPD 文件并使用该文件, 可充分发挥打印机硬件所提供的"
 "全部功能"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3285
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
 "then be used for the setup of your printer."
 msgstr "您可在此选择要安装到您计算机的 PPD 文件, 该文件将用于设置打印机。"
 
-#: printer/printerdrake.pm:3020
+#: printer/printerdrake.pm:3287
 #, c-format
 msgid "Install PPD file from"
 msgstr "安装 PPD 文件的来源"
 
-#: printer/printerdrake.pm:3023 printer/printerdrake.pm:3031
+#: printer/printerdrake.pm:3290 printer/printerdrake.pm:3298
 #: standalone/scannerdrake:183 standalone/scannerdrake:192
 #: standalone/scannerdrake:242 standalone/scannerdrake:250
 #, c-format
 msgid "Floppy Disk"
 msgstr "软盘"
 
-#: printer/printerdrake.pm:3024 printer/printerdrake.pm:3033
+#: printer/printerdrake.pm:3291 printer/printerdrake.pm:3300
 #: standalone/scannerdrake:184 standalone/scannerdrake:194
 #: standalone/scannerdrake:243 standalone/scannerdrake:252
 #, c-format
 msgid "Other place"
 msgstr "其它位置"
 
-#: printer/printerdrake.pm:3039
+#: printer/printerdrake.pm:3306
 #, c-format
 msgid "Select PPD file"
 msgstr "选择 PPD 文件"
 
-#: printer/printerdrake.pm:3043
+#: printer/printerdrake.pm:3310
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "PPD 文件 %s 不存在或者不可读！"
 
-#: printer/printerdrake.pm:3049
+#: printer/printerdrake.pm:3316
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "PPD 文件 %s 不遵从 PPD 规范！"
 
-#: printer/printerdrake.pm:3060
+#: printer/printerdrake.pm:3327
 #, c-format
 msgid "Installing PPD file..."
 msgstr "正在安装 PPD 文件..."
 
-#: printer/printerdrake.pm:3178
+#: printer/printerdrake.pm:3445
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI winprinter 打印机配置"
 
-#: printer/printerdrake.pm:3179
+#: printer/printerdrake.pm:3446
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -13383,12 +13593,12 @@ msgstr ""
 "连接到第一个并行口上。否则, 该打印机将不会工作。您的连接类型设置将会被驱动程"
 "序忽略。"
 
-#: printer/printerdrake.pm:3204 printer/printerdrake.pm:3234
+#: printer/printerdrake.pm:3471 printer/printerdrake.pm:3501
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "利盟喷墨打印机设定"
 
-#: printer/printerdrake.pm:3205
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -13399,7 +13609,7 @@ msgstr ""
 "利盟提供的喷墨打印机驱动程序仅仅支持本地打印机, 而非远程主机或打印服务箱上的"
 "打印机。请把打印机连接到您的本机端口, 或者在连接了打印机的电脑上进行配置。"
 
-#: printer/printerdrake.pm:3235
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -13417,12 +13627,12 @@ msgstr ""
 "图形界面的安装程序。在许可协议之后直接按取消。用“lexmarkmaintain”命令打印喷头"
 "对齐测试页, 然后用这个程序调节喷头对齐。"
 
-#: printer/printerdrake.pm:3245
+#: printer/printerdrake.pm:3512
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "利盟 X125 配置"
 
-#: printer/printerdrake.pm:3246
+#: printer/printerdrake.pm:3513
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -13433,12 +13643,12 @@ msgstr ""
 "此打印的驱动程序只支持通过 USB 连接到本地的打印机, 而非远程主机或打印服务器上"
 "的打印机。请把打印机连接到您的 USB 端口, 或者在连接了打印机的电脑上进行配置。"
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3535
 #, c-format
 msgid "Samsung ML/QL-85G configuration"
 msgstr "Samsung ML/QL-85G 配置"
 
-#: printer/printerdrake.pm:3269 printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3536 printer/printerdrake.pm:3563
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected on the "
@@ -13450,17 +13660,33 @@ msgstr ""
 "务器上或者其它并口的的打印机。请把打印机连接到您的第一个并口, 或者在连接了打"
 "印机的电脑上进行配置。"
 
-#: printer/printerdrake.pm:3295
+#: printer/printerdrake.pm:3562
 #, c-format
 msgid "Canon LBP-460/660 configuration"
 msgstr "Canon LBP-460/660 配置"
 
-#: printer/printerdrake.pm:3314
+#: printer/printerdrake.pm:3589
+#, fuzzy, c-format
+msgid "Canon LBP-810/1120 (CAPT) configuration"
+msgstr "Canon LBP-460/660 配置"
+
+#: printer/printerdrake.pm:3590
+#, fuzzy, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected via "
+"USB, no printers on remote machines or print server boxes or on the parallel "
+"port. Please connect your printer to the USB or configure it on the machine "
+"where it is directly connected to."
+msgstr ""
+"此打印的驱动程序只支持通过 USB 连接到本地的打印机, 而非远程主机或打印服务器上"
+"的打印机。请把打印机连接到您的 USB 端口, 或者在连接了打印机的电脑上进行配置。"
+
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "惠普 LaserJet 1000 的固件上载"
 
-#: printer/printerdrake.pm:3464
+#: printer/printerdrake.pm:3747
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -13475,27 +13701,27 @@ msgstr ""
 "您应该确定页面大小和墨水类型/打印模式(若可用)和激光打印机的硬件配置(内存, 双"
 "工单元, 托纸盘)设置正确。注意超高质量/分辨率打印可能会变得很慢。"
 
-#: printer/printerdrake.pm:3589
+#: printer/printerdrake.pm:3872
 #, c-format
 msgid "Printer default settings"
 msgstr "打印机默认设置"
 
-#: printer/printerdrake.pm:3596
+#: printer/printerdrake.pm:3879
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "选项 %s 必须是整数！"
 
-#: printer/printerdrake.pm:3600
+#: printer/printerdrake.pm:3883
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "选项 %s 必须是数字！"
 
-#: printer/printerdrake.pm:3604
+#: printer/printerdrake.pm:3887
 #, c-format
 msgid "Option %s out of range!"
 msgstr "选项 %s 超出范围！"
 
-#: printer/printerdrake.pm:3656
+#: printer/printerdrake.pm:3939
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -13504,12 +13730,12 @@ msgstr ""
 "您希望设置这个打印机(“%s”)\n"
 "作为默认打印机吗?"
 
-#: printer/printerdrake.pm:3672
+#: printer/printerdrake.pm:3955
 #, c-format
 msgid "Test pages"
 msgstr "测试页"
 
-#: printer/printerdrake.pm:3673
+#: printer/printerdrake.pm:3956
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -13521,52 +13747,52 @@ msgstr ""
 "注意:在某些打印机上打印照片可能要花相当长的时间。\n"
 "一般请选择标准测试页。"
 
-#: printer/printerdrake.pm:3677
+#: printer/printerdrake.pm:3960
 #, c-format
 msgid "No test pages"
 msgstr "没有测试页"
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3961
 #, c-format
 msgid "Print"
 msgstr "打印"
 
-#: printer/printerdrake.pm:3703
+#: printer/printerdrake.pm:3986
 #, c-format
 msgid "Standard test page"
 msgstr "标准测试页"
 
-#: printer/printerdrake.pm:3706
+#: printer/printerdrake.pm:3989
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "可换测试页(信纸)"
 
-#: printer/printerdrake.pm:3709
+#: printer/printerdrake.pm:3992
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "替换测试页 (A4)"
 
-#: printer/printerdrake.pm:3711
+#: printer/printerdrake.pm:3994
 #, c-format
 msgid "Photo test page"
 msgstr "照片测试页"
 
-#: printer/printerdrake.pm:3715
+#: printer/printerdrake.pm:3999
 #, c-format
 msgid "Do not print any test page"
 msgstr "不打印任何测试页"
 
-#: printer/printerdrake.pm:3723 printer/printerdrake.pm:3907
+#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4191
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "正在打印测试页..."
 
-#: printer/printerdrake.pm:3743
+#: printer/printerdrake.pm:4027
 #, c-format
 msgid "Skipping photo test page."
 msgstr "跳过照片测试页。"
 
-#: printer/printerdrake.pm:3760
+#: printer/printerdrake.pm:4044
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13580,7 +13806,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3764
+#: printer/printerdrake.pm:4048
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13589,17 +13815,17 @@ msgstr ""
 "测试页已经发送到打印机。\n"
 "打印机开始工作之前可能要等一段时间。\n"
 
-#: printer/printerdrake.pm:3774
+#: printer/printerdrake.pm:4058
 #, c-format
 msgid "Did it work properly?"
 msgstr "工作正常?"
 
-#: printer/printerdrake.pm:3798 printer/printerdrake.pm:5175
+#: printer/printerdrake.pm:4082 printer/printerdrake.pm:5465
 #, c-format
 msgid "Raw printer"
 msgstr "原始打印机"
 
-#: printer/printerdrake.pm:3836
+#: printer/printerdrake.pm:4120
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -13610,7 +13836,7 @@ msgstr ""
 "要从命令行打印文件可使用命令“%s <文件>”或图形打印工具:“xpp <文件"
 ">”或“kprinter <文件>”。图形工具让您比较容易的选择打印机和修改打印选项。\n"
 
-#: printer/printerdrake.pm:3838
+#: printer/printerdrake.pm:4122
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -13620,8 +13846,8 @@ msgstr ""
 "该命令您可用在许多应用的打印对话框的“打印命令”中, 因为应用程序会提供要打印的"
 "文件, 所以那里不用写文件名。\n"
 
-#: printer/printerdrake.pm:3841 printer/printerdrake.pm:3858
-#: printer/printerdrake.pm:3868
+#: printer/printerdrake.pm:4125 printer/printerdrake.pm:4142
+#: printer/printerdrake.pm:4152
 #, c-format
 msgid ""
 "\n"
@@ -13633,7 +13859,7 @@ msgstr ""
 "“%s”命令也可用来修改特殊打印作业的选项。只需简单地往命令行中加入想要的设置, "
 "例如:“%s <file>”。"
 
-#: printer/printerdrake.pm:3844 printer/printerdrake.pm:3884
+#: printer/printerdrake.pm:4128 printer/printerdrake.pm:4168
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -13644,7 +13870,7 @@ msgstr ""
 "s\n"
 "\n"
 
-#: printer/printerdrake.pm:3848
+#: printer/printerdrake.pm:4132
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
@@ -13653,15 +13879,15 @@ msgstr ""
 "以下是可用于当前打印机的一些打印选项: \n"
 "\n"
 
-#: printer/printerdrake.pm:3853 printer/printerdrake.pm:3863
+#: printer/printerdrake.pm:4137 printer/printerdrake.pm:4147
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\".\n"
 msgstr "要从命令行(终端窗口)打印文件, 请使用命令“%s <文件>”。\n"
 
-#: printer/printerdrake.pm:3855 printer/printerdrake.pm:3865
-#: printer/printerdrake.pm:3875
+#: printer/printerdrake.pm:4139 printer/printerdrake.pm:4149
+#: printer/printerdrake.pm:4159
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -13671,21 +13897,21 @@ msgstr ""
 "该命令您可用在许多应用的打印对话框的“打印命令”项。但是此处并不提供文件名, 因"
 "为要打印的文件由应用程序提供。\n"
 
-#: printer/printerdrake.pm:3860 printer/printerdrake.pm:3870
+#: printer/printerdrake.pm:4144 printer/printerdrake.pm:4154
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
 "\"Print option list\" button."
 msgstr "要获得当前打印机的可用选项列表, 请单击“打印选项列表”按钮。"
 
-#: printer/printerdrake.pm:3873
+#: printer/printerdrake.pm:4157
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\" or \"%s <file>\".\n"
 msgstr "用命令“%s <文件>”或“%s <文件>”打印文件。\n"
 
-#: printer/printerdrake.pm:3877
+#: printer/printerdrake.pm:4161
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13699,7 +13925,7 @@ msgstr ""
 "如果您使用 KDE, 桌面上有“停止打印机！”图标, 当您点击它时, 打印作业将立即停"
 "止。例如, 它可以用在纸张堵塞时。\n"
 
-#: printer/printerdrake.pm:3881
+#: printer/printerdrake.pm:4165
 #, c-format
 msgid ""
 "\n"
@@ -13710,37 +13936,37 @@ msgstr ""
 "\n"
 "“%s”和“%s”命令允许修改打印作业的选项, 例如:“%s <file>”。\n"
 
-#: printer/printerdrake.pm:3891
+#: printer/printerdrake.pm:4175
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "在“%s”打印机上的打印/扫描/照片卡"
 
-#: printer/printerdrake.pm:3892
+#: printer/printerdrake.pm:4176
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "在“%s”打印机上打印/扫描"
 
-#: printer/printerdrake.pm:3894
+#: printer/printerdrake.pm:4178
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "“%s”打印机上的打印/照片卡访问"
 
-#: printer/printerdrake.pm:3896
+#: printer/printerdrake.pm:4180
 #, c-format
 msgid "Using/Maintaining the printer \"%s\""
 msgstr "使用/维护打印机“%s”"
 
-#: printer/printerdrake.pm:3897
+#: printer/printerdrake.pm:4181
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "正在“%s”打印机上打印"
 
-#: printer/printerdrake.pm:3903
+#: printer/printerdrake.pm:4187
 #, c-format
 msgid "Print option list"
 msgstr "打印机选项列表"
 
-#: printer/printerdrake.pm:3925
+#: printer/printerdrake.pm:4209
 #, c-format
 msgid ""
 "Your %s is set up with HP's HPLIP driver software. This way many special "
@@ -13751,7 +13977,7 @@ msgstr ""
 "了。\n"
 "\n"
 
-#: printer/printerdrake.pm:3928
+#: printer/printerdrake.pm:4212
 #, c-format
 msgid ""
 "The scanner in your printer can be used with the usual SANE software, for "
@@ -13760,7 +13986,7 @@ msgstr ""
 "您打印机的扫描功能可以使用传统的 SANE 软件访问，比如 Kooka 和 XSane(都可在多"
 "媒体/图像菜单中找到)。"
 
-#: printer/printerdrake.pm:3929
+#: printer/printerdrake.pm:4213
 #, c-format
 msgid ""
 "Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
@@ -13771,14 +13997,14 @@ msgstr ""
 "描仪。\n"
 "\n"
 
-#: printer/printerdrake.pm:3933
+#: printer/printerdrake.pm:4217
 #, c-format
 msgid ""
 "The memory card readers in your printer can be accessed like a usual USB "
 "mass storage device. "
 msgstr "您打印机上的读卡器可像普通的 USB 存储设备一样进行访问。"
 
-#: printer/printerdrake.pm:3934
+#: printer/printerdrake.pm:4218
 #, c-format
 msgid ""
 "After inserting a card a hard disk icon to access the card should appear on "
@@ -13788,7 +14014,7 @@ msgstr ""
 "插入存储卡后，桌面上会出现一个硬盘图标以便让您访问该存储卡。\n"
 "\n"
 
-#: printer/printerdrake.pm:3936
+#: printer/printerdrake.pm:4220
 #, c-format
 msgid ""
 "The memory card readers in your printer can be accessed using HP's Printer "
@@ -13798,7 +14024,7 @@ msgstr ""
 "您打印机中的读卡器可使用 HP 打印机工具箱(位于系统/监视/惠普打印机工具箱菜单)"
 "访问，请单击“功能”标签中的“访问存储卡...”按钮。"
 
-#: printer/printerdrake.pm:3937
+#: printer/printerdrake.pm:4221
 #, c-format
 msgid ""
 "Note that this is very slow, reading the pictures from the camera or a USB "
@@ -13808,7 +14034,7 @@ msgstr ""
 "请注意，此功能非常慢，从数码相机或 USB 读卡器访问要快得多。\n"
 "\n"
 
-#: printer/printerdrake.pm:3940
+#: printer/printerdrake.pm:4224
 #, c-format
 msgid ""
 "HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) offers a "
@@ -13819,27 +14045,27 @@ msgstr ""
 "监视和维护功能：\n"
 "\n"
 
-#: printer/printerdrake.pm:3941
+#: printer/printerdrake.pm:4225
 #, c-format
 msgid " - Ink level/status info\n"
 msgstr " - 墨水容量/状态信息\n"
 
-#: printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4226
 #, c-format
 msgid " - Ink nozzle cleaning\n"
 msgstr " - 喷头清洗\n"
 
-#: printer/printerdrake.pm:3943
+#: printer/printerdrake.pm:4227
 #, c-format
 msgid " - Print head alignment\n"
 msgstr " - 打印头对齐\n"
 
-#: printer/printerdrake.pm:3944
+#: printer/printerdrake.pm:4228
 #, c-format
 msgid " - Color calibration\n"
 msgstr " - 颜色校正\n"
 
-#: printer/printerdrake.pm:3959
+#: printer/printerdrake.pm:4243
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -13862,7 +14088,7 @@ msgstr ""
 "您无需对此设备使用“Drak 扫描仪”配置工具。除非您想要在网络上共享此扫描仪, 您才"
 "需要使用“Drak 扫描仪”。"
 
-#: printer/printerdrake.pm:3985
+#: printer/printerdrake.pm:4269
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13881,13 +14107,13 @@ msgstr ""
 "盘符“p:”中发现卡上的文件系统, 如果您有多于一个支持照片卡的 HP 打印机可以查看"
 "后续的盘符。在“MtoolsFM”中, 您可以在文件列表的右上角切换盘符。"
 
-#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4055
-#: printer/printerdrake.pm:4090
+#: printer/printerdrake.pm:4312 printer/printerdrake.pm:4339
+#: printer/printerdrake.pm:4374
 #, c-format
 msgid "Transfer printer configuration"
 msgstr "传送打印机配置"
 
-#: printer/printerdrake.pm:4029
+#: printer/printerdrake.pm:4313
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13900,26 +14126,26 @@ msgstr ""
 "覆盖, 但是打印作业不会迁移。\n"
 "由于以下原因, 某些打印队列无法迁移:\n"
 
-#: printer/printerdrake.pm:4032
+#: printer/printerdrake.pm:4316
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
 msgstr "CUPS 不支持 Novell 服务器上的打印机及发送数据到无格式命令的打印机。\n"
 
-#: printer/printerdrake.pm:4034
+#: printer/printerdrake.pm:4318
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
 "printers.\n"
 msgstr "PDQ 只支持本地打印机、远程LPD打印机和 Socket/TCP 打印机。\n"
 
-#: printer/printerdrake.pm:4036
+#: printer/printerdrake.pm:4320
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD 和 LPRng 不支持IPP打印机。\n"
 
-#: printer/printerdrake.pm:4038
+#: printer/printerdrake.pm:4322
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13927,7 +14153,7 @@ msgid ""
 msgstr ""
 "另外, 如果队列不是由这个程序或者“foomatic-configure”所创建, 就无法传送。"
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4323
 #, c-format
 msgid ""
 "\n"
@@ -13938,7 +14164,7 @@ msgstr ""
 "而且, 如果打印机需要使用厂商提供的 PPD 文件配置, 或打印机带有内置的 CUPS 驱动"
 "程序, 它将无法传送。"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4324
 #, c-format
 msgid ""
 "\n"
@@ -13948,17 +14174,17 @@ msgstr ""
 "\n"
 "标记您要迁移的打印机并单击“传送”。"
 
-#: printer/printerdrake.pm:4043
+#: printer/printerdrake.pm:4327
 #, c-format
 msgid "Do not transfer printers"
 msgstr "不传送打印机"
 
-#: printer/printerdrake.pm:4044 printer/printerdrake.pm:4060
+#: printer/printerdrake.pm:4328 printer/printerdrake.pm:4344
 #, c-format
 msgid "Transfer"
 msgstr "传送"
 
-#: printer/printerdrake.pm:4056
+#: printer/printerdrake.pm:4340
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13969,17 +14195,17 @@ msgstr ""
 "单击“传送”覆盖配置。\n"
 "您也可以选择新的名称或跳过该打印机。"
 
-#: printer/printerdrake.pm:4077
+#: printer/printerdrake.pm:4361
 #, c-format
 msgid "New printer name"
 msgstr "新打印机名称"
 
-#: printer/printerdrake.pm:4080
+#: printer/printerdrake.pm:4364
 #, c-format
 msgid "Transferring %s..."
 msgstr "正在传送 %s ..."
 
-#: printer/printerdrake.pm:4091
+#: printer/printerdrake.pm:4375
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13987,28 +14213,28 @@ msgid ""
 msgstr ""
 "您已经传送以前系统中的默认打印机(“%s”), 是否设置为新打印系统的默认打印机 %s?"
 
-#: printer/printerdrake.pm:4101
+#: printer/printerdrake.pm:4385
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "正在刷新打印机数据..."
 
-#: printer/printerdrake.pm:4111
+#: printer/printerdrake.pm:4395
 #, c-format
 msgid "Starting network..."
 msgstr "正在启动网络..."
 
-#: printer/printerdrake.pm:4155 printer/printerdrake.pm:4159
-#: printer/printerdrake.pm:4161
+#: printer/printerdrake.pm:4439 printer/printerdrake.pm:4443
+#: printer/printerdrake.pm:4445
 #, c-format
 msgid "Configure the network now"
 msgstr "立即配置网络"
 
-#: printer/printerdrake.pm:4156
+#: printer/printerdrake.pm:4440
 #, c-format
 msgid "Network functionality not configured"
 msgstr "尚未完成网络配置"
 
-#: printer/printerdrake.pm:4157
+#: printer/printerdrake.pm:4441
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -14019,12 +14245,12 @@ msgstr ""
 "您在配置远程打印机。配置远程打印需要网络访问, 但您还没有配置网络。如果您仍\n"
 "旧不进行网络配置的话, 您将不能使用您现在正在配置的打印机。您希望怎样继续?"
 
-#: printer/printerdrake.pm:4160
+#: printer/printerdrake.pm:4444
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "跳过网络配置继续"
 
-#: printer/printerdrake.pm:4191
+#: printer/printerdrake.pm:4475
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -14037,7 +14263,7 @@ msgstr ""
 "控制中心的“网络和 Internet”/“连接”一节纠正配置, 然后再使用 %s 控制中心的“硬"
 "件”/“打印机”设置打印机"
 
-#: printer/printerdrake.pm:4192
+#: printer/printerdrake.pm:4476
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -14046,27 +14272,27 @@ msgid ""
 msgstr ""
 "网络访问未运行, 也无法启动。请检查您的配置和您的硬件。然后再次配置远程打印。"
 
-#: printer/printerdrake.pm:4202
+#: printer/printerdrake.pm:4486
 #, c-format
 msgid "Restarting printing system..."
 msgstr "重新启动打印系统..."
 
-#: printer/printerdrake.pm:4233
+#: printer/printerdrake.pm:4517
 #, c-format
 msgid "high"
 msgstr "高"
 
-#: printer/printerdrake.pm:4233
+#: printer/printerdrake.pm:4517
 #, c-format
 msgid "paranoid"
 msgstr "严格"
 
-#: printer/printerdrake.pm:4235
+#: printer/printerdrake.pm:4519
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "在 %s 安全级别上安装打印系统"
 
-#: printer/printerdrake.pm:4236
+#: printer/printerdrake.pm:4520
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -14087,12 +14313,12 @@ msgstr ""
 "\n"
 "您要配置打印吗?"
 
-#: printer/printerdrake.pm:4272
+#: printer/printerdrake.pm:4556
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "开机时启动打印系统"
 
-#: printer/printerdrake.pm:4273
+#: printer/printerdrake.pm:4557
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -14112,32 +14338,32 @@ msgstr ""
 "\n"
 "您希望让打印系统自动启动吗?"
 
-#: printer/printerdrake.pm:4296
+#: printer/printerdrake.pm:4580
 #, c-format
 msgid "Checking installed software..."
 msgstr "正在检查已经安装的软件..."
 
-#: printer/printerdrake.pm:4302
+#: printer/printerdrake.pm:4586
 #, c-format
 msgid "Removing %s..."
 msgstr "正在删除 %s..."
 
-#: printer/printerdrake.pm:4306
+#: printer/printerdrake.pm:4590
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "无法删除 %s 打印系统!"
 
-#: printer/printerdrake.pm:4326
+#: printer/printerdrake.pm:4610
 #, c-format
 msgid "Installing %s..."
 msgstr "正在安装 %s..."
 
-#: printer/printerdrake.pm:4330
+#: printer/printerdrake.pm:4614
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "无法安装 %s 打印系统!"
 
-#: printer/printerdrake.pm:4398
+#: printer/printerdrake.pm:4682
 #, c-format
 msgid ""
 "In this mode there is no local printing system, all printing requests go "
@@ -14149,7 +14375,7 @@ msgstr ""
 "意, 您以后将无法定义本地打印队列, 而且如果指定的服务器宕机的话, 将无法通过本"
 "机打印。"
 
-#: printer/printerdrake.pm:4400
+#: printer/printerdrake.pm:4684
 #, c-format
 msgid ""
 "Enter the host name or IP of your CUPS server and click OK if you want to "
@@ -14158,32 +14384,32 @@ msgstr ""
 "如果您想要使用此模式, 请输入您 CUPS 服务器的主机名或 IP 地址, 然后单击“确"
 "定”。否则请单击“退出”。”"
 
-#: printer/printerdrake.pm:4414
+#: printer/printerdrake.pm:4698
 #, c-format
 msgid "Name or IP of remote server:"
 msgstr "远程服务器的名称或 IP 地址:"
 
-#: printer/printerdrake.pm:4434
+#: printer/printerdrake.pm:4718
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "正在设置默认打印机..."
 
-#: printer/printerdrake.pm:4454
+#: printer/printerdrake.pm:4738
 #, c-format
 msgid "Local CUPS printing system or remote CUPS server?"
 msgstr "是本地 CUPS 打印系统还是远程 CUPS 服务器?"
 
-#: printer/printerdrake.pm:4455
+#: printer/printerdrake.pm:4739
 #, c-format
 msgid "The CUPS printing system can be used in two ways: "
 msgstr "CUPS 打印系统可以通过两种方式使用:"
 
-#: printer/printerdrake.pm:4457
+#: printer/printerdrake.pm:4741
 #, c-format
 msgid "1. The CUPS printing system can run locally. "
 msgstr "1. 在本地运行 CUPS 打印系统。"
 
-#: printer/printerdrake.pm:4458
+#: printer/printerdrake.pm:4742
 #, c-format
 msgid ""
 "Then locally connected printers can be used and remote printers on other "
@@ -14192,7 +14418,7 @@ msgstr ""
 "既可以使用本地连接的打印机, 也可以自动发现同一网络中安装在其它 CUPS 服务器上"
 "的远程打印机。"
 
-#: printer/printerdrake.pm:4459
+#: printer/printerdrake.pm:4743
 #, c-format
 msgid ""
 "Disadvantage of this approach is, that more resources on the local machine "
@@ -14204,12 +14430,12 @@ msgstr ""
 "后台运行 CUPS 守护程序, 这可能需要占用一些内存。此外还需要开放IPP 端口(号码 "
 "631)。"
 
-#: printer/printerdrake.pm:4461
+#: printer/printerdrake.pm:4745
 #, 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:4746
 #, c-format
 msgid ""
 "Here local resource occupation is reduced to a minimum. No CUPS daemon is "
@@ -14219,7 +14445,7 @@ msgstr ""
 "这样可将本地资源占用降低最低。既不启动 CUPS 守护程序, 也无需开放端口, 设置本"
 "地打印队列也无需软件架构支持, 这样内存和磁盘空间都基本上不会占用。"
 
-#: printer/printerdrake.pm:4463
+#: printer/printerdrake.pm:4747
 #, c-format
 msgid ""
 "Disadvantage is that it is not possible to define local printers then and if "
@@ -14228,48 +14454,48 @@ msgstr ""
 "缺点是, 以后无法定义本地打印机。而且如果指定的服务器宕机的话, 将无法通过本机"
 "打印。"
 
-#: printer/printerdrake.pm:4465
+#: printer/printerdrake.pm:4749
 #, 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:4753 printer/printerdrake.pm:4768
+#: printer/printerdrake.pm:4772 printer/printerdrake.pm:4778
 #, c-format
 msgid "Remote server, specify Name or IP here:"
 msgstr "远程服务器, 在此指定名称或 IP 地址:"
 
-#: printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4767
 #, c-format
 msgid "Local CUPS printing system"
 msgstr "本地 CUPS 打印系统"
 
-#: printer/printerdrake.pm:4522
+#: printer/printerdrake.pm:4806
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "选择打印机系统"
 
-#: printer/printerdrake.pm:4523
+#: printer/printerdrake.pm:4807
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "您需要使用哪种打印系统?"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4856
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "配置打印机“%s”失败"
 
-#: printer/printerdrake.pm:4587
+#: printer/printerdrake.pm:4871
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "正在安装 Foomatic..."
 
-#: printer/printerdrake.pm:4593
+#: printer/printerdrake.pm:4877
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr "无法安装 %s 软件包, %s 无法启动!"
 
-#: printer/printerdrake.pm:4785
+#: printer/printerdrake.pm:5072
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -14279,48 +14505,48 @@ msgstr ""
 "下列打印机已配置。双击打印机可更改其设置、将其设为默认打印机, 或者查看相关信"
 "息。"
 
-#: printer/printerdrake.pm:4815
+#: printer/printerdrake.pm:5102
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "显示可用的全部远程 CUPS 打印机"
 
-#: printer/printerdrake.pm:4816
+#: printer/printerdrake.pm:5103
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr "更新打印列表(显示所有可用的远程 CUPS 打印机)"
 
-#: printer/printerdrake.pm:4827
+#: printer/printerdrake.pm:5114
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPS 配置"
 
-#: printer/printerdrake.pm:4839
+#: printer/printerdrake.pm:5126
 #, c-format
 msgid "Change the printing system"
 msgstr "更改打印系统"
 
-#: printer/printerdrake.pm:4848
+#: printer/printerdrake.pm:5135
 #, c-format
 msgid "Normal Mode"
 msgstr "普通模式"
 
-#: printer/printerdrake.pm:4849
+#: printer/printerdrake.pm:5136
 #, 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:5408 printer/printerdrake.pm:5466
+#: printer/printerdrake.pm:5552 printer/printerdrake.pm:5561
 #, c-format
 msgid "Printer options"
 msgstr "打印机选项"
 
-#: printer/printerdrake.pm:5154
+#: printer/printerdrake.pm:5444
 #, c-format
 msgid "Modify printer configuration"
 msgstr "修改打印机配置"
 
-#: printer/printerdrake.pm:5156
+#: printer/printerdrake.pm:5446
 #, c-format
 msgid ""
 "Printer %s%s\n"
@@ -14329,99 +14555,104 @@ msgstr ""
 "打印机 %s%s\n"
 "真的要修改吗?"
 
-#: printer/printerdrake.pm:5161
+#: printer/printerdrake.pm:5451
 #, c-format
 msgid "This printer is disabled"
 msgstr "此打印机已禁用"
 
-#: printer/printerdrake.pm:5163
+#: printer/printerdrake.pm:5453
 #, c-format
 msgid "Do it!"
 msgstr "执行！"
 
-#: printer/printerdrake.pm:5168 printer/printerdrake.pm:5223
+#: printer/printerdrake.pm:5458 printer/printerdrake.pm:5520
 #, c-format
 msgid "Printer connection type"
 msgstr "打印机连接类型"
 
-#: printer/printerdrake.pm:5169 printer/printerdrake.pm:5229
+#: printer/printerdrake.pm:5459 printer/printerdrake.pm:5526
 #, c-format
 msgid "Printer name, description, location"
 msgstr "打印机名称、描述、位置"
 
-#: printer/printerdrake.pm:5171 printer/printerdrake.pm:5248
+#: printer/printerdrake.pm:5461 printer/printerdrake.pm:5545
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "打印机厂家, 型号, 驱动"
 
-#: printer/printerdrake.pm:5172 printer/printerdrake.pm:5249
+#: printer/printerdrake.pm:5462 printer/printerdrake.pm:5546
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "打印机厂家, 型号"
 
-#: printer/printerdrake.pm:5178 printer/printerdrake.pm:5259
+#: printer/printerdrake.pm:5468 printer/printerdrake.pm:5556
 #, 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:5473 printer/printerdrake.pm:5562
+#: printer/printerdrake.pm:5564 printer/printerdrake.pm:5573
 #, c-format
 msgid "Enable Printer"
 msgstr "启用打印机"
 
-#: printer/printerdrake.pm:5186 printer/printerdrake.pm:5270
-#: printer/printerdrake.pm:5272
+#: printer/printerdrake.pm:5476 printer/printerdrake.pm:5567
+#: printer/printerdrake.pm:5568 printer/printerdrake.pm:5570
 #, c-format
 msgid "Disable Printer"
 msgstr "禁用打印机"
 
-#: printer/printerdrake.pm:5187 printer/printerdrake.pm:5275
+#: printer/printerdrake.pm:5480 printer/printerdrake.pm:5574
+#, fuzzy, c-format
+msgid "Printer communication error handling"
+msgstr "打印机连接类型"
+
+#: printer/printerdrake.pm:5481 printer/printerdrake.pm:5578
 #, c-format
 msgid "Print test pages"
 msgstr "打印测试页"
 
-#: printer/printerdrake.pm:5188 printer/printerdrake.pm:5277
+#: printer/printerdrake.pm:5482 printer/printerdrake.pm:5580
 #, c-format
 msgid "Learn how to use this printer"
 msgstr "了解怎样使用此打印机"
 
-#: printer/printerdrake.pm:5189 printer/printerdrake.pm:5279
+#: printer/printerdrake.pm:5483 printer/printerdrake.pm:5582
 #, c-format
 msgid "Remove printer"
 msgstr "删除打印机"
 
-#: printer/printerdrake.pm:5237
+#: printer/printerdrake.pm:5534
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "删除旧打印机“%s”..."
 
-#: printer/printerdrake.pm:5268
+#: printer/printerdrake.pm:5565
 #, c-format
 msgid "Printer \"%s\" is now enabled."
 msgstr "打印机“%s”现已启用。"
 
-#: printer/printerdrake.pm:5273
+#: printer/printerdrake.pm:5571
 #, c-format
 msgid "Printer \"%s\" is now disabled."
 msgstr "打印机“%s”现已禁用。"
 
-#: printer/printerdrake.pm:5310
+#: printer/printerdrake.pm:5613
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "真的要删除打印机“%s”?"
 
-#: printer/printerdrake.pm:5314
+#: printer/printerdrake.pm:5617
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "正在删除打印机“%s”..."
 
-#: printer/printerdrake.pm:5338
+#: printer/printerdrake.pm:5641
 #, c-format
 msgid "Default printer"
 msgstr "默认打印机"
 
-#: printer/printerdrake.pm:5339
+#: printer/printerdrake.pm:5642
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "打印机“%s”设为缺省打印机。"
@@ -14431,7 +14662,7 @@ msgstr "打印机“%s”设为缺省打印机。"
 msgid "Can not add a partition to _formatted_ RAID %s"
 msgstr "无法加入一个分区到已经格式化的硬盘阵列 %s"
 
-#: raid.pm:144
+#: raid.pm:145
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "没有足够的分区建立 %d 级的硬盘阵列\n"
@@ -17124,17 +17355,12 @@ msgstr "请注销, 然后同时按 Ctrl-Alt-BackSpace"
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "您需要注销后重新登录才能让更改生效"
 
-#: standalone/drakTermServ:75
-#, c-format
-msgid "Useless without Terminal Server"
-msgstr "没有终端服务器就无用"
-
-#: standalone/drakTermServ:107 standalone/drakTermServ:113
+#: standalone/drakTermServ:102 standalone/drakTermServ:108
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s 需要用户名...\n"
 
-#: standalone/drakTermServ:124
+#: standalone/drakTermServ:119
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -17143,67 +17369,72 @@ msgstr ""
 "%s: %s 需要主机名、MAC 地址、IP、nbi-image、代表瘦客户端的 0/1、代表本地配置"
 "的 0/1...\n"
 
-#: standalone/drakTermServ:130
+#: standalone/drakTermServ:125
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s 需要主机名...\n"
 
-#: standalone/drakTermServ:212 standalone/drakTermServ:215
+#: standalone/drakTermServ:207 standalone/drakTermServ:210
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "终端服务器配置"
 
-#: standalone/drakTermServ:221
+#: standalone/drakTermServ:216
+#, fuzzy, c-format
+msgid "dhcpd Config"
+msgstr "dhcpd 配置..."
+
+#: standalone/drakTermServ:220
 #, c-format
 msgid "Enable Server"
 msgstr "启用服务器"
 
-#: standalone/drakTermServ:227
+#: standalone/drakTermServ:226
 #, c-format
 msgid "Disable Server"
 msgstr "禁用服务器"
 
-#: standalone/drakTermServ:233
+#: standalone/drakTermServ:232
 #, c-format
 msgid "Start Server"
 msgstr "启动服务器"
 
-#: standalone/drakTermServ:239
+#: standalone/drakTermServ:238
 #, c-format
 msgid "Stop Server"
 msgstr "停止服务器"
 
-#: standalone/drakTermServ:248
+#: standalone/drakTermServ:247
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot 软盘/ISO"
 
-#: standalone/drakTermServ:252
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Net Boot Images"
 msgstr "网络启动磁盘镜像"
 
-#: standalone/drakTermServ:259
+#: standalone/drakTermServ:258
 #, c-format
 msgid "Add/Del Users"
 msgstr "添加/删除用户"
 
-#: standalone/drakTermServ:263
+#: standalone/drakTermServ:262
 #, c-format
 msgid "Add/Del Clients"
 msgstr "添加/删除客户"
 
-#: standalone/drakTermServ:271
+#: standalone/drakTermServ:270
 #, c-format
 msgid "Images"
 msgstr "映像"
 
-#: standalone/drakTermServ:272
+#: standalone/drakTermServ:271
 #, c-format
 msgid "Clients/Users"
 msgstr "客户/用户"
 
-#: standalone/drakTermServ:290 standalone/drakbug:47
+#: standalone/drakTermServ:289 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "初次使用向导"
@@ -17250,30 +17481,31 @@ msgstr ""
 "    e) 要求您制作启动软盘。\n"
 "    f) 如果是瘦客户的话, 询问您是否想要重新启动 K 登陆管理器(KDM)。\n"
 
-#: standalone/drakTermServ:378
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Cancel Wizard"
 msgstr "取消向导"
 
-#: standalone/drakTermServ:393
+#: standalone/drakTermServ:394
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "请保存 dhcpd 配置!"
 
-#: standalone/drakTermServ:421
+#: standalone/drakTermServ:422
 #, c-format
 msgid "Use thin clients."
 msgstr "使用瘦客户端。"
 
-#: standalone/drakTermServ:423
+#: standalone/drakTermServ:424
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr "将客户端的 X 键盘设置与服务器同步。"
 
-#: standalone/drakTermServ:425
-#, c-format
+#: standalone/drakTermServ:426
+#, fuzzy, c-format
 msgid ""
-"Please select default client type.\n"
+"Please select default client type (Fat is the default type if 'Use thin' is "
+"unchecked).\n"
 "    'Thin' clients run everything off the server's CPU/RAM, using the client "
 "display.\n"
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
@@ -17282,28 +17514,28 @@ msgstr ""
 "    “瘦”客户端会使用服务器的 CPU/内存, 只是使用客户端进行显示。\n"
 "    “胖”客户端将会使用自己的 CPU/内存, 但会使用服务器的文件系统。"
 
-#: standalone/drakTermServ:445
+#: standalone/drakTermServ:446
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "为全部内核创建网络引导映像"
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:766
-#: standalone/drakTermServ:782
+#: standalone/drakTermServ:447 standalone/drakTermServ:769
+#: standalone/drakTermServ:785
 #, c-format
 msgid "This will take a few minutes."
 msgstr "这将花费几分钟。"
 
-#: standalone/drakTermServ:455 standalone/drakTermServ:496
+#: standalone/drakTermServ:453 standalone/drakTermServ:493
 #, c-format
 msgid "Done!"
 msgstr "完成！"
 
-#: standalone/drakTermServ:467 standalone/drakTermServ:848
+#: standalone/drakTermServ:464 standalone/drakTermServ:849
 #, c-format
 msgid "%s failed"
 msgstr "%s 失败"
 
-#: standalone/drakTermServ:476
+#: standalone/drakTermServ:473
 #, c-format
 msgid ""
 "Not enough space to create\n"
@@ -17313,24 +17545,24 @@ msgstr ""
 "没有足够的空间在 %s 创建 NBI。\n"
 "所需空间：%d MB，剩余空间：%d MB"
 
-#: standalone/drakTermServ:482
+#: standalone/drakTermServ:479
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr "将服务器用户列表与客户列表同步, 包括 root。"
 
-#: standalone/drakTermServ:502
+#: standalone/drakTermServ:499
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr "为了要启用为瘦客户所作的更改, 必须重新启动显示管理器。立即重新启动吗?"
 
-#: standalone/drakTermServ:537
+#: standalone/drakTermServ:534
 #, c-format
 msgid "Terminal Server Overview"
 msgstr "终端服务器概览"
 
-#: standalone/drakTermServ:538
+#: standalone/drakTermServ:535
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -17353,7 +17585,7 @@ msgstr ""
 "etherboot-pcimap.include, 与 dhcpd.conf 相关联, \n"
 "        \t您需要至少为一个完整的内核创建以太网启动镜像。"
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:541
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -17385,7 +17617,7 @@ msgstr ""
 "\t\t\t \n"
 "        \t\t一个可以支持无盘工作站典型的 dhcpd.conf 应该是这样:"
 
-#: standalone/drakTermServ:562
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -17438,7 +17670,7 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\t注意:在添加或更改客户端后您必须停止/启动服务器。"
 
-#: standalone/drakTermServ:582
+#: standalone/drakTermServ:579
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -17467,7 +17699,7 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\t这里的子网/掩码应该与您的网络相同。"
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:591
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -17483,7 +17715,7 @@ msgstr ""
 "        \t\t除了要在 /etc/shadow 中之外, 还应在 %s\n"
 "        \t\t中存有副本。drakTermServ 能够帮助您完成这一过程。"
 
-#: standalone/drakTermServ:598
+#: standalone/drakTermServ:595
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -17500,7 +17732,7 @@ msgstr ""
 "助您创建\n"
 "        \t\t这些文件。"
 
-#: standalone/drakTermServ:603
+#: standalone/drakTermServ:600
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -17532,7 +17764,7 @@ msgstr ""
 "        终端服务器这一特性。本地配置能够被关闭, 但\n"
 "        保留配置文件, 只要客户端机器被配置了的话。"
 
-#: standalone/drakTermServ:612
+#: standalone/drakTermServ:609
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -17584,7 +17816,7 @@ msgstr ""
 "更改\n"
 "        \t\t为 /var/lib/tftpboot, 这里正是 mkinitrd-net 存放映像的地点。"
 
-#: standalone/drakTermServ:633
+#: standalone/drakTermServ:630
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -17600,79 +17832,90 @@ msgid ""
 "        \tcat /usr/share/etherboot/zdsk/3c509.zdsk > /dev/fd0"
 msgstr ""
 "        - 创建 etherboot 软盘/光盘:\n"
-"        \t无盘工作站需要网卡上的 ROM 映像，或者启动软盘或者光盘才能初始化启动过程。\n"
+"        \t无盘工作站需要网卡上的 ROM 映像，或者启动软盘或者光盘才能初始化启动"
+"过程。\n"
 "        \tdrakTermServ 将帮助您根据客户机上的网卡生成这些映像。\n"
 "        \t\t\n"
 "        \t例如，为 3ComA 3c509 手动生成启动软盘的命令为:\n"
 "        \t\t\n"
 "        \tcat /usr/share/etherboot/zdsk/3c509.zdsk > /dev/fd0"
 
-#: standalone/drakTermServ:666
+#: standalone/drakTermServ:663
 #, c-format
 msgid "Boot Floppy"
 msgstr "启动软盘"
 
-#: standalone/drakTermServ:668
+#: standalone/drakTermServ:665
 #, c-format
 msgid "Boot ISO"
 msgstr "启动 ISO"
 
-#: standalone/drakTermServ:670
+#: standalone/drakTermServ:667
 #, c-format
 msgid "PXE Image"
 msgstr "PXE 映像"
 
-#: standalone/drakTermServ:731
+#: standalone/drakTermServ:728
 #, c-format
 msgid "Default kernel version"
 msgstr "默认内核版本"
 
-#: standalone/drakTermServ:734
+#: standalone/drakTermServ:731
 #, c-format
 msgid "Create PXE images."
 msgstr "创建 PXE 映像。"
 
-#: standalone/drakTermServ:764
+#: standalone/drakTermServ:757
+#, c-format
+msgid "Install i586 kernel for older clients"
+msgstr ""
+
+#: standalone/drakTermServ:767
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "建造整个内核 -->"
 
-#: standalone/drakTermServ:771
+#: standalone/drakTermServ:774
 #, c-format
 msgid "No kernel selected!"
 msgstr "没有选择内核！"
 
-#: standalone/drakTermServ:774
+#: standalone/drakTermServ:777
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "建造单独的网卡 -->"
 
-#: standalone/drakTermServ:778
+#: standalone/drakTermServ:781
 #, c-format
 msgid "No NIC selected!"
 msgstr "没有选择网卡！"
 
-#: standalone/drakTermServ:781
+#: standalone/drakTermServ:784
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "建造全部内核 -->"
 
-#: standalone/drakTermServ:796
+#: standalone/drakTermServ:797
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- 删除"
 
-#: standalone/drakTermServ:801
+#: standalone/drakTermServ:802
 #, c-format
 msgid "No image selected!"
 msgstr "没有选择图像！"
 
-#: standalone/drakTermServ:804
+#: standalone/drakTermServ:805
 #, c-format
 msgid "Delete All NBIs"
 msgstr "删除所有 NBI"
 
-#: standalone/drakTermServ:966
+#: standalone/drakTermServ:880
+#, fuzzy, c-format
+msgid "Building images for kernel:"
+msgstr "为全部内核创建网络引导映像"
+
+#: standalone/drakTermServ:1004
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -17682,101 +17925,96 @@ msgstr ""
 "！！！表明系统数据库中的密码与终端服务器数据库中的密码不同。\n"
 "请删除/在终端服务器中重新添加用户后才能登录。"
 
-#: standalone/drakTermServ:971
+#: standalone/drakTermServ:1009
 #, c-format
 msgid "Add User -->"
 msgstr "添加用户 -->"
 
-#: standalone/drakTermServ:977
+#: standalone/drakTermServ:1015
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- 删除用户"
 
-#: standalone/drakTermServ:1013
+#: standalone/drakTermServ:1051
 #, c-format
 msgid "type: %s"
 msgstr "类型: %s"
 
-#: standalone/drakTermServ:1017
+#: standalone/drakTermServ:1055
 #, c-format
 msgid "local config: %s"
 msgstr "本地配置: %s"
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1086
 #, c-format
 msgid ""
 "Allow local hardware\n"
 "configuration."
 msgstr "允许本地硬件配置。"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1095
 #, c-format
 msgid "No net boot images created!"
 msgstr "没有创建网络启动镜像！"
 
-#: standalone/drakTermServ:1075
+#: standalone/drakTermServ:1114
 #, c-format
 msgid "Thin Client"
 msgstr "瘦客户端"
 
-#: standalone/drakTermServ:1079
+#: standalone/drakTermServ:1118
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "允许瘦客户端"
 
-#: standalone/drakTermServ:1080
+#: standalone/drakTermServ:1119
 #, c-format
 msgid ""
 "Sync client X keyboard\n"
 " settings with server."
 msgstr "将客户端的 X 键盘设置与服务器同步。"
 
-#: standalone/drakTermServ:1081
+#: standalone/drakTermServ:1120
 #, c-format
 msgid "Add Client -->"
 msgstr "添加客户 -->"
 
-#: standalone/drakTermServ:1095
+#: standalone/drakTermServ:1134
 #, c-format
 msgid "type: fat"
 msgstr "类型: 胖"
 
-#: standalone/drakTermServ:1096
+#: standalone/drakTermServ:1135
 #, c-format
 msgid "type: thin"
 msgstr "类型: 瘦"
 
-#: standalone/drakTermServ:1103
+#: standalone/drakTermServ:1142
 #, c-format
 msgid "local config: false"
 msgstr "本机配置: 假"
 
-#: standalone/drakTermServ:1104
+#: standalone/drakTermServ:1143
 #, c-format
 msgid "local config: true"
 msgstr "本地配置: 真"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1151
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- 编辑客户"
 
-#: standalone/drakTermServ:1138
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Disable Local Config"
 msgstr "禁用本地配置"
 
-#: standalone/drakTermServ:1145
+#: standalone/drakTermServ:1183
 #, c-format
 msgid "Delete Client"
 msgstr "删除客户"
 
-#: standalone/drakTermServ:1154
-#, c-format
-msgid "dhcpd Config..."
-msgstr "dhcpd 配置..."
-
-#: standalone/drakTermServ:1169
+#: standalone/drakTermServ:1205
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -17785,77 +18023,77 @@ msgstr ""
 "需要重新启动显示管理器以便所有更改生效。\n"
 "(service dm restart - 控制台上)"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1250
 #, c-format
 msgid "Thin clients will not work with autologin. Disable autologin?"
 msgstr "瘦客户无法使用自动登录。禁用自动登录吗?"
 
-#: standalone/drakTermServ:1230
+#: standalone/drakTermServ:1266
 #, c-format
 msgid "All clients will use %s"
 msgstr "全部客户都使用 %s"
 
-#: standalone/drakTermServ:1264
+#: standalone/drakTermServ:1300
 #, c-format
 msgid "Subnet:"
 msgstr "子网: "
 
-#: standalone/drakTermServ:1271
+#: standalone/drakTermServ:1307
 #, c-format
 msgid "Netmask:"
 msgstr "子网掩码: "
 
-#: standalone/drakTermServ:1278
+#: standalone/drakTermServ:1314
 #, c-format
 msgid "Routers:"
 msgstr "路由器: "
 
-#: standalone/drakTermServ:1285
+#: standalone/drakTermServ:1321
 #, c-format
 msgid "Subnet Mask:"
 msgstr "子网掩码: "
 
-#: standalone/drakTermServ:1292
+#: standalone/drakTermServ:1328
 #, c-format
 msgid "Broadcast Address:"
 msgstr "广播地址: "
 
-#: standalone/drakTermServ:1299
+#: standalone/drakTermServ:1335
 #, c-format
 msgid "Domain Name:"
 msgstr "域名: "
 
-#: standalone/drakTermServ:1307
+#: standalone/drakTermServ:1343
 #, c-format
 msgid "Name Servers:"
 msgstr "命名服务器: "
 
-#: standalone/drakTermServ:1318
+#: standalone/drakTermServ:1354
 #, c-format
 msgid "IP Range Start:"
 msgstr "IP 范围起点: "
 
-#: standalone/drakTermServ:1319
+#: standalone/drakTermServ:1355
 #, c-format
 msgid "IP Range End:"
 msgstr "IP 范围终点: "
 
-#: standalone/drakTermServ:1361
+#: standalone/drakTermServ:1397
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr "在已有配置中追加 TS 包含"
 
-#: standalone/drakTermServ:1363
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Write Config"
 msgstr "写入配置"
 
-#: standalone/drakTermServ:1379
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "dhcpd 服务器配置"
 
-#: standalone/drakTermServ:1380
+#: standalone/drakTermServ:1416
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -17865,7 +18103,7 @@ msgstr ""
 "这些值中绝大多数会从您正在运行的系统\n"
 "中提取。若需要您可以进行修改。"
 
-#: standalone/drakTermServ:1383
+#: standalone/drakTermServ:1419
 #, c-format
 msgid ""
 "Dynamic IP Address Pool\n"
@@ -17874,105 +18112,106 @@ msgstr ""
 "动态 IP 地址池\n"
 "(PXE 客户端需要):"
 
-#: standalone/drakTermServ:1536
+#: standalone/drakTermServ:1572
 #, c-format
 msgid "Write to %s failed!"
 msgstr "写入 %s 失败!"
 
-#: standalone/drakTermServ:1548
+#: standalone/drakTermServ:1584
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "请插入软盘: "
 
-#: standalone/drakTermServ:1552
+#: standalone/drakTermServ:1588
 #, c-format
 msgid "Could not access the floppy!"
 msgstr "无法访问软盘！"
 
-#: standalone/drakTermServ:1554
+#: standalone/drakTermServ:1590
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "现在可以取出软盘了"
 
-#: standalone/drakTermServ:1557
+#: standalone/drakTermServ:1593
 #, c-format
 msgid "No floppy drive available!"
 msgstr "没有可用的软盘驱动器！"
 
-#: standalone/drakTermServ:1563
+#: standalone/drakTermServ:1599
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "PXE 镜像是 %s/%s"
 
-#: standalone/drakTermServ:1565
+#: standalone/drakTermServ:1601
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "写入 %s/%s 出错"
 
-#: standalone/drakTermServ:1575
+#: standalone/drakTermServ:1611
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etherboot ISO 镜像是 %s"
 
-#: standalone/drakTermServ:1577
+#: standalone/drakTermServ:1613
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "发生错误！- mkisofs 安装了吗?"
 
-#: standalone/drakTermServ:1598
+#: standalone/drakTermServ:1634
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "需要先创建 /etc/dhcpd.conf 文件！"
 
-#: standalone/drakTermServ:1757
+#: standalone/drakTermServ:1793
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "%s 的密码在中断服务器中无效 - 正在重写...\n"
 
-#: standalone/drakTermServ:1770
+#: standalone/drakTermServ:1806
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s 不是用户...\n"
 
-#: standalone/drakTermServ:1771
+#: standalone/drakTermServ:1807
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s 已经是终端服务器用户了\n"
 
-#: standalone/drakTermServ:1773
+#: standalone/drakTermServ:1809
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "将 %s 添加到终端服务器失败！\n"
 
-#: standalone/drakTermServ:1775
+#: standalone/drakTermServ:1811
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s 已加入终端服务器\n"
 
-#: standalone/drakTermServ:1792
+#: standalone/drakTermServ:1828
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "已删除 %s...\n"
 
-#: standalone/drakTermServ:1794 standalone/drakTermServ:1867
+#: standalone/drakTermServ:1830 standalone/drakTermServ:1903
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s 未找到...\n"
 
-#: standalone/drakTermServ:1895
+#: standalone/drakTermServ:1931
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr "/etc/hosts.allow 和 /etc/hosts.deny 已经配置 - 无更改"
 
-#: standalone/drakTermServ:2035
+#: standalone/drakTermServ:2071
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "配置已更改 - 重新启动 clusternfs/dhcpd 吗?"
 
-#: standalone/drakautoinst:38 standalone/drakhosts:118
-#: standalone/drakhosts:125 standalone/draknfs:86 standalone/draknfs:107
-#: standalone/draknfs:434 standalone/draknfs:436 standalone/draknfs:526
-#: standalone/draknfs:533
+#: standalone/drakautoinst:38 standalone/drakhosts:123
+#: standalone/drakhosts:129 standalone/draknfs:86 standalone/draknfs:107
+#: standalone/draknfs:435 standalone/draknfs:437 standalone/draknfs:527
+#: standalone/draknfs:534 standalone/draksambashare:107
+#: standalone/draksambashare:128 standalone/draksambashare:426
 #, c-format
 msgid "Error!"
 msgstr "错误！"
@@ -18352,7 +18591,7 @@ msgstr "没有适当的权限读写 CD。"
 msgid "No tape in %s!"
 msgstr "%s 里没有磁带！"
 
-#: standalone/drakbackup:932
+#: standalone/drakbackup:935
 #, c-format
 msgid ""
 "Backup destination quota exceeded!\n"
@@ -18361,37 +18600,37 @@ msgstr ""
 "达到备份目标的配额!\n"
 "使用了 %d MB，但分配了 %d MB。"
 
-#: standalone/drakbackup:951 standalone/drakbackup:983
+#: standalone/drakbackup:954 standalone/drakbackup:986
 #, c-format
 msgid "Backup system files..."
 msgstr "备份系统文件..."
 
-#: standalone/drakbackup:984 standalone/drakbackup:1024
+#: standalone/drakbackup:987 standalone/drakbackup:1027
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "备份硬盘文件..."
 
-#: standalone/drakbackup:1023
+#: standalone/drakbackup:1026
 #, c-format
 msgid "Backup User files..."
 msgstr "备份用户文件..."
 
-#: standalone/drakbackup:1057
+#: standalone/drakbackup:1060
 #, c-format
 msgid "Backup Other files..."
 msgstr "备份其它文件..."
 
-#: standalone/drakbackup:1058
+#: standalone/drakbackup:1061
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "硬盘文件备份进度..."
 
-#: standalone/drakbackup:1063
+#: standalone/drakbackup:1066
 #, c-format
 msgid "No changes to backup!"
 msgstr "没有需要备份的修改！"
 
-#: standalone/drakbackup:1080 standalone/drakbackup:1103
+#: standalone/drakbackup:1083 standalone/drakbackup:1106
 #, c-format
 msgid ""
 "\n"
@@ -18402,7 +18641,7 @@ msgstr ""
 "“Drak 备份”使用 %s: \n"
 "\n"
 
-#: standalone/drakbackup:1089
+#: standalone/drakbackup:1092
 #, c-format
 msgid ""
 "\n"
@@ -18412,18 +18651,18 @@ msgstr ""
 "\n"
 "FTP 连接错误: 无法通过 FTP 传送您的备份文件。\n"
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1093
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr "通过 FTP 发送文件出错。请更正您的 FTP 配置。"
 
-#: standalone/drakbackup:1092
+#: standalone/drakbackup:1095
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "通过 FTP 发送的文件列表: %s\n"
 
-#: standalone/drakbackup:1108
+#: standalone/drakbackup:1111
 #, c-format
 msgid ""
 "\n"
@@ -18434,7 +18673,7 @@ msgstr ""
 "“Drak 备份”的光盘操作: \n"
 "\n"
 
-#: standalone/drakbackup:1113
+#: standalone/drakbackup:1116
 #, c-format
 msgid ""
 "\n"
@@ -18445,22 +18684,22 @@ msgstr ""
 "“Drak 备份”的磁带操作: \n"
 "\n"
 
-#: standalone/drakbackup:1122
+#: standalone/drakbackup:1125
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr "发送邮件出错。您的报告邮件没有发出。"
 
-#: standalone/drakbackup:1123
+#: standalone/drakbackup:1126
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr "发送电子邮件出错。\n"
 
-#: standalone/drakbackup:1153
+#: standalone/drakbackup:1156
 #, c-format
 msgid "Can not create catalog!"
 msgstr "无法创建 catalog！"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1397
 #, c-format
 msgid ""
 "\n"
@@ -18469,218 +18708,223 @@ msgstr ""
 "\n"
 "请选中您需要的所有选项。\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1398
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr "这些选项将备份和恢复您的 /etc 目录中的全部文件。\n"
 
-#: standalone/drakbackup:1396
+#: standalone/drakbackup:1399
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "备份系统文件。(/etc 目录)"
 
-#: standalone/drakbackup:1397 standalone/drakbackup:1461
-#: standalone/drakbackup:1527
+#: standalone/drakbackup:1400 standalone/drakbackup:1464
+#: standalone/drakbackup:1530
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr "使用增量/差异备份(不破坏老备份)"
 
-#: standalone/drakbackup:1399 standalone/drakbackup:1463
-#: standalone/drakbackup:1529
+#: standalone/drakbackup:1402 standalone/drakbackup:1466
+#: standalone/drakbackup:1532
 #, c-format
 msgid "Use Incremental Backups"
 msgstr "使用增量备份"
 
-#: standalone/drakbackup:1399 standalone/drakbackup:1463
-#: standalone/drakbackup:1529
+#: standalone/drakbackup:1402 standalone/drakbackup:1466
+#: standalone/drakbackup:1532
 #, c-format
 msgid "Use Differential Backups"
 msgstr "使用差异备份"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1404
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "不包括关键文件(passwd, group, fstab)"
 
-#: standalone/drakbackup:1402
+#: standalone/drakbackup:1405
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
 msgstr "使用此选项您可把 /etc 目录恢复到任何以前的版本。"
 
-#: standalone/drakbackup:1433
+#: standalone/drakbackup:1436
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "请选择您希望备份的用户。"
 
-#: standalone/drakbackup:1460
+#: standalone/drakbackup:1463
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "不包括浏览器缓存"
 
-#: standalone/drakbackup:1514
+#: standalone/drakbackup:1517
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "选择文件或目录, 然后单击“确定”"
 
-#: standalone/drakbackup:1515 standalone/drakfont:657
+#: standalone/drakbackup:1518 standalone/drakfont:655
 #, c-format
 msgid "Remove Selected"
 msgstr "删除选中的"
 
-#: standalone/drakbackup:1578
+#: standalone/drakbackup:1581
 #, c-format
 msgid "Users"
 msgstr "用户"
 
-#: standalone/drakbackup:1598
+#: standalone/drakbackup:1601
 #, c-format
 msgid "Use network connection to backup"
 msgstr "使用网络连接作备份"
 
-#: standalone/drakbackup:1600
+#: standalone/drakbackup:1603
 #, c-format
 msgid "Net Method:"
 msgstr "网络方法:"
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1607
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "把 Expect 用于 SSH"
 
-#: standalone/drakbackup:1605
+#: standalone/drakbackup:1608
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "创建/传送 SSH 的备份密钥"
 
-#: standalone/drakbackup:1607
+#: standalone/drakbackup:1610
 #, c-format
 msgid "Transfer Now"
 msgstr "现在传送"
 
-#: standalone/drakbackup:1609
+#: standalone/drakbackup:1612
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "其它(不是“Drak 备份”)密钥已经有了"
 
-#: standalone/drakbackup:1612
+#: standalone/drakbackup:1615
 #, c-format
 msgid "Host name or IP."
 msgstr "主机名或 IP。"
 
-#: standalone/drakbackup:1617
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "将备份放在该主机的目录(或模块)。"
 
-#: standalone/drakbackup:1629
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Remember this password"
 msgstr "记住密码"
 
-#: standalone/drakbackup:1645
+#: standalone/drakbackup:1648
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "需要主机名、用户名和密码！"
 
-#: standalone/drakbackup:1736
+#: standalone/drakbackup:1739
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "使用 CD/DVDROM 备份"
 
-#: standalone/drakbackup:1739
+#: standalone/drakbackup:1742
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "请选择您的 CD/DVD 设备"
 
-#: standalone/drakbackup:1744
+#: standalone/drakbackup:1747
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "请选择您的 CD/DVD 介质大小"
 
-#: standalone/drakbackup:1751
+#: standalone/drakbackup:1754
 #, c-format
 msgid "Multisession CD"
 msgstr "多轨道 CD"
 
-#: standalone/drakbackup:1753
+#: standalone/drakbackup:1756
 #, c-format
 msgid "CDRW media"
 msgstr "CDRW 介质"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1762
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "清除您的 RW 介质(第一节)"
 
-#: standalone/drakbackup:1760
+#: standalone/drakbackup:1763
 #, c-format
 msgid " Erase Now "
 msgstr " 立即清除 "
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1769
 #, c-format
 msgid "DVD+RW media"
 msgstr "DVD+RW 介质"
 
-#: standalone/drakbackup:1768
+#: standalone/drakbackup:1771
 #, c-format
 msgid "DVD-R media"
 msgstr "DVD-R 介质"
 
-#: standalone/drakbackup:1770
+#: standalone/drakbackup:1773
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAM 设备"
 
-#: standalone/drakbackup:1801
+#: standalone/drakbackup:1804
 #, c-format
 msgid "No CD device defined!"
 msgstr "没有发现 CD 设备！"
 
-#: standalone/drakbackup:1843
+#: standalone/drakbackup:1846
 #, c-format
 msgid "Use tape to backup"
 msgstr "使用磁带备份"
 
-#: standalone/drakbackup:1846
+#: standalone/drakbackup:1849
 #, c-format
 msgid "Device name to use for backup"
 msgstr "用于备份的设备名"
 
-#: standalone/drakbackup:1852
+#: standalone/drakbackup:1855
 #, c-format
 msgid "Backup directly to tape"
 msgstr "直接备份到磁带"
 
-#: standalone/drakbackup:1858
+#: standalone/drakbackup:1861
+#, c-format
+msgid "Use tape hardware compression (EXPERIMENTAL)"
+msgstr ""
+
+#: standalone/drakbackup:1867
 #, c-format
 msgid "Do not rewind tape after backup"
 msgstr "在备份后不倒带"
 
-#: standalone/drakbackup:1864
+#: standalone/drakbackup:1873
 #, c-format
 msgid "Erase tape before backup"
 msgstr "备份前清空磁带"
 
-#: standalone/drakbackup:1870
+#: standalone/drakbackup:1879
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "备份后弹出磁带"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1960
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "请输入要保存的目录:"
 
-#: standalone/drakbackup:1950
+#: standalone/drakbackup:1964
 #, c-format
 msgid "Directory to save to"
 msgstr "要保存的目录"
 
-#: standalone/drakbackup:1955
+#: standalone/drakbackup:1969
 #, c-format
 msgid ""
 "Maximum disk space\n"
@@ -18689,7 +18933,7 @@ msgstr ""
 "分配给备份的最大\n"
 " 磁盘空间(MB)"
 
-#: standalone/drakbackup:1959
+#: standalone/drakbackup:1973
 #, c-format
 msgid ""
 "Delete incremental or differential\n"
@@ -18699,42 +18943,42 @@ msgstr ""
 "删除 N 天前的增量或差异备份\n"
 " (0 代表保留全部备份)以便节省空间"
 
-#: standalone/drakbackup:2026
+#: standalone/drakbackup:2040
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CD-R / DVD-R"
 
-#: standalone/drakbackup:2031
+#: standalone/drakbackup:2045
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "硬盘 / NFS"
 
-#: standalone/drakbackup:2046 standalone/drakbackup:2047
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2060 standalone/drakbackup:2061
+#: standalone/drakbackup:2066
 #, c-format
 msgid "hourly"
 msgstr "每小时"
 
-#: standalone/drakbackup:2046 standalone/drakbackup:2048
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2060 standalone/drakbackup:2062
+#: standalone/drakbackup:2067
 #, c-format
 msgid "daily"
 msgstr "每日"
 
-#: standalone/drakbackup:2046 standalone/drakbackup:2049
-#: standalone/drakbackup:2054
+#: standalone/drakbackup:2060 standalone/drakbackup:2063
+#: standalone/drakbackup:2068
 #, c-format
 msgid "weekly"
 msgstr "每周"
 
-#: standalone/drakbackup:2046 standalone/drakbackup:2050
-#: standalone/drakbackup:2055
+#: standalone/drakbackup:2060 standalone/drakbackup:2064
+#: standalone/drakbackup:2069
 #, c-format
 msgid "monthly"
 msgstr "每月"
 
-#: standalone/drakbackup:2046 standalone/drakbackup:2051
-#: standalone/drakbackup:2056
+#: standalone/drakbackup:2060 standalone/drakbackup:2065
+#: standalone/drakbackup:2070
 #, c-format
 msgid "custom"
 msgstr "定制"
@@ -18742,7 +18986,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:2060
+#: standalone/drakbackup:2074
 #, c-format
 msgid "January"
 msgstr "一月"
@@ -18750,7 +18994,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:2060
+#: standalone/drakbackup:2074
 #, c-format
 msgid "February"
 msgstr "二月"
@@ -18758,7 +19002,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:2060
+#: standalone/drakbackup:2074
 #, c-format
 msgid "March"
 msgstr "三月"
@@ -18766,7 +19010,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:2061
+#: standalone/drakbackup:2075
 #, c-format
 msgid "April"
 msgstr "四月"
@@ -18774,7 +19018,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:2061
+#: standalone/drakbackup:2075
 #, c-format
 msgid "May"
 msgstr "五月"
@@ -18782,7 +19026,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:2061
+#: standalone/drakbackup:2075
 #, c-format
 msgid "June"
 msgstr "六月"
@@ -18790,7 +19034,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:2061
+#: standalone/drakbackup:2075
 #, c-format
 msgid "July"
 msgstr "七月"
@@ -18798,7 +19042,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:2061
+#: standalone/drakbackup:2075
 #, c-format
 msgid "August"
 msgstr "八月"
@@ -18806,7 +19050,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:2061
+#: standalone/drakbackup:2075
 #, c-format
 msgid "September"
 msgstr "九月"
@@ -18814,7 +19058,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:2062
+#: standalone/drakbackup:2076
 #, c-format
 msgid "October"
 msgstr "十月"
@@ -18822,7 +19066,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:2062
+#: standalone/drakbackup:2076
 #, c-format
 msgid "November"
 msgstr "十一月"
@@ -18830,7 +19074,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:2062
+#: standalone/drakbackup:2076
 #, c-format
 msgid "December"
 msgstr "十二月"
@@ -18841,7 +19085,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:2065
+#: standalone/drakbackup:2079
 #, c-format
 msgid "Sunday"
 msgstr "星期日"
@@ -18852,7 +19096,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:2065
+#: standalone/drakbackup:2079
 #, c-format
 msgid "Monday"
 msgstr "星期一"
@@ -18863,7 +19107,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:2065
+#: standalone/drakbackup:2079
 #, c-format
 msgid "Tuesday"
 msgstr "星期二"
@@ -18874,7 +19118,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:2066
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Wednesday"
 msgstr "星期三"
@@ -18885,7 +19129,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:2066
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Thursday"
 msgstr "星期四"
@@ -18896,7 +19140,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:2066
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Friday"
 msgstr "星期五"
@@ -18907,22 +19151,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:2066
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Saturday"
 msgstr "星期六"
 
-#: standalone/drakbackup:2098
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Use daemon"
 msgstr "使用守护进程"
 
-#: standalone/drakbackup:2102
+#: standalone/drakbackup:2116
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "请选择每次备份的时间间隔"
 
-#: standalone/drakbackup:2108
+#: standalone/drakbackup:2122
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "自定义 setup/crontab 项: "
@@ -18930,7 +19174,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:2113
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Minute"
 msgstr "分钟"
@@ -18938,7 +19182,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:2117
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Hour"
 msgstr "小时"
@@ -18946,7 +19190,7 @@ msgstr "小时"
 # ui/evolution-calendar.xml.h:11
 # ui/evolution-calendar.xml.h:11
 # ui/evolution-calendar.xml.h:11
-#: standalone/drakbackup:2121
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Day"
 msgstr "天"
@@ -18954,7 +19198,7 @@ msgstr "天"
 # ui/evolution-calendar.xml.h:20
 # ui/evolution-calendar.xml.h:20
 # ui/evolution-calendar.xml.h:20
-#: standalone/drakbackup:2125
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Month"
 msgstr "月"
@@ -18965,148 +19209,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:2129
+#: standalone/drakbackup:2143
 #, c-format
 msgid "Weekday"
 msgstr "平日"
 
-#: standalone/drakbackup:2135
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "请选择备份使用的介质。"
 
-#: standalone/drakbackup:2141
+#: standalone/drakbackup:2155
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "请确认 cron 守护程序包含在您的服务中。"
 
-#: standalone/drakbackup:2142
+#: standalone/drakbackup:2156
 #, c-format
 msgid ""
 "If your machine is not on all the time, you might want to install anacron."
 msgstr "如果您的计算机并不是时刻开机, 您可能想要安装 anacron。"
 
-#: standalone/drakbackup:2143
+#: standalone/drakbackup:2157
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr "请注意目前所有的“网络”介质都还要使用硬盘。"
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2204
 #, c-format
 msgid "Please choose the compression type"
 msgstr "请选择压缩类型"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2208
 #, c-format
 msgid "Use .backupignore files"
 msgstr "使用 .backupignore 文件"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2210
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "在每次备份后发送邮件报告给:"
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2216
 #, c-format
 msgid "Return address for sent mail:"
 msgstr "发出邮件的回信地址:"
 
-#: standalone/drakbackup:2208
+#: standalone/drakbackup:2222
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "邮件的 SMTP 服务器:"
 
-#: standalone/drakbackup:2213
+#: standalone/drakbackup:2227
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "备份到其它介质之后删除硬盘上的 tar 文件。"
 
-#: standalone/drakbackup:2256
+#: standalone/drakbackup:2270
 #, c-format
 msgid "What"
 msgstr "内容"
 
-#: standalone/drakbackup:2261
+#: standalone/drakbackup:2275
 #, c-format
 msgid "Where"
 msgstr "位置"
 
-#: standalone/drakbackup:2266
+#: standalone/drakbackup:2280
 #, c-format
 msgid "When"
 msgstr "时间"
 
-#: standalone/drakbackup:2271
+#: standalone/drakbackup:2285
 #, c-format
 msgid "More Options"
 msgstr "更多选项"
 
-#: standalone/drakbackup:2284
+#: standalone/drakbackup:2298
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "备份目的未配置..."
 
-#: standalone/drakbackup:2304 standalone/drakbackup:4228
+#: standalone/drakbackup:2318 standalone/drakbackup:4242
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "“Drak 备份”配置"
 
-#: standalone/drakbackup:2320
+#: standalone/drakbackup:2334
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "请选择您希望备份何处"
 
-#: standalone/drakbackup:2323
+#: standalone/drakbackup:2337
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr "用于准备全部介质备份的硬盘驱动器"
 
-#: standalone/drakbackup:2323
+#: standalone/drakbackup:2337
 #, c-format
 msgid "Across Network"
 msgstr "通过网络"
 
-#: standalone/drakbackup:2323
+#: standalone/drakbackup:2337
 #, c-format
 msgid "On CD-R"
 msgstr "在 CD-R 上"
 
-#: standalone/drakbackup:2323
+#: standalone/drakbackup:2337
 #, c-format
 msgid "On Tape Device"
 msgstr "在磁带机上"
 
-#: standalone/drakbackup:2369
+#: standalone/drakbackup:2383
 #, c-format
 msgid "Backup Users"
 msgstr "备份用户"
 
-#: standalone/drakbackup:2370
+#: standalone/drakbackup:2384
 #, c-format
 msgid " (Default is all users)"
 msgstr "(默认是所有用户)"
 
-#: standalone/drakbackup:2383
+#: standalone/drakbackup:2397
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "请选择您要备份的文件"
 
-#: standalone/drakbackup:2384
+#: standalone/drakbackup:2398
 #, c-format
 msgid "Backup System"
 msgstr "备份系统"
 
-#: standalone/drakbackup:2386
+#: standalone/drakbackup:2400
 #, c-format
 msgid "Select user manually"
 msgstr "手工选择用户"
 
-#: standalone/drakbackup:2415
+#: standalone/drakbackup:2429
 #, c-format
 msgid "Please select data to backup..."
 msgstr "请选择需备份的数据..."
 
-#: standalone/drakbackup:2487
+#: standalone/drakbackup:2501
 #, c-format
 msgid ""
 "\n"
@@ -19115,7 +19359,7 @@ msgstr ""
 "\n"
 "备份来源: \n"
 
-#: standalone/drakbackup:2488
+#: standalone/drakbackup:2502
 #, c-format
 msgid ""
 "\n"
@@ -19124,7 +19368,7 @@ msgstr ""
 "\n"
 "- 系统文件: \n"
 
-#: standalone/drakbackup:2490
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -19133,7 +19377,7 @@ msgstr ""
 "\n"
 "- 用户文件: \n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2506
 #, c-format
 msgid ""
 "\n"
@@ -19142,7 +19386,7 @@ msgstr ""
 "\n"
 "- 其它文件: \n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -19151,17 +19395,17 @@ msgstr ""
 "\n"
 "- 保存在硬盘路径: %s\n"
 
-#: standalone/drakbackup:2495
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\t限制磁盘使用为 %s MB\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2510
 #, c-format
 msgid "\tDelete backups older than %s day(s)\n"
 msgstr "\t删除 %s 天前的备份\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -19170,7 +19414,7 @@ msgstr ""
 "\n"
 "- 备份后删除硬盘的 tar 文件。\n"
 
-#: standalone/drakbackup:2504
+#: standalone/drakbackup:2518
 #, c-format
 msgid ""
 "\n"
@@ -19179,22 +19423,22 @@ msgstr ""
 "\n"
 "- 刻录光盘"
 
-#: standalone/drakbackup:2505
+#: standalone/drakbackup:2519
 #, c-format
 msgid "RW"
 msgstr "RW"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2520
 #, c-format
 msgid " on device: %s"
 msgstr " 使用设备: %s"
 
-#: standalone/drakbackup:2507
+#: standalone/drakbackup:2521
 #, c-format
 msgid " (multi-session)"
 msgstr "(多轨道)"
 
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2522
 #, c-format
 msgid ""
 "\n"
@@ -19203,17 +19447,17 @@ msgstr ""
 "\n"
 "- 保存到磁带设备: %s"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\t删除=%s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2525
 #, c-format
 msgid "\tBackup directly to Tape\n"
 msgstr "\t直接备份到磁带\n"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2527
 #, c-format
 msgid ""
 "\n"
@@ -19222,7 +19466,7 @@ msgstr ""
 "\n"
 "- 通过 %s 保存到主机: %s\n"
 
-#: standalone/drakbackup:2514
+#: standalone/drakbackup:2528
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -19231,7 +19475,7 @@ msgstr ""
 "\t\t 用户名: %s\n"
 "\t\t 路径: %s \n"
 
-#: standalone/drakbackup:2515
+#: standalone/drakbackup:2529
 #, c-format
 msgid ""
 "\n"
@@ -19240,47 +19484,47 @@ msgstr ""
 "\n"
 "- 选项: \n"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\t不包括系统文件\n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\t使用 tar 和 bzip2 备份\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\t使用 tar 和 gzip 备份\n"
 
-#: standalone/drakbackup:2520
+#: standalone/drakbackup:2534
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\t只使用 tar 备份\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2536
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\t使用 .backupignore 文件\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2537
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\t发送邮件到 %s\n"
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2538
 #, c-format
 msgid "\tSend mail from %s\n"
 msgstr "\t从 %s 发出邮件\n"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2539
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\t使用 SMTP 服务器 %s\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2541
 #, c-format
 msgid ""
 "\n"
@@ -19289,42 +19533,42 @@ msgstr ""
 "\n"
 "- 守护进程, %s 通过: \n"
 
-#: standalone/drakbackup:2528
+#: standalone/drakbackup:2542
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-硬盘。\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2543
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CD-R。\n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2544
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-磁带\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2545
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-网络通过 FTP。\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2546
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-网络通过 SSH。\n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2547
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-网络通过 rsync。\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2549
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "没有配置, 请选择向导或高级。\n"
 
-#: standalone/drakbackup:2540
+#: standalone/drakbackup:2554
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -19333,27 +19577,27 @@ msgstr ""
 "要恢复数据的清单: \n"
 "\n"
 
-#: standalone/drakbackup:2542
+#: standalone/drakbackup:2556
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- 恢复系统文件。\n"
 
-#: standalone/drakbackup:2544 standalone/drakbackup:2554
+#: standalone/drakbackup:2558 standalone/drakbackup:2568
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - 从日期: %s %s\n"
 
-#: standalone/drakbackup:2547
+#: standalone/drakbackup:2561
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- 恢复用户文件: \n"
 
-#: standalone/drakbackup:2552
+#: standalone/drakbackup:2566
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- 恢复其它文件: \n"
 
-#: standalone/drakbackup:2731
+#: standalone/drakbackup:2745
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -19362,127 +19606,127 @@ msgstr ""
 "已毁坏数据的清单: \n"
 "\n"
 
-#: standalone/drakbackup:2733
+#: standalone/drakbackup:2747
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "请取消选择并删除它。"
 
-#: standalone/drakbackup:2743
+#: standalone/drakbackup:2757
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "备份文件损坏了"
 
-#: standalone/drakbackup:2764
+#: standalone/drakbackup:2778
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "         您选择的全部数据已经              "
 
-#: standalone/drakbackup:2765
+#: standalone/drakbackup:2779
 #, c-format
 msgid "          Successfully Restored on %s       "
 msgstr "          成功的恢复到 %s       "
 
-#: standalone/drakbackup:2885
+#: standalone/drakbackup:2899
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "        恢复配置       "
 
-#: standalone/drakbackup:2913
+#: standalone/drakbackup:2927
 #, c-format
 msgid "OK to restore the other files."
 msgstr "即将恢复其它文件。"
 
-#: standalone/drakbackup:2929
+#: standalone/drakbackup:2943
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr "可恢复的用户清单(每个用户最近的数据是最重要的)"
 
-#: standalone/drakbackup:2994
+#: standalone/drakbackup:3008
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "请选择需要恢复的日期:"
 
-#: standalone/drakbackup:3031
+#: standalone/drakbackup:3045
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "从硬盘恢复"
 
-#: standalone/drakbackup:3033
+#: standalone/drakbackup:3047
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "请输入存储备份的目录"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3051
 #, c-format
 msgid "Directory with backups"
 msgstr "存有备份的目录"
 
-#: standalone/drakbackup:3091
+#: standalone/drakbackup:3105
 #, c-format
 msgid "Select another media to restore from"
 msgstr "请选择另外的介质用以恢复"
 
-#: standalone/drakbackup:3093
+#: standalone/drakbackup:3107
 #, c-format
 msgid "Other Media"
 msgstr "其它介质"
 
-#: standalone/drakbackup:3098
+#: standalone/drakbackup:3112
 #, c-format
 msgid "Restore system"
 msgstr "恢复系统"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3113
 #, c-format
 msgid "Restore Users"
 msgstr "恢复用户文件"
 
-#: standalone/drakbackup:3100
+#: standalone/drakbackup:3114
 #, c-format
 msgid "Restore Other"
 msgstr "恢复其它文件"
 
-#: standalone/drakbackup:3102
+#: standalone/drakbackup:3116
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "选择将要恢复到的路径(/ 除外)"
 
-#: standalone/drakbackup:3106 standalone/drakbackup:3388
+#: standalone/drakbackup:3120 standalone/drakbackup:3402
 #, c-format
 msgid "Path To Restore To"
 msgstr "恢复到的路径"
 
-#: standalone/drakbackup:3109
+#: standalone/drakbackup:3123
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "恢复前做新的备份(只适用于增量备份。)"
 
-#: standalone/drakbackup:3111
+#: standalone/drakbackup:3125
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "恢复前删除用户目录。"
 
-#: standalone/drakbackup:3196
+#: standalone/drakbackup:3210
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr "要搜索的文件名文字(空字符串将匹配全部): "
 
-#: standalone/drakbackup:3199
+#: standalone/drakbackup:3213
 #, c-format
 msgid "Search Backups"
 msgstr "搜索备份"
 
-#: standalone/drakbackup:3217
+#: standalone/drakbackup:3231
 #, c-format
 msgid "No matches found..."
 msgstr "没有发现匹配项..."
 
-#: standalone/drakbackup:3221
+#: standalone/drakbackup:3235
 #, c-format
 msgid "Restore Selected"
 msgstr "恢复选中文件"
 
-#: standalone/drakbackup:3356
+#: standalone/drakbackup:3370
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
@@ -19491,7 +19735,7 @@ msgstr ""
 "点击日期/时间可查看备份文件。\n"
 "Ctrl+单击文件可选择多个文件。"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3376
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -19500,7 +19744,7 @@ msgstr ""
 "恢复选中的\n"
 "目录项"
 
-#: standalone/drakbackup:3371
+#: standalone/drakbackup:3385
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -19509,17 +19753,17 @@ msgstr ""
 "恢复选中的\n"
 "文件"
 
-#: standalone/drakbackup:3448
+#: standalone/drakbackup:3462
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "在 %s 没有发现备份文件。"
 
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Restore From CD"
 msgstr "从光盘恢复"
 
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3475
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -19528,229 +19772,229 @@ msgstr ""
 "请把卷标为 %s 的光盘插入\n"
 "到加载于 /mnt/cdrom 的光盘驱动器"
 
-#: standalone/drakbackup:3463
+#: standalone/drakbackup:3477
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "光盘卷标不对。这张盘的卷标是 %s。"
 
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Restore From Tape"
 msgstr "从磁带恢复"
 
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3487
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr "请把卷标为 %s 的磁带装进磁带机 %s"
 
-#: standalone/drakbackup:3475
+#: standalone/drakbackup:3489
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "磁带卷标不对。这盘磁带的卷标是 %s。"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3500
 #, c-format
 msgid "Restore Via Network"
 msgstr "通过网络恢复"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3500
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "恢复使用的网络协议: %s"
 
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Host Name"
 msgstr "主机名"
 
-#: standalone/drakbackup:3488
+#: standalone/drakbackup:3502
 #, c-format
 msgid "Host Path or Module"
 msgstr "主机路径和模块"
 
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Password required"
 msgstr "需要密码"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3515
 #, c-format
 msgid "Username required"
 msgstr "需要用户名"
 
-#: standalone/drakbackup:3504
+#: standalone/drakbackup:3518
 #, c-format
 msgid "Hostname required"
 msgstr "需要主机名"
 
-#: standalone/drakbackup:3509
+#: standalone/drakbackup:3523
 #, c-format
 msgid "Path or Module required"
 msgstr "要求提供路径或模块"
 
-#: standalone/drakbackup:3522
+#: standalone/drakbackup:3536
 #, c-format
 msgid "Files Restored..."
 msgstr "文件已恢复..."
 
-#: standalone/drakbackup:3525
+#: standalone/drakbackup:3539
 #, c-format
 msgid "Restore Failed..."
 msgstr "恢复失败..."
 
-#: standalone/drakbackup:3543
+#: standalone/drakbackup:3557
 #, c-format
 msgid "%s not retrieved..."
 msgstr "%s 未获取..."
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3833
+#: standalone/drakbackup:3778 standalone/drakbackup:3847
 #, c-format
 msgid "Search for files to restore"
 msgstr "搜索要恢复的文件"
 
-#: standalone/drakbackup:3768
+#: standalone/drakbackup:3782
 #, c-format
 msgid "Restore all backups"
 msgstr "恢复所有备份"
 
-#: standalone/drakbackup:3776
+#: standalone/drakbackup:3790
 #, c-format
 msgid "Custom Restore"
 msgstr "定制恢复"
 
-#: standalone/drakbackup:3780 standalone/drakbackup:3829
+#: standalone/drakbackup:3794 standalone/drakbackup:3843
 #, c-format
 msgid "Restore From Catalog"
 msgstr "从目录恢复"
 
-#: standalone/drakbackup:3801
+#: standalone/drakbackup:3815
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "无法找到要恢复的数据...\n"
 
-#: standalone/drakbackup:3802
+#: standalone/drakbackup:3816
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "查证得 %s 是正确的路径"
 
-#: standalone/drakbackup:3803
+#: standalone/drakbackup:3817
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " 而且 CD 盘在驱动器中"
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3819
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr "备份在未加载的介质中 - 使用目录来恢复"
 
-#: standalone/drakbackup:3821
+#: standalone/drakbackup:3835
 #, c-format
 msgid "CD in place - continue."
 msgstr "光盘就绪 - 继续。"
 
-#: standalone/drakbackup:3826
+#: standalone/drakbackup:3840
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "浏览新的恢复仓库。"
 
-#: standalone/drakbackup:3827
+#: standalone/drakbackup:3841
 #, c-format
 msgid "Directory To Restore From"
 msgstr "恢复来自目录"
 
-#: standalone/drakbackup:3863
+#: standalone/drakbackup:3877
 #, c-format
 msgid "Restore Progress"
 msgstr "恢复进展"
 
-#: standalone/drakbackup:3974
+#: standalone/drakbackup:3988
 #, c-format
 msgid "Build Backup"
 msgstr "创建备份"
 
-#: standalone/drakbackup:4007 standalone/drakbackup:4327
+#: standalone/drakbackup:4021 standalone/drakbackup:4341
 #, c-format
 msgid "Restore"
 msgstr "恢复"
 
-#: standalone/drakbackup:4095 standalone/harddrake2:480
+#: standalone/drakbackup:4109 standalone/harddrake2:479
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "下列软件包需要安装: \n"
 
-#: standalone/drakbackup:4122
+#: standalone/drakbackup:4136
 #, c-format
 msgid "Please select data to restore..."
 msgstr "请选择要恢复的数据..."
 
-#: standalone/drakbackup:4162
+#: standalone/drakbackup:4176
 #, c-format
 msgid "Backup system files"
 msgstr "备份系统文件"
 
-#: standalone/drakbackup:4165
+#: standalone/drakbackup:4179
 #, c-format
 msgid "Backup user files"
 msgstr "备份用户文件"
 
-#: standalone/drakbackup:4168
+#: standalone/drakbackup:4182
 #, c-format
 msgid "Backup other files"
 msgstr "备份其它文件"
 
-#: standalone/drakbackup:4171 standalone/drakbackup:4205
+#: standalone/drakbackup:4185 standalone/drakbackup:4219
 #, c-format
 msgid "Total Progress"
 msgstr "总进展"
 
-#: standalone/drakbackup:4197
+#: standalone/drakbackup:4211
 #, c-format
 msgid "Sending files by FTP"
 msgstr "通过 FTP 发送文件"
 
-#: standalone/drakbackup:4200
+#: standalone/drakbackup:4214
 #, c-format
 msgid "Sending files..."
 msgstr "正在发送文件..."
 
-#: standalone/drakbackup:4270
+#: standalone/drakbackup:4284
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "现在从配置文件备份"
 
-#: standalone/drakbackup:4275
+#: standalone/drakbackup:4289
 #, c-format
 msgid "View Backup Configuration."
 msgstr "查看备份配置。"
 
-#: standalone/drakbackup:4301
+#: standalone/drakbackup:4315
 #, c-format
 msgid "Wizard Configuration"
 msgstr "向导配置"
 
-#: standalone/drakbackup:4306
+#: standalone/drakbackup:4320
 #, c-format
 msgid "Advanced Configuration"
 msgstr "高级配置"
 
-#: standalone/drakbackup:4311
+#: standalone/drakbackup:4325
 #, c-format
 msgid "View Configuration"
 msgstr "查看配置"
 
-#: standalone/drakbackup:4315
+#: standalone/drakbackup:4329
 #, c-format
 msgid "View Last Log"
 msgstr "查看上次的日志"
 
-#: standalone/drakbackup:4320
+#: standalone/drakbackup:4334
 #, c-format
 msgid "Backup Now"
 msgstr "立即备份"
 
-#: standalone/drakbackup:4324
+#: standalone/drakbackup:4338
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -19759,15 +20003,15 @@ msgstr ""
 "没有找到配置文件\n"
 "请单击向导或高级。"
 
-#: standalone/drakbackup:4344 standalone/drakbackup:4347
+#: standalone/drakbackup:4358 standalone/drakbackup:4361
 #, c-format
 msgid "Drakbackup"
 msgstr "Drak 备份"
 
 #: standalone/drakboot:76 standalone/harddrake2:190 standalone/harddrake2:191
 #: standalone/harddrake2:192 standalone/logdrake:69
-#: standalone/printerdrake:139 standalone/printerdrake:140
-#: standalone/printerdrake:141
+#: standalone/printerdrake:148 standalone/printerdrake:149
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -19778,7 +20022,7 @@ msgid "/File/_Quit"
 msgstr "/文件(F)/退出(_Q)"
 
 #: standalone/drakboot:77 standalone/harddrake2:192 standalone/logdrake:75
-#: standalone/printerdrake:141
+#: standalone/printerdrake:150
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
@@ -19822,6 +20066,11 @@ msgstr "安装主题"
 msgid "Graphical boot theme selection"
 msgstr "图形化启动主题选择"
 
+#: standalone/drakboot:141
+#, fuzzy, c-format
+msgid "Graphical boot mode:"
+msgstr "图形化启动主题选择"
+
 #: standalone/drakboot:143
 #, c-format
 msgid "Theme"
@@ -20092,13 +20341,13 @@ msgstr ""
 msgid "Network configuration (%d adapters)"
 msgstr "网络配置(%d 网卡)"
 
-#: standalone/drakconnect:89 standalone/drakconnect:803
+#: standalone/drakconnect:89 standalone/drakconnect:807
 #: standalone/drakroam:163
 #, c-format
 msgid "Gateway:"
 msgstr "网关: "
 
-#: standalone/drakconnect:89 standalone/drakconnect:803
+#: standalone/drakconnect:89 standalone/drakconnect:807
 #, c-format
 msgid "Interface:"
 msgstr "网卡: "
@@ -20113,8 +20362,8 @@ msgstr "请稍候"
 msgid "Interface"
 msgstr "网卡"
 
-#: standalone/drakconnect:109 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: standalone/drakconnect:109 standalone/printerdrake:222
+#: standalone/printerdrake:229
 #, c-format
 msgid "State"
 msgstr "状态"
@@ -20129,7 +20378,7 @@ msgstr "主机名: "
 msgid "Configure hostname..."
 msgstr "配置主机名..."
 
-#: standalone/drakconnect:142 standalone/drakconnect:841
+#: standalone/drakconnect:142 standalone/drakconnect:845
 #, c-format
 msgid "LAN configuration"
 msgstr "局域网配置"
@@ -20251,24 +20500,24 @@ msgstr "总线"
 msgid "Location on the bus"
 msgstr "在总线上的位置"
 
-#: standalone/drakconnect:696 standalone/drakgw:322
+#: standalone/drakconnect:700 standalone/drakgw:313
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
 msgstr "您的系统里没有配置以太网卡。请运行硬件配置工具。"
 
-#: standalone/drakconnect:704
+#: standalone/drakconnect:708
 #, c-format
 msgid "Remove a network interface"
 msgstr "删除网卡"
 
-#: standalone/drakconnect:708
+#: standalone/drakconnect:712
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "选择要删除的网卡: "
 
-#: standalone/drakconnect:740
+#: standalone/drakconnect:744
 #, c-format
 msgid ""
 "An error occurred while deleting the \"%s\" network interface:\n"
@@ -20279,63 +20528,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:741
+#: standalone/drakconnect:745
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "恭喜, “%s”网卡已经成功删除"
 
-#: standalone/drakconnect:757
+#: standalone/drakconnect:761
 #, c-format
 msgid "No IP"
 msgstr "没有 IP"
 
-#: standalone/drakconnect:758
+#: standalone/drakconnect:762
 #, c-format
 msgid "No Mask"
 msgstr "没有掩码"
 
-#: standalone/drakconnect:759 standalone/drakconnect:912
+#: standalone/drakconnect:763 standalone/drakconnect:916
 #, c-format
 msgid "up"
 msgstr "上移"
 
-#: standalone/drakconnect:759 standalone/drakconnect:912
+#: standalone/drakconnect:763 standalone/drakconnect:916
 #, c-format
 msgid "down"
 msgstr "下移"
 
-#: standalone/drakconnect:794 standalone/net_monitor:466
+#: standalone/drakconnect:798 standalone/net_monitor:466
 #, c-format
 msgid "Connected"
 msgstr "已连接"
 
-#: standalone/drakconnect:794 standalone/net_monitor:466
+#: standalone/drakconnect:798 standalone/net_monitor:466
 #, c-format
 msgid "Not connected"
 msgstr "未连接"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:800
 #, c-format
 msgid "Disconnect..."
 msgstr "断开连接..."
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:800
 #, c-format
 msgid "Connect..."
 msgstr "连接..."
 
-#: standalone/drakconnect:837
+#: standalone/drakconnect:841
 #, c-format
 msgid "Deactivate now"
 msgstr "立即禁用"
 
-#: standalone/drakconnect:837
+#: standalone/drakconnect:841
 #, c-format
 msgid "Activate now"
 msgstr "立即激活"
 
-#: standalone/drakconnect:845
+#: standalone/drakconnect:849
 #, c-format
 msgid ""
 "You do not have any configured interface.\n"
@@ -20344,27 +20593,27 @@ msgstr ""
 "您没有配置好的网卡。\n"
 "单击“配置”先配置网卡"
 
-#: standalone/drakconnect:859
+#: standalone/drakconnect:863
 #, c-format
 msgid "LAN Configuration"
 msgstr "LAN 配置"
 
-#: standalone/drakconnect:871
+#: standalone/drakconnect:875
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "适配器 %s: %s"
 
-#: standalone/drakconnect:880
+#: standalone/drakconnect:884
 #, c-format
 msgid "Boot Protocol"
 msgstr "启动协议"
 
-#: standalone/drakconnect:881
+#: standalone/drakconnect:885
 #, c-format
 msgid "Started on boot"
 msgstr "开机时启动"
 
-#: standalone/drakconnect:917
+#: standalone/drakconnect:921
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
@@ -20373,7 +20622,7 @@ msgstr ""
 "这块网卡还没有配置过。\n"
 "请从“Mandriva Linux 控制中心”运行“添加网卡”助手"
 
-#: standalone/drakconnect:971 standalone/net_applet:51
+#: standalone/drakconnect:975 standalone/net_applet:53
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
@@ -20383,37 +20632,37 @@ msgstr ""
 "请从 Mandriva Linux 控制中心运行“%s”助手"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
-#: standalone/drakconnect:972 standalone/drakroam:42 standalone/net_applet:52
+#: standalone/drakconnect:976 standalone/drakroam:42 standalone/net_applet:54
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "设置新的网络连接(局域网、ISDN、ADSL……)"
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:981
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Internet 连接配置"
 
-#: standalone/drakconnect:995
+#: standalone/drakconnect:994
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "第三 DNS 服务器(可选)"
 
-#: standalone/drakconnect:1017
+#: standalone/drakconnect:1016
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Internet 连接配置"
 
-#: standalone/drakconnect:1018
+#: standalone/drakconnect:1017
 #, c-format
 msgid "Internet access"
 msgstr "Internet 访问"
 
-#: standalone/drakconnect:1020 standalone/net_monitor:96
+#: standalone/drakconnect:1019 standalone/net_monitor:96
 #, c-format
 msgid "Connection type: "
 msgstr "连接类型:"
 
-#: standalone/drakconnect:1023
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Status:"
 msgstr "状态: "
@@ -20592,7 +20841,7 @@ msgstr "字体列表"
 msgid "About"
 msgstr "关于"
 
-#: standalone/drakfont:492 standalone/drakfont:688 standalone/drakfont:726
+#: standalone/drakfont:492 standalone/drakfont:686 standalone/drakfont:724
 #, c-format
 msgid "Uninstall"
 msgstr "卸载"
@@ -20723,87 +20972,87 @@ msgstr "Abiword"
 msgid "Generic Printers"
 msgstr "通用打印机"
 
-#: standalone/drakfont:585
+#: standalone/drakfont:583
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "选择字体文件或目录, 然后单击“添加”"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:584
 #, c-format
 msgid "File Selection"
 msgstr "选择文件"
 
-#: standalone/drakfont:590
+#: standalone/drakfont:588
 #, c-format
 msgid "Fonts"
 msgstr "字体"
 
-#: standalone/drakfont:653
+#: standalone/drakfont:651
 #, c-format
 msgid "Import fonts"
 msgstr "导入字体"
 
-#: standalone/drakfont:658
+#: standalone/drakfont:656
 #, c-format
 msgid "Install fonts"
 msgstr "安装字体"
 
-#: standalone/drakfont:693
+#: standalone/drakfont:691
 #, c-format
 msgid "click here if you are sure."
 msgstr "如果您确定, 请点击此处。"
 
-#: standalone/drakfont:695
+#: standalone/drakfont:693
 #, c-format
 msgid "here if no."
 msgstr "如果要放弃, 点击此处。"
 
-#: standalone/drakfont:734
+#: standalone/drakfont:732
 #, c-format
 msgid "Unselected All"
 msgstr "全部不选"
 
-#: standalone/drakfont:737
+#: standalone/drakfont:735
 #, c-format
 msgid "Selected All"
 msgstr "全部选中"
 
-#: standalone/drakfont:740
+#: standalone/drakfont:738
 #, c-format
 msgid "Remove List"
 msgstr "删除列表"
 
-#: standalone/drakfont:751 standalone/drakfont:770
+#: standalone/drakfont:749 standalone/drakfont:768
 #, c-format
 msgid "Importing fonts"
 msgstr "导入字体"
 
-#: standalone/drakfont:755 standalone/drakfont:775
+#: standalone/drakfont:753 standalone/drakfont:773
 #, c-format
 msgid "Initial tests"
 msgstr "初始测试"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:754
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "复制系统中的字体"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:755
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "安装并转换字体"
 
-#: standalone/drakfont:758
+#: standalone/drakfont:756
 #, c-format
 msgid "Post Install"
 msgstr "安装后的设置"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:774
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "删除系统中的字体"
 
-#: standalone/drakfont:777
+#: standalone/drakfont:775
 #, c-format
 msgid "Post Uninstall"
 msgstr "删除后"
@@ -20926,7 +21175,7 @@ msgstr "使用此网关作为域名服务器"
 msgid "The DNS Server IP"
 msgstr "DNS 服务器 IP"
 
-#: standalone/drakgw:241
+#: standalone/drakgw:238
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -20939,77 +21188,77 @@ msgstr ""
 "在此您可以选择 DHCP 服务器配置的不同选项。\n"
 "如果您不知道选项的含义, 那么就不管它, 不必进行修改。"
 
-#: standalone/drakgw:248
+#: standalone/drakgw:245
 #, c-format
 msgid "Use automatic configuration (DHCP)"
 msgstr "使用自动重新配置(DHCP)"
 
-#: standalone/drakgw:249
+#: standalone/drakgw:246
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP 起始范围"
 
-#: standalone/drakgw:250
+#: standalone/drakgw:247
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP 终止范围"
 
-#: standalone/drakgw:251
+#: standalone/drakgw:248
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "默认租期(以秒为单位)"
 
-#: standalone/drakgw:252
+#: standalone/drakgw:249
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "最长租期(以秒为单位)"
 
-#: standalone/drakgw:278
+#: standalone/drakgw:272
 #, c-format
 msgid "Proxy caching server (SQUID)"
 msgstr "代理缓存服务器(SQUID)"
 
-#: standalone/drakgw:282
+#: standalone/drakgw:276
 #, c-format
 msgid "Use this gateway as proxy caching server"
 msgstr "使用此网关作为代理缓存服务器"
 
-#: standalone/drakgw:283
+#: standalone/drakgw:277
 #, c-format
 msgid "Admin mail"
 msgstr "管理员电子邮件"
 
-#: standalone/drakgw:284
+#: standalone/drakgw:278
 #, c-format
 msgid "Visible hostname"
 msgstr "可见主机名"
 
-#: standalone/drakgw:285
+#: standalone/drakgw:279
 #, c-format
 msgid "Proxy port"
 msgstr "代理端口"
 
-#: standalone/drakgw:286
+#: standalone/drakgw:280
 #, c-format
 msgid "Cache size (MB)"
 msgstr "缓存大小(MB)"
 
-#: standalone/drakgw:311
+#: standalone/drakgw:302
 #, c-format
 msgid "Broadcast printer information"
 msgstr "广播打印机信息"
 
-#: standalone/drakgw:328
+#: standalone/drakgw:319
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Internet 连接共享现已启用。"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:325
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Internet 连接共享现在被禁用了。"
 
-#: standalone/drakgw:340
+#: standalone/drakgw:331
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -21021,29 +21270,29 @@ msgstr ""
 "您现在可以利用自动网络设置(DHCP)和透明代理缓存服务器(SQUID)让您的局域网上其它"
 "的电脑共享您的互联网连接了。"
 
-#: standalone/drakgw:375
+#: standalone/drakgw:366
 #, c-format
 msgid "Disabling servers..."
 msgstr "正在禁用服务器..."
 
-#: standalone/drakgw:389
+#: standalone/drakgw:380
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "发现防火墙配置！"
 
-#: standalone/drakgw:390
+#: standalone/drakgw:381
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fixes after installation."
 msgstr "警告！发现原来的配置利用了防火墙功能。您可能需要在安装之后手工修改。"
 
-#: standalone/drakgw:398
+#: standalone/drakgw:386
 #, c-format
 msgid "Configuring..."
 msgstr "正在配置..."
 
-#: standalone/drakgw:399
+#: standalone/drakgw:387
 #, c-format
 msgid "Configuring firewall..."
 msgstr "正在配置防火墙..."
@@ -21096,130 +21345,155 @@ msgstr ""
 "无法显示 %s。\n"
 "此类型没有帮助主题\n"
 
-#: standalone/drakhosts:108
+#: standalone/drakhosts:98
 #, c-format
-msgid "Please %s information"
+msgid "Please add an host to be able to modify it."
+msgstr ""
+
+#: standalone/drakhosts:108
+#, fuzzy, c-format
+msgid "Please modify information"
+msgstr "请%s信息"
+
+#: standalone/drakhosts:109
+#, fuzzy, c-format
+msgid "Please delete information"
 msgstr "请%s信息"
 
 #: standalone/drakhosts:110
+#, fuzzy, c-format
+msgid "Please add information"
+msgstr "请%s信息"
+
+#: standalone/drakhosts:115
 #, c-format
 msgid "IP address:"
 msgstr "IP 地址："
 
-#: standalone/drakhosts:111
+#: standalone/drakhosts:116
 #, c-format
 msgid "Host name:"
 msgstr "主机名："
 
-#: standalone/drakhosts:112
+#: standalone/drakhosts:117
 #, c-format
 msgid "Host Aliases:"
 msgstr "主机别名："
 
-#: standalone/drakhosts:118
+#: standalone/drakhosts:123
 #, c-format
 msgid "Please enter a valid IP address."
 msgstr "请输入有效的 IP 地址。"
 
-#: standalone/drakhosts:125
+#: standalone/drakhosts:129
 #, c-format
 msgid "Same IP is already in %s file."
 msgstr "%s 文件中已经有同样的 IP 了。"
 
-#: standalone/drakhosts:194
+#: standalone/drakhosts:198
 #, c-format
 msgid "Host Aliases"
 msgstr "主机别名"
 
-#: standalone/drakhosts:237
+#: standalone/drakhosts:239
 #, c-format
 msgid "DrakHOSTS manage hosts definitions"
 msgstr "DrakHOSTS 可管理主机定义"
 
-#: standalone/drakhosts:246
+#: standalone/drakhosts:248
 #, c-format
 msgid "Failed to add host."
 msgstr "添加主机失败。"
 
-#: standalone/drakhosts:253
+#: standalone/drakhosts:255
 #, c-format
 msgid "Failed to Modify host."
 msgstr "修改主机失败。"
 
-#: standalone/drakhosts:260
+#: standalone/drakhosts:262
 #, c-format
 msgid "Failed to remove host."
 msgstr "删除主机失败。"
 
-#: standalone/drakids:20
-#, c-format
-msgid "Date"
-msgstr "日期"
-
-#: standalone/drakids:21 standalone/drakids:37
-#, c-format
-msgid "Attacker"
-msgstr "攻击者"
-
-#: standalone/drakids:22
-#, c-format
-msgid "Attack type"
-msgstr "攻击类型"
+#: standalone/drakids:26
+#, fuzzy, c-format
+msgid "Allowed addresses"
+msgstr "允许所有用户使用"
 
-#: standalone/drakids:23
-#, c-format
-msgid "Service"
-msgstr "服务"
+#: standalone/drakids:33 standalone/drakids:134 standalone/drakids:160
+#: standalone/drakids:169 standalone/drakids:179 standalone/drakids:246
+#: standalone/net_applet:61 standalone/net_applet:183
+#: standalone/net_applet:353 standalone/net_applet:390
+#, fuzzy, c-format
+msgid "Interactive Firewall"
+msgstr "激活防火墙"
 
-#: standalone/drakids:24
+#: standalone/drakids:57
 #, c-format
-msgid "Network interface"
-msgstr "网卡"
+msgid "Log"
+msgstr ""
 
-#: standalone/drakids:60 standalone/net_applet:330
-#, c-format
-msgid "Active Firewall"
-msgstr "激活防火墙"
+#: standalone/drakids:61
+#, fuzzy, c-format
+msgid "Clear logs"
+msgstr "全部清除"
 
-#: standalone/drakids:63
+#: standalone/drakids:65 standalone/net_applet:439
 #, c-format
 msgid "Blacklist"
 msgstr "黑名单"
 
-#: standalone/drakids:67
+#: standalone/drakids:69
 #, c-format
 msgid "Remove from blacklist"
 msgstr "从黑名单中移除"
 
-#: standalone/drakids:68
+#: standalone/drakids:70
 #, c-format
 msgid "Move to whitelist"
 msgstr "移动到白名单"
 
-#: standalone/drakids:72
+#: standalone/drakids:74 standalone/net_applet:444
 #, c-format
 msgid "Whitelist"
 msgstr "白名单"
 
-#: standalone/drakids:76
+#: standalone/drakids:78
 #, c-format
 msgid "Remove from whitelist"
 msgstr "从白名单中移除"
 
-#: standalone/drakids:125
+#: standalone/drakids:134 standalone/drakids:160 standalone/drakids:169
+#: standalone/drakids:179 standalone/drakids:246 standalone/net_applet:183
+#: standalone/net_applet:353
 #, c-format
-msgid "Port scanning"
-msgstr "端口扫描"
+msgid "Unable to contact daemon"
+msgstr "无法连接守护程序"
 
-#: standalone/drakids:126
+#: standalone/drakids:191
 #, c-format
-msgid "Service attack"
-msgstr "服务攻击"
+msgid "Date"
+msgstr "日期"
 
-#: standalone/drakids:127
+#: standalone/drakids:192
 #, c-format
-msgid "Password cracking"
-msgstr "密码破解"
+msgid "Attacker"
+msgstr "攻击者"
+
+#: standalone/drakids:193
+#, c-format
+msgid "Attack type"
+msgstr "攻击类型"
+
+#: standalone/drakids:194
+#, c-format
+msgid "Service"
+msgstr "服务"
+
+#: standalone/drakids:195
+#, c-format
+msgid "Network interface"
+msgstr "网卡"
 
 #: standalone/draknfs:43
 #, c-format
@@ -21256,12 +21530,12 @@ msgstr "正在重新启动/重新装入 NFS 服务器..."
 msgid "Error Restarting/Reloading NFS server"
 msgstr "重新启动/重新装入 NFS 服务器出错"
 
-#: standalone/draknfs:102
+#: standalone/draknfs:102 standalone/draksambashare:123
 #, c-format
 msgid "Directory Selection"
 msgstr "目录选择"
 
-#: standalone/draknfs:107
+#: standalone/draknfs:107 standalone/draksambashare:128
 #, c-format
 msgid "Should be a directory."
 msgstr "应该为目录。"
@@ -21295,61 +21569,64 @@ msgstr ""
 "您必须以以下几种方式指定 <span weight=\"bold\">NFS 客户端</span>:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">单主机:</span> 主机既可以是可被解释器识别的缩写，"
-"全称域名，也可以是 IP 地址\n"
+"<span foreground=\"royalblue3\">单主机:</span> 主机既可以是可被解释器识别的缩"
+"写，全称域名，也可以是 IP 地址\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">网络组:</span> 可以通过 @group 的格式指定 NIS 网络组。\n"
+"<span foreground=\"royalblue3\">网络组:</span> 可以通过 @group 的格式指定 "
+"NIS 网络组。\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">通配符:</span> 机器名可包含通配符，如 "
-"* 和 ?。例如：*.cs.foo.edu 可匹配域 cs.food.edu 中的全部主机。\n"
+"<span foreground=\"royalblue3\">通配符:</span> 机器名可包含通配符，如 * "
+"和 ?。例如：*.cs.foo.edu 可匹配域 cs.food.edu 中的全部主机。\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">IP 子网:</span> 您还可以同时将目录导出给 IP 子"
-"网中的全部主机。例如，追加到网络基地址后的“/255.255.252.0”或“/22”。\n"
+"<span foreground=\"royalblue3\">IP 子网:</span> 您还可以同时将目录导出给 IP "
+"子网中的全部主机。例如，追加到网络基地址后的“/255.255.252.0”或“/22”。\n"
 
 #: standalone/draknfs:153
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">User ID options</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">root_squash:</span> map requests from uid/"
-"gid 0 to the anonymous uid/gid.\n"
+"<span foreground=\"royalblue3\">map root user as anonymou:</span> map "
+"requests from uid/gid 0 to the anonymous uid/gid (root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">no_root_squash:</span> turn off root "
-"squashing. This option is mainly useful for diskless clients.\n"
+"<span foreground=\"royalblue3\">allow real remote root access:</span> turn "
+"off root squashing. This option is mainly useful for diskless clients "
+"(no_root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">all_squash:</span> map all uids and gids to "
-"the anonymous  user. Useful  for  NFS-exported public FTP directories, news "
-"spool directories, etc. The opposite option is no_all_squash, which is the "
-"default  setting.\n"
+"<span foreground=\"royalblue3\">map all users to anonymous user:</span> map "
+"all uids and gids to the anonymous  user (all_squash). Useful for NFS-"
+"exported public FTP directories, news spool directories, etc. The opposite "
+"option is no user UID mapping (no_all_squash), which is the default "
+"setting.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">anonuid and anongid:</span> explicitly  set "
+"<span foreground=\"royalblue3\">anonuid and anongid:</span> explicitly set "
 "the uid and gid of the anonymous account.\n"
 msgstr ""
 "<span weight=\"bold\">用户 ID 选项</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">root_squash:</span> 将请求从 uid/gid 0 映射到匿名"
-" uid/gid。\n"
+"<span foreground=\"royalblue3\">root_squash:</span> 将请求从 uid/gid 0 映射到"
+"匿名 uid/gid。\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">no_root_squash:</span> 关闭根挤压。"
-"此选项特别适合于无盘工作站。\n"
+"<span foreground=\"royalblue3\">no_root_squash:</span> 关闭根挤压。此选项特别"
+"适合于无盘工作站。\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">all_squash:</span> 将全部 uid 和 gid 映射到"
-"匿名用户。一般用于通过 NFS 导出的公开 FTP 目录，新闻池目录等等。具有相反功能"
-"的选项是，该设置是默认设置。\n"
+"<span foreground=\"royalblue3\">all_squash:</span> 将全部 uid 和 gid 映射到匿"
+"名用户。一般用于通过 NFS 导出的公开 FTP 目录，新闻池目录等等。具有相反功能的"
+"选项是，该设置是默认设置。\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">anonuid 和 anongid:</span> 显式设置"
-"匿名账户的 uid 和 gid。\n"
+"<span foreground=\"royalblue3\">anonuid 和 anongid:</span> 显式设置匿名账户"
+"的 uid 和 gid。\n"
 
 #: standalone/draknfs:169
 #, c-format
@@ -21378,8 +21655,8 @@ msgid ""
 "requests originate on an internet port less than IPPORT_RESERVED (1024). "
 "This option is on by default."
 msgstr ""
-"<span foreground=\"royalblue3\">%s:</span> 此选项需要发出请求的互联网端口小于"
-" IPPORT_RESERVED (1024)。此选项默认打开。"
+"<span foreground=\"royalblue3\">%s:</span> 此选项需要发出请求的互联网端口小"
+"于 IPPORT_RESERVED (1024)。此选项默认打开。"
 
 #: standalone/draknfs:175
 #, c-format
@@ -21399,115 +21676,120 @@ msgid ""
 "violate the NFS protocol and to reply to requests before any changes made by "
 "these requests have been committed to stable storage (e.g. disc drive)."
 msgstr ""
-"<span foreground=\"royalblue3\">%s:</span> 禁止 NFS 暴露 NFS 协议，并在请求"
-"对存储设备发生实际更改之前先回复请求。"
+"<span foreground=\"royalblue3\">%s:</span> 禁止 NFS 暴露 NFS 协议，并在请求对"
+"存储设备发生实际更改之前先回复请求。"
 
-#: standalone/draknfs:372
+#: standalone/draknfs:306
+#, c-format
+msgid "Please add an NFS share to be able to modify it."
+msgstr ""
+
+#: standalone/draknfs:373
 #, c-format
 msgid "Advanced Options Help"
 msgstr "高级选项帮助"
 
-#: standalone/draknfs:383
+#: standalone/draknfs:384
 #, c-format
 msgid "NFS directory"
 msgstr "NFS 目录"
 
-#: standalone/draknfs:385
+#: standalone/draknfs:386 standalone/draksambashare:401
 #, c-format
 msgid "Directory:"
 msgstr "目录:"
 
-#: standalone/draknfs:388
+#: standalone/draknfs:389
 #, c-format
 msgid "Host access"
 msgstr "主机访问"
 
-#: standalone/draknfs:390
+#: standalone/draknfs:391
 #, c-format
 msgid "Access:"
 msgstr "访问:"
 
-#: standalone/draknfs:390
+#: standalone/draknfs:391
 #, c-format
 msgid "Hosts Access"
 msgstr "主机访问"
 
-#: standalone/draknfs:393
+#: standalone/draknfs:394
 #, c-format
 msgid "User ID Mapping"
 msgstr "用户 ID 映射"
 
-#: standalone/draknfs:395
+#: standalone/draknfs:396
 #, c-format
 msgid "User ID:"
 msgstr "用户 ID:"
 
-#: standalone/draknfs:395
+#: standalone/draknfs:396
 #, c-format
 msgid "Help User ID"
 msgstr "帮助用户 ID"
 
-#: standalone/draknfs:396
+#: standalone/draknfs:397
 #, c-format
 msgid "Anonymous user ID:"
 msgstr "匿名用户 ID:"
 
-#: standalone/draknfs:397
+#: standalone/draknfs:398
 #, c-format
 msgid "Anonymous Group ID:"
 msgstr "匿名组 ID:"
 
-#: standalone/draknfs:434 standalone/draknfs:526
+#: standalone/draknfs:435 standalone/draknfs:527 standalone/draksambashare:426
 #, c-format
 msgid "Please enter a directory to share."
 msgstr "请输入要共享的目录。"
 
-#: standalone/draknfs:436
+#: standalone/draknfs:437
 #, c-format
 msgid "You must specify hosts access."
 msgstr "您必须指定主机访问。"
 
-#: standalone/draknfs:514
+#: standalone/draknfs:515
 #, c-format
 msgid "Share Directory"
 msgstr "共享目录"
 
-#: standalone/draknfs:514
+#: standalone/draknfs:515
 #, c-format
 msgid "Hosts Wildcard"
 msgstr "主机通配符"
 
-#: standalone/draknfs:514
+#: standalone/draknfs:515
 #, c-format
 msgid "General Options"
 msgstr "常规选项"
 
-#: standalone/draknfs:514
+#: standalone/draknfs:515
 #, c-format
 msgid "Custom Options"
 msgstr "自定义选项"
 
-#: standalone/draknfs:533
+#: standalone/draknfs:534
 #, c-format
 msgid "Please use the modify button to set right access."
 msgstr "请使用修改按钮设定访问权限。"
 
-#: standalone/draknfs:588
+#: standalone/draknfs:589
 #, c-format
 msgid "DrakNFS manage NFS shares"
 msgstr "DrakNFS 可管理 NFS 共享"
 
-#: standalone/draknfs:597
+#: standalone/draknfs:598
 #, c-format
 msgid "Failed to add NFS share."
 msgstr "添加 NFS 共享失败。"
 
-#: standalone/draknfs:604
+#: standalone/draknfs:605
 #, c-format
 msgid "Failed to Modify NFS share."
 msgstr "修改 NFS 共享失败。"
 
-#: standalone/draknfs:611
+#: standalone/draknfs:612
 #, c-format
 msgid "Failed to remove an NFS share."
 msgstr "删除 NFS 共享失败。"
@@ -21620,7 +21902,7 @@ msgstr "删除选中的规则"
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
 #: standalone/drakperm:124 standalone/drakups:302 standalone/drakups:362
 #: standalone/drakups:382 standalone/drakvpn:319 standalone/drakvpn:680
-#: standalone/printerdrake:233
+#: standalone/printerdrake:243
 #, c-format
 msgid "Edit"
 msgstr "编辑"
@@ -21853,7 +22135,7 @@ msgid "Disconnect"
 msgstr "断开"
 
 #. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:241 standalone/printerdrake:239
+#: standalone/drakroam:241 standalone/printerdrake:249
 #, c-format
 msgid "Refresh"
 msgstr "刷新"
@@ -21864,6 +22146,262 @@ msgstr "刷新"
 msgid "on"
 msgstr "开"
 
+#: standalone/draksambashare:64
+#, fuzzy, c-format
+msgid "Read List"
+msgstr "删除列表"
+
+#: standalone/draksambashare:65
+#, fuzzy, c-format
+msgid "Write List"
+msgstr "白名单"
+
+#: standalone/draksambashare:66 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Admin users"
+msgstr "添加用户"
+
+#: standalone/draksambashare:67 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Valid users"
+msgstr "添加用户"
+
+#: standalone/draksambashare:68 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Hide dot files"
+msgstr "隐藏文件"
+
+#: standalone/draksambashare:70
+#, fuzzy, c-format
+msgid "Force Group"
+msgstr "组"
+
+#: standalone/draksambashare:71
+#, c-format
+msgid "Force create group"
+msgstr ""
+
+#: standalone/draksambashare:72 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Default case"
+msgstr "默认用户"
+
+#: standalone/draksambashare:73 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Preserve case"
+msgstr "首选项: "
+
+#: standalone/draksambashare:74 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Create mask"
+msgstr "新建"
+
+#: standalone/draksambashare:75 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Directory mask"
+msgstr "目录"
+
+#: standalone/draksambashare:76
+#, fuzzy, c-format
+msgid "Inherit permissions"
+msgstr "权限"
+
+#: standalone/draksambashare:106
+#, fuzzy, c-format
+msgid "Samba server"
+msgstr "Samba 服务器"
+
+#: standalone/draksambashare:106
+#, fuzzy, c-format
+msgid "Restarting/Reloading Samba server..."
+msgstr "正在重新启动/重新装入 NFS 服务器..."
+
+#: standalone/draksambashare:107
+#, fuzzy, c-format
+msgid "Error Restarting/Reloading Samba server"
+msgstr "重新启动/重新装入 NFS 服务器出错"
+
+#: standalone/draksambashare:234 standalone/draksambashare:242
+#, c-format
+msgid "Add a Samba share"
+msgstr ""
+
+#: standalone/draksambashare:237
+#, c-format
+msgid "Goal of this wizard is to easily create a new Samba share."
+msgstr ""
+
+#: standalone/draksambashare:244
+#, fuzzy, c-format
+msgid "Name of the share:"
+msgstr "证书名称"
+
+#: standalone/draksambashare:245 standalone/draksambashare:402
+#, fuzzy, c-format
+msgid "Comment:"
+msgstr "提交"
+
+#: standalone/draksambashare:246
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "路径"
+
+#: standalone/draksambashare:251
+#, c-format
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
+msgstr ""
+
+#: standalone/draksambashare:255 standalone/draksambashare:261
+#, c-format
+msgid "Can\\'t create the directory, please enter a correct path."
+msgstr ""
+
+#: standalone/draksambashare:258 standalone/draksambashare:424
+#, fuzzy, c-format
+msgid "Please enter a Comment for this share."
+msgstr "请输入要共享的目录。"
+
+#: standalone/draksambashare:288 standalone/drakups:120 standalone/drakups:159
+#: standalone/logdrake:449 standalone/logdrake:455
+#, c-format
+msgid "Congratulations"
+msgstr "恭喜"
+
+#: standalone/draksambashare:289
+#, c-format
+msgid ""
+"The wizard successfully added the Samba share. Now just double click on it "
+"in treeview to modify it"
+msgstr ""
+
+#: standalone/draksambashare:321
+#, c-format
+msgid "DrakSamba entry"
+msgstr ""
+
+#: standalone/draksambashare:325
+#, c-format
+msgid "Please add a Samba share to be able to modify it."
+msgstr ""
+
+#: standalone/draksambashare:352
+#, fuzzy, c-format
+msgid "Samba user access"
+msgstr "Samba 服务器"
+
+#: standalone/draksambashare:360
+#, fuzzy, c-format
+msgid "Mask options"
+msgstr "基本选项"
+
+#: standalone/draksambashare:374
+#, fuzzy, c-format
+msgid "Display options"
+msgstr "指定选项"
+
+#: standalone/draksambashare:397
+#, fuzzy, c-format
+msgid "Samba share directory"
+msgstr "共享目录"
+
+#: standalone/draksambashare:400
+#, fuzzy, c-format
+msgid "Share name:"
+msgstr "共享名"
+
+#: standalone/draksambashare:406
+#, c-format
+msgid "Public:"
+msgstr ""
+
+#: standalone/draksambashare:407
+#, fuzzy, c-format
+msgid "Writable:"
+msgstr "写入"
+
+#: standalone/draksambashare:408
+#, c-format
+msgid "Browseable:"
+msgstr ""
+
+#: standalone/draksambashare:430
+#, c-format
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Share directory"
+msgstr "共享目录"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Comment"
+msgstr "提交"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Browseable"
+msgstr "浏览"
+
+#: standalone/draksambashare:543
+#, c-format
+msgid "Public"
+msgstr ""
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Writable"
+msgstr "写入"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Read list"
+msgstr "读取"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Write list"
+msgstr "白名单"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Force create mode"
+msgstr "您的打印机型号"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Force group"
+msgstr "PFS 组"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Inherit Permissions"
+msgstr "权限"
+
+#: standalone/draksambashare:590
+#, fuzzy, c-format
+msgid "DrakSamba manage Samba shares"
+msgstr "DrakNFS 可管理 NFS 共享"
+
+#: standalone/draksambashare:601
+#, fuzzy, c-format
+msgid "Failed to add Samba share."
+msgstr "添加 NFS 共享失败。"
+
+#: standalone/draksambashare:609
+#, fuzzy, c-format
+msgid "Failed to Modify Samba share."
+msgstr "修改 NFS 共享失败。"
+
+#: standalone/draksambashare:616
+#, fuzzy, c-format
+msgid "Failed to remove a Samba share."
+msgstr "删除 NFS 共享失败。"
+
 #: standalone/draksec:49
 #, c-format
 msgid "ALL"
@@ -21874,7 +22412,7 @@ msgstr "所有"
 msgid "LOCAL"
 msgstr "本地"
 
-#: standalone/draksec:53
+#: standalone/draksec:53 standalone/net_applet:449
 #, c-format
 msgid "Ignore"
 msgstr "忽略"
@@ -22064,124 +22602,115 @@ msgstr ""
 "注意: 如果您的声卡是 ISA 即插即用的, 您需要使用 sndconfig 程序。只需在控制台"
 "中输入“alsaconf”或“sndconfig”。"
 
-#: standalone/draksplash:15
-#, c-format
-msgid ""
-"package 'ImageMagick' is required to be able to complete configuration.\n"
-"Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
-msgstr ""
-"要正常工作需要软件包 ImageMagick。\n"
-"请单击“确定”安装 ImageMagick 或“取消”退出"
-
-#: standalone/draksplash:34
+#: standalone/draksplash:30
 #, c-format
 msgid ""
 "x coordinate of text box\n"
 "in number of characters"
 msgstr "文本框的 X 坐标, 按字符数计算"
 
-#: standalone/draksplash:35
+#: standalone/draksplash:31
 #, c-format
 msgid ""
 "y coordinate of text box\n"
 "in number of characters"
 msgstr "文本框的 Y 坐标, 按字符数计算"
 
-#: standalone/draksplash:36
+#: standalone/draksplash:32
 #, c-format
 msgid "text width"
 msgstr "文本宽度"
 
-#: standalone/draksplash:37
+#: standalone/draksplash:33
 #, c-format
 msgid "text box height"
 msgstr "文本框高度"
 
-#: standalone/draksplash:38
+#: standalone/draksplash:34
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
 "of its upper left corner"
 msgstr "进度条的左上角的 X 坐标"
 
-#: standalone/draksplash:39
+#: standalone/draksplash:35
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
 "of its upper left corner"
 msgstr "进度条的左上角的 Y 坐标"
 
-#: standalone/draksplash:40
+#: standalone/draksplash:36
 #, c-format
 msgid "the width of the progress bar"
 msgstr "进度条的宽度"
 
-#: standalone/draksplash:41
+#: standalone/draksplash:37
 #, c-format
 msgid "the height of the progress bar"
 msgstr "进度条的高度"
 
-#: standalone/draksplash:58 standalone/draksplash:63
+#: standalone/draksplash:54 standalone/draksplash:59
 #, c-format
 msgid "Choose progress bar color"
 msgstr "选择进度栏颜色"
 
-#: standalone/draksplash:59 standalone/draksplash:64
+#: standalone/draksplash:55 standalone/draksplash:60
 #, c-format
 msgid "Choose picture"
 msgstr "选择图片"
 
-#: standalone/draksplash:60
+#: standalone/draksplash:56
 #, c-format
 msgid "Silent bootsplash"
 msgstr "静默启动屏幕"
 
-#: standalone/draksplash:65
+#: standalone/draksplash:61
 #, c-format
 msgid "Verbose bootsplash"
 msgstr "详细静默屏幕"
 
-#: standalone/draksplash:67
+#: standalone/draksplash:63
 #, c-format
 msgid "Display logo on Console"
 msgstr "在控制台显示 LOGO"
 
-#: standalone/draksplash:70
+#: standalone/draksplash:66
 #, c-format
 msgid "Console bootsplash"
 msgstr "控制台屏幕"
 
-#: standalone/draksplash:76
+#: standalone/draksplash:72
 #, c-format
 msgid "Theme name"
 msgstr "主题名称"
 
-#: standalone/draksplash:79
+#: standalone/draksplash:75
 #, c-format
 msgid "final resolution"
 msgstr "最终分辨率"
 
-#: standalone/draksplash:84
+#: standalone/draksplash:80
 #, c-format
 msgid "Save theme"
 msgstr "保存主题"
 
-#: standalone/draksplash:145
+#: standalone/draksplash:141
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "保存开机画面主题..."
 
-#: standalone/draksplash:159
+#: standalone/draksplash:150
 #, c-format
 msgid "Unable to load image file %s"
 msgstr "无法装入图像文件 %s"
 
-#: standalone/draksplash:169
+#: standalone/draksplash:161
 #, c-format
 msgid "choose image"
 msgstr "选择图像"
 
-#: standalone/draksplash:186
+#: standalone/draksplash:175
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "进度条颜色选择"
@@ -22229,12 +22758,6 @@ msgstr "自动检测"
 msgid "Detection in progress"
 msgstr "检测进行中"
 
-#: standalone/drakups:120 standalone/drakups:159 standalone/logdrake:449
-#: standalone/logdrake:455
-#, c-format
-msgid "Congratulations"
-msgstr "恭喜"
-
 #: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
@@ -23907,7 +24430,7 @@ msgid "class of hardware device"
 msgstr "硬件设备的分类"
 
 #: standalone/harddrake2:51 standalone/harddrake2:83
-#: standalone/printerdrake:212
+#: standalone/printerdrake:222
 #, c-format
 msgid "Model"
 msgstr "型号"
@@ -24405,14 +24928,15 @@ msgstr "特性"
 
 #. -PO: please keep all "/" characters !!!
 #: standalone/harddrake2:176 standalone/logdrake:76
-#: standalone/printerdrake:135 standalone/printerdrake:148
+#: standalone/printerdrake:144 standalone/printerdrake:157
+#: standalone/printerdrake:169
 #, c-format
 msgid "/_Options"
 msgstr "/选项(_O)"
 
 #: standalone/harddrake2:177 standalone/harddrake2:203 standalone/logdrake:78
-#: standalone/printerdrake:160 standalone/printerdrake:162
-#: standalone/printerdrake:165 standalone/printerdrake:167
+#: standalone/printerdrake:170 standalone/printerdrake:172
+#: standalone/printerdrake:175 standalone/printerdrake:177
 #, c-format
 msgid "/_Help"
 msgstr "/帮助(_H)"
@@ -24442,7 +24966,7 @@ msgstr "/自动检测并口 zip 驱动器(_Z)"
 msgid "/_Upload the hardware list"
 msgstr "/上传硬件列表(_U)"
 
-#: standalone/harddrake2:192 standalone/printerdrake:141
+#: standalone/harddrake2:192 standalone/printerdrake:150
 #, c-format
 msgid "/_Quit"
 msgstr "/退出(_Q)"
@@ -24464,12 +24988,12 @@ msgid ""
 "in fields displayed on the right frame (\"Information\")"
 msgstr "只要您选中了设备, 您就能看到在右侧框架(“信息”)中显示的解释。"
 
-#: standalone/harddrake2:222 standalone/printerdrake:165
+#: standalone/harddrake2:222 standalone/printerdrake:175
 #, c-format
 msgid "/_Report Bug"
 msgstr "/故障报告(_R)"
 
-#: standalone/harddrake2:224 standalone/printerdrake:167
+#: standalone/harddrake2:224 standalone/printerdrake:177
 #, c-format
 msgid "/_About..."
 msgstr "/关于(_A)..."
@@ -24521,8 +25045,8 @@ msgstr "运行配置工具"
 msgid "unknown"
 msgstr "未知"
 
-#: standalone/harddrake2:307 standalone/printerdrake:299
-#: standalone/printerdrake:337
+#: standalone/harddrake2:307 standalone/printerdrake:309
+#: standalone/printerdrake:347
 #, c-format
 msgid "Unknown"
 msgstr "未知"
@@ -24558,22 +25082,22 @@ msgstr "刻录机"
 msgid "DVD"
 msgstr "DVD"
 
-#: standalone/harddrake2:546 standalone/harddrake2:549
+#: standalone/harddrake2:545 standalone/harddrake2:548
 #, c-format
 msgid "Upload the hardware list"
 msgstr "上传硬件列表"
 
-#: standalone/harddrake2:551
+#: standalone/harddrake2:550
 #, c-format
 msgid "Account:"
 msgstr "账户："
 
-#: standalone/harddrake2:552
+#: standalone/harddrake2:551
 #, c-format
 msgid "Password:"
 msgstr "密码："
 
-#: standalone/harddrake2:553
+#: standalone/harddrake2:552
 #, c-format
 msgid "Hostname:"
 msgstr "主机名："
@@ -24593,7 +25117,18 @@ msgstr "您是否想要 BackSpace 在控制台起 Delete 的作用?"
 msgid "LocaleDrake"
 msgstr "Drak 语言设置"
 
-#: standalone/localedrake:43
+#: standalone/localedrake:44
+#, 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"
+#: standalone/localedrake:47 standalone/scannerdrake:135
+#, c-format
+msgid ", "
+msgstr "、"
+
+#: standalone/localedrake:55
 #, c-format
 msgid "The change is done, but to be effective you must logout"
 msgstr "修改已经完成, 不过您必须退出登录修改才会生效"
@@ -24701,7 +25236,7 @@ msgstr "搜索"
 msgid "A tool to monitor your logs"
 msgstr "日志监视工具"
 
-#: standalone/logdrake:128 standalone/net_applet:293 standalone/net_monitor:94
+#: standalone/logdrake:128 standalone/net_applet:315 standalone/net_monitor:94
 #, c-format
 msgid "Settings"
 msgstr "设置"
@@ -24891,162 +25426,137 @@ msgstr "鼠标测试"
 msgid "Please test your mouse:"
 msgstr "请测试您的鼠标:"
 
-#: standalone/net_applet:47
+#: standalone/net_applet:49
 #, c-format
 msgid "Network is up on interface %s"
 msgstr "已通过网卡 %s 联网"
 
 #. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
-#: standalone/net_applet:50
+#: standalone/net_applet:52
 #, c-format
 msgid "Network is down on interface %s. Click on \"Configure Network\""
 msgstr "网卡 %s 的网络已断。请单击“配置网络”"
 
-#: standalone/net_applet:56 standalone/net_monitor:469
+#: standalone/net_applet:58 standalone/net_monitor:469
 #, c-format
 msgid "Connect %s"
 msgstr "连接 %s"
 
-#: standalone/net_applet:57 standalone/net_monitor:469
+#: standalone/net_applet:59 standalone/net_monitor:469
 #, c-format
 msgid "Disconnect %s"
 msgstr "断开 %s"
 
-#: standalone/net_applet:58
+#: standalone/net_applet:60
 #, c-format
 msgid "Monitor Network"
 msgstr "监视网络"
 
-#: standalone/net_applet:59
+#: standalone/net_applet:62
 #, c-format
 msgid "Manage wireless networks"
 msgstr "管理无线网络"
 
-#: standalone/net_applet:60
+#: standalone/net_applet:63
 #, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
-#: standalone/net_applet:62
+#: standalone/net_applet:65
 #, c-format
 msgid "Watched interface"
 msgstr "监视的接口"
 
-#: standalone/net_applet:71
+#: standalone/net_applet:74
 #, c-format
 msgid "Profiles"
 msgstr "配置文件"
 
-#: standalone/net_applet:80
+#: standalone/net_applet:83
 #, c-format
 msgid "Get Online Help"
 msgstr "获得在线帮助"
 
-#: standalone/net_applet:160
+#: standalone/net_applet:304
 #, c-format
-msgid "Unable to select wireless network: %s"
-msgstr "无法选择无线网络: %s"
-
-#: standalone/net_applet:279
-#, c-format
-msgid "Interactive intrusion detection"
-msgstr "交互式检测入侵"
+msgid "Interactive Firewall automatic mode"
+msgstr ""
 
-#: standalone/net_applet:284
+#: standalone/net_applet:309
 #, c-format
 msgid "Always launch on startup"
 msgstr "启动时自动调用"
 
-#: standalone/net_applet:288
-#, c-format
-msgid "Actions"
-msgstr "动作"
-
-#: standalone/net_applet:330
-#, c-format
-msgid "Unable to contact daemon"
-msgstr "无法连接守护程序"
-
-#: standalone/net_applet:349
-#, c-format
-msgid "A port scanning attack has been attempted by %s."
-msgstr "%s 试图进行端口扫描攻击。"
-
-#: standalone/net_applet:350
-#, c-format
-msgid "The %s service has been attacked by %s."
-msgstr "%s 服务已被 %s 攻击。"
-
-#: standalone/net_applet:351
-#, c-format
-msgid "A password cracking attack has been attempted by %s."
-msgstr "%s 正在尝试密码破解攻击。"
+#: standalone/net_applet:313
+#, fuzzy, c-format
+msgid "Wireless networks"
+msgstr "管理无线网络"
 
-#: standalone/net_applet:359
-#, c-format
-msgid "Active Firewall: intrusion detected"
+#: standalone/net_applet:398
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
 msgstr "活动的防火墙: 检测到了入侵"
 
-#: standalone/net_applet:370
-#, c-format
-msgid "Do you want to blacklist the attacker?"
+#: standalone/net_applet:411
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
 msgstr "您是否想要将入侵者加入黑名单?"
 
-#: standalone/net_applet:384
-#, c-format
-msgid "Always blacklist (do not ask again)"
-msgstr "总是黑名单(以后不再询问)"
-
-#: standalone/net_applet:387
+#: standalone/net_applet:414
 #, c-format
 msgid "Attack details"
 msgstr "攻击细节"
 
-#: standalone/net_applet:391
+#: standalone/net_applet:418
 #, c-format
 msgid "Attack time: %s"
 msgstr "攻击时间: %s"
 
-#: standalone/net_applet:392
+#: standalone/net_applet:419
 #, c-format
 msgid "Network interface: %s"
 msgstr "网卡: %s"
 
-#: standalone/net_applet:393
+#: standalone/net_applet:420
 #, c-format
 msgid "Attack type: %s"
 msgstr "攻击类型: %s"
 
-#: standalone/net_applet:394
+#: standalone/net_applet:421
 #, c-format
 msgid "Protocol: %s"
 msgstr "协议: %s"
 
-#: standalone/net_applet:395
+#: standalone/net_applet:422
 #, c-format
 msgid "Attacker IP address: %s"
 msgstr "攻击者 IP 地址: %s"
 
-#: standalone/net_applet:396
+#: standalone/net_applet:423
 #, c-format
 msgid "Attacker hostname: %s"
 msgstr "攻击者主机名: %s"
 
-#: standalone/net_applet:397
+#: standalone/net_applet:426
 #, c-format
 msgid "Service attacked: %s"
 msgstr "攻击的服务: %s"
 
-#: standalone/net_applet:398
+#: standalone/net_applet:427
 #, c-format
 msgid "Port attacked: %s"
 msgstr "攻击的端口: %s"
 
-#: standalone/net_applet:399
+#: standalone/net_applet:429
 #, c-format
 msgid "Type of ICMP attack: %s"
 msgstr "ICMP 攻击的类型: %s"
 
+#: standalone/net_applet:434
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "总是黑名单(以后不再询问)"
+
 #: standalone/net_monitor:58 standalone/net_monitor:63
 #, c-format
 msgid "Network Monitoring"
@@ -25175,154 +25685,159 @@ msgstr "警告, 检测到了另外的 Internet 连接, 可能使用您的网络"
 msgid "No internet connection configured"
 msgstr "尚未配置 Internet 连接"
 
-#: standalone/printerdrake:68
+#: standalone/printerdrake:74
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "正在读取所安装打印机的数据..."
 
-#: standalone/printerdrake:117
+#: standalone/printerdrake:126
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "%s 打印机管理工具"
 
-#: standalone/printerdrake:131 standalone/printerdrake:132
-#: standalone/printerdrake:133 standalone/printerdrake:134
+#: standalone/printerdrake:140 standalone/printerdrake:141
 #: standalone/printerdrake:142 standalone/printerdrake:143
-#: standalone/printerdrake:147
+#: standalone/printerdrake:151 standalone/printerdrake:152
+#: standalone/printerdrake:156
 #, c-format
 msgid "/_Actions"
 msgstr "/操作(_A)"
 
-#: standalone/printerdrake:131 standalone/printerdrake:143
+#: standalone/printerdrake:140 standalone/printerdrake:152
 #, c-format
 msgid "/_Add Printer"
 msgstr "/添加打印机(_A)"
 
-#: standalone/printerdrake:132
+#: standalone/printerdrake:141
 #, c-format
 msgid "/Set as _Default"
 msgstr "/设为默认值(_D)"
 
-#: standalone/printerdrake:133
+#: standalone/printerdrake:142
 #, c-format
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: standalone/printerdrake:134
+#: standalone/printerdrake:143
 #, c-format
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: standalone/printerdrake:135
+#: standalone/printerdrake:144
 #, c-format
 msgid "/_Expert mode"
 msgstr "/专家模式(_E)"
 
-#: standalone/printerdrake:140
+#: standalone/printerdrake:149
 #, c-format
 msgid "/_Refresh"
 msgstr "/刷新(_R)"
 
-#: standalone/printerdrake:147
+#: standalone/printerdrake:156
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/配置 CUPS(_C)"
 
-#: standalone/printerdrake:182
+#: standalone/printerdrake:169
+#, fuzzy, c-format
+msgid "/Configure _Auto Administration"
+msgstr "远程管理"
+
+#: standalone/printerdrake:192
 #, c-format
 msgid "Search:"
 msgstr "搜索:"
 
-#: standalone/printerdrake:185
+#: standalone/printerdrake:195
 #, c-format
 msgid "Apply filter"
 msgstr "应用过滤器"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:222 standalone/printerdrake:229
 #, c-format
 msgid "Def."
 msgstr "默认"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:222 standalone/printerdrake:229
 #, c-format
 msgid "Printer Name"
 msgstr "打印机名称"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:222
 #, c-format
 msgid "Connection Type"
 msgstr "连接类型"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:229
 #, c-format
 msgid "Server Name"
 msgstr "服务器名"
 
 #. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:227
+#: standalone/printerdrake:237
 #, c-format
 msgid "Add Printer"
 msgstr "添加打印机"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:237
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "向系统中添加一台新打印机"
 
 #. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:230
+#: standalone/printerdrake:240
 #, c-format
 msgid "Set as default"
 msgstr "设为默认值"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:240
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "将选中打印机设为默认打印机"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:243
 #, c-format
 msgid "Edit selected printer"
 msgstr "编辑选中的打印机"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:246
 #, c-format
 msgid "Delete selected printer"
 msgstr "删除选中的打印机"
 
-#: standalone/printerdrake:239
+#: standalone/printerdrake:249
 #, c-format
 msgid "Refresh the list"
 msgstr "刷新列表"
 
 #. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:242
+#: standalone/printerdrake:252
 #, c-format
 msgid "Configure CUPS"
 msgstr "配置 CUPS"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:252
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "配置 CUPS 打印系统"
 
-#: standalone/printerdrake:300 standalone/printerdrake:338
+#: standalone/printerdrake:310 standalone/printerdrake:348
 #, c-format
 msgid "Enabled"
 msgstr "已启用"
 
-#: standalone/printerdrake:301 standalone/printerdrake:339
+#: standalone/printerdrake:311 standalone/printerdrake:349
 #, c-format
 msgid "Disabled"
 msgstr "已禁用"
 
-#: standalone/printerdrake:561
+#: standalone/printerdrake:578
 #, c-format
 msgid "Authors: "
 msgstr "作者: "
 
 #. -PO: here %s is the version number
-#: standalone/printerdrake:571
+#: standalone/printerdrake:588
 #, c-format
 msgid "Printer Management %s"
 msgstr "打印机管理 %s"
@@ -25787,27 +26302,27 @@ msgstr ""
 msgid "Your scanner(s) will not be available on the network."
 msgstr "您的扫描仪将不会在网络上出现。"
 
-#: standalone/service_harddrake:104
+#: standalone/service_harddrake:105
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "删除了一些“%s”类别的设备:\n"
 
-#: standalone/service_harddrake:105
+#: standalone/service_harddrake:106
 #, c-format
 msgid "- %s was removed\n"
 msgstr "- %s 已删除\n"
 
-#: standalone/service_harddrake:108
+#: standalone/service_harddrake:109
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "添加了一些设备: %s\n"
 
-#: standalone/service_harddrake:109
+#: standalone/service_harddrake:110
 #, c-format
 msgid "- %s was added\n"
 msgstr "- %s 已添加\n"
 
-#: standalone/service_harddrake:206
+#: standalone/service_harddrake:207
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "硬件检测进行中"
@@ -25971,3 +26486,50 @@ msgstr ""
 msgid "Installation failed"
 msgstr "安装失败"
 
+#~ msgid ""
+#~ "Enable user disk quota accounting enabled, and optionally enforce limits"
+#~ msgstr "启用用户磁盘配额记账及可选强制限制"
+
+#~ msgid "Printer on SMB/Windows 95/98/NT server"
+#~ msgstr "SMB/Windows 95/98/NT 服务器上的打印机"
+
+#~ msgid "Found printer on %s..."
+#~ msgstr "在 %s 上找到了打印机..."
+
+#~ msgid "Useless without Terminal Server"
+#~ msgstr "没有终端服务器就无用"
+
+#~ msgid ""
+#~ "Please select default client type.\n"
+#~ "    'Thin' clients run everything off the server's CPU/RAM, using the "
+#~ "client display.\n"
+#~ "    'Fat' clients use their own CPU/RAM but the server's filesystem."
+#~ msgstr ""
+#~ "请选择默认客户端类型。\n"
+#~ "    “瘦”客户端会使用服务器的 CPU/内存, 只是使用客户端进行显示。\n"
+#~ "    “胖”客户端将会使用自己的 CPU/内存, 但会使用服务器的文件系统。"
+
+#~ msgid "dhcpd Config..."
+#~ msgstr "dhcpd 配置..."
+
+#~ msgid ""
+#~ "package 'ImageMagick' is required to be able to complete configuration.\n"
+#~ "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
+#~ msgstr ""
+#~ "要正常工作需要软件包 ImageMagick。\n"
+#~ "请单击“确定”安装 ImageMagick 或“取消”退出"
+
+#~ msgid "Unable to select wireless network: %s"
+#~ msgstr "无法选择无线网络: %s"
+
+#~ msgid "Interactive intrusion detection"
+#~ msgstr "交互式检测入侵"
+
+#~ msgid "Actions"
+#~ msgstr "动作"
+
+#~ msgid "Active Firewall: intrusion detected"
+#~ msgstr "活动的防火墙: 检测到了入侵"
+
+#~ msgid "Do you want to blacklist the attacker?"
+#~ msgstr "您是否想要将入侵者加入黑名单?"