updated pot file

author: Pablo Saratxaga <pablo@mandriva.com> 2005-05-31 06:00:21 +0000
committer: Pablo Saratxaga <pablo@mandriva.com> 2005-05-31 06:00:21 +0000
commit: b8814bf1900523f84c79c4463bee2f73f2d37476 (patch)
tree: 3bfeeac9c4b644244550b227ae1b19d8b5c36647 /perl-install/share/po/zh_CN.po
parent: 181c673fd4c642bbecce865707228d73098ccea9 (diff)
download: drakx-b8814bf1900523f84c79c4463bee2f73f2d37476.tar
drakx-b8814bf1900523f84c79c4463bee2f73f2d37476.tar.gz
drakx-b8814bf1900523f84c79c4463bee2f73f2d37476.tar.bz2
drakx-b8814bf1900523f84c79c4463bee2f73f2d37476.tar.xz
drakx-b8814bf1900523f84c79c4463bee2f73f2d37476.zip
1 files changed, 887 insertions, 820 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index ec10553c8..43a2ffd99 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-05-22 20:07+0200\n"
+"POT-Creation-Date: 2005-05-31 13:03+0200\n"
 "PO-Revision-Date: 2005-04-29 23:58+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -72,7 +72,7 @@ msgstr ""
 "请单击按钮重新启动计算机, 拔出该密钥盘之后, 去掉写保护后再插入, \n"
 "然后再次调用 Mandriva Move。"
 
-#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1325
 #, c-format
 msgid "Reboot"
 msgstr "重新启动"
@@ -164,17 +164,20 @@ msgstr "请稍候, 正在检测并配置设备..."
 #: diskdrake/interactive.pm:240 diskdrake/interactive.pm:401
 #: diskdrake/interactive.pm:419 diskdrake/interactive.pm:556
 #: diskdrake/interactive.pm:561 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:182
-#: install_any.pm:1698 install_any.pm:1721 install_steps.pm:82
+#: install_any.pm:1658 install_any.pm:1681 install_steps.pm:82
 #: install_steps_interactive.pm:38 interactive/http.pm:117
 #: interactive/http.pm:118 network/ndiswrapper.pm:27 network/ndiswrapper.pm:41
 #: network/ndiswrapper.pm:89 network/ndiswrapper.pm:101
-#: network/netconnect.pm:1013 network/netconnect.pm:1121
-#: network/netconnect.pm:1125 network/netconnect.pm:1129
-#: network/netconnect.pm:1134 network/netconnect.pm:1266
-#: network/netconnect.pm:1270 network/netconnect.pm:1274
-#: network/netconnect.pm:1278 network/netconnect.pm:1386
-#: network/netconnect.pm:1391 network/netconnect.pm:1411
-#: network/netconnect.pm:1622 printer/printerdrake.pm:244
+#: network/netconnect.pm:915 network/netconnect.pm:1021
+#: network/netconnect.pm:1025 network/netconnect.pm:1029
+#: network/netconnect.pm:1034 network/netconnect.pm:1166
+#: network/netconnect.pm:1170 network/netconnect.pm:1174
+#: network/netconnect.pm:1178 network/netconnect.pm:1287
+#: network/netconnect.pm:1292 network/netconnect.pm:1312
+#: network/netconnect.pm:1523 network/thirdparty.pm:265
+#: network/thirdparty.pm:272 network/thirdparty.pm:308
+#: network/thirdparty.pm:310 network/thirdparty.pm:331
+#: network/thirdparty.pm:355 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
@@ -213,14 +216,15 @@ msgstr "请稍候, 正在检测并配置设备..."
 #: standalone/drakconnect:692 standalone/drakconnect:707
 #: standalone/drakfloppy:297 standalone/drakfloppy:300
 #: standalone/drakfloppy:306 standalone/drakfont:210 standalone/drakfont:223
-#: standalone/drakfont:261 standalone/drakroam:41 standalone/draksplash:26
+#: standalone/drakfont:261 standalone/drakgw:51 standalone/drakgw:191
+#: standalone/drakgw:220 standalone/drakgw:261 standalone/drakgw:295
+#: standalone/drakgw:400 standalone/drakroam:41 standalone/draksplash:15
 #: standalone/drakxtv:107 standalone/finish-install:39 standalone/logdrake:169
 #: standalone/logdrake:438 standalone/logdrake:443 standalone/scannerdrake:59
 #: standalone/scannerdrake:202 standalone/scannerdrake:261
 #: standalone/scannerdrake:715 standalone/scannerdrake:726
 #: standalone/scannerdrake:865 standalone/scannerdrake:876
 #: standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121
-#: wizards2.pm:95 wizards2.pm:99 wizards2.pm:121
 #, c-format
 msgid "Error"
 msgstr "错误"
@@ -451,15 +455,16 @@ msgstr ""
 "使用 Xorg %s, 您的显示卡可以得到 3D 硬件加速支持。\n"
 "注意这是试验阶段的支持, 它可能会使您的电脑失去反应。"
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:921
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:926
 #, c-format
 msgid "Custom"
 msgstr "自定义"
 
 #: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
-#: install_steps_interactive.pm:86 printer/printerdrake.pm:744
-#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4857
-#: standalone/draksplash:83 standalone/logdrake:174 standalone/net_applet:229
+#: install_steps_interactive.pm:86 install_steps_interactive.pm:1325
+#: printer/printerdrake.pm:744 printer/printerdrake.pm:4405
+#: printer/printerdrake.pm:4857 standalone/draksplash:85
+#: standalone/logdrake:174 standalone/net_applet:230
 #: standalone/scannerdrake:477
 #, c-format
 msgid "Quit"
@@ -599,7 +604,7 @@ msgid "Resolutions"
 msgstr "分辨率"
 
 #: Xconfig/resolution_and_depth.pm:310 diskdrake/hd_gtk.pm:339
-#: install_steps_gtk.pm:283 mouse.pm:168 services.pm:162
+#: install_steps_gtk.pm:284 mouse.pm:168 services.pm:162
 #: standalone/drakbackup:1581 standalone/drakperm:251
 #, c-format
 msgid "Other"
@@ -616,7 +621,7 @@ msgid "Graphics card: %s"
 msgstr "显示卡: %s"
 
 #: Xconfig/resolution_and_depth.pm:374 interactive.pm:433
-#: interactive/gtk.pm:767 interactive/http.pm:103 interactive/http.pm:156
+#: interactive/gtk.pm:808 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
@@ -625,15 +630,15 @@ msgstr "显示卡: %s"
 #: standalone/drakconnect:166 standalone/drakconnect:885
 #: standalone/drakconnect:972 standalone/drakconnect:1071
 #: standalone/drakfont:574 standalone/drakfont:586 standalone/drakroam:392
-#: standalone/draksplash:145 standalone/drakups:212 standalone/net_monitor:345
+#: standalone/draksplash:160 standalone/drakups:212 standalone/net_monitor:345
 #: ugtk2.pm:409 ugtk2.pm:506 ugtk2.pm:908 ugtk2.pm:931
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
 #: Xconfig/resolution_and_depth.pm:374 diskdrake/smbnfs_gtk.pm:81 help.pm:89
-#: help.pm:444 install_steps_gtk.pm:479 install_steps_interactive.pm:422
-#: install_steps_interactive.pm:827 interactive.pm:434 interactive/gtk.pm:771
+#: help.pm:444 install_steps_gtk.pm:480 install_steps_interactive.pm:422
+#: install_steps_interactive.pm:831 interactive.pm:434 interactive/gtk.pm:812
 #: 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
@@ -642,7 +647,7 @@ msgstr "确定"
 #: standalone/drakbackup:3947 standalone/drakconnect:165
 #: standalone/drakconnect:970 standalone/drakconnect:1070
 #: standalone/drakfont:586 standalone/drakfont:664 standalone/drakfont:741
-#: standalone/draksplash:145 standalone/drakups:219 standalone/logdrake:174
+#: standalone/draksplash:160 standalone/drakups:219 standalone/logdrake:174
 #: standalone/net_monitor:344 ugtk2.pm:403 ugtk2.pm:504 ugtk2.pm:513
 #: ugtk2.pm:908
 #, c-format
@@ -650,8 +655,8 @@ msgid "Cancel"
 msgstr "取消"
 
 #: Xconfig/resolution_and_depth.pm:374 diskdrake/hd_gtk.pm:153
-#: install_steps_gtk.pm:227 install_steps_gtk.pm:628 interactive.pm:528
-#: interactive/gtk.pm:637 interactive/gtk.pm:639 standalone/drakTermServ:285
+#: install_steps_gtk.pm:228 install_steps_gtk.pm:629 interactive.pm:528
+#: interactive/gtk.pm:678 interactive/gtk.pm:680 standalone/drakTermServ:285
 #: standalone/drakbackup:3881 standalone/drakbug:104
 #: standalone/drakconnect:161 standalone/drakconnect:246
 #: standalone/drakfont:509 standalone/drakperm:134 standalone/draksec:336
@@ -799,10 +804,10 @@ msgid ""
 "other"
 msgstr "其它"
 
-#: any.pm:143 harddrake/sound.pm:191 interactive.pm:471 pkgs.pm:481
+#: any.pm:143 harddrake/sound.pm:191 interactive.pm:471 pkgs.pm:468
 #: standalone/drakconnect:168 standalone/drakconnect:646 standalone/draksec:68
 #: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:244
-#: standalone/service_harddrake:203
+#: standalone/service_harddrake:206
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
@@ -956,7 +961,7 @@ msgid "Force No Local APIC"
 msgstr "强制无本地 APIC"
 
 #: any.pm:293 any.pm:637 authentication.pm:187 diskdrake/smbnfs_gtk.pm:180
-#: network/netconnect.pm:688 printer/printerdrake.pm:1663
+#: network/netconnect.pm:659 printer/printerdrake.pm:1663
 #: printer/printerdrake.pm:1784 standalone/drakbackup:1625
 #: standalone/drakbackup:3488 standalone/drakups:299
 #, c-format
@@ -1248,20 +1253,18 @@ msgstr "您可在此设定启动时自动以某用户的身份登入系统。"
 msgid "Do you want to use this feature?"
 msgstr "您要使用此特性吗?"
 
-#: any.pm:690 help.pm:180 help.pm:285 help.pm:444 install_any.pm:887
+#: any.pm:690 help.pm:180 help.pm:285 help.pm:444 install_any.pm:861
 #: interactive.pm:158 modules/interactive.pm:71 printer/printerdrake.pm:743
-#: standalone/drakbackup:2501 standalone/drakgw:287 standalone/drakgw:288
-#: standalone/drakgw:296 standalone/drakgw:306 standalone/draksec:55
-#: standalone/harddrake2:306 standalone/net_applet:309 ugtk2.pm:907
-#: wizards.pm:156 wizards2.pm:158
+#: standalone/drakbackup:2501 standalone/draksec:55 standalone/harddrake2:306
+#: standalone/net_applet:310 ugtk2.pm:907 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "是"
 
 #: any.pm:690 help.pm:180 help.pm:285 help.pm:313 help.pm:444
-#: install_any.pm:887 interactive.pm:158 modules/interactive.pm:71
+#: install_any.pm:861 interactive.pm:158 modules/interactive.pm:71
 #: standalone/drakbackup:2501 standalone/draksec:54 standalone/harddrake2:307
-#: standalone/net_applet:305 ugtk2.pm:907 wizards.pm:156 wizards2.pm:158
+#: standalone/net_applet:306 ugtk2.pm:907 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "否"
@@ -1306,56 +1309,56 @@ msgstr "默认使用 Unicode"
 msgid "All languages"
 msgstr "全部语言"
 
-#: any.pm:794 help.pm:566 help.pm:855 install_steps_interactive.pm:947
+#: any.pm:798 help.pm:566 help.pm:855 install_steps_interactive.pm:952
 #, c-format
 msgid "Country / Region"
 msgstr "国家/地区"
 
-#: any.pm:795
+#: any.pm:799
 #, c-format
 msgid "Please choose your country."
 msgstr "请选择您的国家/地区。"
 
-#: any.pm:797
+#: any.pm:801
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "在此列出了可用的全部国家/地区"
 
-#: any.pm:798
+#: any.pm:802
 #, c-format
 msgid "Other Countries"
 msgstr "其它国家"
 
-#: any.pm:798 help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
+#: any.pm:802 help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
 #: interactive.pm:394
 #, c-format
 msgid "Advanced"
 msgstr "高级"
 
-#: any.pm:806
+#: any.pm:810
 #, c-format
 msgid "Input method:"
 msgstr "输入法:"
 
-#: any.pm:807 install_any.pm:422 network/netconnect.pm:186
-#: network/netconnect.pm:380 network/netconnect.pm:385
-#: network/netconnect.pm:1377 printer/printerdrake.pm:105
+#: any.pm:811 install_any.pm:406 network/netconnect.pm:187
+#: network/netconnect.pm:381 network/netconnect.pm:386
+#: network/netconnect.pm:1278 printer/printerdrake.pm:105
 #: printer/printerdrake.pm:2199
 #, c-format
 msgid "None"
 msgstr "无"
 
-#: any.pm:921
+#: any.pm:926
 #, c-format
 msgid "No sharing"
 msgstr "禁止共享"
 
-#: any.pm:921
+#: any.pm:926
 #, c-format
 msgid "Allow all users"
 msgstr "允许所有用户使用"
 
-#: any.pm:925
+#: any.pm:930
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1368,32 +1371,32 @@ msgstr ""
 "选择允许, 用户将只需在 Konqueror 和 Nautilus 中单击“共享”即可开放共享。\n"
 "“自定义”允许按照不同用户细分设置。\n"
 
-#: any.pm:937
+#: any.pm:942
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 传统的 Unix 文件共享系统, Mac 和 Windows 上支持较少。"
 
-#: any.pm:940
+#: any.pm:945
 #, 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:948
+#: any.pm:953
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
 
-#: any.pm:973
+#: any.pm:978
 #, c-format
 msgid "Launch userdrake"
 msgstr "运行“Drak 用户管理”"
 
-#: any.pm:973 printer/printerdrake.pm:3900 printer/printerdrake.pm:3903
+#: any.pm:978 printer/printerdrake.pm:3900 printer/printerdrake.pm:3903
 #: printer/printerdrake.pm:3904 printer/printerdrake.pm:3905
 #: printer/printerdrake.pm:5166 standalone/drakTermServ:295
 #: standalone/drakbackup:4081 standalone/drakbug:126 standalone/drakfont:497
@@ -1403,7 +1406,7 @@ msgstr "运行“Drak 用户管理”"
 msgid "Close"
 msgstr "关闭"
 
-#: any.pm:975
+#: any.pm:980
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1681,7 +1684,7 @@ msgstr "无密码"
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "这个密码太简单了(至少要有 %d 个字符)"
 
-#: authentication.pm:189 network/netconnect.pm:385 network/netconnect.pm:689
+#: authentication.pm:189 network/netconnect.pm:386 network/netconnect.pm:660
 #: standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:492
 #, c-format
 msgid "Authentication"
@@ -1815,7 +1818,7 @@ msgstr "澳大利亚"
 
 #: crypto.pm:16 crypto.pm:50 lang.pm:214 network/adsl_consts.pm:93
 #: network/adsl_consts.pm:102 network/adsl_consts.pm:114
-#: network/adsl_consts.pm:123 network/netconnect.pm:51
+#: network/adsl_consts.pm:123 network/netconnect.pm:52
 #, c-format
 msgid "Belgium"
 msgstr "比利时"
@@ -1885,7 +1888,7 @@ msgstr "芬兰"
 #: network/adsl_consts.pm:431 network/adsl_consts.pm:442
 #: network/adsl_consts.pm:454 network/adsl_consts.pm:466
 #: network/adsl_consts.pm:477 network/adsl_consts.pm:488
-#: network/netconnect.pm:48
+#: network/netconnect.pm:49
 #, c-format
 msgid "France"
 msgstr "法国"
