summaryrefslogtreecommitdiffstats
path: root/move/Makefile
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-12-08 15:47:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-12-08 15:47:22 +0000
commitf0247d52217365f0a1ae4e883db3624f7e2d818b (patch)
tree8e6250aa115a10ef0c5b66fadb84f5306ef57dad /move/Makefile
parent1cde4b2b8ec9b86c6bdfdeca969b521bb4543cb9 (diff)
downloaddrakx-f0247d52217365f0a1ae4e883db3624f7e2d818b.tar
drakx-f0247d52217365f0a1ae4e883db3624f7e2d818b.tar.gz
drakx-f0247d52217365f0a1ae4e883db3624f7e2d818b.tar.bz2
drakx-f0247d52217365f0a1ae4e883db3624f7e2d818b.tar.xz
drakx-f0247d52217365f0a1ae4e883db3624f7e2d818b.zip
set volset
Diffstat (limited to 'move/Makefile')
-rw-r--r--move/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/move/Makefile b/move/Makefile
index 2c2da4d53..87dbcb5d9 100644
--- a/move/Makefile
+++ b/move/Makefile
@@ -109,7 +109,9 @@ iso: un_live_tree_boot install live_tree_boot
touch /tmp/iso/isolinux/boot.cat
find /tmp/iso/isolinux -type f -printf '%p 100\n' > /tmp/iso.sort ; echo '/tmp/iso/live_tree_boot.clp 5' >> /tmp/iso.sort
- mkisofs -r -J -hide-rr-moved -nobak -cache-inodes -V 'MandrakeMove' -b isolinux/isolinux.bin -c isolinux/boot.cat -sort /tmp/iso.sort -no-emul-boot -boot-load-size 4 -boot-info-table -o $(ISO) /tmp/iso
+# download version: MOVE10DO
+# complete version: MOVE10IN
+ mkisofs -r -J -hide-rr-moved -nobak -cache-inodes -P MandrakeSoft -V 'MandrakeMove' -volset MOVE10IN -b isolinux/isolinux.bin -c isolinux/boot.cat -sort /tmp/iso.sort -no-emul-boot -boot-load-size 4 -boot-info-table -o $(ISO) /tmp/iso
mv /tmp/iso/*.clp /tmp
mkcd --addmd5 $(ISO)
# cdrecord -v -eject dev=0,0,0 blank=fast gracetime=2 speed=99 $(ISO)
class='ctx'> 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"