71 files changed, 27492 insertions, 26978 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index dba23b9c0..3358ef262 100644 --- a/perl-install/share/po/DrakX.pot +++ b/perl-install/share/po/DrakX.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2005-08-28 17:40+0800\n" +"POT-Creation-Date: 2005-08-30 18:05+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -131,7 +131,7 @@ msgstr "" msgid "Please wait, detecting and configuring devices..." msgstr "" -#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664 diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/interactive.pm:230 diskdrake/interactive.pm:243 diskdrake/interactive.pm:404 diskdrake/interactive.pm:422 diskdrake/interactive.pm:558 diskdrake/interactive.pm:563 diskdrake/smbnfs_gtk.pm:41 do_pkgs.pm:19 do_pkgs.pm:37 fsedit.pm:209 install_any.pm:1730 install_any.pm:1782 install_steps.pm:81 install_steps_interactive.pm:37 interactive/http.pm:117 interactive/http.pm:118 network/ndiswrapper.pm:27 network/ndiswrapper.pm:42 network/ndiswrapper.pm:89 network/ndiswrapper.pm:101 network/netconnect.pm:918 network/netconnect.pm:922 network/netconnect.pm:926 network/netconnect.pm:931 network/netconnect.pm:1074 network/netconnect.pm:1078 network/netconnect.pm:1196 network/netconnect.pm:1201 network/netconnect.pm:1221 network/netconnect.pm:1374 network/thirdparty.pm:266 network/thirdparty.pm:273 network/thirdparty.pm:309 network/thirdparty.pm:311 network/thirdparty.pm:332 network/thirdparty.pm:356 printer/printerdrake.pm:244 printer/printerdrake.pm:251 printer/printerdrake.pm:276 printer/printerdrake.pm:422 printer/printerdrake.pm:427 printer/printerdrake.pm:440 printer/printerdrake.pm:450 printer/printerdrake.pm:514 printer/printerdrake.pm:686 printer/printerdrake.pm:690 printer/printerdrake.pm:772 printer/printerdrake.pm:1575 printer/printerdrake.pm:1623 printer/printerdrake.pm:1660 printer/printerdrake.pm:1705 printer/printerdrake.pm:1709 printer/printerdrake.pm:1723 printer/printerdrake.pm:1815 printer/printerdrake.pm:1896 printer/printerdrake.pm:1900 printer/printerdrake.pm:1904 printer/printerdrake.pm:1953 printer/printerdrake.pm:2011 printer/printerdrake.pm:2015 printer/printerdrake.pm:2029 printer/printerdrake.pm:2149 printer/printerdrake.pm:2153 printer/printerdrake.pm:2196 printer/printerdrake.pm:2271 printer/printerdrake.pm:2289 printer/printerdrake.pm:2298 printer/printerdrake.pm:2307 printer/printerdrake.pm:2318 printer/printerdrake.pm:2382 printer/printerdrake.pm:2477 printer/printerdrake.pm:3026 printer/printerdrake.pm:3310 printer/printerdrake.pm:3316 printer/printerdrake.pm:3880 printer/printerdrake.pm:3884 printer/printerdrake.pm:3888 printer/printerdrake.pm:4349 printer/printerdrake.pm:4590 printer/printerdrake.pm:4614 printer/printerdrake.pm:4691 printer/printerdrake.pm:4757 printer/printerdrake.pm:4877 standalone/drakTermServ:394 standalone/drakTermServ:464 standalone/drakTermServ:473 standalone/drakTermServ:774 standalone/drakTermServ:781 standalone/drakTermServ:802 standalone/drakTermServ:849 standalone/drakTermServ:1095 standalone/drakTermServ:1572 standalone/drakTermServ:1588 standalone/drakTermServ:1593 standalone/drakTermServ:1601 standalone/drakTermServ:1613 standalone/drakTermServ:1634 standalone/drakauth:36 standalone/drakbackup:498 standalone/drakbackup:612 standalone/drakbackup:1093 standalone/drakbackup:1125 standalone/drakbackup:1648 standalone/drakbackup:1804 standalone/drakbackup:2429 standalone/drakbackup:4118 standalone/drakbackup:4338 standalone/drakclock:124 standalone/drakconnect:676 standalone/drakconnect:680 standalone/drakconnect:685 standalone/drakconnect:700 standalone/drakfont:210 standalone/drakfont:223 standalone/drakfont:261 standalone/drakgw:50 standalone/drakgw:188 standalone/drakhosts:98 standalone/drakhosts:246 standalone/drakhosts:253 standalone/drakhosts:260 standalone/draknfs:304 standalone/draknfs:593 standalone/draknfs:600 standalone/draknfs:607 standalone/drakroam:41 standalone/draksambashare:379 standalone/draksambashare:383 standalone/draksambashare:386 standalone/draksambashare:389 standalone/draksambashare:449 standalone/draksambashare:473 standalone/draksambashare:547 standalone/draksambashare:629 standalone/draksambashare:696 standalone/draksambashare:796 standalone/draksambashare:803 standalone/draksambashare:938 standalone/draksambashare:1129 standalone/draksambashare:1138 standalone/draksambashare:1147 standalone/draksambashare:1168 standalone/draksambashare:1177 standalone/draksambashare:1186 standalone/draksambashare:1206 standalone/draksambashare:1214 standalone/draksambashare:1226 standalone/draksplash:150 standalone/drakxtv:107 standalone/finish-install:49 standalone/logdrake:168 standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59 standalone/scannerdrake:202 standalone/scannerdrake:261 standalone/scannerdrake:715 standalone/scannerdrake:726 standalone/scannerdrake:865 standalone/scannerdrake:876 standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121 +#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664 diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/interactive.pm:230 diskdrake/interactive.pm:243 diskdrake/interactive.pm:404 diskdrake/interactive.pm:422 diskdrake/interactive.pm:558 diskdrake/interactive.pm:563 diskdrake/smbnfs_gtk.pm:41 do_pkgs.pm:19 do_pkgs.pm:37 fsedit.pm:209 install_any.pm:1730 install_any.pm:1782 install_steps.pm:81 install_steps_interactive.pm:37 interactive/http.pm:117 interactive/http.pm:118 network/ndiswrapper.pm:27 network/ndiswrapper.pm:42 network/ndiswrapper.pm:89 network/ndiswrapper.pm:101 network/netconnect.pm:910 network/netconnect.pm:914 network/netconnect.pm:918 network/netconnect.pm:923 network/netconnect.pm:1067 network/netconnect.pm:1071 network/netconnect.pm:1189 network/netconnect.pm:1194 network/netconnect.pm:1214 network/netconnect.pm:1367 network/thirdparty.pm:266 network/thirdparty.pm:273 network/thirdparty.pm:309 network/thirdparty.pm:311 network/thirdparty.pm:332 network/thirdparty.pm:356 printer/printerdrake.pm:244 printer/printerdrake.pm:251 printer/printerdrake.pm:276 printer/printerdrake.pm:422 printer/printerdrake.pm:427 printer/printerdrake.pm:440 printer/printerdrake.pm:450 printer/printerdrake.pm:514 printer/printerdrake.pm:686 printer/printerdrake.pm:690 printer/printerdrake.pm:772 printer/printerdrake.pm:1575 printer/printerdrake.pm:1623 printer/printerdrake.pm:1660 printer/printerdrake.pm:1705 printer/printerdrake.pm:1709 printer/printerdrake.pm:1723 printer/printerdrake.pm:1815 printer/printerdrake.pm:1896 printer/printerdrake.pm:1900 printer/printerdrake.pm:1904 printer/printerdrake.pm:1953 printer/printerdrake.pm:2011 printer/printerdrake.pm:2015 printer/printerdrake.pm:2029 printer/printerdrake.pm:2149 printer/printerdrake.pm:2153 printer/printerdrake.pm:2196 printer/printerdrake.pm:2271 printer/printerdrake.pm:2289 printer/printerdrake.pm:2298 printer/printerdrake.pm:2307 printer/printerdrake.pm:2318 printer/printerdrake.pm:2382 printer/printerdrake.pm:2477 printer/printerdrake.pm:3026 printer/printerdrake.pm:3310 printer/printerdrake.pm:3316 printer/printerdrake.pm:3880 printer/printerdrake.pm:3884 printer/printerdrake.pm:3888 printer/printerdrake.pm:4349 printer/printerdrake.pm:4590 printer/printerdrake.pm:4614 printer/printerdrake.pm:4691 printer/printerdrake.pm:4757 printer/printerdrake.pm:4877 standalone/drakTermServ:394 standalone/drakTermServ:464 standalone/drakTermServ:473 standalone/drakTermServ:774 standalone/drakTermServ:781 standalone/drakTermServ:802 standalone/drakTermServ:849 standalone/drakTermServ:1095 standalone/drakTermServ:1572 standalone/drakTermServ:1588 standalone/drakTermServ:1593 standalone/drakTermServ:1601 standalone/drakTermServ:1613 standalone/drakTermServ:1634 standalone/drakauth:36 standalone/drakbackup:498 standalone/drakbackup:612 standalone/drakbackup:1093 standalone/drakbackup:1125 standalone/drakbackup:1648 standalone/drakbackup:1804 standalone/drakbackup:2429 standalone/drakbackup:4118 standalone/drakbackup:4338 standalone/drakclock:124 standalone/drakconnect:676 standalone/drakconnect:680 standalone/drakconnect:685 standalone/drakconnect:700 standalone/drakfont:210 standalone/drakfont:223 standalone/drakfont:261 standalone/drakgw:50 standalone/drakgw:188 standalone/drakhosts:98 standalone/drakhosts:246 standalone/drakhosts:253 standalone/drakhosts:260 standalone/draknfs:304 standalone/draknfs:593 standalone/draknfs:600 standalone/draknfs:607 standalone/drakroam:41 standalone/draksambashare:379 standalone/draksambashare:383 standalone/draksambashare:386 standalone/draksambashare:389 standalone/draksambashare:449 standalone/draksambashare:473 standalone/draksambashare:547 standalone/draksambashare:629 standalone/draksambashare:696 standalone/draksambashare:796 standalone/draksambashare:803 standalone/draksambashare:938 standalone/draksambashare:1129 standalone/draksambashare:1138 standalone/draksambashare:1147 standalone/draksambashare:1168 standalone/draksambashare:1177 standalone/draksambashare:1186 standalone/draksambashare:1206 standalone/draksambashare:1214 standalone/draksambashare:1226 standalone/draksplash:150 standalone/drakxtv:107 standalone/finish-install:49 standalone/logdrake:168 standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59 standalone/scannerdrake:202 standalone/scannerdrake:261 standalone/scannerdrake:715 standalone/scannerdrake:726 standalone/scannerdrake:865 standalone/scannerdrake:876 standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121 #, c-format msgid "Error" msgstr "" @@ -344,7 +344,7 @@ msgstr "" msgid "Custom" msgstr "" -#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14 install_steps_interactive.pm:86 install_steps_interactive.pm:1324 printer/printerdrake.pm:882 printer/printerdrake.pm:899 printer/printerdrake.pm:4686 printer/printerdrake.pm:5141 standalone/drakhosts:263 standalone/drakids:62 standalone/drakids:71 standalone/drakids:79 standalone/draksplash:81 standalone/logdrake:173 standalone/net_applet:84 standalone/scannerdrake:477 +#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14 install_steps_interactive.pm:86 install_steps_interactive.pm:1324 printer/printerdrake.pm:882 printer/printerdrake.pm:899 printer/printerdrake.pm:4686 printer/printerdrake.pm:5141 standalone/drakhosts:263 standalone/drakids:62 standalone/drakids:71 standalone/drakids:79 standalone/draksplash:81 standalone/logdrake:173 standalone/net_applet:82 standalone/scannerdrake:477 #, c-format msgid "Quit" msgstr "" @@ -490,7 +490,7 @@ msgstr "" msgid "Cancel" msgstr "" -#: Xconfig/resolution_and_depth.pm:373 diskdrake/hd_gtk.pm:150 install_steps_gtk.pm:232 install_steps_gtk.pm:634 interactive.pm:527 interactive/gtk.pm:681 interactive/gtk.pm:683 standalone/drakTermServ:284 standalone/drakbackup:3897 standalone/drakbug:105 standalone/drakconnect:153 standalone/drakconnect:236 standalone/drakfont:510 standalone/draknfs:206 standalone/drakperm:133 standalone/draksambashare:314 standalone/draksec:336 standalone/draksec:338 standalone/draksec:356 standalone/draksec:358 ugtk2.pm:1050 ugtk2.pm:1051 +#: Xconfig/resolution_and_depth.pm:373 diskdrake/hd_gtk.pm:150 install_steps_gtk.pm:232 install_steps_gtk.pm:636 interactive.pm:527 interactive/gtk.pm:681 interactive/gtk.pm:683 standalone/drakTermServ:284 standalone/drakbackup:3897 standalone/drakbug:105 standalone/drakconnect:153 standalone/drakconnect:236 standalone/drakfont:510 standalone/draknfs:206 standalone/drakperm:133 standalone/draksambashare:314 standalone/draksec:336 standalone/draksec:338 standalone/draksec:356 standalone/draksec:358 ugtk2.pm:1050 ugtk2.pm:1051 #, c-format msgid "Help" msgstr "" @@ -776,7 +776,7 @@ msgstr "" msgid "Force No Local APIC" msgstr "" -#: any.pm:294 any.pm:648 authentication.pm:186 diskdrake/smbnfs_gtk.pm:180 network/netconnect.pm:571 printer/printerdrake.pm:1887 printer/printerdrake.pm:2008 standalone/drakbackup:1630 standalone/drakbackup:3504 standalone/drakups:299 +#: any.pm:294 any.pm:648 authentication.pm:186 diskdrake/smbnfs_gtk.pm:180 network/netconnect.pm:565 printer/printerdrake.pm:1887 printer/printerdrake.pm:2008 standalone/drakbackup:1630 standalone/drakbackup:3504 standalone/drakups:299 #, c-format msgid "Password" msgstr "" @@ -1148,7 +1148,7 @@ msgstr "" msgid "Input method:" msgstr "" -#: any.pm:854 install_any.pm:421 network/netconnect.pm:153 network/netconnect.pm:309 network/netconnect.pm:314 network/netconnect.pm:1187 printer/printerdrake.pm:105 printer/printerdrake.pm:2429 printer/printerdrake.pm:2429 +#: any.pm:854 install_any.pm:421 network/netconnect.pm:303 network/netconnect.pm:308 network/netconnect.pm:1180 network/wireless.pm:7 printer/printerdrake.pm:105 printer/printerdrake.pm:2429 printer/printerdrake.pm:2429 #, c-format msgid "None" msgstr "" @@ -1446,7 +1446,7 @@ msgstr "" msgid "This password is too short (it must be at least %d characters long)" msgstr "" -#: authentication.pm:188 network/netconnect.pm:314 network/netconnect.pm:572 standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:481 +#: authentication.pm:188 network/netconnect.pm:308 network/netconnect.pm:566 standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:481 #, c-format msgid "Authentication" msgstr "" @@ -1457,7 +1457,7 @@ msgid "Can not use broadcast with no NIS domain" msgstr "" #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) -#: bootloader.pm:753 +#: bootloader.pm:765 #, c-format msgid "" "Welcome to the operating system chooser!\n" @@ -1468,54 +1468,54 @@ msgid "" "" msgstr "" -#: bootloader.pm:853 +#: bootloader.pm:865 #, c-format msgid "LILO with graphical menu" msgstr "" -#: bootloader.pm:854 +#: bootloader.pm:866 #, c-format msgid "LILO with text menu" msgstr "" -#: bootloader.pm:855 +#: bootloader.pm:867 #, c-format msgid "GRUB with graphical menu" msgstr "" -#: bootloader.pm:856 +#: bootloader.pm:868 #, c-format msgid "GRUB with text menu" msgstr "" -#: bootloader.pm:857 +#: bootloader.pm:869 #, c-format msgid "Yaboot" msgstr "" -#: bootloader.pm:935 +#: bootloader.pm:947 #, c-format msgid "not enough room in /boot" msgstr "" -#: bootloader.pm:1414 +#: bootloader.pm:1433 #, c-format msgid "" "You can not install the bootloader on a %s partition\n" "" msgstr "" -#: bootloader.pm:1454 +#: bootloader.pm:1473 #, c-format msgid "Your bootloader configuration must be updated because partition has been renumbered" msgstr "" -#: bootloader.pm:1467 +#: bootloader.pm:1486 #, c-format msgid "The bootloader can not be installed correctly. You have to boot rescue and choose \"%s\"" msgstr "" -#: bootloader.pm:1468 +#: bootloader.pm:1487 #, c-format msgid "Re-install Boot Loader" msgstr "" @@ -2589,7 +2589,7 @@ msgstr "" msgid "The encryption keys do not match" msgstr "" -#: diskdrake/interactive.pm:1329 network/netconnect.pm:1025 standalone/drakconnect:419 +#: diskdrake/interactive.pm:1329 network/netconnect.pm:1018 standalone/drakconnect:419 #, c-format msgid "Encryption key" msgstr "" @@ -2838,24 +2838,24 @@ msgid "" "" msgstr "" -#: fsedit.pm:381 +#: fsedit.pm:378 #, c-format msgid "Mount points must begin with a leading /" msgstr "" -#: fsedit.pm:382 +#: fsedit.pm:379 #, c-format msgid "Mount points should contain only alphanumerical characters" msgstr "" -#: fsedit.pm:383 +#: fsedit.pm:380 #, c-format msgid "" "There is already a partition with mount point %s\n" "" msgstr "" -#: fsedit.pm:385 +#: fsedit.pm:382 #, c-format msgid "" "You've selected a software RAID partition as root (/).\n" @@ -2863,12 +2863,12 @@ msgid "" "Please be sure to add a /boot partition" msgstr "" -#: fsedit.pm:390 +#: fsedit.pm:387 #, c-format msgid "You can not use a LVM Logical Volume for mount point %s since it spans physical volumes" msgstr "" -#: fsedit.pm:392 +#: fsedit.pm:389 #, c-format msgid "" "You've selected a LVM Logical Volume as root (/).\n" @@ -2876,29 +2876,29 @@ msgid "" "You should create a /boot partition first" msgstr "" -#: fsedit.pm:396 fsedit.pm:398 +#: fsedit.pm:393 fsedit.pm:395 #, c-format msgid "This directory should remain within the root filesystem" msgstr "" -#: fsedit.pm:400 fsedit.pm:402 +#: fsedit.pm:397 fsedit.pm:399 #, c-format msgid "" "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount point\n" "" msgstr "" -#: fsedit.pm:404 +#: fsedit.pm:401 #, c-format msgid "You can not use an encrypted file system for mount point %s" msgstr "" -#: fsedit.pm:465 +#: fsedit.pm:462 #, c-format msgid "Not enough free space for auto-allocating" msgstr "" -#: fsedit.pm:467 +#: fsedit.pm:464 #, c-format msgid "Nothing to do" msgstr "" @@ -3008,7 +3008,7 @@ msgstr "" msgid "Ethernetcard" msgstr "" -#: harddrake/data.pm:282 network/netconnect.pm:484 +#: harddrake/data.pm:282 network/netconnect.pm:478 #, c-format msgid "Modem" msgstr "" @@ -3192,7 +3192,7 @@ msgstr "" msgid "Trouble shooting" msgstr "" -#: harddrake/sound.pm:271 install_steps_interactive.pm:1309 keyboard.pm:391 network/ndiswrapper.pm:95 network/netconnect.pm:463 printer/printerdrake.pm:1429 printer/printerdrake.pm:2460 printer/printerdrake.pm:2559 printer/printerdrake.pm:2605 printer/printerdrake.pm:2672 printer/printerdrake.pm:2707 printer/printerdrake.pm:3032 printer/printerdrake.pm:3039 printer/printerdrake.pm:4025 printer/printerdrake.pm:4354 printer/printerdrake.pm:4474 printer/printerdrake.pm:5614 standalone/drakTermServ:326 standalone/drakTermServ:1205 standalone/drakTermServ:1266 standalone/drakTermServ:1931 standalone/drakbackup:497 standalone/drakbackup:596 standalone/drakboot:125 standalone/drakclock:224 standalone/drakconnect:973 standalone/drakups:27 standalone/harddrake2:479 standalone/localedrake:43 standalone/scannerdrake:51 standalone/scannerdrake:940 +#: harddrake/sound.pm:271 install_steps_interactive.pm:1309 keyboard.pm:391 network/ndiswrapper.pm:95 network/netconnect.pm:457 printer/printerdrake.pm:1429 printer/printerdrake.pm:2460 printer/printerdrake.pm:2559 printer/printerdrake.pm:2605 printer/printerdrake.pm:2672 printer/printerdrake.pm:2707 printer/printerdrake.pm:3032 printer/printerdrake.pm:3039 printer/printerdrake.pm:4025 printer/printerdrake.pm:4354 printer/printerdrake.pm:4474 printer/printerdrake.pm:5614 standalone/drakTermServ:326 standalone/drakTermServ:1205 standalone/drakTermServ:1266 standalone/drakTermServ:1931 standalone/drakbackup:497 standalone/drakbackup:596 standalone/drakboot:125 standalone/drakclock:224 standalone/drakconnect:973 standalone/drakups:27 standalone/harddrake2:479 standalone/localedrake:43 standalone/scannerdrake:51 standalone/scannerdrake:940 #, c-format msgid "Warning" msgstr "" @@ -3288,7 +3288,7 @@ msgid "" "The current driver for your \"%s\" sound card is \"%s\" " msgstr "" -#: harddrake/v4l.pm:12 standalone/net_applet:66 standalone/net_applet:67 standalone/net_applet:69 +#: harddrake/v4l.pm:12 standalone/net_applet:64 standalone/net_applet:65 standalone/net_applet:67 #, c-format msgid "Auto-detect" msgstr "" @@ -3359,7 +3359,7 @@ msgid "" "button will reboot your computer." msgstr "" -#: help.pm:14 install_steps_gtk.pm:557 install_steps_interactive.pm:92 install_steps_interactive.pm:738 standalone/drakautoinst:214 +#: help.pm:14 install_steps_gtk.pm:559 install_steps_interactive.pm:92 install_steps_interactive.pm:738 standalone/drakautoinst:214 #, c-format msgid "Accept" msgstr "" @@ -3409,7 +3409,7 @@ msgstr "" msgid "User name" msgstr "" -#: help.pm:51 help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:237 install_steps_gtk.pm:699 interactive.pm:432 interactive/newt.pm:321 network/thirdparty.pm:322 printer/printerdrake.pm:3962 standalone/drakTermServ:384 standalone/drakbackup:3954 standalone/drakbackup:4048 standalone/drakbackup:4065 standalone/drakbackup:4083 ugtk2.pm:510 +#: help.pm:51 help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:237 install_steps_gtk.pm:701 interactive.pm:432 interactive/newt.pm:321 network/thirdparty.pm:322 printer/printerdrake.pm:3962 standalone/drakTermServ:384 standalone/drakbackup:3954 standalone/drakbackup:4048 standalone/drakbackup:4065 standalone/drakbackup:4083 ugtk2.pm:510 #, c-format msgid "Next" msgstr "" @@ -3624,7 +3624,7 @@ msgid "" "manual is similar to the one used during installation." msgstr "" -#: help.pm:186 help.pm:566 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 install_steps_gtk.pm:612 standalone/drakbackup:2341 standalone/drakbackup:2345 standalone/drakbackup:2349 standalone/drakbackup:2353 +#: help.pm:186 help.pm:566 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 install_steps_gtk.pm:614 standalone/drakbackup:2341 standalone/drakbackup:2345 standalone/drakbackup:2349 standalone/drakbackup:2353 #, c-format msgid "Configure" msgstr "" @@ -5311,27 +5311,27 @@ msgstr "" msgid "Time remaining " msgstr "" -#: install_steps_gtk.pm:502 +#: install_steps_gtk.pm:504 #, c-format msgid "Please wait, preparing installation..." msgstr "" -#: install_steps_gtk.pm:517 +#: install_steps_gtk.pm:519 #, c-format msgid "%d packages" msgstr "" -#: install_steps_gtk.pm:522 +#: install_steps_gtk.pm:524 #, c-format msgid "Installing package %s" msgstr "" -#: install_steps_gtk.pm:557 install_steps_interactive.pm:92 install_steps_interactive.pm:738 +#: install_steps_gtk.pm:559 install_steps_interactive.pm:92 install_steps_interactive.pm:738 #, c-format msgid "Refuse" msgstr "" -#: install_steps_gtk.pm:561 install_steps_interactive.pm:742 +#: install_steps_gtk.pm:563 install_steps_interactive.pm:742 #, c-format msgid "" "Change your Cd-Rom!\n" @@ -5339,46 +5339,46 @@ msgid "" "If you do not have it, press Cancel to avoid installation from this Cd-Rom." msgstr "" -#: install_steps_gtk.pm:576 install_steps_interactive.pm:753 +#: install_steps_gtk.pm:578 install_steps_interactive.pm:753 #, c-format msgid "There was an error ordering packages:" msgstr "" -#: install_steps_gtk.pm:576 install_steps_gtk.pm:580 install_steps_interactive.pm:753 install_steps_interactive.pm:757 +#: install_steps_gtk.pm:578 install_steps_gtk.pm:582 install_steps_interactive.pm:753 install_steps_interactive.pm:757 #, c-format msgid "Go on anyway?" msgstr "" -#: install_steps_gtk.pm:580 install_steps_interactive.pm:757 +#: install_steps_gtk.pm:582 install_steps_interactive.pm:757 #, c-format msgid "There was an error installing packages:" msgstr "" -#: install_steps_gtk.pm:599 install_steps_interactive.pm:933 steps.pm:30 +#: install_steps_gtk.pm:601 install_steps_interactive.pm:933 steps.pm:30 #, c-format msgid "Summary" msgstr "" -#: install_steps_gtk.pm:622 install_steps_interactive.pm:929 install_steps_interactive.pm:1078 +#: install_steps_gtk.pm:624 install_steps_interactive.pm:929 install_steps_interactive.pm:1078 #, c-format msgid "not configured" msgstr "" -#: install_steps_gtk.pm:685 +#: install_steps_gtk.pm:687 #, c-format msgid "" "The following installation media have been found.\n" "If you want to skip some of them, you can unselect them now." msgstr "" -#: install_steps_gtk.pm:694 +#: install_steps_gtk.pm:696 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard drive before installation.\n" "It will then continue from the hard drive and the packages will remain available once the system is fully installed." msgstr "" -#: install_steps_gtk.pm:696 +#: install_steps_gtk.pm:698 #, c-format msgid "Copy whole CDs" msgstr "" @@ -8102,7 +8102,7 @@ msgstr "" msgid "GlidePoint" msgstr "" -#: mouse.pm:36 network/modem.pm:47 network/modem.pm:48 network/modem.pm:49 network/modem.pm:68 network/modem.pm:82 network/modem.pm:87 network/modem.pm:120 network/netconnect.pm:583 network/netconnect.pm:588 network/netconnect.pm:600 network/netconnect.pm:605 network/netconnect.pm:621 network/netconnect.pm:623 +#: mouse.pm:36 network/modem.pm:47 network/modem.pm:48 network/modem.pm:49 network/modem.pm:68 network/modem.pm:82 network/modem.pm:87 network/modem.pm:120 network/netconnect.pm:577 network/netconnect.pm:582 network/netconnect.pm:594 network/netconnect.pm:599 network/netconnect.pm:615 network/netconnect.pm:617 #, c-format msgid "Automatic" msgstr "" @@ -8429,32 +8429,32 @@ msgstr "" msgid "A \"%s\" attack has been attempted by %s" msgstr "" -#: network/isdn.pm:117 network/netconnect.pm:455 network/netconnect.pm:544 network/netconnect.pm:547 network/netconnect.pm:690 network/netconnect.pm:694 +#: network/isdn.pm:117 network/netconnect.pm:449 network/netconnect.pm:538 network/netconnect.pm:541 network/netconnect.pm:684 network/netconnect.pm:688 #, c-format msgid "Unlisted - edit manually" msgstr "" -#: network/isdn.pm:160 network/netconnect.pm:387 +#: network/isdn.pm:160 network/netconnect.pm:381 #, c-format msgid "ISA / PCMCIA" msgstr "" -#: network/isdn.pm:160 network/netconnect.pm:387 +#: network/isdn.pm:160 network/netconnect.pm:381 #, c-format msgid "I do not know" msgstr "" -#: network/isdn.pm:161 network/netconnect.pm:387 +#: network/isdn.pm:161 network/netconnect.pm:381 #, c-format msgid "PCI" msgstr "" -#: network/isdn.pm:162 network/netconnect.pm:387 +#: network/isdn.pm:162 network/netconnect.pm:381 #, c-format msgid "USB" msgstr "" -#: network/modem.pm:47 network/modem.pm:48 network/modem.pm:49 network/netconnect.pm:588 network/netconnect.pm:605 network/netconnect.pm:621 +#: network/modem.pm:47 network/modem.pm:48 network/modem.pm:49 network/netconnect.pm:582 network/netconnect.pm:599 network/netconnect.pm:615 #, c-format msgid "Manual" msgstr "" @@ -8491,7 +8491,7 @@ msgstr "" msgid "Unable to find the ndiswrapper interface!" msgstr "" -#: network/netconnect.pm:69 network/netconnect.pm:485 network/netconnect.pm:492 +#: network/netconnect.pm:69 network/netconnect.pm:479 network/netconnect.pm:486 #, c-format msgid "Manual choice" msgstr "" @@ -8533,297 +8533,282 @@ msgid "" "No D-Channel (leased lines)" msgstr "" -#: network/netconnect.pm:120 network/thirdparty.pm:184 +#: network/netconnect.pm:117 network/thirdparty.pm:184 #, c-format msgid "Alcatel speedtouch USB modem" msgstr "" -#: network/netconnect.pm:121 +#: network/netconnect.pm:118 #, c-format msgid "Sagem USB modem" msgstr "" -#: network/netconnect.pm:122 +#: network/netconnect.pm:119 #, c-format msgid "Bewan modem" msgstr "" -#: network/netconnect.pm:123 +#: network/netconnect.pm:120 #, c-format msgid "ECI Hi-Focus modem" msgstr "" -#: network/netconnect.pm:127 +#: network/netconnect.pm:124 #, c-format msgid "Dynamic Host Configuration Protocol (DHCP)" msgstr "" -#: network/netconnect.pm:128 +#: network/netconnect.pm:125 #, c-format msgid "Manual TCP/IP configuration" msgstr "" -#: network/netconnect.pm:129 +#: network/netconnect.pm:126 #, c-format msgid "Point to Point Tunneling Protocol (PPTP)" msgstr "" -#: network/netconnect.pm:130 +#: network/netconnect.pm:127 #, c-format msgid "PPP over Ethernet (PPPoE)" msgstr "" -#: network/netconnect.pm:131 +#: network/netconnect.pm:128 #, c-format msgid "PPP over ATM (PPPoA)" msgstr "" -#: network/netconnect.pm:132 +#: network/netconnect.pm:129 #, c-format msgid "DSL over CAPI" msgstr "" -#: network/netconnect.pm:136 +#: network/netconnect.pm:133 #, c-format msgid "Bridged Ethernet LLC" msgstr "" -#: network/netconnect.pm:137 +#: network/netconnect.pm:134 #, c-format msgid "Bridged Ethernet VC" msgstr "" -#: network/netconnect.pm:138 +#: network/netconnect.pm:135 #, c-format msgid "Routed IP LLC" msgstr "" -#: network/netconnect.pm:139 +#: network/netconnect.pm:136 #, c-format msgid "Routed IP VC" msgstr "" -#: network/netconnect.pm:140 +#: network/netconnect.pm:137 #, c-format msgid "PPPoA LLC" msgstr "" -#: network/netconnect.pm:141 +#: network/netconnect.pm:138 #, c-format msgid "PPPoA VC" msgstr "" -#: network/netconnect.pm:145 standalone/drakconnect:498 +#: network/netconnect.pm:142 standalone/drakconnect:498 #, c-format msgid "Script-based" msgstr "" -#: network/netconnect.pm:146 standalone/drakconnect:498 +#: network/netconnect.pm:143 standalone/drakconnect:498 #, c-format msgid "PAP" msgstr "" -#: network/netconnect.pm:147 standalone/drakconnect:498 +#: network/netconnect.pm:144 standalone/drakconnect:498 #, c-format msgid "Terminal-based" msgstr "" -#: network/netconnect.pm:148 standalone/drakconnect:498 +#: network/netconnect.pm:145 standalone/drakconnect:498 #, c-format msgid "CHAP" msgstr "" -#: network/netconnect.pm:149 standalone/drakconnect:498 +#: network/netconnect.pm:146 standalone/drakconnect:498 #, c-format msgid "PAP/CHAP" msgstr "" -#: network/netconnect.pm:154 -#, c-format -msgid "Open WEP" -msgstr "" - -#: network/netconnect.pm:155 -#, c-format -msgid "Restricted WEP" -msgstr "" - -#: network/netconnect.pm:156 -#, c-format -msgid "WPA Pre-Shared Key" -msgstr "" - -#: network/netconnect.pm:242 standalone/drakconnect:56 +#: network/netconnect.pm:236 standalone/drakconnect:56 #, c-format msgid "Network & Internet Configuration" msgstr "" -#: network/netconnect.pm:248 +#: network/netconnect.pm:242 #, c-format msgid "LAN connection" msgstr "" -#: network/netconnect.pm:249 network/netconnect.pm:268 +#: network/netconnect.pm:243 network/netconnect.pm:262 #, c-format msgid "Wireless connection" msgstr "" -#: network/netconnect.pm:250 +#: network/netconnect.pm:244 #, c-format msgid "ADSL connection" msgstr "" -#: network/netconnect.pm:251 +#: network/netconnect.pm:245 #, c-format msgid "Cable connection" msgstr "" -#: network/netconnect.pm:252 +#: network/netconnect.pm:246 #, c-format msgid "ISDN connection" msgstr "" -#: network/netconnect.pm:253 +#: network/netconnect.pm:247 #, c-format msgid "Modem connection" msgstr "" -#: network/netconnect.pm:254 +#: network/netconnect.pm:248 #, c-format msgid "DVB connection" msgstr "" -#: network/netconnect.pm:264 +#: network/netconnect.pm:258 #, c-format msgid "Choose the connection you want to configure" msgstr "" -#: network/netconnect.pm:279 network/netconnect.pm:769 +#: network/netconnect.pm:273 network/netconnect.pm:761 #, c-format msgid "Connection Configuration" msgstr "" -#: network/netconnect.pm:279 network/netconnect.pm:770 +#: network/netconnect.pm:273 network/netconnect.pm:762 #, c-format msgid "Please fill or check the field below" msgstr "" -#: network/netconnect.pm:282 +#: network/netconnect.pm:276 #, c-format msgid "Your personal phone number" msgstr "" -#: network/netconnect.pm:283 network/netconnect.pm:773 +#: network/netconnect.pm:277 network/netconnect.pm:765 #, c-format msgid "Provider name (ex provider.net)" msgstr "" -#: network/netconnect.pm:284 standalone/drakconnect:493 +#: network/netconnect.pm:278 standalone/drakconnect:493 #, c-format msgid "Provider phone number" msgstr "" -#: network/netconnect.pm:285 +#: network/netconnect.pm:279 #, c-format msgid "Provider DNS 1 (optional)" msgstr "" -#: network/netconnect.pm:286 +#: network/netconnect.pm:280 #, c-format msgid "Provider DNS 2 (optional)" msgstr "" -#: network/netconnect.pm:287 standalone/drakconnect:444 +#: network/netconnect.pm:281 standalone/drakconnect:444 #, c-format msgid "Dialing mode" msgstr "" -#: network/netconnect.pm:288 standalone/drakconnect:449 standalone/drakconnect:517 +#: network/netconnect.pm:282 standalone/drakconnect:449 standalone/drakconnect:517 #, c-format msgid "Connection speed" msgstr "" -#: network/netconnect.pm:289 standalone/drakconnect:454 +#: network/netconnect.pm:283 standalone/drakconnect:454 #, c-format msgid "Connection timeout (in sec)" msgstr "" -#: network/netconnect.pm:290 network/netconnect.pm:315 network/netconnect.pm:776 standalone/drakconnect:491 +#: network/netconnect.pm:284 network/netconnect.pm:309 network/netconnect.pm:768 standalone/drakconnect:491 #, c-format msgid "Account Login (user name)" msgstr "" -#: network/netconnect.pm:291 network/netconnect.pm:316 network/netconnect.pm:777 standalone/drakconnect:492 +#: network/netconnect.pm:285 network/netconnect.pm:310 network/netconnect.pm:769 standalone/drakconnect:492 #, c-format msgid "Account Password" msgstr "" -#: network/netconnect.pm:292 standalone/drakconnect:554 +#: network/netconnect.pm:286 standalone/drakconnect:554 #, c-format msgid "Card IRQ" msgstr "" -#: network/netconnect.pm:293 standalone/drakconnect:555 +#: network/netconnect.pm:287 standalone/drakconnect:555 #, c-format msgid "Card mem (DMA)" msgstr "" -#: network/netconnect.pm:294 standalone/drakconnect:556 +#: network/netconnect.pm:288 standalone/drakconnect:556 #, c-format msgid "Card IO" msgstr "" -#: network/netconnect.pm:295 standalone/drakconnect:557 +#: network/netconnect.pm:289 standalone/drakconnect:557 #, c-format msgid "Card IO_0" msgstr "" -#: network/netconnect.pm:296 +#: network/netconnect.pm:290 #, c-format msgid "Card IO_1" msgstr "" -#: network/netconnect.pm:311 +#: network/netconnect.pm:305 #, c-format msgid "Cable: account options" msgstr "" -#: network/netconnect.pm:314 +#: network/netconnect.pm:308 #, c-format msgid "Use BPALogin (needed for Telstra)" msgstr "" -#: network/netconnect.pm:340 network/netconnect.pm:657 network/netconnect.pm:808 network/netconnect.pm:1120 +#: network/netconnect.pm:334 network/netconnect.pm:651 network/netconnect.pm:800 network/netconnect.pm:1113 #, c-format msgid "Select the network interface to configure:" msgstr "" -#: network/netconnect.pm:342 network/netconnect.pm:377 network/netconnect.pm:658 network/netconnect.pm:810 network/shorewall.pm:69 standalone/drakconnect:713 +#: network/netconnect.pm:336 network/netconnect.pm:371 network/netconnect.pm:652 network/netconnect.pm:802 network/shorewall.pm:69 standalone/drakconnect:713 #, c-format msgid "Net Device" msgstr "" -#: network/netconnect.pm:343 network/netconnect.pm:348 +#: network/netconnect.pm:337 network/netconnect.pm:342 #, c-format msgid "External ISDN modem" msgstr "" -#: network/netconnect.pm:376 standalone/harddrake2:216 +#: network/netconnect.pm:370 standalone/harddrake2:216 #, c-format msgid "Select a device!" msgstr "" -#: network/netconnect.pm:385 network/netconnect.pm:395 network/netconnect.pm:405 network/netconnect.pm:438 network/netconnect.pm:452 +#: network/netconnect.pm:379 network/netconnect.pm:389 network/netconnect.pm:399 network/netconnect.pm:432 network/netconnect.pm:446 #, c-format msgid "ISDN Configuration" msgstr "" -#: network/netconnect.pm:386 +#: network/netconnect.pm:380 #, c-format msgid "What kind of card do you have?" msgstr "" -#: network/netconnect.pm:396 +#: network/netconnect.pm:390 #, c-format msgid "" "\n" @@ -8833,224 +8818,218 @@ msgid "" "" msgstr "" -#: network/netconnect.pm:400 +#: network/netconnect.pm:394 #, c-format msgid "Continue" msgstr "" -#: network/netconnect.pm:400 +#: network/netconnect.pm:394 #, c-format msgid "Abort" msgstr "" -#: network/netconnect.pm:406 +#: network/netconnect.pm:400 #, c-format msgid "Which of the following is your ISDN card?" msgstr "" -#: network/netconnect.pm:424 +#: network/netconnect.pm:418 #, c-format msgid "A CAPI driver is available for this modem. This CAPI driver can offer more capabilities than the free driver (like sending faxes). Which driver do you want to use?" msgstr "" -#: network/netconnect.pm:426 standalone/drakconnect:109 standalone/drakups:251 standalone/harddrake2:133 +#: network/netconnect.pm:420 standalone/drakconnect:109 standalone/drakups:251 standalone/harddrake2:133 #, c-format msgid "Driver" msgstr "" -#: network/netconnect.pm:438 +#: network/netconnect.pm:432 #, c-format msgid "Which protocol do you want to use?" msgstr "" -#: network/netconnect.pm:440 standalone/drakconnect:109 standalone/drakconnect:300 standalone/drakconnect:562 standalone/drakids:196 standalone/drakvpn:1128 +#: network/netconnect.pm:434 standalone/drakconnect:109 standalone/drakconnect:300 standalone/drakconnect:562 standalone/drakids:196 standalone/drakvpn:1128 #, c-format msgid "Protocol" msgstr "" -#: network/netconnect.pm:452 +#: network/netconnect.pm:446 #, c-format msgid "" "Select your provider.\n" "If it is not listed, choose Unlisted." msgstr "" -#: network/netconnect.pm:454 network/netconnect.pm:543 network/netconnect.pm:689 +#: network/netconnect.pm:448 network/netconnect.pm:537 network/netconnect.pm:683 #, c-format msgid "Provider:" msgstr "" -#: network/netconnect.pm:463 +#: network/netconnect.pm:457 #, c-format msgid "" "Your modem is not supported by the system.\n" "Take a look at http://www.linmodems.org" msgstr "" -#: network/netconnect.pm:482 +#: network/netconnect.pm:476 #, c-format msgid "Select the modem to configure:" msgstr "" -#: network/netconnect.pm:512 +#: network/netconnect.pm:506 #, c-format msgid "Please choose which serial port your modem is connected to." msgstr "" -#: network/netconnect.pm:541 +#: network/netconnect.pm:535 #, c-format msgid "Select your provider:" msgstr "" -#: network/netconnect.pm:565 +#: network/netconnect.pm:559 #, c-format msgid "Dialup: account options" msgstr "" -#: network/netconnect.pm:568 +#: network/netconnect.pm:562 #, c-format msgid "Connection name" msgstr "" -#: network/netconnect.pm:569 +#: network/netconnect.pm:563 #, c-format msgid "Phone number" msgstr "" -#: network/netconnect.pm:570 +#: network/netconnect.pm:564 #, c-format msgid "Login ID" msgstr "" -#: network/netconnect.pm:585 network/netconnect.pm:618 +#: network/netconnect.pm:579 network/netconnect.pm:612 #, c-format msgid "Dialup: IP parameters" msgstr "" -#: network/netconnect.pm:588 +#: network/netconnect.pm:582 #, c-format msgid "IP parameters" msgstr "" -#: network/netconnect.pm:589 network/netconnect.pm:894 printer/printerdrake.pm:460 standalone/drakconnect:109 standalone/drakconnect:316 standalone/drakconnect:882 standalone/drakhosts:197 standalone/drakups:286 +#: network/netconnect.pm:583 network/netconnect.pm:886 printer/printerdrake.pm:460 standalone/drakconnect:109 standalone/drakconnect:316 standalone/drakconnect:882 standalone/drakhosts:197 standalone/drakups:286 #, c-format msgid "IP address" msgstr "" -#: network/netconnect.pm:590 +#: network/netconnect.pm:584 #, c-format msgid "Subnet mask" msgstr "" -#: network/netconnect.pm:602 +#: network/netconnect.pm:596 #, c-format msgid "Dialup: DNS parameters" msgstr "" -#: network/netconnect.pm:605 +#: network/netconnect.pm:599 #, c-format msgid "DNS" msgstr "" -#: network/netconnect.pm:606 +#: network/netconnect.pm:600 #, c-format msgid "Domain name" msgstr "" -#: network/netconnect.pm:607 network/netconnect.pm:774 standalone/drakconnect:992 +#: network/netconnect.pm:601 network/netconnect.pm:766 standalone/drakconnect:992 #, c-format msgid "First DNS Server (optional)" msgstr "" -#: network/netconnect.pm:608 network/netconnect.pm:775 standalone/drakconnect:993 +#: network/netconnect.pm:602 network/netconnect.pm:767 standalone/drakconnect:993 #, c-format msgid "Second DNS Server (optional)" msgstr "" -#: network/netconnect.pm:609 +#: network/netconnect.pm:603 #, c-format msgid "Set hostname from IP" msgstr "" -#: network/netconnect.pm:621 standalone/drakconnect:327 +#: network/netconnect.pm:615 standalone/drakconnect:327 #, c-format msgid "Gateway" msgstr "" -#: network/netconnect.pm:622 +#: network/netconnect.pm:616 #, c-format msgid "Gateway IP address" msgstr "" -#: network/netconnect.pm:657 +#: network/netconnect.pm:651 #, c-format msgid "ADSL configuration" msgstr "" -#: network/netconnect.pm:687 +#: network/netconnect.pm:681 #, c-format msgid "Please choose your ADSL provider" msgstr "" -#: network/netconnect.pm:717 -#, c-format -msgid "Connect to the Internet" -msgstr "" - -#: network/netconnect.pm:718 +#: network/netconnect.pm:711 #, c-format msgid "" -"The most common way to connect with adsl is pppoe.\n" -"Some connections use PPTP, a few use DHCP.\n" -"If you do not know, choose 'use PPPoE'" +"Please choose your DSL connection type.\n" +"If you do not know it, keep the preselected type." msgstr "" -#: network/netconnect.pm:722 +#: network/netconnect.pm:714 #, c-format msgid "ADSL connection type:" msgstr "" -#: network/netconnect.pm:779 +#: network/netconnect.pm:771 #, c-format msgid "Virtual Path ID (VPI):" msgstr "" -#: network/netconnect.pm:780 +#: network/netconnect.pm:772 #, c-format msgid "Virtual Circuit ID (VCI):" msgstr "" -#: network/netconnect.pm:783 +#: network/netconnect.pm:775 #, c-format msgid "Encapsulation:" msgstr "" -#: network/netconnect.pm:810 +#: network/netconnect.pm:802 #, c-format msgid "Manually load a driver" msgstr "" -#: network/netconnect.pm:810 +#: network/netconnect.pm:802 #, c-format msgid "Use a Windows driver (with ndiswrapper)" msgstr "" -#: network/netconnect.pm:850 +#: network/netconnect.pm:842 #, c-format msgid "Zeroconf hostname resolution" msgstr "" -#: network/netconnect.pm:851 network/netconnect.pm:881 +#: network/netconnect.pm:843 network/netconnect.pm:873 #, c-format msgid "Configuring network device %s (driver %s)" msgstr "" -#: network/netconnect.pm:852 +#: network/netconnect.pm:844 #, 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:882 +#: network/netconnect.pm:874 #, c-format msgid "" "Please enter the IP configuration for this machine.\n" @@ -9058,194 +9037,194 @@ msgid "" "notation (for example, 1.2.3.4)." msgstr "" -#: network/netconnect.pm:889 standalone/drakconnect:373 +#: network/netconnect.pm:881 standalone/drakconnect:373 #, c-format msgid "Assign host name from DHCP address" msgstr "" -#: network/netconnect.pm:890 standalone/drakconnect:375 +#: network/netconnect.pm:882 standalone/drakconnect:375 #, c-format msgid "DHCP host name" msgstr "" -#: network/netconnect.pm:895 standalone/drakconnect:321 standalone/drakconnect:883 standalone/drakgw:181 +#: network/netconnect.pm:887 standalone/drakconnect:321 standalone/drakconnect:883 standalone/drakgw:181 #, c-format msgid "Netmask" msgstr "" -#: network/netconnect.pm:897 standalone/drakconnect:437 +#: network/netconnect.pm:889 standalone/drakconnect:437 #, c-format msgid "Track network card id (useful for laptops)" msgstr "" -#: network/netconnect.pm:898 standalone/drakconnect:438 +#: network/netconnect.pm:890 standalone/drakconnect:438 #, c-format msgid "Network Hotplugging" msgstr "" -#: network/netconnect.pm:900 standalone/drakconnect:432 +#: network/netconnect.pm:892 standalone/drakconnect:432 #, c-format msgid "Start at boot" msgstr "" -#: network/netconnect.pm:902 standalone/drakconnect:460 +#: network/netconnect.pm:894 standalone/drakconnect:460 #, c-format msgid "Metric" msgstr "" -#: network/netconnect.pm:903 +#: network/netconnect.pm:895 #, c-format msgid "Enable IPv6 to IPv4 tunnel" msgstr "" -#: network/netconnect.pm:905 standalone/drakconnect:369 standalone/drakconnect:886 +#: network/netconnect.pm:897 standalone/drakconnect:369 standalone/drakconnect:886 #, c-format msgid "DHCP client" msgstr "" -#: network/netconnect.pm:907 standalone/drakconnect:379 +#: network/netconnect.pm:899 standalone/drakconnect:379 #, c-format msgid "DHCP timeout (in seconds)" msgstr "" -#: network/netconnect.pm:908 standalone/drakconnect:382 +#: network/netconnect.pm:900 standalone/drakconnect:382 #, c-format msgid "Get DNS servers from DHCP" msgstr "" -#: network/netconnect.pm:909 standalone/drakconnect:383 +#: network/netconnect.pm:901 standalone/drakconnect:383 #, c-format msgid "Get YP servers from DHCP" msgstr "" -#: network/netconnect.pm:910 standalone/drakconnect:384 +#: network/netconnect.pm:902 standalone/drakconnect:384 #, c-format msgid "Get NTPD servers from DHCP" msgstr "" -#: network/netconnect.pm:918 printer/printerdrake.pm:1896 standalone/drakconnect:676 +#: network/netconnect.pm:910 printer/printerdrake.pm:1896 standalone/drakconnect:676 #, c-format msgid "IP address should be in format 1.2.3.4" msgstr "" -#: network/netconnect.pm:922 standalone/drakconnect:680 +#: network/netconnect.pm:914 standalone/drakconnect:680 #, c-format msgid "Netmask should be in format 255.255.224.0" msgstr "" -#: network/netconnect
#- remove any existing save in Trash of each user and
#- move appropriate file there after an upgrade.
foreach my $dir (grep { -d $_ } list_skels($prefix, 'Desktop')) {
unlink("$dir/Trash/$_") && rename("$dir/$_", "$dir/Trash/$_")
foreach grep { -e "$dir/$_" } @toMove, grep { /\.rpmorig$/ } all($dir)
}
}
#-###############################################################################
#- auto_install stuff
#-###############################################################################
sub auto_inst_file() { ($::g_auto_install ? "/tmp" : "$::o->{prefix}/root") . "/auto_inst.cfg.pl" }
sub g_auto_install(;$) {
my ($f) = @_; $f ||= auto_inst_file;
my $o = {};
require pkgs;
$o->{default_packages} = [ map { pkgs::packageName($_) } grep { pkgs::packageFlagSelected($_) && !pkgs::packageFlagBase($_) } values %{$::o->{packages}{names}} ];
my @fields = qw(mntpoint type size);
$o->{partitions} = [ map { my %l; @l{@fields} = @$_{@fields}; \%l } grep { $_->{mntpoint} } @{$::o->{fstab}} ];
exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse wacom netc timezone superuser intf keyboard mkbootdisk users installClass partitioning isUpgrade manualFstab nomouseprobe crypto security netcnx useSupermount autoExitInstall); #- TODO modules bootloader
if (my $card = $::o->{X}{card}) {
$o->{X}{$_} = $::o->{X}{$_} foreach qw(default_depth resolution_wanted);
if ($o->{X}{default_depth} and my $depth = $card->{depth}{$o->{X}{default_depth}}) {
$depth ||= [];
$o->{X}{resolution_wanted} ||= join "x", @{$depth->[0]} unless is_empty_array_ref($depth->[0]);
$o->{X}{monitor} = $::o->{X}{monitor} if $::o->{X}{monitor}{manual};
}
}
local $o->{partitioning}{auto_allocate} = 1;
local $o->{autoExitInstall} = 1;
#- deep copy because we're modifying it below
$o->{users} = [ @{$o->{users} || []} ];
$_ = { %{$_ || {}} }, delete @$_{qw(oldu oldg password password2)} foreach $o->{superuser}, @{$o->{users} || []};
output($f,
"# You should always check the syntax with 'perl -cw auto_inst.cfg.pl' before testing\n",
Data::Dumper->Dump([$o], ['$o']), "\0");
}
sub loadO {
my ($O, $f) = @_; $f ||= auto_inst_file;
my $o;
if ($f =~ /^(floppy|patch)$/) {
my $f = $f eq "floppy" ? 'auto_inst.cfg' : "patch";
unless ($::testing) {
fs::mount(devices::make(detect_devices::floppy()), "/mnt", (arch() =~ /sparc/ ? "romfs" : "vfat"), 'readonly');
$f = "/mnt/$f";
}
-e $f or $f .= '.pl';
my $b = before_leaving {
fs::umount("/mnt") unless $::testing;
modules::unload($_) foreach qw(vfat fat);
};
$o = loadO($O, $f);
} else {
-e "$f.pl" and $f .= ".pl" unless -e $f;
my $fh = -e $f ? do { local *F; open F, $f; *F } : getFile($f) or die _("Error reading file $f");
{
local $/ = "\0";
no strict;
eval <$fh>;
close $fh;
$@ and log::l("Bad kickstart file $f (failed $@)");
}
add2hash_($o ||= {}, $O);
}
bless $o, ref $O;
}
sub generate_ks_cfg {
my ($o) = @_;
return if $o->{method} =~ /hd|cdrom/;
my $ks;
if ($o->{method} =~ /ftp|http/) {
$ks .= "url --url $ENV{URLPREFIX}\n";
} elsif ($o->{method} =~ /nfs/) {
cat_("/proc/mounts") =~ m|(\S+):(\S+)\s+/tmp/image nfs| or die;
$ks .= "nfs --server $1 --dir $2\n";
}
my ($intf) = values %{$o->{intf}};
if ($intf->{BOOTPROTO} =~ /^(dhcp|bootp)$/) {
$ks .= "network --bootproto $intf->{BOOTPROTO}\n";
} else {
require network;
my %l = (ip => $intf->{IPADDR}, netmask => $intf->{NETMASK}, gateway => $o->{netc}{GATEWAY});
$ks .= "network " . join(" ", map_each { $::b && "--$::a $::b" } %l);
$ks .= " --nameserver $_" foreach network::dnsServers($o->{netc});
$ks .= "\n";
}
$ks;
}
sub guess_mount_point {
my ($part, $prefix, $user) = @_;
my %l = (
'/' => 'etc/fstab',
'/boot' => 'vmlinuz',
'/tmp' => '.X11-unix',
'/usr' => 'X11R6',
'/var' => 'catman',
);
my $handle = any::inspect($part, $prefix) or return;
my $d = $handle->{dir};
my ($mnt) = grep { -e "$d/$l{$_}" } keys %l;
$mnt ||= (stat("$d/.bashrc"))[4] ? '/root' : '/home/user' . ++$$user if -e "$d/.bashrc";
$mnt ||= (grep { -d $_ && (stat($_))[4] >= 500 && -e "$_/.bashrc" } glob_("$d")) ? '/home' : '';
($mnt, $handle);
}
sub suggest_mount_points {
my ($hds, $prefix, $uniq) = @_;
my @fstab = fsedit::get_fstab(@$hds);
my $user;
foreach my $part (grep { isTrueFS($_) } @fstab) {
$part->{mntpoint} && !$part->{unsafeMntpoint} and next; #- if already found via an fstab
my ($mnt, $handle) = guess_mount_point($part, $prefix, \$user) or next;
next if $uniq && fsedit::mntpoint2part($mnt, \@fstab);
$part->{mntpoint} = $mnt; delete $part->{unsafeMntpoint};
#- try to find other mount points via fstab
fs::get_mntpoints_from_fstab([ fsedit::get_fstab(@$hds) ], $handle->{dir}, $uniq) if $mnt eq '/';
}
$_->{mntpoint} and log::l("suggest_mount_points: $_->{device} -> $_->{mntpoint}") foreach @fstab;
}
#- mainly for finding the root partitions for upgrade
sub find_root_parts {
my ($hds, $prefix) = @_;
log::l("find_root_parts");
my $user;
grep {
my ($mnt) = guess_mount_point($_, $prefix, \$user);
$mnt eq '/';
} fsedit::get_fstab(@$hds);
}
sub use_root_part {
my ($fstab, $part, $prefix) = @_;
{
my $handle = any::inspect($part, $prefix) or die;
fs::get_mntpoints_from_fstab($fstab, $handle->{dir}, 'uniq');
}
map { $_->{mntpoint} = 'swap' } grep { isSwap($_) } @$fstab; #- use all available swap.
}
sub getHds {
my ($o, $f_err) = @_;
my $ok = 1;
my $flags = $o->{partitioning};
my @drives = detect_devices::hds();
# add2hash_($o->{partitioning}, { readonly => 1 }) if partition_table_raw::typeOfMBR($drives[0]{device}) eq 'system_commander';
getHds:
my $hds = catch_cdie { fsedit::hds(\@drives, $flags) }
sub {
$ok = 0;
my $err = $@; $err =~ s/ at (.*?)$//;
log::l("error reading partition table: $err");
!$flags->{readonly} && $f_err and $f_err->($err);
};
if (is_empty_array_ref($hds) && $o->{autoSCSI}) {
$o->setupSCSI; #- ask for an unautodetected scsi card
goto getHds;
}
$::testing or partition_table_raw::test_for_bad_drives($_) foreach @$hds;
$ok = fsedit::verifyHds($hds, $flags->{readonly}, $ok)
unless $flags->{clearall} || $flags->{clear};
$o->{hds} = $hds;
$o->{fstab} = [ fsedit::get_fstab(@$hds) ];
fs::check_mounted($o->{fstab});
fs::merge_fstabs($o->{fstab}, $o->{manualFstab});
my @win = grep { isFat($_) && isFat({ type => fsedit::typeOfPart($_->{device}) }) } @{$o->{fstab}};
log::l("win parts: ", join ",", map { $_->{device} } @win) if @win;
if (@win == 1) {
$win[0]{mntpoint} = "/mnt/windows";
} else {
my %w; foreach (@win) {
my $v = $w{$_->{device_windobe}}++;
$_->{mntpoint} = $_->{unsafeMntpoint} = "/mnt/win_" . lc($_->{device_windobe}) . ($v ? $v+1 : ''); #- lc cuz of StartOffice(!) cf dadou
}
}
my @sunos = grep { isSunOS($_) && type2name($_->{type}) =~ /root/i } @{$o->{fstab}}; #- take only into account root partitions.
if (@sunos) {
my $v = '';
map { $_->{mntpoint} = $_->{unsafeMntpoint} = "/mnt/sunos" . ($v && ++$v) } @sunos;
}
#- a good job is to mount SunOS root partition, and to use mount point described here in /etc/vfstab.
$ok;
}
sub log_sizes {
my ($o) = @_;
my @df = common::df($o->{prefix});
log::l(sprintf "Installed: %dMB(df), %dMB(rpm)",
($df[0] - $df[1]) / 1024,
sum(`rpm --root $o->{prefix}/ -qa --queryformat "%{size}\n"`) / sqr(1024)) if -x "$o->{prefix}/bin/rpm";
}
1;
|