@@ -1913,7 +1916,7 @@ msgstr "以色列"
 
 #: crypto.pm:32 crypto.pm:63 lang.pm:300 network/adsl_consts.pm:557
 #: network/adsl_consts.pm:569 network/adsl_consts.pm:580
-#: network/adsl_consts.pm:589 network/netconnect.pm:50 standalone/drakxtv:47
+#: network/adsl_consts.pm:589 network/netconnect.pm:51 standalone/drakxtv:47
 #, c-format
 msgid "Italy"
 msgstr "意大利"
@@ -1925,7 +1928,7 @@ msgstr "日本"
 
 #: crypto.pm:34 crypto.pm:65 lang.pm:352 network/adsl_consts.pm:620
 #: network/adsl_consts.pm:629 network/adsl_consts.pm:638
-#: network/adsl_consts.pm:647 network/netconnect.pm:49
+#: network/adsl_consts.pm:647 network/netconnect.pm:50
 #, c-format
 msgid "Netherlands"
 msgstr "荷兰"
@@ -1984,7 +1987,7 @@ msgstr "中国台湾"
 msgid "South Africa"
 msgstr "南非"
 
-#: crypto.pm:78 crypto.pm:108 lang.pm:416 network/netconnect.pm:52
+#: crypto.pm:78 crypto.pm:108 lang.pm:416 network/netconnect.pm:53
 #, c-format
 msgid "United States"
 msgstr "美国"
@@ -2090,7 +2093,7 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "请单击一个分区"
 
-#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:481
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:482
 #: standalone/drakbackup:2936 standalone/drakbackup:2996
 #, c-format
 msgid "Details"
@@ -2685,7 +2688,7 @@ msgstr "DOS 下的盘符: %s(只是猜测)\n"
 msgid "Type: "
 msgstr "类型: "
 
-#: diskdrake/interactive.pm:1197 install_steps_gtk.pm:295
+#: diskdrake/interactive.pm:1197 install_steps_gtk.pm:296
 #, c-format
 msgid "Name: "
 msgstr "名称: "
@@ -2852,7 +2855,7 @@ msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
 msgid "The encryption keys do not match"
 msgstr "两次加密密钥不符"
 
-#: diskdrake/interactive.pm:1295 network/netconnect.pm:1222
+#: diskdrake/interactive.pm:1295 network/netconnect.pm:1122
 #: standalone/drakconnect:430
 #, c-format
 msgid "Encryption key"
@@ -3172,7 +3175,7 @@ msgstr "没有足够的空闲空间供自动分配"
 msgid "Nothing to do"
 msgstr "不做任何事"
 
-#: harddrake/data.pm:62 install_any.pm:1639
+#: harddrake/data.pm:62 install_any.pm:1599
 #, c-format
 msgid "Floppy"
 msgstr "软盘"
@@ -3182,12 +3185,12 @@ msgstr "软盘"
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:88 install_any.pm:1640
+#: harddrake/data.pm:88 install_any.pm:1600
 #, c-format
 msgid "Hard Disk"
 msgstr "硬盘"
 
-#: harddrake/data.pm:97 install_any.pm:1641
+#: harddrake/data.pm:97 install_any.pm:1601
 #, c-format
 msgid "CDROM"
 msgstr "CDROM"
@@ -3277,7 +3280,7 @@ msgstr "蓝牙设备"
 msgid "Ethernetcard"
 msgstr "以太网卡"
 
-#: harddrake/data.pm:283 network/netconnect.pm:575
+#: harddrake/data.pm:283 network/netconnect.pm:573
 #, c-format
 msgid "Modem"
 msgstr "调制解调器"
@@ -3298,7 +3301,7 @@ msgid "AGP controllers"
 msgstr "AGP 控制器"
 
 #: harddrake/data.pm:325 help.pm:186 help.pm:855
-#: install_steps_interactive.pm:979
+#: install_steps_interactive.pm:984
 #, c-format
 msgid "Printer"
 msgstr "打印机"
@@ -3365,7 +3368,7 @@ msgid "Bridges and system controllers"
 msgstr "桥接和系统控制器"
 
 #: harddrake/data.pm:448 help.pm:855 install_steps_interactive.pm:118
-#: install_steps_interactive.pm:939 standalone/keyboarddrake:29
+#: install_steps_interactive.pm:944 standalone/keyboarddrake:29
 #, c-format
 msgid "Keyboard"
 msgstr "键盘"
@@ -3375,27 +3378,27 @@ msgstr "键盘"
 msgid "Tablet and touchscreen"
 msgstr "手写板和触摸屏"
 
-#: harddrake/data.pm:469 help.pm:855 install_steps_interactive.pm:972
+#: harddrake/data.pm:470 help.pm:855 install_steps_interactive.pm:977
 #, c-format
 msgid "Mouse"
 msgstr "鼠标"
 
-#: harddrake/data.pm:483
+#: harddrake/data.pm:484
 #, c-format
 msgid "UPS"
 msgstr "UPS"
 
-#: harddrake/data.pm:492
+#: harddrake/data.pm:493
 #, c-format
 msgid "Scanner"
 msgstr "扫描仪"
 
-#: harddrake/data.pm:502 standalone/harddrake2:440
+#: harddrake/data.pm:503 standalone/harddrake2:440
 #, c-format
 msgid "Unknown/Others"
 msgstr "未知/其它"
 
-#: harddrake/data.pm:530
+#: harddrake/data.pm:531
 #, c-format
 msgid "cpu # "
 msgstr "CPU # "
@@ -3488,8 +3491,8 @@ msgstr "驱动程序: "
 msgid "Trouble shooting"
 msgstr "疑难解答"
 
-#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1072
-#: network/ndiswrapper.pm:95 network/netconnect.pm:561
+#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1081
+#: network/ndiswrapper.pm:95 network/netconnect.pm:552
 #: printer/printerdrake.pm:1206 printer/printerdrake.pm:2230
 #: printer/printerdrake.pm:2316 printer/printerdrake.pm:2362
 #: printer/printerdrake.pm:2429 printer/printerdrake.pm:2464
@@ -3625,8 +3628,8 @@ msgstr ""
 "\n"
 "当前为您的声卡“%s”使用的是“%s”驱动程序 "
 
-#: harddrake/v4l.pm:14 standalone/net_applet:74 standalone/net_applet:75
-#: standalone/net_applet:77
+#: harddrake/v4l.pm:14 standalone/net_applet:75 standalone/net_applet:76
+#: standalone/net_applet:78
 #, c-format
 msgid "Auto-detect"
 msgstr "自动检测"
@@ -3705,8 +3708,8 @@ msgstr ""
 "版。如果您同意其中的全部条款, 请选中\"%s\"框。如果不同意, 单击\"%s\"按钮将重"
 "新启动您的计算机。"
 
-#: help.pm:14 install_steps_gtk.pm:551 install_steps_interactive.pm:92
-#: install_steps_interactive.pm:731 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:735 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr "接受"
@@ -3784,12 +3787,12 @@ msgstr ""
 msgid "User name"
 msgstr "用户名"
 
-#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:232
-#: install_steps_gtk.pm:693 interactive.pm:433 interactive/newt.pm:321
-#: network/netconnect.pm:335 network/tools.pm:191 printer/printerdrake.pm:3678
-#: standalone/drakTermServ:383 standalone/drakbackup:3938
-#: standalone/drakbackup:4032 standalone/drakbackup:4049
-#: standalone/drakbackup:4067 ugtk2.pm:506
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:233
+#: install_steps_gtk.pm:694 interactive.pm:433 interactive/newt.pm:321
+#: network/netconnect.pm:336 network/thirdparty.pm:321
+#: printer/printerdrake.pm:3678 standalone/drakTermServ:383
+#: standalone/drakbackup:3938 standalone/drakbackup:4032
+#: standalone/drakbackup:4049 standalone/drakbackup:4067 ugtk2.pm:506
 #, c-format
 msgid "Next"
 msgstr "下一步"
@@ -3995,7 +3998,7 @@ msgstr "开发"
 msgid "Graphical Environment"
 msgstr "图形环境"
 
-#: help.pm:146 install_steps_gtk.pm:230 install_steps_interactive.pm:642
+#: help.pm:146 install_steps_gtk.pm:231 install_steps_interactive.pm:642
 #, c-format
 msgid "Individual package selection"
 msgstr "选择单个软件包"
@@ -4104,7 +4107,7 @@ msgstr ""
 "节, 其中详细描述了如何设置新打印机。那里给出的界面与安装时所用的界面大体相"
 "同。"
 
-#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:606
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:607
 #: standalone/drakbackup:2325 standalone/drakbackup:2329
 #: standalone/drakbackup:2333 standalone/drakbackup:2337
 #, c-format
@@ -4176,7 +4179,7 @@ msgstr ""
 "Internet。最好选择地理位置离您较近的时间服务器。此选项还会自动安装时间服务"
 "器, 这样您局域网中的其它计算机都能够进行自动校时了。"
 
-#: help.pm:217 install_steps_interactive.pm:874
+#: help.pm:217 install_steps_interactive.pm:879
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "您的系统时钟设定为 GMT"
@@ -4597,17 +4600,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr "生成自动安装软盘"
 
-#: help.pm:409 install_steps_interactive.pm:1331
+#: help.pm:409 install_steps_interactive.pm:1336
 #, c-format
 msgid "Replay"
 msgstr "重现"
 
-#: help.pm:409 install_steps_interactive.pm:1331
+#: help.pm:409 install_steps_interactive.pm:1336
 #, c-format
 msgid "Automated"
 msgstr "自动"
 
-#: help.pm:409 install_steps_interactive.pm:1334
+#: help.pm:409 install_steps_interactive.pm:1339
 #, c-format
 msgid "Save packages selection"
 msgstr "保存软件包选择"
@@ -4656,7 +4659,7 @@ msgstr ""
 "\n"
 "如果您想要选择要检测磁盘上的坏块, 请单击单击\"%s\"。"
 
-#: help.pm:431 install_steps_gtk.pm:387 interactive.pm:434
+#: help.pm:431 install_steps_gtk.pm:388 interactive.pm:434
 #: interactive/newt.pm:318 printer/printerdrake.pm:3676
 #: standalone/drakTermServ:362 standalone/drakbackup:3898
 #: standalone/drakbackup:3937 standalone/drakbackup:4048
@@ -4693,7 +4696,7 @@ msgstr ""
 "理位置较近的镜像。之后会出现一个可以下载的软件包选择树：复查选项, 然后单击\"%"
 "s\"来获取并安装选中的软件包, 要终止请单击\"%s\"。"
 
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:386
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:387
 #: install_steps_interactive.pm:156 standalone/drakbackup:4095
 #, c-format
 msgid "Install"
@@ -5424,8 +5427,8 @@ msgstr ""
 "\"%s\"：如果在您的系统中检测到了声卡, 则会在此处显示。如果您发现在此显示的声"
 "卡与您系统中实际安装的声卡并不相同, 您可以单击该按钮选择不同的驱动程序。"
 
-#: help.pm:788 help.pm:855 install_steps_interactive.pm:1006
-#: install_steps_interactive.pm:1023
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1011
+#: install_steps_interactive.pm:1028
 #, c-format
 msgid "Sound card"
 msgstr "声卡"
@@ -5557,12 +5560,12 @@ msgstr ""
 " * \"%s\"：在此您可以精确调整要在您的计算机上运行哪些服务。如果您要将此计算机"
 "用作服务器, 那么应该复查这一设置。"
 
-#: help.pm:855 install_steps_interactive.pm:965 standalone/drakclock:100
+#: help.pm:855 install_steps_interactive.pm:970 standalone/drakclock:100
 #, c-format
 msgid "Timezone"
 msgstr "时区"
 
-#: help.pm:855 install_steps_interactive.pm:1039
+#: help.pm:855 install_steps_interactive.pm:1044
 #, c-format
 msgid "TV card"
 msgstr "电视卡"
@@ -5577,33 +5580,33 @@ msgstr "ISDN 卡"
 msgid "Graphical Interface"
 msgstr "图形界面"
 
-#: help.pm:855 install_any.pm:1662 install_steps_interactive.pm:1057
+#: help.pm:855 install_any.pm:1622 install_steps_interactive.pm:1062
 #: standalone/drakbackup:2019
 #, c-format
 msgid "Network"
 msgstr "网络"
 
-#: help.pm:855 install_steps_interactive.pm:1072
+#: help.pm:855 install_steps_interactive.pm:1077
 #, c-format
 msgid "Proxies"
 msgstr "代理服务器"
 
-#: help.pm:855 install_steps_interactive.pm:1083
+#: help.pm:855 install_steps_interactive.pm:1088
 #, c-format
 msgid "Security Level"
 msgstr "安全级别"
 
-#: help.pm:855 install_steps_interactive.pm:1097
+#: help.pm:855 install_steps_interactive.pm:1102
 #, c-format
 msgid "Firewall"
 msgstr "防火墙"
 
-#: help.pm:855 install_steps_interactive.pm:1113
+#: help.pm:855 install_steps_interactive.pm:1118
 #, c-format
 msgid "Bootloader"
 msgstr "引导程序"
 
-#: help.pm:855 install_steps_interactive.pm:1126 services.pm:193
+#: help.pm:855 install_steps_interactive.pm:1131 services.pm:193
 #, c-format
 msgid "Services"
 msgstr "服务"
@@ -5659,13 +5662,13 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "您还必须格式化 %s"
 
-#: install_any.pm:406
+#: install_any.pm:390
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "您有其它赠品介质吗?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:409
+#: install_any.pm:393
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -5678,7 +5681,7 @@ msgstr ""
 "\n"
 "您是否有要配置的赠品安装介质?"
 
-#: install_any.pm:422 printer/printerdrake.pm:3022
+#: install_any.pm:406 printer/printerdrake.pm:3022
 #: printer/printerdrake.pm:3029 standalone/scannerdrake:182
 #: standalone/scannerdrake:190 standalone/scannerdrake:241
 #: standalone/scannerdrake:248
@@ -5686,49 +5689,49 @@ msgstr ""
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: install_any.pm:422
+#: install_any.pm:406
 #, c-format
 msgid "Network (http)"
 msgstr "网络 (http)"
 
-#: install_any.pm:422
+#: install_any.pm:406
 #, c-format
 msgid "Network (ftp)"
 msgstr "网络 (ftp)"
 
-#: install_any.pm:451
+#: install_any.pm:436
 #, c-format
 msgid "Insert the CD 1 again"
 msgstr "再次插入第一张光盘"
 
-#: install_any.pm:479 standalone/drakbackup:112
+#: install_any.pm:460 standalone/drakbackup:112
 #, c-format
 msgid "No device found"
 msgstr "没有发现设备"
 
-#: install_any.pm:484
+#: install_any.pm:465
 #, c-format
 msgid "Insert the CD"
 msgstr "插入光盘"
 
-#: install_any.pm:489
+#: install_any.pm:470
 #, c-format
 msgid "Unable to mount CD-ROM"
 msgstr "无法挂载 CD-ROM"
 
-#: install_any.pm:521 install_any.pm:525
+#: install_any.pm:502 install_any.pm:506
 #, c-format
 msgid "URL of the mirror?"
 msgstr "镜像的 URL?"
 
-#: install_any.pm:558
+#: install_any.pm:539
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "无法在此镜像上找到软件包列表文件。请确定位置正确。"
 
-#: install_any.pm:725
+#: install_any.pm:699
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -5739,13 +5742,13 @@ msgstr ""
 "\n"
 "请在驱动器中插入标有“%s”的光盘, 然后单击“确定”。"
 
-#: install_any.pm:738
+#: install_any.pm:712
 #, c-format
 msgid "Copying in progress"
 msgstr "复制进行中"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:878
+#: install_any.pm:852
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -5768,7 +5771,7 @@ msgstr ""
 "您真要安装这些服务器吗?\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:901
+#: install_any.pm:875
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -5781,22 +5784,22 @@ msgstr ""
 "\n"
 "您确定要删除这些软件包吗?\n"
 
-#: install_any.pm:1349 partition_table.pm:603
+#: install_any.pm:1309 partition_table.pm:603
 #, c-format
 msgid "Error reading file %s"
 msgstr "请取文件 %s 出错"
 
-#: install_any.pm:1559
+#: install_any.pm:1519
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "下列盘片已重命名:"
 
-#: install_any.pm:1561
+#: install_any.pm:1521
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s(以前的名称为 %s)"
 
-#: install_any.pm:1599
+#: install_any.pm:1559
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5804,42 +5807,42 @@ msgid ""
 msgstr ""
 "发生错误！新建文件系统时找不到可用的设备。请检查您的硬件以确定问题的原因"
 
-#: install_any.pm:1643
+#: install_any.pm:1603
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: install_any.pm:1643
+#: install_any.pm:1603
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: install_any.pm:1643
+#: install_any.pm:1603
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: install_any.pm:1666
+#: install_any.pm:1626
 #, c-format
 msgid "Please choose a media"
 msgstr "请选择介质"
 
-#: install_any.pm:1698
+#: install_any.pm:1658
 #, c-format
 msgid "Bad media %s"
 msgstr "无效的介质 %s"
 
-#: install_any.pm:1710
+#: install_any.pm:1670
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "文件已经存在。覆盖吗?"
 
-#: install_any.pm:1761
+#: install_any.pm:1721
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "无法在分区完成之前进行屏幕捕捉"
 
-#: install_any.pm:1768
+#: install_any.pm:1728
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "安装完成后, 所有的屏幕抓图都会保存到 %s 之中"
@@ -5885,7 +5888,7 @@ msgstr ""
 "\n"
 "要继续吗?"
 
-#: install_interactive.pm:70 install_steps.pm:211
+#: install_interactive.pm:70 install_steps.pm:219
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "您必须有一个FAT分区载入 /boot/efi"
@@ -6355,12 +6358,12 @@ msgstr ""
 msgid "http://www.mandrivalinux.com/en/errata.php3"
 msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
-#: install_steps.pm:246
+#: install_steps.pm:254
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "重复的挂载点 %s"
 
-#: install_steps.pm:479
+#: install_steps.pm:489
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -6377,7 +6380,7 @@ msgstr ""
 msgid "Entering step `%s'\n"
 msgstr "进入步骤“%s”\n"
 
-#: install_steps_gtk.pm:176
+#: install_steps_gtk.pm:177
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -6386,94 +6389,94 @@ msgid ""
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: install_steps_gtk.pm:223 install_steps_interactive.pm:624
+#: install_steps_gtk.pm:224 install_steps_interactive.pm:624
 #, c-format
 msgid "Package Group Selection"
 msgstr "程序组选择"
 
-#: install_steps_gtk.pm:249 install_steps_interactive.pm:567
+#: install_steps_gtk.pm:250 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "总共大小: %d / %d MB"
 
-#: install_steps_gtk.pm:294
+#: install_steps_gtk.pm:295
 #, c-format
 msgid "Bad package"
 msgstr "有错的软件包"
 
-#: install_steps_gtk.pm:296
+#: install_steps_gtk.pm:297
 #, c-format
 msgid "Version: "
 msgstr "版本: "
 
-#: install_steps_gtk.pm:297
+#: install_steps_gtk.pm:298
 #, c-format
 msgid "Size: "
 msgstr "大小: "
 
-#: install_steps_gtk.pm:297
+#: install_steps_gtk.pm:298
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:298
+#: install_steps_gtk.pm:299
 #, c-format
 msgid "Importance: "
 msgstr "重要程度: "
 
-#: install_steps_gtk.pm:331
+#: install_steps_gtk.pm:332
 #, c-format
 msgid "You can not select/unselect this package"
 msgstr "您不能改变这个软件包的选定"
 
-#: install_steps_gtk.pm:335
+#: install_steps_gtk.pm:336
 #, c-format
 msgid "due to missing %s"
 msgstr "由于缺少 %s"
 
-#: install_steps_gtk.pm:336
+#: install_steps_gtk.pm:337
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由于不满足的 %s"
 
-#: install_steps_gtk.pm:337
+#: install_steps_gtk.pm:338
 #, c-format
 msgid "trying to promote %s"
 msgstr "尝试推广 %s"
 
-#: install_steps_gtk.pm:338
+#: install_steps_gtk.pm:339
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:344
 #, c-format
 msgid ""
 "You can not select this package as there is not enough space left to install "
 "it"
 msgstr "您不可以选择这个软件包。没有足够空间安装它。"
 
-#: install_steps_gtk.pm:346
+#: install_steps_gtk.pm:347
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "即将安装下列软件包"
 
-#: install_steps_gtk.pm:347
+#: install_steps_gtk.pm:348
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "即将卸载下列软件包"
 
-#: install_steps_gtk.pm:371
+#: install_steps_gtk.pm:372
 #, c-format
 msgid "This is a mandatory package, it can not be unselected"
 msgstr "这个软件包是必需的, 不能取消选定"
 
-#: install_steps_gtk.pm:373
+#: install_steps_gtk.pm:374
 #, c-format
 msgid "You can not unselect this package. It is already installed"
 msgstr "您不可以取消选择这个软件包。它已经安装过了"
 
-#: install_steps_gtk.pm:376
+#: install_steps_gtk.pm:377
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6482,78 +6485,78 @@ msgstr ""
 "这个软件包必须进行升级。\n"
 "您真的要删除它吗?"
 
-#: install_steps_gtk.pm:379
+#: install_steps_gtk.pm:380
 #, c-format
 msgid "You can not unselect this package. It must be upgraded"
 msgstr "您不能不选择这个软件包。它必须升级"
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:385
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "自动显示选中的软件包"
 
-#: install_steps_gtk.pm:389
+#: install_steps_gtk.pm:390
 #, c-format
 msgid "Load/Save selection"
 msgstr "装入/保存选择"
 
-#: install_steps_gtk.pm:390
+#: install_steps_gtk.pm:391
 #, c-format
 msgid "Updating package selection"
 msgstr "更新软件包选择"
 
-#: install_steps_gtk.pm:395
+#: install_steps_gtk.pm:396
 #, c-format
 msgid "Minimal install"
 msgstr "最小安装"
 
-#: install_steps_gtk.pm:409 install_steps_interactive.pm:483
+#: install_steps_gtk.pm:410 install_steps_interactive.pm:483
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "选择您想要安装的软件包"
 
-#: install_steps_gtk.pm:425 install_steps_interactive.pm:706
+#: install_steps_gtk.pm:426 install_steps_interactive.pm:710
 #, c-format
 msgid "Installing"
 msgstr "正在安装"
 
-#: install_steps_gtk.pm:432
+#: install_steps_gtk.pm:433
 #, c-format
 msgid "Estimating"
 msgstr "正在估计"
 
-#: install_steps_gtk.pm:481
+#: install_steps_gtk.pm:482
 #, c-format
 msgid "No details"
 msgstr "无细节"
 
-#: install_steps_gtk.pm:489
+#: install_steps_gtk.pm:490
 #, c-format
 msgid "Time remaining "
 msgstr "剩余时间"
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:497
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "请稍候, 正在准备安装..."
 
-#: install_steps_gtk.pm:511
+#: install_steps_gtk.pm:512
 #, c-format
 msgid "%d packages"
 msgstr "%d 个软件包"
 
-#: install_steps_gtk.pm:516
+#: install_steps_gtk.pm:517
 #, c-format
 msgid "Installing package %s"
 msgstr "正在安装软件包 %s"
 
-#: install_steps_gtk.pm:551 install_steps_interactive.pm:92
-#: install_steps_interactive.pm:731
+#: install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:735
 #, c-format
 msgid "Refuse"
 msgstr "拒绝"
 
-#: install_steps_gtk.pm:555 install_steps_interactive.pm:735
+#: install_steps_gtk.pm:556 install_steps_interactive.pm:739
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -6566,29 +6569,29 @@ msgstr ""
 "请在驱动器中插入标有“%s”的光盘, 然后单击“确定”。\n"
 "如果您没有这张光盘, 请单击“取消”, 放弃安装这张光盘上的软件。"
 
-#: install_steps_gtk.pm:570 install_steps_interactive.pm:746
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:750
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "排列软件包时出错: "
 
-#: install_steps_gtk.pm:570 install_steps_gtk.pm:574
-#: install_steps_interactive.pm:746 install_steps_interactive.pm:750
+#: install_steps_gtk.pm:571 install_steps_gtk.pm:575
+#: install_steps_interactive.pm:750 install_steps_interactive.pm:754
 #, c-format
 msgid "Go on anyway?"
 msgstr "真的要继续?"
 
-#: install_steps_gtk.pm:574 install_steps_interactive.pm:750
+#: install_steps_gtk.pm:575 install_steps_interactive.pm:754
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "安装软件包时出错: "
 
-#: install_steps_gtk.pm:616 install_steps_interactive.pm:921
-#: install_steps_interactive.pm:1073
+#: install_steps_gtk.pm:617 install_steps_interactive.pm:926
+#: install_steps_interactive.pm:1078
 #, c-format
 msgid "not configured"
 msgstr "未配置"
 
-#: install_steps_gtk.pm:679
+#: install_steps_gtk.pm:680
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -6597,7 +6600,7 @@ msgstr ""
 "找到了下列安装介质。\n"
 "如果您想要跳过其中一些, 请不要选中。"
 
-#: install_steps_gtk.pm:688
+#: install_steps_gtk.pm:689
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -6609,7 +6612,7 @@ msgstr ""
 "然后，安装将会从硬盘继续进行。当系统安装完成后，软件包仍然保留，以供日后添加"
 "软件使用。"
 
-#: install_steps_gtk.pm:690
+#: install_steps_gtk.pm:691
 #, c-format
 msgid "Copy whole CDs"
 msgstr "复制整张光盘"
@@ -6704,7 +6707,7 @@ msgstr "IDE"
 msgid "Configuring IDE"
 msgstr "配置 IDE"
 
-#: install_steps_interactive.pm:256 network/tools.pm:181
+#: install_steps_interactive.pm:256
 #, c-format
 msgid "No partition available"
 msgstr "没有可用的硬盘分区"
@@ -6780,7 +6783,7 @@ msgstr "正在查找已经安装过的软件包..."
 msgid "Finding packages to upgrade..."
 msgstr "正在寻找可升级的程序..."
 
-#: install_steps_interactive.pm:421 install_steps_interactive.pm:826
+#: install_steps_interactive.pm:421 install_steps_interactive.pm:830
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "选择一个镜像网站来取得软件包"
@@ -6865,12 +6868,12 @@ msgstr ""
 msgid "Cd-Rom labeled \"%s\""
 msgstr "标为 %s 的光盘"
 
-#: install_steps_interactive.pm:706
+#: install_steps_interactive.pm:710
 #, c-format
 msgid "Preparing installation"
 msgstr "正在准备安装"
 
-#: install_steps_interactive.pm:715
+#: install_steps_interactive.pm:719
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -6879,17 +6882,17 @@ msgstr ""
 "正在安装软件包 %s \n"
 "%d%%"
 
-#: install_steps_interactive.pm:764
+#: install_steps_interactive.pm:768
 #, c-format
 msgid "Post-install configuration"
 msgstr "安装后的配置"
 
-#: install_steps_interactive.pm:771
+#: install_steps_interactive.pm:775
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "请确定更新模块介质位于驱动器 %s"
 
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:804
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -6908,147 +6911,147 @@ msgstr ""
 "\n"
 "您是否要安装升级包?"
 
-#: install_steps_interactive.pm:821
+#: install_steps_interactive.pm:825
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 
-#: install_steps_interactive.pm:840
+#: install_steps_interactive.pm:844
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "正在连接镜像网站以取得可供安装的软件包的列表..."
 
-#: install_steps_interactive.pm:844
+#: install_steps_interactive.pm:848
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "无法连接镜像 %s"
 
-#: install_steps_interactive.pm:844
+#: install_steps_interactive.pm:848
 #, c-format
 msgid "Would you like to try again?"
 msgstr "您是否想要再试一次?"
 
-#: install_steps_interactive.pm:870 standalone/drakclock:45
+#: install_steps_interactive.pm:875 standalone/drakclock:45
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您所在的时区?"
 
-#: install_steps_interactive.pm:875
+#: install_steps_interactive.pm:880
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自动时间同步(使用 NTP)"
 
-#: install_steps_interactive.pm:883
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "NTP Server"
 msgstr "NTP 服务器"
 
-#: install_steps_interactive.pm:925 steps.pm:30
+#: install_steps_interactive.pm:930 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "概要"
 
-#: install_steps_interactive.pm:938 install_steps_interactive.pm:946
-#: install_steps_interactive.pm:964 install_steps_interactive.pm:971
-#: install_steps_interactive.pm:1125 services.pm:133
+#: install_steps_interactive.pm:943 install_steps_interactive.pm:951
+#: install_steps_interactive.pm:969 install_steps_interactive.pm:976
+#: install_steps_interactive.pm:1130 services.pm:133
 #: standalone/drakbackup:1571
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: install_steps_interactive.pm:978 install_steps_interactive.pm:1005
-#: install_steps_interactive.pm:1022 install_steps_interactive.pm:1038
-#: install_steps_interactive.pm:1049
+#: 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
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: install_steps_interactive.pm:984 install_steps_interactive.pm:993
+#: install_steps_interactive.pm:989 install_steps_interactive.pm:998
 #, c-format
 msgid "Remote CUPS server"
 msgstr "远程 CUPS 服务器"
 
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:989
 #, c-format
 msgid "No printer"
 msgstr "没有打印机"
 
-#: install_steps_interactive.pm:1026
+#: install_steps_interactive.pm:1031
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "您有 ISA 声卡吗?"
 
-#: install_steps_interactive.pm:1028
+#: install_steps_interactive.pm:1033
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "安装之后运行“alsaconf”或“sndconfig”来配置您的声卡"
 
-#: install_steps_interactive.pm:1030
+#: install_steps_interactive.pm:1035
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "没有检测到声卡。请在安装之后尝试“Drak 硬件配置”。"
 
-#: install_steps_interactive.pm:1050
+#: install_steps_interactive.pm:1055
 #, c-format
 msgid "Graphical interface"
 msgstr "图形界面"
 
-#: install_steps_interactive.pm:1056 install_steps_interactive.pm:1071
+#: install_steps_interactive.pm:1061 install_steps_interactive.pm:1076
 #, c-format
 msgid "Network & Internet"
 msgstr "网络和 Internet"
 
-#: install_steps_interactive.pm:1073
+#: install_steps_interactive.pm:1078
 #, c-format
 msgid "configured"
 msgstr "已配置"
 
-#: install_steps_interactive.pm:1082 install_steps_interactive.pm:1096
+#: install_steps_interactive.pm:1087 install_steps_interactive.pm:1101
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "安全"
 
-#: install_steps_interactive.pm:1101
+#: install_steps_interactive.pm:1106
 #, c-format
 msgid "activated"
 msgstr "已激活"
 
-#: install_steps_interactive.pm:1101
+#: install_steps_interactive.pm:1106
 #, c-format
 msgid "disabled"
 msgstr "已禁用"
 
-#: install_steps_interactive.pm:1112
+#: install_steps_interactive.pm:1117
 #, c-format
 msgid "Boot"
 msgstr "启动"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1116
+#: install_steps_interactive.pm:1121
 #, c-format
 msgid "%s on %s"
 msgstr "位于 %2$s 上的 %1$s"
 
-#: install_steps_interactive.pm:1130 services.pm:175
+#: install_steps_interactive.pm:1135 services.pm:175
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "服务: %2$d 项已注册, %1$d 项已激活"
 
-#: install_steps_interactive.pm:1140
+#: install_steps_interactive.pm:1145
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "您还没有配置过 X。您真的想要这样吗?"
 
-#: install_steps_interactive.pm:1220
+#: install_steps_interactive.pm:1225
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "正在准备引导程序..."
 
-#: install_steps_interactive.pm:1230
+#: install_steps_interactive.pm:1235
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -7060,12 +7063,12 @@ msgstr ""
 "续, 不过您需要使用 BootX 或其它方式启动您的机器。根文件系统的内核参数是："
 "root=%s"
 
-#: install_steps_interactive.pm:1236
+#: install_steps_interactive.pm:1241
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "您要使用 aboot 吗?"
 
-#: install_steps_interactive.pm:1239
+#: install_steps_interactive.pm:1244
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7074,29 +7077,29 @@ msgstr ""
 "安装 aboot 时出错, \n"
 "强迫安装会毁坏第一个分区, 要继续吗?"
 
-#: install_steps_interactive.pm:1260
+#: install_steps_interactive.pm:1265
 #, 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:1289 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1294 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "请在驱动器 %s 中插入一张空白软盘"
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1299
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "请插入另外一张软盘, 作为驱动程序盘"
 
-#: install_steps_interactive.pm:1296
+#: install_steps_interactive.pm:1301
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "正在创建自动安装软盘..."
 
-#: install_steps_interactive.pm:1308
+#: install_steps_interactive.pm:1313
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7107,12 +7110,12 @@ msgstr ""
 "\n"
 "您真的要现在退出吗?"
 
-#: install_steps_interactive.pm:1324
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "生成自动安装软盘"
 
-#: install_steps_interactive.pm:1326
+#: install_steps_interactive.pm:1331
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7144,7 +7147,7 @@ msgstr "  <Tab>/<Alt-Tab> 在项目间移动 | <空格> 选择 | <F12> 下个画
 msgid "Choose a file"
 msgstr "选择文件"
 
-#: interactive.pm:318 interactive/gtk.pm:489 standalone/drakbackup:1512
+#: interactive.pm:318 interactive/gtk.pm:505 standalone/drakbackup:1512
 #: standalone/drakfont:656 standalone/drakroam:218 standalone/drakups:301
 #: standalone/drakups:361 standalone/drakups:381 standalone/drakvpn:333
 #: standalone/drakvpn:694
@@ -7152,12 +7155,12 @@ msgstr "选择文件"
 msgid "Add"
 msgstr "添加"
 
-#: interactive.pm:318 interactive/gtk.pm:489
+#: interactive.pm:318 interactive/gtk.pm:505
 #, c-format
 msgid "Modify"
 msgstr "修改"
 
-#: interactive.pm:318 interactive/gtk.pm:489 standalone/drakroam:202
+#: interactive.pm:318 interactive/gtk.pm:505 standalone/drakroam:202
 #: standalone/drakups:303 standalone/drakups:363 standalone/drakups:383
 #: standalone/drakvpn:333 standalone/drakvpn:694
 #, c-format
@@ -8470,7 +8473,7 @@ msgid "Gabon"
 msgstr "加蓬"
 
 #: lang.pm:269 network/adsl_consts.pm:944 network/adsl_consts.pm:955
-#: network/netconnect.pm:53
+#: network/netconnect.pm:54
 #, c-format
 msgid "United Kingdom"
 msgstr "英国"
@@ -9201,18 +9204,18 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: lang.pm:1073
+#: lang.pm:1082
 #, 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:1076 standalone/scannerdrake:135
+#: lang.pm:1085 standalone/scannerdrake:135
 #, c-format
 msgid ", "
 msgstr "、"
 
-#: lang.pm:1129
+#: lang.pm:1138
 #, c-format
 msgid "Welcome to %s"
 msgstr "欢迎使用 %s"
@@ -9417,9 +9420,9 @@ msgstr "GlidePoint"
 
 #: mouse.pm:36 network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
 #: network/modem.pm:85 network/modem.pm:99 network/modem.pm:104
-#: network/modem.pm:137 network/netconnect.pm:700 network/netconnect.pm:705
-#: network/netconnect.pm:717 network/netconnect.pm:722
-#: network/netconnect.pm:738 network/netconnect.pm:740
+#: network/modem.pm:137 network/netconnect.pm:671 network/netconnect.pm:676
+#: network/netconnect.pm:688 network/netconnect.pm:693
+#: network/netconnect.pm:709 network/netconnect.pm:711
 #, c-format
 msgid "Automatic"
 msgstr "自动"
@@ -9634,12 +9637,12 @@ msgstr "Sagem (使用 PPPoA) USB"
 msgid "Sagem (using DHCP) USB"
 msgstr "Sagem (使用 DHCP) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:906
+#: network/adsl.pm:35 network/netconnect.pm:808
 #, c-format
 msgid "Connect to the Internet"
 msgstr "连接到 Internet"
 
-#: network/adsl.pm:36 network/netconnect.pm:907
+#: network/adsl.pm:36 network/netconnect.pm:809
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
@@ -9650,7 +9653,7 @@ msgstr ""
 "有一些利用 PPTP, 还有极少数利用 DHCP。\n"
 "如果您没有把握, 就选择“PPPoE”"
 
-#: network/adsl.pm:41 network/netconnect.pm:911
+#: network/adsl.pm:41 network/netconnect.pm:813
 #, c-format
 msgid "ADSL connection type:"
 msgstr "ADSL 连接类型:"
@@ -9778,36 +9781,36 @@ msgstr "全部(无防火墙)"
 msgid "Other ports"
 msgstr "其它端口"
 
-#: network/isdn.pm:124 network/netconnect.pm:547 network/netconnect.pm:661
-#: network/netconnect.pm:664 network/netconnect.pm:822
-#: network/netconnect.pm:826
+#: network/isdn.pm:121 network/netconnect.pm:538 network/netconnect.pm:632
+#: network/netconnect.pm:635 network/netconnect.pm:779
+#: network/netconnect.pm:783
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "未列出 - 手动编辑"
 
-#: network/isdn.pm:167 network/netconnect.pm:479
+#: network/isdn.pm:164 network/netconnect.pm:470
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:167 network/netconnect.pm:479
+#: network/isdn.pm:164 network/netconnect.pm:470
 #, c-format
 msgid "I do not know"
 msgstr "我不知道"
 
-#: network/isdn.pm:168 network/netconnect.pm:479
+#: network/isdn.pm:165 network/netconnect.pm:470
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:169 network/netconnect.pm:479
+#: network/isdn.pm:166 network/netconnect.pm:470
 #, c-format
 msgid "USB"
 msgstr "USB"
 
 #: network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
-#: network/netconnect.pm:705 network/netconnect.pm:722
-#: network/netconnect.pm:738
+#: network/netconnect.pm:676 network/netconnect.pm:693
+#: network/netconnect.pm:709
 #, c-format
 msgid "Manual"
 msgstr "手动"
@@ -9846,44 +9849,44 @@ msgstr ""
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "找不到 ndiswrapper 接口!"
 
-#: network/netconnect.pm:91 network/netconnect.pm:576
-#: network/netconnect.pm:580
+#: network/netconnect.pm:92 network/netconnect.pm:574
+#: network/netconnect.pm:581
 #, c-format
 msgid "Manual choice"
 msgstr "手动选择"
 
-#: network/netconnect.pm:91
+#: network/netconnect.pm:92
 #, c-format
 msgid "Internal ISDN card"
 msgstr "内置 ISDN 卡"
 
-#: network/netconnect.pm:104 printer/printerdrake.pm:1418
+#: network/netconnect.pm:105 printer/printerdrake.pm:1418
 #: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "手工配置"
 
-#: network/netconnect.pm:105
+#: network/netconnect.pm:106
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "自动 IP(BOOTP/DHCP)"
 
-#: network/netconnect.pm:107
+#: network/netconnect.pm:108
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "自动 IP(BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:110
+#: network/netconnect.pm:111
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "世界其它地区的协议"
 
-#: network/netconnect.pm:112 standalone/drakconnect:574
+#: network/netconnect.pm:113 standalone/drakconnect:574
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "欧洲协议(EDSS1)"
 
-#: network/netconnect.pm:113 standalone/drakconnect:575
+#: network/netconnect.pm:114 standalone/drakconnect:575
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -9892,188 +9895,188 @@ msgstr ""
 "世界其它地区的协议\n"
 "没有 D-信道(专线)"
 
-#: network/netconnect.pm:153
+#: network/netconnect.pm:154 network/thirdparty.pm:183
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "阿尔卡特 Speedtouch USB 调制解调器"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:155
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB 调制解调器"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:156
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan 调制解调器"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:157
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus 调制解调器"
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:161
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "动态主机配置协议(DHCP)"
 
-#: network/netconnect.pm:161
+#: network/netconnect.pm:162
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "手工配置 TCP/IP"
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:163
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "点对点隧道协议(PPTP)"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:164
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "以太网上的点对点协议(PPPoE)"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:165
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "异步传输模式下的点对点协议(PPPoA)"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:166
 #, c-format
 msgid "DSL over CAPI"
 msgstr "CAPI 上的 DSL"
 
-#: network/netconnect.pm:169
+#: network/netconnect.pm:170
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "桥接以太网 LLC"
 
-#: network/netconnect.pm:170
+#: network/netconnect.pm:171
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "桥接以太网 VC"
 
-#: network/netconnect.pm:171
+#: network/netconnect.pm:172
 #, c-format
 msgid "Routed IP LLC"
 msgstr "路由 IP LLC"
 
-#: network/netconnect.pm:172
+#: network/netconnect.pm:173
 #, c-format
 msgid "Routed IP VC"
 msgstr "路由 IP VC"
 
-#: network/netconnect.pm:173
+#: network/netconnect.pm:174
 #, c-format
 msgid "PPPoA LLC"
 msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:174
+#: network/netconnect.pm:175
 #, c-format
 msgid "PPPoA VC"
 msgstr "PPPoA VC"
 
-#: network/netconnect.pm:178 standalone/drakconnect:509
+#: network/netconnect.pm:179 standalone/drakconnect:509
 #, c-format
 msgid "Script-based"
 msgstr "基于脚本登录"
 
-#: network/netconnect.pm:179 standalone/drakconnect:509
+#: network/netconnect.pm:180 standalone/drakconnect:509
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:180 standalone/drakconnect:509
+#: network/netconnect.pm:181 standalone/drakconnect:509
 #, c-format
 msgid "Terminal-based"
 msgstr "基于终端"
 
-#: network/netconnect.pm:181 standalone/drakconnect:509
+#: network/netconnect.pm:182 standalone/drakconnect:509
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:182 standalone/drakconnect:509
+#: network/netconnect.pm:183 standalone/drakconnect:509
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:187
+#: network/netconnect.pm:188
 #, c-format
 msgid "Open WEP"
 msgstr "开放 WEP"
 
-#: network/netconnect.pm:188
+#: network/netconnect.pm:189
 #, c-format
 msgid "Restricted WEP"
 msgstr "限制 WEP"
 
-#: network/netconnect.pm:189
+#: network/netconnect.pm:190
 #, c-format
 msgid "WPA Pre-Shared Key"
 msgstr "WPA 预共享密钥"
 
-#: network/netconnect.pm:294 standalone/drakconnect:60
+#: network/netconnect.pm:295 standalone/drakconnect:60
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "网络和 Internet 配置"
 
-#: network/netconnect.pm:300
+#: network/netconnect.pm:301
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(在端口 %s 检测到)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:302
+#: network/netconnect.pm:303
 #, c-format
 msgid "(detected %s)"
 msgstr "(检测到 %s)"
 
-#: network/netconnect.pm:302
+#: network/netconnect.pm:303
 #, c-format
 msgid "(detected)"
 msgstr "(检测到)"
 
-#: network/netconnect.pm:304
+#: network/netconnect.pm:305
 #, c-format
 msgid "LAN connection"
 msgstr "局域网连接"
 
-#: network/netconnect.pm:305 network/netconnect.pm:324
+#: network/netconnect.pm:306 network/netconnect.pm:325
 #, c-format
 msgid "Wireless connection"
 msgstr "无线连接"
 
-#: network/netconnect.pm:306
+#: network/netconnect.pm:307
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL 连接"
 
-#: network/netconnect.pm:307
+#: network/netconnect.pm:308
 #, c-format
 msgid "Cable connection"
 msgstr "有线电缆连接"
 
-#: network/netconnect.pm:308
+#: network/netconnect.pm:309
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN 连接"
 
-#: network/netconnect.pm:309
+#: network/netconnect.pm:310
 #, c-format
 msgid "Modem connection"
 msgstr "调制解调器连接"
 
-#: network/netconnect.pm:310
+#: network/netconnect.pm:311
 #, c-format
 msgid "DVB connection"
 msgstr ""
 
-#: network/netconnect.pm:320
+#: network/netconnect.pm:321
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "选择您想要配置的连接"
 
-#: network/netconnect.pm:334
+#: network/netconnect.pm:335
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -10086,141 +10089,140 @@ msgstr ""
 "\n"
 "按“%s”继续。"
 
-#: network/netconnect.pm:342 network/netconnect.pm:958
+#: network/netconnect.pm:343 network/netconnect.pm:860
 #, c-format
 msgid "Connection Configuration"
 msgstr "连接配置"
 
-#: network/netconnect.pm:343 network/netconnect.pm:959
+#: network/netconnect.pm:344 network/netconnect.pm:861
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "请填写或选择下列项目"
 
-#: network/netconnect.pm:350 standalone/drakconnect:565
+#: network/netconnect.pm:351 standalone/drakconnect:565
 #, c-format
 msgid "Card IRQ"
 msgstr "网卡的 IRQ"
 
-#: network/netconnect.pm:351 standalone/drakconnect:566
+#: network/netconnect.pm:352 standalone/drakconnect:566
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "网卡内存(DMA)"
 
-#: network/netconnect.pm:352 standalone/drakconnect:567
+#: network/netconnect.pm:353 standalone/drakconnect:567
 #, c-format
 msgid "Card IO"
 msgstr "网卡 IO"
 
-#: network/netconnect.pm:353 standalone/drakconnect:568
+#: network/netconnect.pm:354 standalone/drakconnect:568
 #, c-format
 msgid "Card IO_0"
 msgstr "网卡 IO_0"
 
-#: network/netconnect.pm:354
+#: network/netconnect.pm:355
 #, c-format
 msgid "Card IO_1"
 msgstr "网卡 IO_1"
 
-#: network/netconnect.pm:355
+#: network/netconnect.pm:356
 #, c-format
 msgid "Your personal phone number"
 msgstr "您自己的电话号码"
 
-#: network/netconnect.pm:356 network/netconnect.pm:962
+#: network/netconnect.pm:357 network/netconnect.pm:864
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "服务商名称(如 provider.net)"
 
-#: network/netconnect.pm:357 standalone/drakconnect:504
+#: network/netconnect.pm:358 standalone/drakconnect:504
 #, c-format
 msgid "Provider phone number"
 msgstr "服务商电话号码"
 
-#: network/netconnect.pm:358
+#: network/netconnect.pm:359
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "服务商 DNS 1(可选)"
 
-#: network/netconnect.pm:359
+#: network/netconnect.pm:360
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "服务商 DNS 2(可选)"
 
-#: network/netconnect.pm:360 standalone/drakconnect:455
+#: network/netconnect.pm:361 standalone/drakconnect:455
 #, c-format
 msgid "Dialing mode"
 msgstr "拨号模式"
 
-#: network/netconnect.pm:361 standalone/drakconnect:460
+#: network/netconnect.pm:362 standalone/drakconnect:460
 #: standalone/drakconnect:528
 #, c-format
 msgid "Connection speed"
 msgstr "连接速率"
 
-#: network/netconnect.pm:362 standalone/drakconnect:465
+#: network/netconnect.pm:363 standalone/drakconnect:465
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "连接超时(秒)"
 
-#: network/netconnect.pm:365 network/netconnect.pm:386
-#: network/netconnect.pm:965 standalone/drakconnect:502
+#: network/netconnect.pm:366 network/netconnect.pm:387
+#: network/netconnect.pm:867 standalone/drakconnect:502
 #, c-format
 msgid "Account Login (user name)"
 msgstr "账户登录(用户名)"
 
-#: network/netconnect.pm:366 network/netconnect.pm:387
-#: network/netconnect.pm:966 standalone/drakconnect:503
+#: network/netconnect.pm:367 network/netconnect.pm:388
+#: network/netconnect.pm:868 standalone/drakconnect:503
 #, c-format
 msgid "Account Password"
 msgstr "账户密码"
 
-#: network/netconnect.pm:382
+#: network/netconnect.pm:383
 #, c-format
 msgid "Cable: account options"
 msgstr "光缆: 账户选项"
 
-#: network/netconnect.pm:385
+#: network/netconnect.pm:386
 #, c-format
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "使用 BPALogin (Telstra 需要)"
 
-#: network/netconnect.pm:419 network/netconnect.pm:775
-#: network/netconnect.pm:1004 network/netconnect.pm:1309
+#: network/netconnect.pm:420 network/netconnect.pm:746
+#: network/netconnect.pm:906 network/netconnect.pm:1210
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "选择要配置的网卡: "
 
-#: network/netconnect.pm:421 network/netconnect.pm:469
-#: network/netconnect.pm:776 network/netconnect.pm:1006
-#: network/shorewall.pm:96 standalone/drakconnect:720 standalone/drakgw:224
-#: standalone/drakvpn:221
+#: network/netconnect.pm:422 network/netconnect.pm:460
+#: network/netconnect.pm:747 network/netconnect.pm:908 network/shorewall.pm:72
+#: standalone/drakconnect:720 standalone/drakvpn:221
 #, c-format
 msgid "Net Device"
 msgstr "网络设备"
 
-#: network/netconnect.pm:422 network/netconnect.pm:430
+#: network/netconnect.pm:423 network/netconnect.pm:431
 #, c-format
 msgid "External ISDN modem"
 msgstr "外置 ISDN 调制解调器"
 
-#: network/netconnect.pm:468 standalone/harddrake2:215
+#: network/netconnect.pm:459 standalone/harddrake2:215
 #, c-format
 msgid "Select a device!"
 msgstr "请选择设备！"
 
-#: network/netconnect.pm:477 network/netconnect.pm:487
-#: network/netconnect.pm:497 network/netconnect.pm:530
-#: network/netconnect.pm:544
+#: network/netconnect.pm:468 network/netconnect.pm:478
+#: network/netconnect.pm:488 network/netconnect.pm:521
+#: network/netconnect.pm:535
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN 配置"
 
-#: network/netconnect.pm:478
+#: network/netconnect.pm:469
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "请问您适配卡的种类?"
 
-#: network/netconnect.pm:488
+#: network/netconnect.pm:479
 #, c-format
 msgid ""
 "\n"
@@ -10234,22 +10236,22 @@ msgstr ""
 "\n"
 "如果您的卡是 PCMCIA 卡, 您必须知道它的“irq”和“io”。\n"
 
-#: network/netconnect.pm:492
+#: network/netconnect.pm:483
 #, c-format
 msgid "Continue"
 msgstr "继续"
 
-#: network/netconnect.pm:492
+#: network/netconnect.pm:483
 #, c-format
 msgid "Abort"
 msgstr "中止"
 
-#: network/netconnect.pm:498
+#: network/netconnect.pm:489
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "下列哪个是您的 ISDN 卡?"
 
-#: network/netconnect.pm:516
+#: network/netconnect.pm:507
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -10259,25 +10261,25 @@ msgstr ""
 "此调制解调器适用 CAPI 驱动程序。此 CAPI 驱动程序比免费驱动程序提供更多的功能"
 "(比如发送传真)。您想要使用哪个驱动程序?"
 
-#: network/netconnect.pm:518 standalone/drakconnect:117 standalone/drakups:251
+#: network/netconnect.pm:509 standalone/drakconnect:117 standalone/drakups:251
 #: standalone/harddrake2:132
 #, c-format
 msgid "Driver"
 msgstr "驱动程序"
 
-#: network/netconnect.pm:530
+#: network/netconnect.pm:521
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "您将使用哪种协议?"
 
-#: network/netconnect.pm:532 standalone/drakconnect:117
+#: network/netconnect.pm:523 standalone/drakconnect:117
 #: standalone/drakconnect:311 standalone/drakconnect:573
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "协议"
 
-#: network/netconnect.pm:544
+#: network/netconnect.pm:535
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -10286,13 +10288,13 @@ msgstr ""
 "选择您的提供商。\n"
 "如果该提供商未被列出, 请选择“未列出”。"
 
-#: network/netconnect.pm:546 network/netconnect.pm:660
-#: network/netconnect.pm:821
+#: network/netconnect.pm:537 network/netconnect.pm:631
+#: network/netconnect.pm:778
 #, c-format
 msgid "Provider:"
 msgstr "服务商:"
 
-#: network/netconnect.pm:561
+#: network/netconnect.pm:552
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -10301,52 +10303,52 @@ msgstr ""
 "您的调制解调器不被系统支持。\n"
 "请看看 http://www.linmodems.org"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:571
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "选择要配置的调制解调器:"
 
-#: network/netconnect.pm:627
+#: network/netconnect.pm:599
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "请选择您的调制解调器是连接到哪个串行端口。"
 
-#: network/netconnect.pm:658
+#: network/netconnect.pm:629
 #, c-format
 msgid "Select your provider:"
 msgstr "选择您的服务商:"
 
-#: network/netconnect.pm:682
+#: network/netconnect.pm:653
 #, c-format
 msgid "Dialup: account options"
 msgstr "拨号: 账户设置"
 
-#: network/netconnect.pm:685
+#: network/netconnect.pm:656
 #, c-format
 msgid "Connection name"
 msgstr "连接名称"
 
-#: network/netconnect.pm:686
+#: network/netconnect.pm:657
 #, c-format
 msgid "Phone number"
 msgstr "电话号码"
 
-#: network/netconnect.pm:687
+#: network/netconnect.pm:658
 #, c-format
 msgid "Login ID"
 msgstr "登录 ID"
 
-#: network/netconnect.pm:702 network/netconnect.pm:735
+#: network/netconnect.pm:673 network/netconnect.pm:706
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "拨号: IP 参数"
 
-#: network/netconnect.pm:705
+#: network/netconnect.pm:676
 #, c-format
 msgid "IP parameters"
 msgstr "IP 参数"
 
-#: network/netconnect.pm:706 network/netconnect.pm:1096
+#: network/netconnect.pm:677 network/netconnect.pm:996
 #: printer/printerdrake.pm:460 standalone/drakconnect:117
 #: standalone/drakconnect:327 standalone/drakconnect:915
 #: standalone/drakups:286
@@ -10354,128 +10356,79 @@ msgstr "IP 参数"
 msgid "IP address"
 msgstr "IP 地址"
 
-#: network/netconnect.pm:707
+#: network/netconnect.pm:678
 #, c-format
 msgid "Subnet mask"
 msgstr "子网掩码"
 
-#: network/netconnect.pm:719
+#: network/netconnect.pm:690
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "拨号: DNS 参数"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:693
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:723
+#: network/netconnect.pm:694
 #, c-format
 msgid "Domain name"
 msgstr "域名"
 
-#: network/netconnect.pm:724 network/netconnect.pm:963
+#: network/netconnect.pm:695 network/netconnect.pm:865
 #: standalone/drakconnect:1033
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "首选 DNS 服务器(可选)"
 
-#: network/netconnect.pm:725 network/netconnect.pm:964
+#: network/netconnect.pm:696 network/netconnect.pm:866
 #: standalone/drakconnect:1034
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "备选 DNS 服务器(可选)"
 
-#: network/netconnect.pm:726
+#: network/netconnect.pm:697
 #, c-format
 msgid "Set hostname from IP"
 msgstr "由 IP 设置主机名"
 
-#: network/netconnect.pm:738 standalone/drakconnect:338
+#: network/netconnect.pm:709 standalone/drakconnect:338
 #, c-format
 msgid "Gateway"
 msgstr "网关"
 
-#: network/netconnect.pm:739
+#: network/netconnect.pm:710
 #, c-format
 msgid "Gateway IP address"
 msgstr "网关 IP 地址"
 
-#: network/netconnect.pm:775
+#: network/netconnect.pm:746
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSL 配置"
 
-#: network/netconnect.pm:819
+#: network/netconnect.pm:776
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "请选择您的 ADSL 提供商"
 
-#: network/netconnect.pm:840
-#, c-format
-msgid ""
-"You need the Alcatel microcode.\n"
-"You can provide it now via a floppy or your windows partition,\n"
-"or skip and do it later."
-msgstr ""
-"您需要阿尔卡特微代码。\n"
-"您可以通过软盘或您的 Windows 分区提供该微代码,\n"
-"或者现在跳过稍后再做。"
-
-#: network/netconnect.pm:844 network/netconnect.pm:849
-#, c-format
-msgid "Use a floppy"
-msgstr "使用软盘"
-
-#: network/netconnect.pm:844 network/netconnect.pm:853
-#, c-format
-msgid "Use my Windows partition"
-msgstr "使用我的 Windows 分区"
-
-#: network/netconnect.pm:844 network/netconnect.pm:856
-#, c-format
-msgid "Do it later"
-msgstr "稍后再做"
-
-#: network/netconnect.pm:863
-#, c-format
-msgid "Firmware copy failed, file %s not found"
-msgstr "固件复制失败, 文件 %s 未找到"
-
 #: network/netconnect.pm:870
 #, c-format
-msgid "Firmware copy succeeded"
-msgstr "固件复制成功"
-
-#: network/netconnect.pm:885
-#, c-format
-msgid ""
-"You need the Alcatel microcode.\n"
-"Download it at:\n"
-"%s\n"
-"and copy the mgmt.o in /usr/share/speedtouch"
-msgstr ""
-"您需要阿尔卡特微码。\n"
-"请从\n"
-"%s\n"
-"下载并将 mgmt.o 复制到 /usr/share/speedtouch"
-
-#: network/netconnect.pm:968
-#, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "虚拟路径 ID (VPI):"
 
-#: network/netconnect.pm:969
+#: network/netconnect.pm:871
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "虚拟电路 ID (VCI):"
 
-#: network/netconnect.pm:972
+#: network/netconnect.pm:874
 #, c-format
 msgid "Encapsulation:"
 msgstr "封装: "
 
-#: network/netconnect.pm:994
+#: network/netconnect.pm:896 network/thirdparty.pm:204
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10487,40 +10440,42 @@ msgstr ""
 "\n"
 "您可以在此网站: http://eciadsl.flashtux.org/ 找到驱动程序。"
 
-#: network/netconnect.pm:1006
+#: network/netconnect.pm:908
 #, c-format
 msgid "Manually load a driver"
 msgstr "手动装入驱动程序"
 
-#: network/netconnect.pm:1006
+#: network/netconnect.pm:908
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "使用 Windows 驱动程序(通过 ndiswrapper)"
 
-#: network/netconnect.pm:1013 network/netconnect.pm:1274
-#: network/netconnect.pm:1278 printer/printerdrake.pm:3741
+#: network/netconnect.pm:915 network/netconnect.pm:1174
+#: network/netconnect.pm:1178 printer/printerdrake.pm:3741
+#: standalone/drakgw:220 standalone/drakgw:261 standalone/drakgw:295
+#: standalone/drakgw:400
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "无法安装 %s 软件包!"
 
-#: network/netconnect.pm:1048
+#: network/netconnect.pm:950
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf 主机名解析"
 
-#: network/netconnect.pm:1049 network/netconnect.pm:1083
+#: network/netconnect.pm:951 network/netconnect.pm:983
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "配置网络设备 %s(驱动程序 %s)"
 
-#: network/netconnect.pm:1050
+#: network/netconnect.pm:952
 #, 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:1084
+#: network/netconnect.pm:984
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10531,186 +10486,186 @@ msgstr ""
 "下列项目要求以句点分隔十进制格式输入的 IP 地址。\n"
 "(例如, 1.2.3.4)"
 
-#: network/netconnect.pm:1091 standalone/drakconnect:384
+#: network/netconnect.pm:991 standalone/drakconnect:384
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "从 DHCP 地址指定主机名"
 
-#: network/netconnect.pm:1092 standalone/drakconnect:386
+#: network/netconnect.pm:992 standalone/drakconnect:386
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP 主机名"
 
-#: network/netconnect.pm:1097 standalone/drakconnect:332
-#: standalone/drakconnect:916 standalone/drakgw:320
+#: network/netconnect.pm:997 standalone/drakconnect:332
+#: standalone/drakconnect:916 standalone/drakgw:184
 #, c-format
 msgid "Netmask"
 msgstr "子网掩码"
 
-#: network/netconnect.pm:1099 standalone/drakconnect:448
+#: network/netconnect.pm:999 standalone/drakconnect:448
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "跟踪网卡标志(用于笔记本电脑)"
 
-#: network/netconnect.pm:1101 standalone/drakconnect:449
+#: network/netconnect.pm:1001 standalone/drakconnect:449
 #, c-format
 msgid "Network Hotplugging"
 msgstr "网络热插拔"
 
-#: network/netconnect.pm:1103 standalone/drakconnect:443
+#: network/netconnect.pm:1003 standalone/drakconnect:443
 #, c-format
 msgid "Start at boot"
 msgstr "开机时启动"
 
-#: network/netconnect.pm:1105 standalone/drakconnect:471
+#: network/netconnect.pm:1005 standalone/drakconnect:471
 #, c-format
 msgid "Metric"
 msgstr "度量衡"
 
-#: network/netconnect.pm:1107 standalone/drakconnect:380
+#: network/netconnect.pm:1007 standalone/drakconnect:380
 #: standalone/drakconnect:919
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP 客户端"
 
-#: network/netconnect.pm:1109 standalone/drakconnect:390
+#: network/netconnect.pm:1009 standalone/drakconnect:390
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP 超时(秒)"
 
-#: network/netconnect.pm:1110 standalone/drakconnect:393
+#: network/netconnect.pm:1010 standalone/drakconnect:393
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "从 DHCP 获取 DNS 服务器"
 
-#: network/netconnect.pm:1111 standalone/drakconnect:394
+#: network/netconnect.pm:1011 standalone/drakconnect:394
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "从 DHCP 获取 YP 服务器"
 
-#: network/netconnect.pm:1112 standalone/drakconnect:395
+#: network/netconnect.pm:1012 standalone/drakconnect:395
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "从 DHCP 获取 NTPD 服务器"
 
-#: network/netconnect.pm:1121 printer/printerdrake.pm:1672
+#: network/netconnect.pm:1021 printer/printerdrake.pm:1672
 #: standalone/drakconnect:683
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP 地址的格式应该是 1.2.3.4"
 
-#: network/netconnect.pm:1125 standalone/drakconnect:687
+#: network/netconnect.pm:1025 standalone/drakconnect:687
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "子网掩码的格式应该是 255.255.224.0"
 
-#: network/netconnect.pm:1129
+#: network/netconnect.pm:1029
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "警告: IP 地址 %s 通常是被保留的！"
 
-#: network/netconnect.pm:1134 standalone/drakTermServ:1783
+#: network/netconnect.pm:1034 standalone/drakTermServ:1783
 #: standalone/drakTermServ:1784 standalone/drakTermServ:1785
 #, c-format
 msgid "%s already in use\n"
 msgstr "%s 已经被使用了\n"
 
-#: network/netconnect.pm:1167
+#: network/netconnect.pm:1067
 #, c-format
 msgid "Choose an ndiswrapper driver"
 msgstr "选择 ndiswrapper 驱动程序"
 
-#: network/netconnect.pm:1169
+#: network/netconnect.pm:1069
 #, c-format
 msgid "Use the ndiswrapper driver %s"
 msgstr "使用 ndiswrapper 驱动程序 %s"
 
-#: network/netconnect.pm:1169
+#: network/netconnect.pm:1069
 #, c-format
 msgid "Install a new driver"
 msgstr "安装新驱动程序"
 
-#: network/netconnect.pm:1181
+#: network/netconnect.pm:1081
 #, c-format
 msgid "Select a device:"
 msgstr "选择设备:"
 
-#: network/netconnect.pm:1208
+#: network/netconnect.pm:1108
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "请选择此网卡的无线参数:"
 
-#: network/netconnect.pm:1211 standalone/drakconnect:415
+#: network/netconnect.pm:1111 standalone/drakconnect:415
 #, c-format
 msgid "Operating Mode"
 msgstr "操作模式"
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1112
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1112
 #, c-format
 msgid "Managed"
 msgstr "受控的"
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1112
 #, c-format
 msgid "Master"
 msgstr "主要的"
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1112
 #, c-format
 msgid "Repeater"
 msgstr "转发器"
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1112
 #, c-format
 msgid "Secondary"
 msgstr "次要的"
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1112
 #, c-format
 msgid "Auto"
 msgstr "自动"
 
-#: network/netconnect.pm:1214 standalone/drakconnect:416
+#: network/netconnect.pm:1114 standalone/drakconnect:416
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "网络名称(ESSID)"
 
-#: network/netconnect.pm:1215 standalone/drakconnect:417
+#: network/netconnect.pm:1115 standalone/drakconnect:417
 #, c-format
 msgid "Network ID"
 msgstr "网络 ID"
 
-#: network/netconnect.pm:1216 standalone/drakconnect:418
+#: network/netconnect.pm:1116 standalone/drakconnect:418
 #, c-format
 msgid "Operating frequency"
 msgstr "运行频率"
 
-#: network/netconnect.pm:1217 standalone/drakconnect:419
+#: network/netconnect.pm:1117 standalone/drakconnect:419
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "灵敏度阀值"
 
-#: network/netconnect.pm:1218 standalone/drakconnect:420
+#: network/netconnect.pm:1118 standalone/drakconnect:420
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "比特率(每秒比特数, b/s)"
 
-#: network/netconnect.pm:1219
+#: network/netconnect.pm:1119
 #, c-format
 msgid "Encryption mode"
 msgstr "加密模式"
 
-#: network/netconnect.pm:1223 standalone/drakconnect:431
+#: network/netconnect.pm:1123 standalone/drakconnect:431
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:1224
+#: network/netconnect.pm:1124
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10729,17 +10684,17 @@ msgstr ""
 "包\n"
 "的大小, 一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
 
-#: network/netconnect.pm:1231 standalone/drakconnect:432
+#: network/netconnect.pm:1131 standalone/drakconnect:432
 #, c-format
 msgid "Fragmentation"
 msgstr "块"
 
-#: network/netconnect.pm:1232 standalone/drakconnect:433
+#: network/netconnect.pm:1132 standalone/drakconnect:433
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "Iwconfig 命令的额外参数"
 
-#: network/netconnect.pm:1233
+#: network/netconnect.pm:1133
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10755,12 +10710,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:1240 standalone/drakconnect:434
+#: network/netconnect.pm:1140 standalone/drakconnect:434
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr "Iwspy 命令的额外参数"
 
-#: network/netconnect.pm:1241
+#: network/netconnect.pm:1141
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10778,12 +10733,12 @@ msgstr ""
 "\n"
 "请参看 iwpspy(8) man page 中的更多信息。"
 
-#: network/netconnect.pm:1250 standalone/drakconnect:435
+#: network/netconnect.pm:1150 standalone/drakconnect:435
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "Iwpriv 命令的额外参数"
 
-#: network/netconnect.pm:1251
+#: network/netconnect.pm:1151
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10812,7 +10767,7 @@ msgstr ""
 "\n"
 "请参看 iwpriv(8) man page 中的更多信息。"
 
-#: network/netconnect.pm:1266
+#: network/netconnect.pm:1166
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10821,44 +10776,44 @@ msgstr ""
 "频率应该有后缀 k, M 或 G(如“2.46G”代表 2.46 GHz 频率), 或者后带足够"
 "的“0”(零)。"
 
-#: network/netconnect.pm:1270
+#: network/netconnect.pm:1170
 #, 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:1309
+#: network/netconnect.pm:1210
 #, c-format
 msgid "DVB configuration"
 msgstr ""
 
-#: network/netconnect.pm:1310
+#: network/netconnect.pm:1211
 #, c-format
 msgid "DVB Adapter"
 msgstr ""
 
-#: network/netconnect.pm:1328
+#: network/netconnect.pm:1229
 #, c-format
 msgid "DVB adapter settings"
 msgstr ""
 
-#: network/netconnect.pm:1331
+#: network/netconnect.pm:1232
 #, c-format
 msgid "Adapter card"
 msgstr ""
 
-#: network/netconnect.pm:1332
+#: network/netconnect.pm:1233
 #, c-format
 msgid "Net demux"
 msgstr ""
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1234
 #, c-format
 msgid "PID"
 msgstr ""
 
-#: network/netconnect.pm:1361
+#: network/netconnect.pm:1262
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10870,67 +10825,67 @@ msgstr ""
 "您的主机名称必需是个完全限定的名称, 例如“mybox.mylab.myco.com”。\n"
 "如果您有网关的话, 也请输入其 IP 地址。"
 
-#: network/netconnect.pm:1366
+#: network/netconnect.pm:1267
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr "最后, 您还应该至少输入您 DNS 服务器的 IP 地址。"
 
-#: network/netconnect.pm:1368 standalone/drakconnect:1032
+#: network/netconnect.pm:1269 standalone/drakconnect:1032
 #, c-format
 msgid "Host name (optional)"
 msgstr "主机名(可选)"
 
-#: network/netconnect.pm:1368
+#: network/netconnect.pm:1269
 #, c-format
 msgid "Host name"
 msgstr "主机名"
 
-#: network/netconnect.pm:1370
+#: network/netconnect.pm:1271
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS 服务器 1"
 
-#: network/netconnect.pm:1371
+#: network/netconnect.pm:1272
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS 服务器 2"
 
-#: network/netconnect.pm:1372
+#: network/netconnect.pm:1273
 #, c-format
 msgid "DNS server 3"
 msgstr "DNS 服务器 3"
 
-#: network/netconnect.pm:1373
+#: network/netconnect.pm:1274
 #, c-format
 msgid "Search domain"
 msgstr "搜索网域"
 
-#: network/netconnect.pm:1374
+#: network/netconnect.pm:1275
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "默认情况下, 搜索域名将会根据完全限定的主机名进行设定"
 
-#: network/netconnect.pm:1375
+#: network/netconnect.pm:1276
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "网关(如 %s)"
 
-#: network/netconnect.pm:1377
+#: network/netconnect.pm:1278
 #, c-format
 msgid "Gateway device"
 msgstr "网关设备"
 
-#: network/netconnect.pm:1386
+#: network/netconnect.pm:1287
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS 服务器的格式应该是 1.2.3.4"
 
-#: network/netconnect.pm:1391 standalone/drakconnect:692
+#: network/netconnect.pm:1292 standalone/drakconnect:692
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "网关地址的格式应该是 1.2.3.4"
 
-#: network/netconnect.pm:1404
+#: network/netconnect.pm:1305
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -10942,17 +10897,17 @@ msgstr ""
 "这将被您的计算机用于通知其未被网络管理的共享资源。\n"
 "大多数网络中不需要此设置。"
 
-#: network/netconnect.pm:1408
+#: network/netconnect.pm:1309
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf 主机名"
 
-#: network/netconnect.pm:1411
+#: network/netconnect.pm:1312
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf 主机名不能包含“.”"
 
-#: network/netconnect.pm:1421
+#: network/netconnect.pm:1322
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10963,57 +10918,57 @@ msgstr ""
 "选择您要使用的一种。\n"
 "\n"
 
-#: network/netconnect.pm:1423
+#: network/netconnect.pm:1324
 #, c-format
 msgid "Internet connection"
 msgstr "Internet 连接"
 
-#: network/netconnect.pm:1432
+#: network/netconnect.pm:1333
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "配置完成, 您想要应用设置吗?"
 
-#: network/netconnect.pm:1439
+#: network/netconnect.pm:1340
 #, c-format
 msgid "Do you want to allow users to start the connection?"
 msgstr "您是否希望允许用户启动连接?"
 
-#: network/netconnect.pm:1459
+#: network/netconnect.pm:1360
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "您是否希望一开机就启动连接?"
 
-#: network/netconnect.pm:1478
+#: network/netconnect.pm:1379
 #, c-format
 msgid "Automatically at boot"
 msgstr "开机时自动启动"
 
-#: network/netconnect.pm:1480
+#: network/netconnect.pm:1381
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "使用系统脱盘中的网络小程序"
 
-#: network/netconnect.pm:1482
+#: network/netconnect.pm:1383
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "手动(启动时仍会激活网卡)"
 
-#: network/netconnect.pm:1491
+#: network/netconnect.pm:1392
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "您想要如何拨打此连接?"
 
-#: network/netconnect.pm:1505
+#: network/netconnect.pm:1406
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "网络需要重新启动。您要重新启动吗?"
 
-#: network/netconnect.pm:1512 network/netconnect.pm:1583
+#: network/netconnect.pm:1413 network/netconnect.pm:1484
 #, c-format
 msgid "Network Configuration"
 msgstr "网络配置"
 
-#: network/netconnect.pm:1513
+#: network/netconnect.pm:1414
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -11024,27 +10979,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1522
+#: network/netconnect.pm:1423
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "您想要测试连接到 Internet 吗?"
 
-#: network/netconnect.pm:1530 standalone/drakconnect:1064
+#: network/netconnect.pm:1431 standalone/drakconnect:1064
 #, c-format
 msgid "Testing your connection..."
 msgstr "正在测试您的连接..."
 
-#: network/netconnect.pm:1550
+#: network/netconnect.pm:1451
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "您的系统现在正连接到 Internet。"
 
-#: network/netconnect.pm:1551
+#: network/netconnect.pm:1452
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "由于安全原因, 现在将断开连接。"
 
-#: network/netconnect.pm:1552
+#: network/netconnect.pm:1453
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -11053,7 +11008,7 @@ msgstr ""
 "看来系统没有连接到 Internet。\n"
 "请重新尝试配置您的连接。"
 
-#: network/netconnect.pm:1567
+#: network/netconnect.pm:1468
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -11062,14 +11017,14 @@ msgstr ""
 "恭喜, 网络和 Internet 配置完成。\n"
 "\n"
 
-#: network/netconnect.pm:1570
+#: network/netconnect.pm:1471
 #, 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:1571
+#: network/netconnect.pm:1472
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
@@ -11080,7 +11035,7 @@ msgstr ""
 "请从网络监视器或者控制中心测试您的连接。如果您的连接不工作, 您可能想要重新配"
 "置。"
 
-#: network/netconnect.pm:1584
+#: network/netconnect.pm:1485
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -11091,7 +11046,7 @@ msgstr ""
 "由于您正在执行网络安装, 您的网络已经配置好了。\n"
 "单击“确定”保存配置, 或“取消”重新配置网络。\n"
 
-#: network/netconnect.pm:1622
+#: network/netconnect.pm:1523
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -11100,44 +11055,32 @@ msgstr ""
 "发生了意外错误: \n"
 "%s"
 
-#: network/network.pm:316
+#: network/network.pm:337
 #, c-format
 msgid "Proxies configuration"
 msgstr "代理服务器配置"
 
-#: network/network.pm:317
+#: network/network.pm:338
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP 代理服务器"
 
-#: network/network.pm:318
+#: network/network.pm:339
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP 代理服务器"
 
-#: network/network.pm:321
+#: network/network.pm:342
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "代理服务器应该是 http://..."
 
-#: network/network.pm:322
+#: network/network.pm:343
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL 应该是以“ftp:”或“http:”开头"
 
-#: network/shorewall.pm:25
-#, c-format
-msgid "Firewalling configuration detected!"
-msgstr "发现防火墙配置！"
-
-#: network/shorewall.pm:26
-#, c-format
-msgid ""
-"Warning! An existing firewalling configuration has been detected. You may "
-"need some manual fixes after installation."
-msgstr "警告！发现原来的配置利用了防火墙功能。您可能需要在安装之后手工修改。"
-
-#: network/shorewall.pm:89 standalone/drakgw:217 standalone/drakvpn:214
+#: network/shorewall.pm:57 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -11154,12 +11097,55 @@ msgstr ""
 "\t\teth0 或 eth1 代表有线电视连接, \n"
 "\t\tippp+ 代表 ISDN 连接。\n"
 
-#: network/tools.pm:190
+#: network/thirdparty.pm:195
+#, fuzzy, c-format
+msgid "Copy the Alcatel microcode as mgmt.o in /usr/share/speedtouch/"
+msgstr ""
+"您需要阿尔卡特微码。\n"
+"请从\n"
+"%s\n"
+"下载并将 mgmt.o 复制到 /usr/share/speedtouch"
+
+#: network/thirdparty.pm:265
+#, fuzzy, c-format
+msgid "Could not install the packages (%s)!"
+msgstr "无法安装 %s 软件包!"
+
+#: network/thirdparty.pm:273
+#, c-format
+msgid "Some packages (%s) are required but aren't available."
+msgstr ""
+
+#: network/thirdparty.pm:274
+#, c-format
+msgid ""
+"These packages can be found in Mandriva Club or in Mandriva commercial "
+"releases."
+msgstr ""
+
+#: network/thirdparty.pm:275
+#, c-format
+msgid ""
+"The required files can also be installed from this URL:\n"
+"%s"
+msgstr ""
+
+#: network/thirdparty.pm:308
+#, fuzzy, c-format
+msgid "Unable to find \"%s\" on your Windows system!"
+msgstr "删除系统中的字体"
+
+#: network/thirdparty.pm:310
+#, c-format
+msgid "No Windows system has been detected!"
+msgstr ""
+
+#: network/thirdparty.pm:320
 #, c-format
 msgid "Insert floppy"
 msgstr "插入软盘"
 
-#: network/tools.pm:191
+#: network/thirdparty.pm:321
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -11168,11 +11154,58 @@ msgstr ""
 "请在驱动器 %s 中插入一张 FAT 格式的软盘, 该软盘要求在根目录有 %s。然后, 请按 "
 "%s"
 
-#: network/tools.pm:196
+#: network/thirdparty.pm:331
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "软驱访问错误, 无法挂载 %s"
 
+#: network/thirdparty.pm:341
+#, c-format
+msgid ""
+"You need the Alcatel microcode.\n"
+"You can provide it now via a floppy or your windows partition,\n"
+"or skip and do it later."
+msgstr ""
+"您需要阿尔卡特微代码。\n"
+"您可以通过软盘或您的 Windows 分区提供该微代码,\n"
+"或者现在跳过稍后再做。"
+
+#: network/thirdparty.pm:345 network/thirdparty.pm:347
+#, c-format
+msgid "Use a floppy"
+msgstr "使用软盘"
+
+#: network/thirdparty.pm:345
+#, c-format
+msgid "Use my Windows partition"
+msgstr "使用我的 Windows 分区"
+
+#: network/thirdparty.pm:355
+#, c-format
+msgid "Firmware copy failed, file %s not found"
+msgstr "固件复制失败, 文件 %s 未找到"
+
+#: network/thirdparty.pm:360 standalone/drakautoinst:252
+#: standalone/drakvpn:902 standalone/scannerdrake:405
+#, c-format
+msgid "Congratulations!"
+msgstr "恭喜！"
+
+#: network/thirdparty.pm:360
+#, c-format
+msgid "Firmware copy succeeded"
+msgstr "固件复制成功"
+
+#: network/thirdparty.pm:425
+#, c-format
+msgid "Looking for required software and drivers..."
+msgstr ""
+
+#: network/thirdparty.pm:435
+#, fuzzy, c-format
+msgid "Please wait, running device configuration commands..."
+msgstr "请稍候, 正在检测并配置设备..."
+
 #: partition_table.pm:397
 #, c-format
 msgid "mount failed: "
@@ -11220,32 +11253,32 @@ msgstr ""
 "一次数据完整性检查失败了。\n"
 "这意味着, 如果继续往硬盘里写入任何东西, 硬盘将可能随时坏掉, 损坏数据"
 
-#: pkgs.pm:23
+#: pkgs.pm:22
 #, c-format
 msgid "must have"
 msgstr "必须拥有"
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "important"
 msgstr "非常重要"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "very nice"
 msgstr "比较重要"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "nice"
 msgstr "一般"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "maybe"
 msgstr "或许有用"
 
-#: pkgs.pm:481
+#: pkgs.pm:468
 #, c-format
 msgid "Downloading file %s..."
 msgstr "正在下载文件 %s..."
@@ -15610,8 +15643,8 @@ msgid ""
 "mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
-"要<b>更多地了解</b>我们的活力社区, 请浏览 <b>www.mandrivalinux.org</b>；而如果"
-"您想要直接<b>参与</b>开发的话, 请直接查看 <b>www.mandrivalinux.org/en/"
+"要<b>更多地了解</b>我们的活力社区, 请浏览 <b>www.mandrivalinux.org</b>；而如"
+"果您想要直接<b>参与</b>开发的话, 请直接查看 <b>www.mandrivalinux.org/en/"
 "cookerdevel.php3</b>。"
 
 #: share/advertising/05.pl:15
@@ -17940,12 +17973,6 @@ msgstr ""
 "\n"
 "左边列出了自动安装可用的选项"
 
-#: standalone/drakautoinst:252 standalone/drakgw:597 standalone/drakvpn:902
-#: standalone/scannerdrake:405
-#, c-format
-msgid "Congratulations!"
-msgstr "恭喜！"
-
 #: standalone/drakautoinst:253
 #, c-format
 msgid ""
@@ -20095,12 +20122,12 @@ msgstr "遇忙等待"
 msgid "Modem sound"
 msgstr "调制解调器声音"
 
-#: standalone/drakconnect:553
+#: standalone/drakconnect:553 standalone/drakgw:108
 #, c-format
 msgid "Enable"
 msgstr "启用"
 
-#: standalone/drakconnect:553
+#: standalone/drakconnect:553 standalone/drakgw:108
 #, c-format
 msgid "Disable"
 msgstr "禁用"
@@ -20131,7 +20158,7 @@ msgstr "总线"
 msgid "Location on the bus"
 msgstr "在总线上的位置"
 
-#: standalone/drakconnect:707 standalone/drakgw:247 standalone/drakpxe:138
+#: standalone/drakconnect:707 standalone/drakgw:325 standalone/drakpxe:138
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -20305,32 +20332,27 @@ msgstr "连接类型:"
 msgid "Status:"
 msgstr "状态: "
 
-#: standalone/drakedm:34
+#: standalone/drakedm:40
 #, c-format
 msgid "GDM (GNOME Display Manager)"
 msgstr "GDM (GNOME 显示管理器)"
 
-#: standalone/drakedm:35
+#: standalone/drakedm:41
 #, c-format
 msgid "KDM (KDE Display Manager)"
 msgstr "KDM (KDE 显示管理器)"
 
-#: standalone/drakedm:36
-#, c-format
-msgid "MdkKDM (Mandriva Linux Display Manager)"
-msgstr "MdkKDM (Mandriva Linux 显示管理器)"
-
-#: standalone/drakedm:37
+#: standalone/drakedm:42
 #, c-format
 msgid "XDM (X Display Manager)"
 msgstr "XDM (X 显示管理器)"
 
-#: standalone/drakedm:55
+#: standalone/drakedm:53
 #, c-format
 msgid "Choosing a display manager"
 msgstr "选择其它显示管理器"
 
-#: standalone/drakedm:56
+#: standalone/drakedm:54
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -20340,12 +20362,12 @@ msgstr ""
 "X11 显示管理器允许您以图形化方式登录到您的系统, 使用 X 窗口系统和在您的本\n"
 "地机器同时跑很多个不同的 X 连接服务。"
 
-#: standalone/drakedm:79
+#: standalone/drakedm:72
 #, c-format
 msgid "The change is done, do you want to restart the dm service?"
 msgstr "更改已经完成, 您想要重新启动 dm 设备吗?"
 
-#: standalone/drakedm:80
+#: standalone/drakedm:73
 #, c-format
 msgid ""
 "You are going to close all running programs and lose your current session. "
@@ -20816,67 +20838,37 @@ msgstr "删除系统中的字体"
 msgid "Post Uninstall"
 msgstr "删除后"
 
-#: standalone/drakgw:58 standalone/drakgw:191
-#, c-format
-msgid "Internet Connection Sharing"
-msgstr "共享互联网连接"
-
-#: standalone/drakgw:111 standalone/drakvpn:51
+#: standalone/drakgw:51 standalone/drakvpn:51
 #, c-format
 msgid "Sorry, we support only 2.4 and above kernels."
 msgstr "对不起, 我们只支持 2.4 及以上版本的内核。"
 
-#: standalone/drakgw:122
+#: standalone/drakgw:78
 #, c-format
-msgid "Internet Connection Sharing currently disabled"
-msgstr "Internet 连接共享现在被禁用"
+msgid "Internet Connection Sharing"
+msgstr "共享互联网连接"
 
-#: standalone/drakgw:123
+#: standalone/drakgw:82
 #, c-format
 msgid ""
-"The setup of Internet connection sharing has already been done.\n"
-"It's currently disabled.\n"
+"You are about to configure your computer to share its Internet connection.\n"
+"With that feature, other computers on your local network will be able to use "
+"this computer's Internet connection.\n"
 "\n"
-"What would you like to do?"
+"Make sure you have configured your Network/Internet access using drakconnect "
+"before going any further.\n"
+"\n"
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN)."
 msgstr ""
-"Internet 连接共享的设定已经完成。\n"
-"它当前已经被禁用。\n"
+"现在将要把您电脑上的 Internet 连接配置为共享给其它电脑。\n"
+"使用此特性, 局域网上的其它计算机都将可以使用本机上的 Internet 连接。\n"
 "\n"
-"您要做什么?"
-
-#: standalone/drakgw:127 standalone/drakvpn:127
-#, c-format
-msgid "enable"
-msgstr "启用"
-
-#: standalone/drakgw:127 standalone/drakgw:154 standalone/drakvpn:101
-#: standalone/drakvpn:127
-#, c-format
-msgid "reconfigure"
-msgstr "重新配置"
-
-#: standalone/drakgw:127 standalone/drakgw:154 standalone/drakvpn:101
-#: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
-#, c-format
-msgid "dismiss"
-msgstr "放弃"
-
-#: standalone/drakgw:134
-#, c-format
-msgid "Enabling servers..."
-msgstr "正在启用服务器..."
-
-#: standalone/drakgw:146
-#, c-format
-msgid "Internet Connection Sharing is now enabled."
-msgstr "Internet 连接共享现已启用。"
-
-#: standalone/drakgw:149
-#, c-format
-msgid "Internet Connection Sharing currently enabled"
-msgstr "Internet 连接共享现在已经启用"
+"请确定在继续操作之前已经使用 DrakConnect 配置了您的网络/Internet 访问。\n"
+"\n"
+"注意: 您另外需要一块专用的网卡来设置局域网(LAN)。"
 
-#: standalone/drakgw:150
+#: standalone/drakgw:98
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -20889,62 +20881,25 @@ msgstr ""
 "\n"
 "您要做什么?"
 
-#: standalone/drakgw:154 standalone/drakvpn:101
-#, c-format
-msgid "disable"
-msgstr "禁用"
-
-#: standalone/drakgw:157
-#, c-format
-msgid "Disabling servers..."
-msgstr "正在禁用服务器..."
-
-#: standalone/drakgw:172
-#, c-format
-msgid "Internet Connection Sharing is now disabled."
-msgstr "Internet 连接共享现在被禁用了。"
-
-#: standalone/drakgw:192
+#: standalone/drakgw:102
 #, c-format
 msgid ""
-"You are about to configure your computer to share its Internet connection.\n"
-"With that feature, other computers on your local network will be able to use "
-"this computer's Internet connection.\n"
-"\n"
-"Make sure you have configured your Network/Internet access using drakconnect "
-"before going any further.\n"
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently disabled.\n"
 "\n"
-"Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN)."
+"What would you like to do?"
 msgstr ""
-"现在将要把您电脑上的 Internet 连接配置为共享给其它电脑。\n"
-"使用此特性, 局域网上的其它计算机都将可以使用本机上的 Internet 连接。\n"
-"\n"
-"请确定在继续操作之前已经使用 DrakConnect 配置了您的网络/Internet 访问。\n"
+"Internet 连接共享的设定已经完成。\n"
+"它当前已经被禁用。\n"
 "\n"
-"注意: 您另外需要一块专用的网卡来设置局域网(LAN)。"
-
-#: standalone/drakgw:236
-#, c-format
-msgid "Interface %s (using module %s)"
-msgstr "网卡 %s(使用 %s 模块)"
-
-#: standalone/drakgw:237
-#, c-format
-msgid "Interface %s"
-msgstr "网卡 %s"
-
-#: standalone/drakgw:246 standalone/drakpxe:137
-#, c-format
-msgid "No network adapter on your system!"
-msgstr "您系统中没有网卡！"
+"您要做什么?"
 
-#: standalone/drakgw:253
-#, c-format
-msgid "Network interface"
-msgstr "网卡"
+#: standalone/drakgw:108
+#, fuzzy, c-format
+msgid "Reconfigure"
+msgstr "重新配置"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:148
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -20959,106 +20914,49 @@ msgstr ""
 "\n"
 "对这块网卡配置您的局域网。"
 
-#: standalone/drakgw:260 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "选择网卡"
-
-#: standalone/drakgw:261
+#: standalone/drakgw:159
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "请选择您将使用哪张网卡连接您的局域网。"
 
-#: standalone/drakgw:290
-#, c-format
-msgid "Network interface already configured"
-msgstr "已完成网络配置"
-
-#: standalone/drakgw:291
-#, c-format
-msgid ""
-"Warning, the network adapter (%s) is already configured.\n"
-"\n"
-"Do you want an automatic re-configuration?\n"
-"\n"
-"You can do it manually but you need to know what you're doing."
-msgstr ""
-"警告, 网卡(%s)已经配置过。\n"
-"\n"
-"您希望自动重新配置吗?\n"
-"\n"
-"如果您知道怎样做, 也可以手工配置。"
-
-#: standalone/drakgw:296
-#, c-format
-msgid "Automatic reconfiguration"
-msgstr "自动重新配置"
+#: standalone/drakgw:180
+#, fuzzy, c-format
+msgid "Local Area Network setings"
+msgstr "本地网络地址"
 
-#: standalone/drakgw:296
+#: standalone/drakgw:183
 #, c-format
-msgid "No (experts only)"
-msgstr "无(仅对专家)"
+msgid "Local Network adress"
+msgstr "本地网络地址"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:185
 #, c-format
-msgid "Show current interface configuration"
-msgstr "修改当前网络接口的配置"
+msgid "The internal domain name"
+msgstr "内部域名"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:191
 #, c-format
-msgid "Current interface configuration"
-msgstr "当前接口配置"
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "在当前的 %s 配置中发现可能的 LAN 地址冲突！\n"
 
-#: standalone/drakgw:299
-#, c-format
-msgid ""
-"Current configuration of `%s':\n"
-"\n"
-"Network: %s\n"
-"IP address: %s\n"
-"IP attribution: %s\n"
-"Driver: %s"
-msgstr ""
-"“%s”的当前配置: \n"
-"\n"
-"网络: %s\n"
-"IP 地址: %s\n"
-"IP 属性: %s\n"
-"其它: %s"
+#: standalone/drakgw:207
+#, fuzzy, c-format
+msgid "Domain Name Server (DNS) configuration"
+msgstr "终端服务器配置"
 
-#: standalone/drakgw:312
+#: standalone/drakgw:211
 #, c-format
-msgid ""
-"I can keep your current configuration and assume you already set up a DHCP "
-"server; in that case please verify I correctly read the Network that you use "
-"for your local network; I will not reconfigure it and I will not touch your "
-"DHCP server configuration.\n"
-"\n"
-"The default DNS entry is the Caching Nameserver configured on the firewall. "
-"You can replace that with your ISP DNS IP, for example.\n"
-"\t\t      \n"
-"Otherwise, I can reconfigure your interface and (re)configure a DHCP server "
-"for you.\n"
-"\n"
+msgid "Use this gateway as domain name server"
 msgstr ""
-"我现在可以保留您当前的设置并假定您已经设置好了 DHCP 服务器；如果是这样的话, "
-"请检查我已经从本地网络上读取到了您正在使用的网络；我不会强行重新配置, 也不会"
-"更改您的 DHCP 服务器配置。\n"
-"\n"
-"默认的 DNS 项是配置在防火墙上的缓冲命名服务器。例如, 您可以将其替换为您的 "
-"ISP DNS IP。\n"
-"\t\t      \n"
-"否则, 我就会重新配置您的接口并重新为您配置 DHCP 服务器。\n"
-"\n"
 
-#: standalone/drakgw:319
+#: standalone/drakgw:212
 #, c-format
-msgid "Local Network adress"
-msgstr "本地网络地址"
+msgid "The DNS Server IP"
+msgstr "DNS 服务器 IP"
 
-#: standalone/drakgw:323
+#: standalone/drakgw:244
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -21071,72 +20969,77 @@ msgstr ""
 "在此您可以选择 DHCP 服务器配置的不同选项。\n"
 "如果您不知道选项的含义, 那么就不管它, 不必进行修改。"
 
-#: standalone/drakgw:327
-#, c-format
-msgid "(This) DHCP Server IP"
-msgstr "(此)DHCP 服务器 IP"
-
-#: standalone/drakgw:328
-#, c-format
-msgid "The DNS Server IP"
-msgstr "DNS 服务器 IP"
-
-#: standalone/drakgw:329
-#, c-format
-msgid "The internal domain name"
-msgstr "内部域名"
+#: standalone/drakgw:251
+#, fuzzy, c-format
+msgid "Use automatic configuration (DHCP)"
+msgstr "自动重新配置"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:252
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP 起始范围"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:253
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP 终止范围"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:254
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "默认租期(以秒为单位)"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:255
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "最长租期(以秒为单位)"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:281
 #, c-format
-msgid "Re-configure interface and DHCP server"
-msgstr "重新配置网卡和 DHCP 服务器"
+msgid "Proxy caching server (SQUID)"
+msgstr ""
 
-#: standalone/drakgw:341
+#: standalone/drakgw:285
 #, c-format
-msgid "The Local Network did not finish with `.0', bailing out."
-msgstr "本地网络没有以“.0”结束, 已经修改。"
+msgid "Use this gateway as proxy caching server"
+msgstr ""
 
-#: standalone/drakgw:351
+#: standalone/drakgw:286
 #, c-format
-msgid "Potential LAN address conflict found in current config of %s!\n"
-msgstr "在当前的 %s 配置中发现可能的 LAN 地址冲突！\n"
+msgid "Admin mail"
+msgstr ""
 
-#: standalone/drakgw:361
-#, c-format
-msgid "Configuring..."
-msgstr "正在配置..."
+#: standalone/drakgw:287
+#, fuzzy, c-format
+msgid "Visible hostname"
+msgstr "远程主机名"
+
+#: standalone/drakgw:288
+#, fuzzy, c-format
+msgid "Proxy port"
+msgstr "属性"
+
+#: standalone/drakgw:289
+#, fuzzy, c-format
+msgid "Cache size (MB)"
+msgstr "缓存大小"
 
-#: standalone/drakgw:362
+#: standalone/drakgw:314
+#, fuzzy, c-format
+msgid "Broadcast printer information"
+msgstr "硬盘信息"
+
+#: standalone/drakgw:331
 #, c-format
-msgid "Configuring scripts, installing software, starting servers..."
-msgstr "正在配置脚本, 安装软件, 启动服务程序 ..."
+msgid "Internet Connection Sharing is now enabled."
+msgstr "Internet 连接共享现已启用。"
 
-#: standalone/drakgw:402 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:337
 #, c-format
-msgid "Problems installing package %s"
-msgstr "安装 %s 软件包出现问题"
+msgid "Internet Connection Sharing is now disabled."
+msgstr "Internet 连接共享现在被禁用了。"
 
-#: standalone/drakgw:598
+#: standalone/drakgw:343
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -21148,6 +21051,33 @@ msgstr ""
 "您现在可以利用自动网络设置(DHCP)和透明代理缓存服务器(SQUID)让您的局域网上其它"
 "的电脑共享您的互联网连接了。"
 
+#: standalone/drakgw:378
+#, c-format
+msgid "Disabling servers..."
+msgstr "正在禁用服务器..."
+
+#: standalone/drakgw:392
+#, c-format
+msgid "Firewalling configuration detected!"
+msgstr "发现防火墙配置！"
+
+#: standalone/drakgw:393
+#, c-format
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fixes after installation."
+msgstr "警告！发现原来的配置利用了防火墙功能。您可能需要在安装之后手工修改。"
+
+#: standalone/drakgw:396
+#, c-format
+msgid "Configuring..."
+msgstr "正在配置..."
+
+#: standalone/drakgw:397
+#, c-format
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "正在配置脚本, 安装软件, 启动服务程序 ..."
+
 #: standalone/drakhelp:17
 #, c-format
 msgid ""
@@ -21459,6 +21389,16 @@ msgstr ""
 "\n"
 "注意: 要建立一个局域网(LAN), 您需要专用的网卡。"
 
+#: standalone/drakpxe:137
+#, c-format
+msgid "No network adapter on your system!"
+msgstr "您系统中没有网卡！"
+
+#: standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "选择网卡"
+
 #: standalone/drakpxe:143
 #, c-format
 msgid "Please choose which network interface will be used for the dhcp server."
@@ -21541,6 +21481,11 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "auto_install.cfg 文件的位置"
 
+#: standalone/drakpxe:231 standalone/drakvpn:278
+#, c-format
+msgid "Problems installing package %s"
+msgstr "安装 %s 软件包出现问题"
+
 #: standalone/drakroam:41
 #, c-format
 msgid ""
@@ -21650,7 +21595,7 @@ msgid "Disconnect"
 msgstr "断开"
 
 #. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:241 standalone/net_applet:90
+#: standalone/drakroam:241 standalone/net_applet:91
 #: standalone/printerdrake:238
 #, c-format
 msgid "Refresh"
@@ -21862,7 +21807,7 @@ msgstr ""
 "注意: 如果您的声卡是 ISA 即插即用的, 您需要使用 sndconfig 程序。只需在控制台"
 "中输入“alsaconf”或“sndconfig”。"
 
-#: standalone/draksplash:26
+#: standalone/draksplash:15
 #, c-format
 msgid ""
 "package 'ImageMagick' is required to be able to complete configuration.\n"
@@ -21871,110 +21816,110 @@ msgstr ""
 "要正常工作需要软件包 ImageMagick。\n"
 "请单击“确定”安装 ImageMagick 或“取消”退出"
 
-#: standalone/draksplash:32
+#: standalone/draksplash:34
 #, c-format
 msgid ""
 "x coordinate of text box\n"
 "in number of characters"
 msgstr "文本框的 X 坐标, 按字符数计算"
 
-#: standalone/draksplash:33
+#: standalone/draksplash:35
 #, c-format
 msgid ""
 "y coordinate of text box\n"
 "in number of characters"
 msgstr "文本框的 Y 坐标, 按字符数计算"
 
-#: standalone/draksplash:34
+#: standalone/draksplash:36
 #, c-format
 msgid "text width"
 msgstr "文本宽度"
 
-#: standalone/draksplash:35
+#: standalone/draksplash:37
 #, c-format
 msgid "text box height"
 msgstr "文本框高度"
 
-#: standalone/draksplash:36
+#: standalone/draksplash:38
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
 "of its upper left corner"
 msgstr "进度条的左上角的 X 坐标"
 
-#: standalone/draksplash:37
+#: standalone/draksplash:39
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
 "of its upper left corner"
 msgstr "进度条的左上角的 Y 坐标"
 
-#: standalone/draksplash:38
+#: standalone/draksplash:40
 #, c-format
 msgid "the width of the progress bar"
 msgstr "进度条的宽度"
 
-#: standalone/draksplash:39
+#: standalone/draksplash:41
 #, c-format
 msgid "the height of the progress bar"
 msgstr "进度条的高度"
 
-#: standalone/draksplash:56 standalone/draksplash:61
+#: standalone/draksplash:58 standalone/draksplash:63
 #, c-format
 msgid "Choose progress bar color"
 msgstr ""
 
-#: standalone/draksplash:57 standalone/draksplash:62
+#: standalone/draksplash:59 standalone/draksplash:64
 #, c-format
 msgid "Choose picture"
 msgstr ""
 
-#: standalone/draksplash:58
+#: standalone/draksplash:60
 #, c-format
 msgid "Silent bootsplash"
 msgstr ""
 
-#: standalone/draksplash:63
+#: standalone/draksplash:65
 #, c-format
 msgid "Verbose bootsplash"
 msgstr ""
 
-#: standalone/draksplash:65
+#: standalone/draksplash:67
 #, c-format
 msgid "Display logo on Console"
 msgstr "在控制台显示 LOGO"
 
-#: standalone/draksplash:68
+#: standalone/draksplash:70
 #, c-format
 msgid "Console bootsplash"
 msgstr ""
 
-#: standalone/draksplash:74
+#: standalone/draksplash:76
 #, c-format
 msgid "Theme name"
 msgstr "主题名称"
 
-#: standalone/draksplash:77
+#: standalone/draksplash:79
 #, c-format
 msgid "final resolution"
 msgstr "最终分辨率"
 
-#: standalone/draksplash:82
+#: standalone/draksplash:84
 #, c-format
 msgid "Save theme"
 msgstr "保存主题"
 
-#: standalone/draksplash:130
+#: standalone/draksplash:145
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "保存开机画面主题..."
 
-#: standalone/draksplash:145
+#: standalone/draksplash:160
 #, c-format
 msgid "choose image"
 msgstr "选择图像"
 
-#: standalone/draksplash:162
+#: standalone/draksplash:177
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "进度条颜色选择"
@@ -22174,6 +22119,22 @@ msgstr ""
 "\n"
 "您要做什么?"
 
+#: standalone/drakvpn:101
+#, c-format
+msgid "disable"
+msgstr "禁用"
+
+#: standalone/drakvpn:101 standalone/drakvpn:127
+#, c-format
+msgid "reconfigure"
+msgstr "重新配置"
+
+#: standalone/drakvpn:101 standalone/drakvpn:127 standalone/drakvpn:376
+#: standalone/drakvpn:735
+#, c-format
+msgid "dismiss"
+msgstr "放弃"
+
 #: standalone/drakvpn:105
 #, c-format
 msgid "Disabling VPN..."
@@ -22204,6 +22165,11 @@ msgstr ""
 "\n"
 "您要做什么?"
 
+#: standalone/drakvpn:127
+#, c-format
+msgid "enable"
+msgstr "启用"
+
 #: standalone/drakvpn:135
 #, c-format
 msgid "Enabling VPN..."
@@ -24681,110 +24647,115 @@ msgstr "监视网络"
 
 #: standalone/net_applet:71
 #, c-format
+msgid "Manage wireless networks"
+msgstr ""
+
+#: standalone/net_applet:72
+#, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
-#: standalone/net_applet:73
+#: standalone/net_applet:74
 #, c-format
 msgid "Watched interface"
 msgstr "监视的接口"
 
-#: standalone/net_applet:82
+#: standalone/net_applet:83
 #, c-format
 msgid "Profiles"
 msgstr "配置文件"
 
-#: standalone/net_applet:91
+#: standalone/net_applet:92
 #, c-format
 msgid "Get Online Help"
 msgstr "获得在线帮助"
 
-#: standalone/net_applet:223
+#: standalone/net_applet:224
 #, c-format
 msgid "Interactive intrusion detection"
 msgstr "交互式检测入侵"
 
-#: standalone/net_applet:227
+#: standalone/net_applet:228
 #, c-format
 msgid "Always launch on startup"
 msgstr "启动时自动调用"
 
-#: standalone/net_applet:280
+#: standalone/net_applet:281
 #, c-format
 msgid "A port scanning attack has been attempted by %s."
 msgstr "%s 试图进行端口扫描攻击。"
 
-#: standalone/net_applet:281
+#: standalone/net_applet:282
 #, c-format
 msgid "The %s service has been attacked by %s."
 msgstr "%s 服务已被 %s 攻击。"
 
-#: standalone/net_applet:282
+#: standalone/net_applet:283
 #, c-format
 msgid "A password cracking attack has been attempted by %s."
 msgstr "%s 正在尝试密码破解攻击。"
 
-#: standalone/net_applet:290
+#: standalone/net_applet:291
 #, c-format
 msgid "Active Firewall: intrusion detected"
 msgstr "活动的防火墙: 检测到了入侵"
 
-#: standalone/net_applet:301
+#: standalone/net_applet:302
 #, c-format
 msgid "Do you want to blacklist the attacker?"
 msgstr "您是否想要将入侵者加入黑名单?"
 
-#: standalone/net_applet:315
+#: standalone/net_applet:316
 #, c-format
 msgid "Always blacklist (do not ask again)"
 msgstr "总是黑名单(以后不再询问)"
 
-#: standalone/net_applet:318
+#: standalone/net_applet:319
 #, c-format
 msgid "Attack details"
 msgstr "攻击细节"
 
-#: standalone/net_applet:322
+#: standalone/net_applet:323
 #, c-format
 msgid "Attack time: %s"
 msgstr "攻击时间: %s"
 
-#: standalone/net_applet:323
+#: standalone/net_applet:324
 #, c-format
 msgid "Network interface: %s"
 msgstr "网卡: %s"
 
-#: standalone/net_applet:324
+#: standalone/net_applet:325
 #, c-format
 msgid "Attack type: %s"
 msgstr "攻击类型: %s"
 
-#: standalone/net_applet:325
+#: standalone/net_applet:326
 #, c-format
 msgid "Protocol: %s"
 msgstr "协议: %s"
 
-#: standalone/net_applet:326
+#: standalone/net_applet:327
 #, c-format
 msgid "Attacker IP address: %s"
 msgstr "攻击者 IP 地址: %s"
 
-#: standalone/net_applet:327
+#: standalone/net_applet:328
 #, c-format
 msgid "Attacker hostname: %s"
 msgstr "攻击者主机名: %s"
 
-#: standalone/net_applet:328
+#: standalone/net_applet:329
 #, c-format
 msgid "Service attacked: %s"
 msgstr "攻击的服务: %s"
 
-#: standalone/net_applet:329
+#: standalone/net_applet:330
 #, c-format
 msgid "Port attacked: %s"
 msgstr "攻击的端口: %s"
 
-#: standalone/net_applet:330
+#: standalone/net_applet:331
 #, c-format
 msgid "Type of ICMP attack: %s"
 msgstr "ICMP 攻击的类型: %s"
@@ -25549,7 +25520,7 @@ msgstr "添加了一些设备: %s\n"
 msgid "- %s was added\n"
 msgstr "- %s 已添加\n"
 
-#: standalone/service_harddrake:203
+#: standalone/service_harddrake:206
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "硬件检测进行中"
@@ -25699,7 +25670,7 @@ msgstr "折叠树"
 msgid "Toggle between flat and group sorted"
 msgstr "切换清单显示/分组排序"
 
-#: wizards.pm:95 wizards2.pm:95
+#: wizards.pm:95
 #, c-format
 msgid ""
 "%s is not installed\n"
@@ -25708,7 +25679,103 @@ msgstr ""
 "%s 未安装\n"
 "请点击“下一步”进行安装, 或者点击“取消”退出"
 
-#: wizards.pm:99 wizards2.pm:99
+#: wizards.pm:99
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
+
+#~ msgid "Do it later"
+#~ msgstr "稍后再做"
+
+#~ msgid "MdkKDM (Mandriva Linux Display Manager)"
+#~ msgstr "MdkKDM (Mandriva Linux 显示管理器)"
+
+#~ msgid "Internet Connection Sharing currently disabled"
+#~ msgstr "Internet 连接共享现在被禁用"
+
+#~ msgid "Enabling servers..."
+#~ msgstr "正在启用服务器..."
+
+#~ msgid "Internet Connection Sharing currently enabled"
+#~ msgstr "Internet 连接共享现在已经启用"
+
+#~ msgid "Interface %s (using module %s)"
+#~ msgstr "网卡 %s(使用 %s 模块)"
+
+#~ msgid "Interface %s"
+#~ msgstr "网卡 %s"
+
+#~ msgid "Network interface"
+#~ msgstr "网卡"
+
+#~ msgid "Network interface already configured"
+#~ msgstr "已完成网络配置"
+
+#~ msgid ""
+#~ "Warning, the network adapter (%s) is already configured.\n"
+#~ "\n"
+#~ "Do you want an automatic re-configuration?\n"
+#~ "\n"
+#~ "You can do it manually but you need to know what you're doing."
+#~ msgstr ""
+#~ "警告, 网卡(%s)已经配置过。\n"
+#~ "\n"
+#~ "您希望自动重新配置吗?\n"
+#~ "\n"
+#~ "如果您知道怎样做, 也可以手工配置。"
+
+#~ msgid "No (experts only)"
+#~ msgstr "无(仅对专家)"
+
+#~ msgid "Show current interface configuration"
+#~ msgstr "修改当前网络接口的配置"
+
+#~ msgid "Current interface configuration"
+#~ msgstr "当前接口配置"
+
+#~ msgid ""
+#~ "Current configuration of `%s':\n"
+#~ "\n"
+#~ "Network: %s\n"
+#~ "IP address: %s\n"
+#~ "IP attribution: %s\n"
+#~ "Driver: %s"
+#~ msgstr ""
+#~ "“%s”的当前配置: \n"
+#~ "\n"
+#~ "网络: %s\n"
+#~ "IP 地址: %s\n"
+#~ "IP 属性: %s\n"
+#~ "其它: %s"
+
+#~ msgid ""
+#~ "I can keep your current configuration and assume you already set up a "
+#~ "DHCP server; in that case please verify I correctly read the Network that "
+#~ "you use for your local network; I will not reconfigure it and I will not "
+#~ "touch your DHCP server configuration.\n"
+#~ "\n"
+#~ "The default DNS entry is the Caching Nameserver configured on the "
+#~ "firewall. You can replace that with your ISP DNS IP, for example.\n"
+#~ "\t\t      \n"
+#~ "Otherwise, I can reconfigure your interface and (re)configure a DHCP "
+#~ "server for you.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "我现在可以保留您当前的设置并假定您已经设置好了 DHCP 服务器；如果是这样的"
+#~ "话, 请检查我已经从本地网络上读取到了您正在使用的网络；我不会强行重新配置, "
+#~ "也不会更改您的 DHCP 服务器配置。\n"
+#~ "\n"
+#~ "默认的 DNS 项是配置在防火墙上的缓冲命名服务器。例如, 您可以将其替换为您的 "
+#~ "ISP DNS IP。\n"
+#~ "\t\t      \n"
+#~ "否则, 我就会重新配置您的接口并重新为您配置 DHCP 服务器。\n"
+#~ "\n"
+
+#~ msgid "(This) DHCP Server IP"
+#~ msgstr "(此)DHCP 服务器 IP"
+
+#~ msgid "Re-configure interface and DHCP server"
+#~ msgstr "重新配置网卡和 DHCP 服务器"
+
+#~ msgid "The Local Network did not finish with `.0', bailing out."
+#~ msgstr "本地网络没有以“.0”结束, 已经修改。"
author	Pablo Saratxaga <pablo@mandriva.com>	2005-05-31 06:00:21 +0000
committer	Pablo Saratxaga <pablo@mandriva.com>	2005-05-31 06:00:21 +0000
commit	b8814bf1900523f84c79c4463bee2f73f2d37476 (patch)
tree	3bfeeac9c4b644244550b227ae1b19d8b5c36647 /perl-install/share/po/zh_CN.po
parent	181c673fd4c642bbecce865707228d73098ccea9 (diff)
download	drakx-b8814bf1900523f84c79c4463bee2f73f2d37476.tar drakx-b8814bf1900523f84c79c4463bee2f73f2d37476.tar.gz drakx-b8814bf1900523f84c79c4463bee2f73f2d37476.tar.bz2 drakx-b8814bf1900523f84c79c4463bee2f73f2d37476.tar.xz drakx-b8814bf1900523f84c79c4463bee2f73f2d37476.zip