updated pot file

2 files changed, 1340 insertions, 1299 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index cccb65513..14a7e0edc 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: 2004-01-17 16:46+0100\n"
+"POT-Creation-Date: 2004-01-20 17:47+0100\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"
@@ -76,7 +76,7 @@ msgid ""
 "plug the key again, and launch Mandrake Move again."
 msgstr ""
 
-#: ../move/move.pm:402 help.pm:414 install_steps_interactive.pm:1304
+#: ../move/move.pm:402 help.pm:414 install_steps_interactive.pm:1299
 #, c-format
 msgid "Reboot"
 msgstr ""
@@ -118,12 +118,12 @@ msgstr ""
 msgid "Please wait, detecting and configuring devices..."
 msgstr ""
 
-#: ../move/move.pm:502 ../move/move.pm:559 ../move/move.pm:563 ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117 diskdrake/interactive.pm:214 diskdrake/interactive.pm:227 diskdrake/interactive.pm:366 diskdrake/interactive.pm:381 diskdrake/interactive.pm:502 diskdrake/interactive.pm:507 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:252 install_steps.pm:77 install_steps_interactive.pm:40 interactive/http.pm:118 interactive/http.pm:119 standalone/drakTermServ:403 standalone/drakTermServ:755 standalone/drakTermServ:767 standalone/drakTermServ:953 standalone/drakTermServ:1338 standalone/drakTermServ:1343 standalone/drakTermServ:1354 standalone/drakTermServ:1373 standalone/drakauth:36 standalone/drakbackup:766 standalone/drakbackup:879 standalone/drakbackup:1476 standalone/drakbackup:1507 standalone/drakbackup:1988 standalone/drakbackup:2160 standalone/drakbackup:2714 standalone/drakbackup:2781 standalone/drakbackup:4763 standalone/drakboot:225 standalone/drakbug:267 standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:478 standalone/drakfloppy:301 standalone/drakfloppy:305 standalone/drakfloppy:311 standalone/drakfont:211 standalone/drakfont:224 standalone/drakfont:262 standalone/drakfont:602 standalone/draksplash:21 standalone/logdrake:171 wizards.pm:94 wizards.pm:98 wizards.pm:120
+#: ../move/move.pm:502 ../move/move.pm:559 ../move/move.pm:563 ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117 diskdrake/interactive.pm:214 diskdrake/interactive.pm:227 diskdrake/interactive.pm:366 diskdrake/interactive.pm:381 diskdrake/interactive.pm:502 diskdrake/interactive.pm:507 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:252 install_steps.pm:81 install_steps_interactive.pm:40 interactive/http.pm:118 interactive/http.pm:119 network/netconnect.pm:609 network/netconnect.pm:612 network/netconnect.pm:685 network/netconnect.pm:689 network/netconnect.pm:708 network/netconnect.pm:753 network/netconnect.pm:758 network/netconnect.pm:776 standalone/drakTermServ:403 standalone/drakTermServ:755 standalone/drakTermServ:767 standalone/drakTermServ:953 standalone/drakTermServ:1338 standalone/drakTermServ:1343 standalone/drakTermServ:1354 standalone/drakTermServ:1373 standalone/drakauth:36 standalone/drakbackup:766 standalone/drakbackup:879 standalone/drakbackup:1476 standalone/drakbackup:1507 standalone/drakbackup:1988 standalone/drakbackup:2160 standalone/drakbackup:2714 standalone/drakbackup:2781 standalone/drakbackup:4763 standalone/drakboot:225 standalone/drakbug:267 standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:523 standalone/drakfloppy:301 standalone/drakfloppy:305 standalone/drakfloppy:311 standalone/drakfont:211 standalone/drakfont:224 standalone/drakfont:262 standalone/drakfont:602 standalone/draksplash:21 standalone/logdrake:171 wizards.pm:94 wizards.pm:98 wizards.pm:120
 #, c-format
 msgid "Error"
 msgstr ""
 
-#: ../move/move.pm:503 install_steps.pm:78
+#: ../move/move.pm:503 install_steps.pm:82
 #, c-format
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
@@ -336,12 +336,12 @@ msgstr ""
 msgid "Xpmac (installation display driver)"
 msgstr ""
 
-#: Xconfig/main.pm:78 Xconfig/main.pm:79 Xconfig/monitor.pm:106 any.pm:816
+#: Xconfig/main.pm:78 Xconfig/main.pm:79 Xconfig/monitor.pm:106 any.pm:809
 #, c-format
 msgid "Custom"
 msgstr ""
 
-#: Xconfig/main.pm:103 diskdrake/dav.pm:28 install_steps_interactive.pm:87 printer/printerdrake.pm:3852 standalone/draksplash:114 standalone/harddrake2:187 standalone/logdrake:176 standalone/scannerdrake:432
+#: Xconfig/main.pm:103 diskdrake/dav.pm:28 install_steps_interactive.pm:83 printer/printerdrake.pm:3852 standalone/draksplash:114 standalone/harddrake2:187 standalone/logdrake:176 standalone/scannerdrake:432
 #, c-format
 msgid "Quit"
 msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: Xconfig/monitor.pm:109 standalone/drakconnect:432 standalone/harddrake2:68 standalone/harddrake2:69
+#: Xconfig/monitor.pm:109 standalone/drakconnect:475 standalone/harddrake2:68 standalone/harddrake2:69
 #, c-format
 msgid "Vendor"
 msgstr ""
@@ -467,17 +467,17 @@ msgstr ""
 msgid "Graphics card: %s"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:289 interactive.pm:403 interactive/gtk.pm:761 interactive/http.pm:103 interactive/http.pm:157 interactive/newt.pm:300 interactive/newt.pm:402 interactive/stdio.pm:39 interactive/stdio.pm:143 interactive/stdio.pm:144 interactive/stdio.pm:173 standalone/drakbackup:4257 standalone/drakbackup:4289 standalone/drakbackup:4382 standalone/drakbackup:4399 standalone/drakbackup:4500 standalone/drakconnect:168 standalone/drakconnect:636 standalone/drakconnect:723 standalone/drakconnect:866 standalone/drakups:194 standalone/mousedrake:77 standalone/net_monitor:308 ugtk2.pm:396 ugtk2.pm:494 ugtk2.pm:1044 ugtk2.pm:1067
+#: Xconfig/resolution_and_depth.pm:289 interactive.pm:403 interactive/gtk.pm:761 interactive/http.pm:103 interactive/http.pm:157 interactive/newt.pm:300 interactive/newt.pm:402 interactive/stdio.pm:39 interactive/stdio.pm:143 interactive/stdio.pm:144 interactive/stdio.pm:173 standalone/drakbackup:4257 standalone/drakbackup:4289 standalone/drakbackup:4382 standalone/drakbackup:4399 standalone/drakbackup:4500 standalone/drakconnect:167 standalone/drakconnect:681 standalone/drakconnect:768 standalone/drakconnect:911 standalone/drakups:194 standalone/mousedrake:77 standalone/net_monitor:308 ugtk2.pm:404 ugtk2.pm:502 ugtk2.pm:1052 ugtk2.pm:1075
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:289 any.pm:857 diskdrake/smbnfs_gtk.pm:81 help.pm:192 help.pm:453 install_steps_gtk.pm:500 install_steps_interactive.pm:783 interactive.pm:404 interactive/gtk.pm:765 interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:299 interactive/newt.pm:406 interactive/stdio.pm:39 interactive/stdio.pm:143 interactive/stdio.pm:177 printer/printerdrake.pm:2906 standalone/drakautoinst:200 standalone/drakbackup:4221 standalone/drakbackup:4248 standalone/drakbackup:4273 standalone/drakbackup:4306 standalone/drakbackup:4332 standalone/drakbackup:4358 standalone/drakbackup:4415 standalone/drakbackup:4441 standalone/drakbackup:4471 standalone/drakbackup:4495 standalone/drakconnect:167 standalone/drakconnect:721 standalone/drakconnect:875 standalone/drakfont:662 standalone/drakfont:739 standalone/drakups:201 standalone/logdrake:176 standalone/mousedrake:76 standalone/net_monitor:304 ugtk2.pm:390 ugtk2.pm:492 ugtk2.pm:501 ugtk2.pm:1044
+#: Xconfig/resolution_and_depth.pm:289 any.pm:850 diskdrake/smbnfs_gtk.pm:81 help.pm:192 help.pm:453 install_steps_gtk.pm:500 install_steps_interactive.pm:779 interactive.pm:404 interactive/gtk.pm:765 interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:299 interactive/newt.pm:406 interactive/stdio.pm:39 interactive/stdio.pm:143 interactive/stdio.pm:177 printer/printerdrake.pm:2906 standalone/drakautoinst:200 standalone/drakbackup:4221 standalone/drakbackup:4248 standalone/drakbackup:4273 standalone/drakbackup:4306 standalone/drakbackup:4332 standalone/drakbackup:4358 standalone/drakbackup:4415 standalone/drakbackup:4441 standalone/drakbackup:4471 standalone/drakbackup:4495 standalone/drakconnect:166 standalone/drakconnect:766 standalone/drakconnect:920 standalone/drakfont:662 standalone/drakfont:739 standalone/drakups:201 standalone/logdrake:176 standalone/mousedrake:76 standalone/net_monitor:304 ugtk2.pm:398 ugtk2.pm:500 ugtk2.pm:509 ugtk2.pm:1052
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154 install_steps_gtk.pm:278 install_steps_gtk.pm:685 interactive.pm:498 interactive/gtk.pm:652 interactive/gtk.pm:654 standalone/drakTermServ:321 standalone/drakbackup:4218 standalone/drakbackup:4245 standalone/drakbackup:4270 standalone/drakbackup:4303 standalone/drakbackup:4329 standalone/drakbackup:4355 standalone/drakbackup:4396 standalone/drakbackup:4412 standalone/drakbackup:4438 standalone/drakbackup:4467 standalone/drakbackup:4492 standalone/drakbackup:4517 standalone/drakbug:157 standalone/drakconnect:163 standalone/drakconnect:223 standalone/drakfont:514 standalone/drakperm:134 standalone/draksec:282 standalone/harddrake2:186 ugtk2.pm:1152 ugtk2.pm:1153
+#: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154 install_steps_gtk.pm:278 install_steps_gtk.pm:685 interactive.pm:498 interactive/gtk.pm:651 interactive/gtk.pm:653 standalone/drakTermServ:321 standalone/drakbackup:4218 standalone/drakbackup:4245 standalone/drakbackup:4270 standalone/drakbackup:4303 standalone/drakbackup:4329 standalone/drakbackup:4355 standalone/drakbackup:4396 standalone/drakbackup:4412 standalone/drakbackup:4438 standalone/drakbackup:4467 standalone/drakbackup:4492 standalone/drakbackup:4517 standalone/drakbug:157 standalone/drakconnect:162 standalone/drakconnect:230 standalone/drakfont:514 standalone/drakperm:134 standalone/draksec:282 standalone/harddrake2:186 ugtk2.pm:1160 ugtk2.pm:1161
 #, c-format
 msgid "Help"
 msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: any.pm:98 harddrake/sound.pm:147 interactive.pm:441 standalone/drakbug:259 standalone/drakconnect:170 standalone/drakups:90 standalone/drakxtv:90 standalone/harddrake2:133 standalone/service_harddrake:94
+#: any.pm:98 harddrake/sound.pm:147 interactive.pm:441 standalone/drakbug:259 standalone/drakconnect:169 standalone/drakconnect:202 standalone/drakups:90 standalone/drakxtv:90 standalone/harddrake2:133 standalone/service_harddrake:94
 #, c-format
 msgid "Please wait"
 msgstr ""
@@ -742,12 +742,12 @@ msgstr ""
 msgid "Force No APIC"
 msgstr ""
 
-#: any.pm:221 any.pm:552 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1160 network/netconnect.pm:500 printer/printerdrake.pm:1331 printer/printerdrake.pm:1445 standalone/drakbackup:1974 standalone/drakbackup:3826 standalone/drakconnect:818 standalone/drakconnect:846 standalone/drakups:278
+#: any.pm:221 any.pm:545 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1155 network/netconnect.pm:439 printer/printerdrake.pm:1331 printer/printerdrake.pm:1445 standalone/drakbackup:1974 standalone/drakbackup:3826 standalone/drakconnect:863 standalone/drakconnect:891 standalone/drakups:278
 #, c-format
 msgid "Password"
 msgstr ""
 
-#: any.pm:222 any.pm:553 install_steps_interactive.pm:1161
+#: any.pm:222 any.pm:546 install_steps_interactive.pm:1156
 #, c-format
 msgid "Password (again)"
 msgstr ""
@@ -787,12 +787,12 @@ msgstr ""
 msgid "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: any.pm:235 any.pm:525 install_steps_interactive.pm:1155
+#: any.pm:235 any.pm:518 install_steps_interactive.pm:1150
 #, c-format
 msgid "The passwords do not match"
 msgstr ""
 
-#: any.pm:235 any.pm:525 diskdrake/interactive.pm:1249 install_steps_interactive.pm:1155
+#: any.pm:235 any.pm:518 diskdrake/interactive.pm:1249 install_steps_interactive.pm:1150
 #, c-format
 msgid "Please try again"
 msgstr ""
@@ -832,12 +832,12 @@ msgstr ""
 msgid "Image"
 msgstr ""
 
-#: any.pm:291 any.pm:302
+#: any.pm:291 any.pm:300
 #, c-format
 msgid "Root"
 msgstr ""
 
-#: any.pm:292 any.pm:320
+#: any.pm:292 any.pm:313
 #, c-format
 msgid "Append"
 msgstr ""
@@ -847,226 +847,211 @@ msgstr ""
 msgid "Initrd"
 msgstr ""
 
-#: any.pm:297
-#, c-format
-msgid "Read-write"
-msgstr ""
-
-#: any.pm:304
-#, c-format
-msgid "Table"
-msgstr ""
-
-#: any.pm:305
-#, c-format
-msgid "Unsafe"
-msgstr ""
-
-#: any.pm:312 any.pm:317 any.pm:319
+#: any.pm:305 any.pm:310 any.pm:312
 #, c-format
 msgid "Label"
 msgstr ""
 
-#: any.pm:314 any.pm:324 harddrake/v4l.pm:236 standalone/drakfloppy:88 standalone/drakfloppy:94
+#: any.pm:307 any.pm:317 harddrake/v4l.pm:236 standalone/drakfloppy:88 standalone/drakfloppy:94
 #, c-format
 msgid "Default"
 msgstr ""
 
-#: any.pm:321
+#: any.pm:314
 #, c-format
 msgid "Initrd-size"
 msgstr ""
 
-#: any.pm:323
+#: any.pm:316
 #, c-format
 msgid "NoVideo"
 msgstr ""
 
-#: any.pm:334
+#: any.pm:327
 #, c-format
 msgid "Empty label not allowed"
 msgstr ""
 
-#: any.pm:335
+#: any.pm:328
 #, c-format
 msgid "You must specify a kernel image"
 msgstr ""
 
-#: any.pm:335
+#: any.pm:328
 #, c-format
 msgid "You must specify a root partition"
 msgstr ""
 
-#: any.pm:336
+#: any.pm:329
 #, c-format
 msgid "This label is already used"
 msgstr ""
 
-#: any.pm:348
+#: any.pm:341
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr ""
 
-#: any.pm:349 standalone/drakbackup:1888
+#: any.pm:342 standalone/drakbackup:1888
 #, c-format
 msgid "Linux"
 msgstr ""
 
-#: any.pm:349
+#: any.pm:342
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr ""
 
-#: any.pm:350
+#: any.pm:343
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr ""
 
-#: any.pm:350
+#: any.pm:343
 #, c-format
 msgid "Other OS (windows...)"
 msgstr ""
 
-#: any.pm:378
+#: any.pm:371
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
 "You can create additional entries or change the existing ones."
 msgstr ""
 
-#: any.pm:510
+#: any.pm:503
 #, c-format
 msgid "access to X programs"
 msgstr ""
 
-#: any.pm:511
+#: any.pm:504
 #, c-format
 msgid "access to rpm tools"
 msgstr ""
 
-#: any.pm:512
+#: any.pm:505
 #, c-format
 msgid "allow \"su\""
 msgstr ""
 
-#: any.pm:513
+#: any.pm:506
 #, c-format
 msgid "access to administrative files"
 msgstr ""
 
-#: any.pm:514
+#: any.pm:507
 #, c-format
 msgid "access to network tools"
 msgstr ""
 
-#: any.pm:515
+#: any.pm:508
 #, c-format
 msgid "access to compilation tools"
 msgstr ""
 
-#: any.pm:521
+#: any.pm:514
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: any.pm:526
+#: any.pm:519
 #, c-format
 msgid "This password is too simple"
 msgstr ""
 
-#: any.pm:527
+#: any.pm:520
 #, c-format
 msgid "Please give a user name"
 msgstr ""
 
-#: any.pm:528
+#: any.pm:521
 #, c-format
 msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: any.pm:529
+#: any.pm:522
 #, c-format
 msgid "The user name is too long"
 msgstr ""
 
-#: any.pm:530
+#: any.pm:523
 #, c-format
 msgid "This user name has already been added"
 msgstr ""
 
-#: any.pm:534
+#: any.pm:527
 #, c-format
 msgid "Add user"
 msgstr ""
 
-#: any.pm:535
+#: any.pm:528
 #, c-format
 msgid ""
 "Enter a user\n"
 "%s"
 msgstr ""
 
-#: any.pm:538 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158 diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:534 interactive/http.pm:152 printer/printerdrake.pm:160 printer/printerdrake.pm:347 printer/printerdrake.pm:3852 standalone/drakbackup:3034 standalone/scannerdrake:623 standalone/scannerdrake:773
+#: any.pm:531 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158 diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:534 interactive/http.pm:152 printer/printerdrake.pm:160 printer/printerdrake.pm:347 printer/printerdrake.pm:3852 standalone/drakbackup:3034 standalone/scannerdrake:623 standalone/scannerdrake:773
 #, c-format
 msgid "Done"
 msgstr ""
 
-#: any.pm:539 help.pm:51
+#: any.pm:532 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr ""
 
-#: any.pm:550
+#: any.pm:543
 #, c-format
 msgid "Real name"
 msgstr ""
 
-#: any.pm:551 help.pm:51 printer/printerdrake.pm:1330 printer/printerdrake.pm:1444
+#: any.pm:544 help.pm:51 printer/printerdrake.pm:1330 printer/printerdrake.pm:1444
 #, c-format
 msgid "User name"
 msgstr ""
 
-#: any.pm:554
+#: any.pm:547
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: any.pm:556
+#: any.pm:549
 #, c-format
 msgid "Icon"
 msgstr ""
 
-#: any.pm:597 security/l10n.pm:14
+#: any.pm:590 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr ""
 
-#: any.pm:598
+#: any.pm:591
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 
-#: any.pm:599 help.pm:51
+#: any.pm:592 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr ""
 
-#: any.pm:600
+#: any.pm:593
 #, c-format
 msgid "Choose the default user:"
 msgstr ""
 
-#: any.pm:601
+#: any.pm:594
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr ""
 
-#: any.pm:613
+#: any.pm:606
 #, c-format
 msgid "Please choose a language to use."
 msgstr ""
 
-#: any.pm:633
+#: any.pm:626
 #, c-format
 msgid ""
 "Mandrake Linux can support multiple languages. Select\n"
@@ -1074,62 +1059,62 @@ msgid ""
 "when your installation is complete and you restart your system."
 msgstr ""
 
-#: any.pm:644 help.pm:634
+#: any.pm:637 help.pm:634
 #, c-format
 msgid "Use Unicode by default"
 msgstr ""
 
-#: any.pm:645 help.pm:634
+#: any.pm:638 help.pm:634
 #, c-format
 msgid "All languages"
 msgstr ""
 
-#: any.pm:681 help.pm:571 help.pm:951 install_steps_interactive.pm:903
+#: any.pm:674 help.pm:571 help.pm:951 install_steps_interactive.pm:899
 #, c-format
 msgid "Country / Region"
 msgstr ""
 
-#: any.pm:682
+#: any.pm:675
 #, c-format
 msgid "Please choose your country."
 msgstr ""
 
-#: any.pm:684
+#: any.pm:677
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr ""
 
-#: any.pm:685 diskdrake/interactive.pm:289 help.pm:534 help.pm:571 help.pm:609 help.pm:951 install_steps_interactive.pm:118
+#: any.pm:678 diskdrake/interactive.pm:289 help.pm:534 help.pm:571 help.pm:609 help.pm:951 install_steps_interactive.pm:114
 #, c-format
 msgid "More"
 msgstr ""
 
-#: any.pm:816
+#: any.pm:809
 #, c-format
 msgid "No sharing"
 msgstr ""
 
-#: any.pm:816
+#: any.pm:809
 #, c-format
 msgid "Allow all users"
 msgstr ""
 
-#: any.pm:826 do_pkgs.pm:21
+#: any.pm:819 do_pkgs.pm:21
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr ""
 
-#: any.pm:828
+#: any.pm:821
 #, c-format
 msgid "You can export using NFS or Samba. Please select which you'd like to use."
 msgstr ""
 
-#: any.pm:836 do_pkgs.pm:26
+#: any.pm:829 do_pkgs.pm:26
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr ""
 
-#: any.pm:842
+#: any.pm:835
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1139,12 +1124,12 @@ msgid ""
 ""
 msgstr ""
 
-#: any.pm:857
+#: any.pm:850
 #, c-format
 msgid "Launch userdrake"
 msgstr ""
 
-#: any.pm:859
+#: any.pm:852
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1232,7 +1217,7 @@ msgid "Can't 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:547
+#: bootloader.pm:535
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1243,37 +1228,37 @@ msgid ""
 ""
 msgstr ""
 
-#: bootloader.pm:679
+#: bootloader.pm:667
 #, c-format
 msgid "SILO"
 msgstr ""
 
-#: bootloader.pm:681 help.pm:729
+#: bootloader.pm:669 help.pm:729
 #, c-format
 msgid "LILO with graphical menu"
 msgstr ""
 
-#: bootloader.pm:682 help.pm:729
+#: bootloader.pm:670 help.pm:729
 #, c-format
 msgid "LILO with text menu"
 msgstr ""
 
-#: bootloader.pm:684
+#: bootloader.pm:672
 #, c-format
 msgid "Grub"
 msgstr ""
 
-#: bootloader.pm:686
+#: bootloader.pm:674
 #, c-format
 msgid "Yaboot"
 msgstr ""
 
-#: bootloader.pm:1153
+#: bootloader.pm:1142
 #, c-format
 msgid "not enough room in /boot"
 msgstr ""
 
-#: bootloader.pm:1181
+#: bootloader.pm:1170
 #, c-format
 msgid ""
 "You can't install the bootloader on a %s partition\n"
@@ -1335,7 +1320,7 @@ msgstr ""
 msgid "consolehelper missing"
 msgstr ""
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:235 network/netconnect.pm:55 network/netconnect.pm:291
+#: crypto.pm:14 crypto.pm:28 lang.pm:235 network/netconnect.pm:53 network/netconnect.pm:249
 #, c-format
 msgid "France"
 msgstr ""
@@ -1345,7 +1330,7 @@ msgstr ""
 msgid "Costa Rica"
 msgstr ""
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:183 network/netconnect.pm:58 network/netconnect.pm:290
+#: crypto.pm:16 crypto.pm:29 lang.pm:183 network/netconnect.pm:56 network/netconnect.pm:248
 #, c-format
 msgid "Belgium"
 msgstr ""
@@ -1375,12 +1360,12 @@ msgstr ""
 msgid "Sweden"
 msgstr ""
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:320 network/netconnect.pm:56 network/netconnect.pm:293
+#: crypto.pm:22 crypto.pm:36 lang.pm:320 network/netconnect.pm:54 network/netconnect.pm:251
 #, c-format
 msgid "Netherlands"
 msgstr ""
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:268 network/netconnect.pm:57 network/netconnect.pm:292 standalone/drakxtv:48
+#: crypto.pm:23 crypto.pm:37 lang.pm:268 network/netconnect.pm:55 network/netconnect.pm:250 standalone/drakxtv:48
 #, c-format
 msgid "Italy"
 msgstr ""
@@ -1390,7 +1375,7 @@ msgstr ""
 msgid "Austria"
 msgstr ""
 
-#: crypto.pm:35 crypto.pm:61 lang.pm:384 network/netconnect.pm:59 network/netconnect.pm:295
+#: crypto.pm:35 crypto.pm:61 lang.pm:384 network/netconnect.pm:57 network/netconnect.pm:253
 #, c-format
 msgid "United States"
 msgstr ""
@@ -1624,7 +1609,7 @@ msgstr ""
 msgid "Do you want to save /etc/fstab modifications"
 msgstr ""
 
-#: diskdrake/interactive.pm:274 install_steps_interactive.pm:305
+#: diskdrake/interactive.pm:274 install_steps_interactive.pm:301
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
@@ -1696,7 +1681,7 @@ msgid ""
 "Still continue?"
 msgstr ""
 
-#: diskdrake/interactive.pm:375 harddrake/sound.pm:219 keyboard.pm:311 network/netconnect.pm:400 network/netconnect.pm:409 network/netconnect.pm:430 network/netconnect.pm:435 standalone/drakTermServ:1062 standalone/drakTermServ:1692 standalone/drakbackup:765 standalone/drakbackup:863 standalone/drakclock:200 standalone/drakconnect:758 standalone/drakfloppy:295 standalone/drakups:27
+#: diskdrake/interactive.pm:375 harddrake/sound.pm:219 keyboard.pm:311 network/netconnect.pm:334 standalone/drakTermServ:1062 standalone/drakTermServ:1692 standalone/drakbackup:765 standalone/drakbackup:863 standalone/drakclock:200 standalone/drakconnect:803 standalone/drakfloppy:295 standalone/drakups:27
 #, c-format
 msgid "Warning"
 msgstr ""
@@ -2258,7 +2243,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr ""
 
-#: diskdrake/interactive.pm:1252 network/netconnect.pm:656 standalone/drakconnect:321
+#: diskdrake/interactive.pm:1252 network/netconnect.pm:645 standalone/drakconnect:362
 #, c-format
 msgid "Encryption key"
 msgstr ""
@@ -2318,36 +2303,36 @@ msgstr ""
 msgid "Search new servers"
 msgstr ""
 
-#: do_pkgs.pm:136
+#: do_pkgs.pm:137
 #, c-format
 msgid "Installing packages..."
 msgstr ""
 
-#: do_pkgs.pm:210
+#: do_pkgs.pm:211
 #, c-format
 msgid "Removing packages..."
 msgstr ""
 
-#: fs.pm:397
+#: fs.pm:399
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
 
-#: fs.pm:400
+#: fs.pm:402
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
 
-#: fs.pm:403
+#: fs.pm:405
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 
-#: fs.pm:405
+#: fs.pm:407
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2355,7 +2340,7 @@ msgid ""
 "containing binaries for architectures other than its own."
 msgstr ""
 
-#: fs.pm:409
+#: fs.pm:411
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2363,17 +2348,17 @@ msgid ""
 "have suidperl(1) installed.)"
 msgstr ""
 
-#: fs.pm:413
+#: fs.pm:415
 #, c-format
 msgid "Mount the file system read-only."
 msgstr ""
 
-#: fs.pm:415
+#: fs.pm:417
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 
-#: fs.pm:419
+#: fs.pm:421
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2383,52 +2368,52 @@ msgid ""
 "user,exec,dev,suid )."
 msgstr ""
 
-#: fs.pm:427
+#: fs.pm:429
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr ""
 
-#: fs.pm:563 fs.pm:573 fs.pm:577 fs.pm:581 fs.pm:585 fs.pm:589 swap.pm:12
+#: fs.pm:565 fs.pm:575 fs.pm:579 fs.pm:583 fs.pm:587 fs.pm:591 swap.pm:12
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr ""
 
-#: fs.pm:626
+#: fs.pm:628
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr ""
 
-#: fs.pm:633 fs.pm:640
+#: fs.pm:635 fs.pm:642
 #, c-format
 msgid "Formatting partition %s"
 msgstr ""
 
-#: fs.pm:637
+#: fs.pm:639
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr ""
 
-#: fs.pm:703 fs.pm:756
+#: fs.pm:705 fs.pm:758
 #, c-format
 msgid "Mounting partition %s"
 msgstr ""
 
-#: fs.pm:704 fs.pm:757
+#: fs.pm:706 fs.pm:759
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr ""
 
-#: fs.pm:724 fs.pm:732
+#: fs.pm:726 fs.pm:734
 #, c-format
 msgid "Checking %s"
 msgstr ""
 
-#: fs.pm:773 partition_table.pm:635
+#: fs.pm:775 partition_table.pm:635
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr ""
 
-#: fs.pm:805
+#: fs.pm:807
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr ""
@@ -2607,7 +2592,7 @@ msgstr ""
 msgid "Ethernetcard"
 msgstr ""
 
-#: harddrake/data.pm:66
+#: harddrake/data.pm:66 network/netconnect.pm:347
 #, c-format
 msgid "Modem"
 msgstr ""
@@ -2632,7 +2617,7 @@ msgstr ""
 msgid "Unknown/Others"
 msgstr ""
 
-#: harddrake/data.pm:74 help.pm:198 help.pm:951 install_steps_interactive.pm:931 printer/printerdrake.pm:671 printer/printerdrake.pm:3951
+#: harddrake/data.pm:74 help.pm:198 help.pm:951 install_steps_interactive.pm:927 printer/printerdrake.pm:671 printer/printerdrake.pm:3951
 #, c-format
 msgid "Printer"
 msgstr ""
@@ -2642,7 +2627,7 @@ msgstr ""
 msgid "Scanner"
 msgstr ""
 
-#: harddrake/data.pm:78 help.pm:951 install_steps_interactive.pm:924
+#: harddrake/data.pm:78 help.pm:951 install_steps_interactive.pm:920
 #, c-format
 msgid "Mouse"
 msgstr ""
@@ -2682,7 +2667,7 @@ msgstr ""
 msgid "cpu # "
 msgstr ""
 
-#: harddrake/sound.pm:147 standalone/drakconnect:172
+#: harddrake/sound.pm:147 standalone/drakconnect:171
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr ""
@@ -2901,7 +2886,7 @@ msgid ""
 "terms in it, check the \"%s\" box. If not, simply turn off your computer."
 msgstr ""
 
-#: help.pm:13 install_steps_gtk.pm:614 install_steps_interactive.pm:92 install_steps_interactive.pm:693 standalone/drakautoinst:199
+#: help.pm:13 install_steps_gtk.pm:614 install_steps_interactive.pm:88 install_steps_interactive.pm:689 standalone/drakautoinst:199
 #, c-format
 msgid "Accept"
 msgstr ""
@@ -2947,7 +2932,7 @@ msgid ""
 "If you are not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 
-#: help.pm:51 help.pm:51 help.pm:192 help.pm:440 help.pm:660 help.pm:965 help.pm:965 install_steps_gtk.pm:286 interactive.pm:403 interactive/newt.pm:300 network/netconnect.pm:251 network/tools.pm:228 printer/printerdrake.pm:2908 standalone/drakbackup:4424 standalone/drakbackup:4450 standalone/drakbackup:4480 standalone/drakbackup:4504 ugtk2.pm:494
+#: help.pm:51 help.pm:51 help.pm:192 help.pm:440 help.pm:660 help.pm:965 help.pm:965 install_steps_gtk.pm:286 interactive.pm:403 interactive/newt.pm:300 network/netconnect.pm:209 network/tools.pm:228 printer/printerdrake.pm:2908 standalone/drakbackup:4424 standalone/drakbackup:4450 standalone/drakbackup:4480 standalone/drakbackup:4504 ugtk2.pm:502
 #, c-format
 msgid "Next"
 msgstr ""
@@ -3067,7 +3052,7 @@ msgstr ""
 msgid "Graphical Environment"
 msgstr ""
 
-#: help.pm:137 install_steps_interactive.pm:555
+#: help.pm:137 install_steps_interactive.pm:551
 #, c-format
 msgid "With X"
 msgstr ""
@@ -3082,7 +3067,7 @@ msgstr ""
 msgid "Truly minimal install"
 msgstr ""
 
-#: help.pm:137 install_steps_gtk.pm:281 install_steps_interactive.pm:601
+#: help.pm:137 install_steps_gtk.pm:281 install_steps_interactive.pm:597
 #, c-format
 msgid "Individual package selection"
 msgstr ""
@@ -3130,12 +3115,12 @@ msgid ""
 "create such a floppy."
 msgstr ""
 
-#: help.pm:172 help.pm:294 help.pm:322 help.pm:453 install_any.pm:416 interactive.pm:149 modules/interactive.pm:69 standalone/harddrake2:217 ugtk2.pm:1043 wizards.pm:155
+#: help.pm:172 help.pm:294 help.pm:322 help.pm:453 install_any.pm:415 interactive.pm:149 modules/interactive.pm:69 standalone/harddrake2:217 ugtk2.pm:1051 wizards.pm:155
 #, c-format
 msgid "No"
 msgstr ""
 
-#: help.pm:172 help.pm:294 help.pm:453 help.pm:453 install_any.pm:416 interactive.pm:149 modules/interactive.pm:69 standalone/drakgw:272 standalone/drakgw:273 standalone/drakgw:281 standalone/drakgw:291 standalone/harddrake2:216 ugtk2.pm:1043 wizards.pm:155
+#: help.pm:172 help.pm:294 help.pm:453 help.pm:453 install_any.pm:415 interactive.pm:149 modules/interactive.pm:69 standalone/drakgw:280 standalone/drakgw:281 standalone/drakgw:289 standalone/drakgw:299 standalone/harddrake2:216 ugtk2.pm:1051 wizards.pm:155
 #, c-format
 msgid "Yes"
 msgstr ""
@@ -3168,7 +3153,7 @@ msgid ""
 "installed and use the program described there to configure your connection."
 msgstr ""
 
-#: help.pm:192 network/netconnect.pm:158
+#: help.pm:192
 #, c-format
 msgid "Use auto detection"
 msgstr ""
@@ -3225,7 +3210,7 @@ msgid ""
 "other machines on your local network as well."
 msgstr ""
 
-#: help.pm:230 install_steps_interactive.pm:830
+#: help.pm:230 install_steps_interactive.pm:826
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr ""
@@ -3478,17 +3463,17 @@ msgstr ""
 msgid "generate auto-install floppy"
 msgstr ""
 
-#: help.pm:414 install_steps_interactive.pm:1314
+#: help.pm:414 install_steps_interactive.pm:1309
 #, c-format
 msgid "Replay"
 msgstr ""
 
-#: help.pm:414 install_steps_interactive.pm:1314
+#: help.pm:414 install_steps_interactive.pm:1309
 #, c-format
 msgid "Automated"
 msgstr ""
 
-#: help.pm:414 install_steps_interactive.pm:1317
+#: help.pm:414 install_steps_interactive.pm:1312
 #, c-format
 msgid "Save packages selection"
 msgstr ""
@@ -3522,7 +3507,7 @@ msgid ""
 "bad blocks on the disk."
 msgstr ""
 
-#: help.pm:440 help.pm:965 install_steps_gtk.pm:443 interactive.pm:404 interactive/newt.pm:299 printer/printerdrake.pm:2906 standalone/drakbackup:4225 standalone/drakbackup:4253 standalone/drakbackup:4311 standalone/drakbackup:4337 standalone/drakbackup:4363 standalone/drakbackup:4420 standalone/drakbackup:4446 standalone/drakbackup:4476 standalone/drakbackup:4500 ugtk2.pm:492
+#: help.pm:440 help.pm:965 install_steps_gtk.pm:443 interactive.pm:404 interactive/newt.pm:299 printer/printerdrake.pm:2906 standalone/drakbackup:4225 standalone/drakbackup:4253 standalone/drakbackup:4311 standalone/drakbackup:4337 standalone/drakbackup:4363 standalone/drakbackup:4420 standalone/drakbackup:4446 standalone/drakbackup:4476 standalone/drakbackup:4500 ugtk2.pm:500
 #, c-format
 msgid "Previous"
 msgstr ""
@@ -3543,7 +3528,7 @@ msgid ""
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
 
-#: help.pm:453 help.pm:592 install_steps_gtk.pm:442 install_steps_interactive.pm:152 standalone/drakbackup:4539
+#: help.pm:453 help.pm:592 install_steps_gtk.pm:442 install_steps_interactive.pm:148 standalone/drakbackup:4539
 #, c-format
 msgid "Install"
 msgstr ""
@@ -3843,7 +3828,7 @@ msgid "authentication"
 msgstr ""
 
 #. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:702 install_steps_interactive.pm:1150
+#: help.pm:702 install_steps_interactive.pm:1146
 #, c-format
 msgid "No password"
 msgstr ""
@@ -4114,7 +4099,7 @@ msgid ""
 "driver."
 msgstr ""
 
-#: help.pm:889 help.pm:951 install_steps_interactive.pm:958 install_steps_interactive.pm:975
+#: help.pm:889 help.pm:951 install_steps_interactive.pm:954 install_steps_interactive.pm:971
 #, c-format
 msgid "Sound card"
 msgstr ""
@@ -4184,12 +4169,12 @@ msgid ""
 "idea to review this setup."
 msgstr ""
 
-#: help.pm:951 install_steps_interactive.pm:114 install_steps_interactive.pm:895 standalone/keyboarddrake:23
+#: help.pm:951 install_steps_interactive.pm:110 install_steps_interactive.pm:891 standalone/keyboarddrake:23
 #, c-format
 msgid "Keyboard"
 msgstr ""
 
-#: help.pm:951 install_steps_interactive.pm:917
+#: help.pm:951 install_steps_interactive.pm:913
 #, c-format
 msgid "Timezone"
 msgstr ""
@@ -4199,7 +4184,7 @@ msgstr ""
 msgid "Graphical Interface"
 msgstr ""
 
-#: help.pm:951 install_steps_interactive.pm:991
+#: help.pm:951 install_steps_interactive.pm:987
 #, c-format
 msgid "TV card"
 msgstr ""
@@ -4209,27 +4194,27 @@ msgstr ""
 msgid "ISDN card"
 msgstr ""
 
-#: help.pm:951 install_steps_interactive.pm:1009 standalone/drakbackup:2374
+#: help.pm:951 install_steps_interactive.pm:1005 standalone/drakbackup:2374
 #, c-format
 msgid "Network"
 msgstr ""
 
-#: help.pm:951 install_steps_interactive.pm:1035
+#: help.pm:951 install_steps_interactive.pm:1031
 #, c-format
 msgid "Security Level"
 msgstr ""
 
-#: help.pm:951 install_steps_interactive.pm:1049
+#: help.pm:951 install_steps_interactive.pm:1045
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: help.pm:951 install_steps_interactive.pm:1063
+#: help.pm:951 install_steps_interactive.pm:1059
 #, c-format
 msgid "Bootloader"
 msgstr ""
 
-#: help.pm:951 install_steps_interactive.pm:1073 services.pm:195
+#: help.pm:951 install_steps_interactive.pm:1069 services.pm:195
 #, c-format
 msgid "Services"
 msgstr ""
@@ -4264,7 +4249,7 @@ msgstr ""
 msgid "You must also format %s"
 msgstr ""
 
-#: install_any.pm:407
+#: install_any.pm:406
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -4279,7 +4264,7 @@ msgid ""
 ""
 msgstr ""
 
-#: install_any.pm:428
+#: install_any.pm:427
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -4289,27 +4274,27 @@ msgid ""
 ""
 msgstr ""
 
-#: install_any.pm:806
+#: install_any.pm:805
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr ""
 
-#: install_any.pm:810
+#: install_any.pm:809
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr ""
 
-#: install_any.pm:822
+#: install_any.pm:821
 #, c-format
 msgid "To use this saved packages selection, boot installation with ``linux defcfg=floppy''"
 msgstr ""
 
-#: install_any.pm:845 partition_table.pm:844
+#: install_any.pm:844 partition_table.pm:844
 #, c-format
 msgid "Error reading file %s"
 msgstr ""
 
-#: install_any.pm:962
+#: install_any.pm:961
 #, c-format
 msgid "An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem"
 msgstr ""
@@ -4347,7 +4332,7 @@ msgid ""
 "Continue anyway?"
 msgstr ""
 
-#: install_interactive.pm:70 install_steps.pm:201
+#: install_interactive.pm:70 install_steps.pm:205
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr ""
@@ -4660,12 +4645,12 @@ msgstr ""
 msgid "http://www.mandrakelinux.com/en/92errata.php3"
 msgstr ""
 
-#: install_steps.pm:236
+#: install_steps.pm:240
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr ""
 
-#: install_steps.pm:401
+#: install_steps.pm:405
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
@@ -4674,7 +4659,7 @@ msgid ""
 ""
 msgstr ""
 
-#: install_steps.pm:532
+#: install_steps.pm:536
 #, c-format
 msgid "No floppy drive available"
 msgstr ""
@@ -4694,12 +4679,12 @@ msgid ""
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: install_steps_gtk.pm:243 install_steps_interactive.pm:583
+#: install_steps_gtk.pm:243 install_steps_interactive.pm:579
 #, c-format
 msgid "Package Group Selection"
 msgstr ""
 
-#: install_steps_gtk.pm:303 install_steps_interactive.pm:523
+#: install_steps_gtk.pm:303 install_steps_interactive.pm:519
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr ""
@@ -4813,12 +4798,12 @@ msgstr ""
 msgid "Minimal install"
 msgstr ""
 
-#: install_steps_gtk.pm:465 install_steps_interactive.pm:431
+#: install_steps_gtk.pm:465 install_steps_interactive.pm:427
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: install_steps_gtk.pm:481 install_steps_interactive.pm:669
+#: install_steps_gtk.pm:481 install_steps_interactive.pm:665
 #, c-format
 msgid "Installing"
 msgstr ""
@@ -4853,12 +4838,12 @@ msgstr ""
 msgid "Installing package %s"
 msgstr ""
 
-#: install_steps_gtk.pm:614 install_steps_interactive.pm:92 install_steps_interactive.pm:693
+#: install_steps_gtk.pm:614 install_steps_interactive.pm:88 install_steps_interactive.pm:689
 #, c-format
 msgid "Refuse"
 msgstr ""
 
-#: install_steps_gtk.pm:615 install_steps_interactive.pm:694
+#: install_steps_gtk.pm:615 install_steps_interactive.pm:690
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4867,246 +4852,246 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: install_steps_gtk.pm:630 install_steps_interactive.pm:706
+#: install_steps_gtk.pm:630 install_steps_interactive.pm:702
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: install_steps_gtk.pm:630 install_steps_gtk.pm:634 install_steps_interactive.pm:706 install_steps_interactive.pm:710
+#: install_steps_gtk.pm:630 install_steps_gtk.pm:634 install_steps_interactive.pm:702 install_steps_interactive.pm:706
 #, c-format
 msgid "Go on anyway?"
 msgstr ""
 
-#: install_steps_gtk.pm:634 install_steps_interactive.pm:710
+#: install_steps_gtk.pm:634 install_steps_interactive.pm:706
 #, c-format
 msgid "There was an error installing packages:"
 msgstr ""
 
-#: install_steps_gtk.pm:674 install_steps_interactive.pm:877 install_steps_interactive.pm:1025
+#: install_steps_gtk.pm:674 install_steps_interactive.pm:873 install_steps_interactive.pm:1021
 #, c-format
 msgid "not configured"
 msgstr ""
 
-#: install_steps_interactive.pm:85
+#: install_steps_interactive.pm:81
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr ""
 
-#: install_steps_interactive.pm:86
+#: install_steps_interactive.pm:82
 #, c-format
 msgid "License agreement"
 msgstr ""
 
-#: install_steps_interactive.pm:115
+#: install_steps_interactive.pm:111
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr ""
 
-#: install_steps_interactive.pm:117
+#: install_steps_interactive.pm:113
 #, c-format
 msgid "Here is the full list of keyboards available"
 msgstr ""
 
-#: install_steps_interactive.pm:147
+#: install_steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr ""
 
-#: install_steps_interactive.pm:148
+#: install_steps_interactive.pm:144
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: install_steps_interactive.pm:154
+#: install_steps_interactive.pm:150
 #, c-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: install_steps_interactive.pm:164
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Encryption key for %s"
 msgstr ""
 
-#: install_steps_interactive.pm:181
+#: install_steps_interactive.pm:177
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr ""
 
-#: install_steps_interactive.pm:190 standalone/mousedrake:56
+#: install_steps_interactive.pm:186 standalone/mousedrake:56
 #, c-format
 msgid "Mouse Port"
 msgstr ""
 
-#: install_steps_interactive.pm:191 standalone/mousedrake:57
+#: install_steps_interactive.pm:187 standalone/mousedrake:57
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr ""
 
-#: install_steps_interactive.pm:201
+#: install_steps_interactive.pm:197
 #, c-format
 msgid "Buttons emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:203
+#: install_steps_interactive.pm:199
 #, c-format
 msgid "Button 2 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:204
+#: install_steps_interactive.pm:200
 #, c-format
 msgid "Button 3 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:225
+#: install_steps_interactive.pm:221
 #, c-format
 msgid "PCMCIA"
 msgstr ""
 
-#: install_steps_interactive.pm:225
+#: install_steps_interactive.pm:221
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr ""
 
-#: install_steps_interactive.pm:232
+#: install_steps_interactive.pm:228
 #, c-format
 msgid "IDE"
 msgstr ""
 
-#: install_steps_interactive.pm:232
+#: install_steps_interactive.pm:228
 #, c-format
 msgid "Configuring IDE"
 msgstr ""
 
-#: install_steps_interactive.pm:252 network/tools.pm:217
+#: install_steps_interactive.pm:248 network/tools.pm:217
 #, c-format
 msgid "No partition available"
 msgstr ""
 
-#: install_steps_interactive.pm:255
+#: install_steps_interactive.pm:251
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr ""
 
-#: install_steps_interactive.pm:262
+#: install_steps_interactive.pm:258
 #, c-format
 msgid "Choose the mount points"
 msgstr ""
 
-#: install_steps_interactive.pm:292
+#: install_steps_interactive.pm:288
 #, c-format
 msgid "No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: install_steps_interactive.pm:329
+#: install_steps_interactive.pm:325
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr ""
 
-#: install_steps_interactive.pm:331
+#: install_steps_interactive.pm:327
 #, c-format
 msgid "Check bad blocks?"
 msgstr ""
 
-#: install_steps_interactive.pm:363
+#: install_steps_interactive.pm:359
 #, c-format
 msgid "Failed to check filesystem %s. Do you want to repair the errors? (beware, you can lose data)"
 msgstr ""
 
-#: install_steps_interactive.pm:366
+#: install_steps_interactive.pm:362
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr ""
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:369
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr ""
 
-#: install_steps_interactive.pm:374 install_steps_interactive.pm:393
+#: install_steps_interactive.pm:370 install_steps_interactive.pm:389
 #, c-format
 msgid "Looking for available packages..."
 msgstr ""
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:373
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 
-#: install_steps_interactive.pm:381
+#: install_steps_interactive.pm:377
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: install_steps_interactive.pm:402
+#: install_steps_interactive.pm:398
 #, c-format
 msgid "Your system does not have enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 
-#: install_steps_interactive.pm:443
+#: install_steps_interactive.pm:439
 #, c-format
 msgid ""
 "Please choose load or save package selection on floppy.\n"
 "The format is the same as auto_install generated floppies."
 msgstr ""
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:441
 #, c-format
 msgid "Load from floppy"
 msgstr ""
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:441
 #, c-format
 msgid "Save on floppy"
 msgstr ""
 
-#: install_steps_interactive.pm:449
+#: install_steps_interactive.pm:445
 #, c-format
 msgid "Package selection"
 msgstr ""
 
-#: install_steps_interactive.pm:449
+#: install_steps_interactive.pm:445
 #, c-format
 msgid "Loading from floppy"
 msgstr ""
 
-#: install_steps_interactive.pm:454
+#: install_steps_interactive.pm:450
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr ""
 
-#: install_steps_interactive.pm:536
+#: install_steps_interactive.pm:532
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: install_steps_interactive.pm:551
+#: install_steps_interactive.pm:547
 #, c-format
 msgid "Type of install"
 msgstr ""
 
-#: install_steps_interactive.pm:552
+#: install_steps_interactive.pm:548
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: install_steps_interactive.pm:556
+#: install_steps_interactive.pm:552
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: install_steps_interactive.pm:557
+#: install_steps_interactive.pm:553
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: install_steps_interactive.pm:600 standalone/drakxtv:53
+#: install_steps_interactive.pm:596 standalone/drakxtv:53
 #, c-format
 msgid "All"
 msgstr ""
 
-#: install_steps_interactive.pm:644
+#: install_steps_interactive.pm:640
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -5114,39 +5099,39 @@ msgid ""
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: install_steps_interactive.pm:649
+#: install_steps_interactive.pm:645
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr ""
 
-#: install_steps_interactive.pm:669
+#: install_steps_interactive.pm:665
 #, c-format
 msgid "Preparing installation"
 msgstr ""
 
-#: install_steps_interactive.pm:678
+#: install_steps_interactive.pm:674
 #, c-format
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
 
-#: install_steps_interactive.pm:724
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Post-install configuration"
 msgstr ""
 
-#: install_steps_interactive.pm:730
+#: install_steps_interactive.pm:726
 #, c-format
 msgid "Please insert the Boot floppy used in drive %s"
 msgstr ""
 
-#: install_steps_interactive.pm:736
+#: install_steps_interactive.pm:732
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr ""
 
-#: install_steps_interactive.pm:757
+#: install_steps_interactive.pm:753
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -5159,168 +5144,168 @@ msgid ""
 "Do you want to install the updates ?"
 msgstr ""
 
-#: install_steps_interactive.pm:778
+#: install_steps_interactive.pm:774
 #, c-format
 msgid "Contacting Mandrake Linux web site to get the list of available mirrors..."
 msgstr ""
 
-#: install_steps_interactive.pm:782
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: install_steps_interactive.pm:796
+#: install_steps_interactive.pm:792
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr ""
 
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:796
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr ""
 
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:796
 #, c-format
 msgid "Would you like to try again?"
 msgstr ""
 
-#: install_steps_interactive.pm:826 standalone/drakclock:42
+#: install_steps_interactive.pm:822 standalone/drakclock:42
 #, c-format
 msgid "Which is your timezone?"
 msgstr ""
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:827
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr ""
 
-#: install_steps_interactive.pm:839
+#: install_steps_interactive.pm:835
 #, c-format
 msgid "NTP Server"
 msgstr ""
 
-#: install_steps_interactive.pm:881 steps.pm:30
+#: install_steps_interactive.pm:877 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr ""
 
-#: install_steps_interactive.pm:894 install_steps_interactive.pm:902 install_steps_interactive.pm:916 install_steps_interactive.pm:923 install_steps_interactive.pm:1072 services.pm:135 standalone/drakbackup:1921
+#: install_steps_interactive.pm:890 install_steps_interactive.pm:898 install_steps_interactive.pm:912 install_steps_interactive.pm:919 install_steps_interactive.pm:1068 services.pm:135 standalone/drakbackup:1921
 #, c-format
 msgid "System"
 msgstr ""
 
-#: install_steps_interactive.pm:930 install_steps_interactive.pm:957 install_steps_interactive.pm:974 install_steps_interactive.pm:990 install_steps_interactive.pm:1001
+#: install_steps_interactive.pm:926 install_steps_interactive.pm:953 install_steps_interactive.pm:970 install_steps_interactive.pm:986 install_steps_interactive.pm:997
 #, c-format
 msgid "Hardware"
 msgstr ""
 
-#: install_steps_interactive.pm:936 install_steps_interactive.pm:945
+#: install_steps_interactive.pm:932 install_steps_interactive.pm:941
 #, c-format
 msgid "Remote CUPS server"
 msgstr ""
 
-#: install_steps_interactive.pm:936
+#: install_steps_interactive.pm:932
 #, c-format
 msgid "No printer"
 msgstr ""
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:974
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr ""
 
-#: install_steps_interactive.pm:980
+#: install_steps_interactive.pm:976
 #, c-format
 msgid "Run \"sndconfig\" after installation to configure your sound card"
 msgstr ""
 
-#: install_steps_interactive.pm:982
+#: install_steps_interactive.pm:978
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: install_steps_interactive.pm:1002
+#: install_steps_interactive.pm:998
 #, c-format
 msgid "Graphical interface"
 msgstr ""
 
-#: install_steps_interactive.pm:1008 install_steps_interactive.pm:1023
+#: install_steps_interactive.pm:1004 install_steps_interactive.pm:1019
 #, c-format
 msgid "Network & Internet"
 msgstr ""
 
-#: install_steps_interactive.pm:1024
+#: install_steps_interactive.pm:1020
 #, c-format
 msgid "Proxies"
 msgstr ""
 
-#: install_steps_interactive.pm:1025
+#: install_steps_interactive.pm:1021
 #, c-format
 msgid "configured"
 msgstr ""
 
-#: install_steps_interactive.pm:1034 install_steps_interactive.pm:1048 steps.pm:20
+#: install_steps_interactive.pm:1030 install_steps_interactive.pm:1044 steps.pm:20
 #, c-format
 msgid "Security"
 msgstr ""
 
-#: install_steps_interactive.pm:1053
+#: install_steps_interactive.pm:1049
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: install_steps_interactive.pm:1053
+#: install_steps_interactive.pm:1049
 #, c-format
 msgid "disabled"
 msgstr ""
 
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1058
 #, c-format
 msgid "Boot"
 msgstr ""
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1066
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "%s on %s"
 msgstr ""
 
-#: install_steps_interactive.pm:1077 services.pm:177
+#: install_steps_interactive.pm:1073 services.pm:177
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr ""
 
-#: install_steps_interactive.pm:1087
+#: install_steps_interactive.pm:1083
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: install_steps_interactive.pm:1145
+#: install_steps_interactive.pm:1141
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr ""
 
-#: install_steps_interactive.pm:1146
+#: install_steps_interactive.pm:1142
 #, c-format
 msgid "Set root password"
 msgstr ""
 
-#: install_steps_interactive.pm:1157
+#: install_steps_interactive.pm:1152
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr ""
 
-#: install_steps_interactive.pm:1162 network/netconnect.pm:501 standalone/drakauth:26 standalone/drakconnect:819 standalone/logdrake:111
+#: install_steps_interactive.pm:1157 network/netconnect.pm:440 standalone/drakauth:26 standalone/drakconnect:419 standalone/drakconnect:864 standalone/logdrake:111
 #, c-format
 msgid "Authentication"
 msgstr ""
 
-#: install_steps_interactive.pm:1193
+#: install_steps_interactive.pm:1188
 #, c-format
 msgid "Preparing bootloader..."
 msgstr ""
 
-#: install_steps_interactive.pm:1203
+#: install_steps_interactive.pm:1198
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -5329,29 +5314,29 @@ msgid ""
 " need to use BootX or some other means to boot your machine"
 msgstr ""
 
-#: install_steps_interactive.pm:1209
+#: install_steps_interactive.pm:1204
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr ""
 
-#: install_steps_interactive.pm:1212
+#: install_steps_interactive.pm:1207
 #, c-format
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: install_steps_interactive.pm:1223
+#: install_steps_interactive.pm:1218
 #, c-format
 msgid "Installing bootloader"
 msgstr ""
 
-#: install_steps_interactive.pm:1230
+#: install_steps_interactive.pm:1225
 #, c-format
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 
-#: install_steps_interactive.pm:1235
+#: install_steps_interactive.pm:1230
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -5362,17 +5347,17 @@ msgid ""
 "At your next boot you should see the bootloader prompt."
 msgstr ""
 
-#: install_steps_interactive.pm:1277 standalone/drakautoinst:75
+#: install_steps_interactive.pm:1272 standalone/drakautoinst:75
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: install_steps_interactive.pm:1281
+#: install_steps_interactive.pm:1276
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr ""
 
-#: install_steps_interactive.pm:1292
+#: install_steps_interactive.pm:1287
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -5380,12 +5365,12 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: install_steps_interactive.pm:1307
+#: install_steps_interactive.pm:1302
 #, c-format
 msgid "Generate auto install floppy"
 msgstr ""
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1304
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -5416,7 +5401,7 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: interactive.pm:403 interactive/newt.pm:300 ugtk2.pm:494
+#: interactive.pm:403 interactive/newt.pm:300 ugtk2.pm:502
 #, c-format
 msgid "Finish"
 msgstr ""
@@ -6408,7 +6393,7 @@ msgstr ""
 msgid "Gabon"
 msgstr ""
 
-#: lang.pm:237 network/netconnect.pm:60 network/netconnect.pm:294
+#: lang.pm:237 network/netconnect.pm:58 network/netconnect.pm:252
 #, c-format
 msgid "United Kingdom"
 msgstr ""
@@ -7222,12 +7207,7 @@ msgid ""
 ""
 msgstr ""
 
-#: modules.pm:323
-#, c-format
-msgid "PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."
-msgstr ""
-
-#: modules/interactive.pm:20 standalone/drakconnect:864
+#: modules/interactive.pm:20 standalone/drakconnect:909
 #, c-format
 msgid "Parameters"
 msgstr ""
@@ -7332,27 +7312,27 @@ msgid ""
 "Do you want to try again with other parameters?"
 msgstr ""
 
-#: modules/parameters.pm:46
+#: modules/parameters.pm:45
 #, c-format
 msgid "a number"
 msgstr ""
 
-#: modules/parameters.pm:48
+#: modules/parameters.pm:47
 #, c-format
 msgid "%d comma separated numbers"
 msgstr ""
 
-#: modules/parameters.pm:48
+#: modules/parameters.pm:47
 #, c-format
 msgid "%d comma separated strings"
 msgstr ""
 
-#: modules/parameters.pm:50
+#: modules/parameters.pm:49
 #, c-format
 msgid "comma separated numbers"
 msgstr ""
 
-#: modules/parameters.pm:50
+#: modules/parameters.pm:49
 #, c-format
 msgid "comma separated strings"
 msgstr ""
@@ -7382,7 +7362,7 @@ msgstr ""
 msgid "GlidePoint"
 msgstr ""
 
-#: mouse.pm:35
+#: mouse.pm:35 network/modem.pm:24 network/modem.pm:38 network/modem.pm:43 network/modem.pm:75 network/netconnect.pm:429 network/netconnect.pm:430 network/netconnect.pm:431 network/netconnect.pm:451 network/netconnect.pm:456 network/netconnect.pm:469 network/netconnect.pm:474 network/netconnect.pm:490 network/netconnect.pm:492
 #, c-format
 msgid "Automatic"
 msgstr ""
@@ -7577,7 +7557,7 @@ msgstr ""
 msgid "Sagem (using dhcp) usb"
 msgstr ""
 
-#: network/adsl.pm:36 network/netconnect.pm:304
+#: network/adsl.pm:36
 #, c-format
 msgid "Connect to the Internet"
 msgstr ""
@@ -7739,7 +7719,7 @@ msgstr ""
 msgid "Other ports"
 msgstr ""
 
-#: network/isdn.pm:127 network/isdn.pm:145 network/isdn.pm:157 network/isdn.pm:163 network/isdn.pm:173 network/isdn.pm:183 network/netconnect.pm:373
+#: network/isdn.pm:127 network/isdn.pm:145 network/isdn.pm:157 network/isdn.pm:163 network/isdn.pm:173 network/isdn.pm:183 network/netconnect.pm:313
 #, c-format
 msgid "ISDN Configuration"
 msgstr ""
@@ -7751,7 +7731,7 @@ msgid ""
 "If it isn't listed, choose Unlisted."
 msgstr ""
 
-#: network/isdn.pm:140 standalone/drakconnect:416
+#: network/isdn.pm:140 standalone/drakconnect:459
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr ""
@@ -7761,7 +7741,7 @@ msgstr ""
 msgid "European protocol"
 msgstr ""
 
-#: network/isdn.pm:142 standalone/drakconnect:417
+#: network/isdn.pm:142 standalone/drakconnect:460
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -7833,133 +7813,133 @@ msgstr ""
 msgid "Which of the following is your ISDN card?"
 msgstr ""
 
-#: network/netconnect.pm:88
+#: network/modem.pm:22 network/netconnect.pm:409 network/netconnect.pm:441 standalone/drakconnect:434 standalone/drakconnect:864
 #, c-format
-msgid "Ad-hoc"
+msgid "Script-based"
 msgstr ""
 
-#: network/netconnect.pm:89
+#: network/modem.pm:22 network/netconnect.pm:409 network/netconnect.pm:441 standalone/drakconnect:434 standalone/drakconnect:864
 #, c-format
-msgid "Managed"
+msgid "PAP"
 msgstr ""
 
-#: network/netconnect.pm:90
+#: network/modem.pm:22 network/netconnect.pm:409 network/netconnect.pm:441 standalone/drakconnect:434 standalone/drakconnect:864
 #, c-format
-msgid "Master"
+msgid "Terminal-based"
 msgstr ""
 
-#: network/netconnect.pm:91
+#: network/modem.pm:22 network/netconnect.pm:409 network/netconnect.pm:441 standalone/drakconnect:434 standalone/drakconnect:864
 #, c-format
-msgid "Repeater"
+msgid "CHAP"
 msgstr ""
 
-#: network/netconnect.pm:92
+#: network/modem.pm:22 network/netconnect.pm:409 network/netconnect.pm:441
 #, c-format
-msgid "Secondary"
+msgid "PAP/CHAP"
 msgstr ""
 
-#: network/netconnect.pm:93
+#: network/netconnect.pm:97
 #, c-format
-msgid "Auto"
+msgid "Ad-hoc"
 msgstr ""
 
-#: network/netconnect.pm:96 printer/printerdrake.pm:1109 standalone/drakups:64
+#: network/netconnect.pm:98
 #, c-format
-msgid "Manual configuration"
+msgid "Managed"
 msgstr ""
 
-#: network/netconnect.pm:97 network/netconnect.pm:567
+#: network/netconnect.pm:99
 #, c-format
-msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
+msgid "Master"
 msgstr ""
 
-#: network/netconnect.pm:146 standalone/drakconnect:54
+#: network/netconnect.pm:100
 #, c-format
-msgid "Network & Internet Configuration"
+msgid "Repeater"
 msgstr ""
 
-#: network/netconnect.pm:151
+#: network/netconnect.pm:101
 #, c-format
-msgid ""
-"Welcome to The Network Configuration Wizard.\n"
-"\n"
-"We are about to configure your internet/network connection.\n"
-"If you don't want to use the auto detection, deselect the checkbox.\n"
-""
+msgid "Secondary"
 msgstr ""
 
-#: network/netconnect.pm:159 printer/printerdrake.pm:3848
+#: network/netconnect.pm:102
 #, c-format
-msgid "Expert Mode"
+msgid "Auto"
 msgstr ""
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:105 printer/printerdrake.pm:1109 standalone/drakups:64
 #, c-format
-msgid "Network Configuration Wizard"
+msgid "Manual configuration"
 msgstr ""
 
-#: network/netconnect.pm:163 printer/printerdrake.pm:921
+#: network/netconnect.pm:106
 #, c-format
-msgid "Detecting devices..."
+msgid "Automatic IP (BOOTP/DHCP)"
 msgstr ""
 
-#. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:183
+#: network/netconnect.pm:108 network/netconnect.pm:558
 #, c-format
-msgid "Normal modem connection"
+msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr ""
 
-#: network/netconnect.pm:183
+#: network/netconnect.pm:141 standalone/drakconnect:53
 #, c-format
-msgid "(detected on port %s)"
+msgid "Network & Internet Configuration"
 msgstr ""
 
-#: network/netconnect.pm:184
+#. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
+#: network/netconnect.pm:152
 #, c-format
-msgid "Winmodem connection"
+msgid "Modem connection"
 msgstr ""
 
-#: network/netconnect.pm:184 network/netconnect.pm:186 network/netconnect.pm:187 network/netconnect.pm:188 network/netconnect.pm:190
+#: network/netconnect.pm:152
 #, c-format
-msgid "(detected)"
+msgid "(detected on port %s)"
 msgstr ""
 
-#: network/netconnect.pm:185
+#: network/netconnect.pm:154
 #, c-format
 msgid "ISDN connection"
 msgstr ""
 
-#: network/netconnect.pm:185
+#: network/netconnect.pm:154
 #, c-format
 msgid "(detected %s)"
 msgstr ""
 
-#: network/netconnect.pm:186
+#: network/netconnect.pm:155
 #, c-format
 msgid "ADSL connection"
 msgstr ""
 
-#: network/netconnect.pm:187
+#: network/netconnect.pm:155 network/netconnect.pm:156 network/netconnect.pm:157 network/netconnect.pm:159
+#, c-format
+msgid "(detected)"
+msgstr ""
+
+#: network/netconnect.pm:156
 #, c-format
 msgid "Cable connection"
 msgstr ""
 
-#: network/netconnect.pm:188
+#: network/netconnect.pm:157
 #, c-format
 msgid "LAN connection"
 msgstr ""
 
-#: network/netconnect.pm:190
+#: network/netconnect.pm:159
 #, c-format
 msgid "Wireless connection"
 msgstr ""
 
-#: network/netconnect.pm:209
+#: network/netconnect.pm:178
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr ""
 
-#: network/netconnect.pm:250
+#: network/netconnect.pm:208
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -7968,234 +7948,239 @@ msgid ""
 "Press \"%s\" to continue."
 msgstr ""
 
-#: network/netconnect.pm:260
+#: network/netconnect.pm:218
 #, c-format
 msgid "Connection Configuration"
 msgstr ""
 
-#: network/netconnect.pm:261
+#: network/netconnect.pm:219
 #, c-format
 msgid "Please fill or check the field below"
 msgstr ""
 
-#: network/netconnect.pm:267 standalone/drakconnect:407 standalone/drakconnect:801
+#: network/netconnect.pm:225 standalone/drakconnect:450 standalone/drakconnect:846
 #, c-format
 msgid "Card IRQ"
 msgstr ""
 
-#: network/netconnect.pm:268 standalone/drakconnect:408 standalone/drakconnect:802
+#: network/netconnect.pm:226 standalone/drakconnect:451 standalone/drakconnect:847
 #, c-format
 msgid "Card mem (DMA)"
 msgstr ""
 
-#: network/netconnect.pm:269 standalone/drakconnect:409 standalone/drakconnect:803
+#: network/netconnect.pm:227 standalone/drakconnect:452 standalone/drakconnect:848
 #, c-format
 msgid "Card IO"
 msgstr ""
 
-#: network/netconnect.pm:270 standalone/drakconnect:804
+#: network/netconnect.pm:228 standalone/drakconnect:453 standalone/drakconnect:849
 #, c-format
 msgid "Card IO_0"
 msgstr ""
 
-#: network/netconnect.pm:271 standalone/drakconnect:410 standalone/drakconnect:805
+#: network/netconnect.pm:229 standalone/drakconnect:850
 #, c-format
 msgid "Card IO_1"
 msgstr ""
 
-#: network/netconnect.pm:272 standalone/drakconnect:806
+#: network/netconnect.pm:230 standalone/drakconnect:851
 #, c-format
 msgid "Your personal phone number"
 msgstr ""
 
-#: network/netconnect.pm:273 standalone/drakconnect:807
+#: network/netconnect.pm:231 standalone/drakconnect:852
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: network/netconnect.pm:274 standalone/drakconnect:808
+#: network/netconnect.pm:232 standalone/drakconnect:431 standalone/drakconnect:853
 #, c-format
 msgid "Provider phone number"
 msgstr ""
 
-#: network/netconnect.pm:275 standalone/drakconnect:809
+#: network/netconnect.pm:233 standalone/drakconnect:854
 #, c-format
 msgid "Provider dns 1 (optional)"
 msgstr ""
 
-#: network/netconnect.pm:276 standalone/drakconnect:810
+#: network/netconnect.pm:234 standalone/drakconnect:855
 #, c-format
 msgid "Provider dns 2 (optional)"
 msgstr ""
 
-#: network/netconnect.pm:277
+#: network/netconnect.pm:235
 #, c-format
 msgid "Choose your country"
 msgstr ""
 
-#: network/netconnect.pm:278 standalone/drakconnect:348 standalone/drakconnect:813
+#: network/netconnect.pm:236 standalone/drakconnect:389 standalone/drakconnect:858
 #, c-format
 msgid "Dialing mode"
 msgstr ""
 
-#: network/netconnect.pm:279 standalone/drakconnect:353 standalone/drakconnect:825
+#: network/netconnect.pm:237 standalone/drakconnect:394 standalone/drakconnect:870
 #, c-format
 msgid "Connection speed"
 msgstr ""
 
-#: network/netconnect.pm:280 standalone/drakconnect:358 standalone/drakconnect:826
+#: network/netconnect.pm:238 standalone/drakconnect:399 standalone/drakconnect:871
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr ""
 
-#: network/netconnect.pm:283 standalone/drakconnect:385 standalone/drakconnect:811
+#: network/netconnect.pm:241 standalone/drakconnect:429 standalone/drakconnect:856
 #, c-format
 msgid "Account Login (user name)"
 msgstr ""
 
-#: network/netconnect.pm:284 standalone/drakconnect:386 standalone/drakconnect:812 standalone/drakconnect:846
+#: network/netconnect.pm:242 standalone/drakconnect:430 standalone/drakconnect:857 standalone/drakconnect:891
 #, c-format
 msgid "Account Password"
 msgstr ""
 
-#: network/netconnect.pm:305
-#, c-format
-msgid "Which dhcp client do you want to use ? (default is dhcp-client)"
-msgstr ""
-
-#: network/netconnect.pm:342
+#: network/netconnect.pm:281
 #, c-format
 msgid "What kind is your ISDN connection?"
 msgstr ""
 
-#: network/netconnect.pm:343
+#: network/netconnect.pm:282
 #, c-format
 msgid "Internal ISDN card"
 msgstr ""
 
-#: network/netconnect.pm:343
+#: network/netconnect.pm:282
 #, c-format
 msgid "External ISDN modem"
 msgstr ""
 
-#: network/netconnect.pm:373
+#: network/netconnect.pm:313
 #, c-format
 msgid "Do you want to start a new configuration ?"
 msgstr ""
 
-#: network/netconnect.pm:376
+#: network/netconnect.pm:316
 #, c-format
 msgid "I have detected an ISDN PCI card, but I don't know its type. Please select a PCI card on the next screen."
 msgstr ""
 
-#: network/netconnect.pm:385
+#: network/netconnect.pm:325
 #, c-format
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 
-#: network/netconnect.pm:400 network/netconnect.pm:430
-#, c-format
-msgid "You don't have any winmodem"
-msgstr ""
-
-#: network/netconnect.pm:409 network/netconnect.pm:435
+#: network/netconnect.pm:334
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
 
-#: network/netconnect.pm:411
+#: network/netconnect.pm:345
 #, c-format
-msgid "Title"
+msgid "Select the modem to configure:"
 msgstr ""
 
-#: network/netconnect.pm:411
+#: network/netconnect.pm:385
 #, c-format
-msgid "\"%s\" based winmodem detected, do you want to install needed software ?"
+msgid "Please choose which serial port your modem is connected to."
 msgstr ""
 
-#: network/netconnect.pm:411
+#: network/netconnect.pm:429 network/netconnect.pm:430 network/netconnect.pm:431 network/netconnect.pm:456 network/netconnect.pm:474 network/netconnect.pm:490
 #, c-format
-msgid "Install rpm"
+msgid "Manual"
 msgstr ""
 
-#: network/netconnect.pm:411
+#: network/netconnect.pm:433
 #, c-format
-msgid "Do nothing"
+msgid "Dialup: account options"
 msgstr ""
 
-#: network/netconnect.pm:481
+#: network/netconnect.pm:436 standalone/drakconnect:860
 #, c-format
-msgid "Please choose which serial port your modem is connected to."
+msgid "Connection name"
 msgstr ""
 
-#: network/netconnect.pm:495
+#: network/netconnect.pm:437 standalone/drakconnect:861
 #, c-format
-msgid "Dialup options"
+msgid "Phone number"
 msgstr ""
 
-#: network/netconnect.pm:497 standalone/drakconnect:815
+#: network/netconnect.pm:438 standalone/drakconnect:862
 #, c-format
-msgid "Connection name"
+msgid "Login ID"
 msgstr ""
 
-#: network/netconnect.pm:498 standalone/drakconnect:816
+#: network/netconnect.pm:453 network/netconnect.pm:487
 #, c-format
-msgid "Phone number"
+msgid "Dialup: IP parameters"
 msgstr ""
 
-#: network/netconnect.pm:499 standalone/drakconnect:817
+#: network/netconnect.pm:456 network/netconnect.pm:594 printer/printerdrake.pm:426 standalone/drakconnect:118 standalone/drakconnect:302 standalone/drakconnect:711 standalone/drakups:266
 #, c-format
-msgid "Login ID"
+msgid "IP address"
 msgstr ""
 
-#: network/netconnect.pm:501 standalone/drakconnect:819
+#: network/netconnect.pm:457 network/netconnect.pm:475 standalone/drakconnect:865
 #, c-format
-msgid "PAP"
+msgid "Domain name"
 msgstr ""
 
-#: network/netconnect.pm:501 standalone/drakconnect:819
+#: network/netconnect.pm:458
 #, c-format
-msgid "Terminal-based"
+msgid "IP adress"
 msgstr ""
 
-#: network/netconnect.pm:501 standalone/drakconnect:819
+#: network/netconnect.pm:459
 #, c-format
-msgid "Script-based"
+msgid "Subnet mask"
 msgstr ""
 
-#: network/netconnect.pm:501 standalone/drakconnect:819
+#: network/netconnect.pm:471
 #, c-format
-msgid "CHAP"
+msgid "Dialup: DNS parameters"
 msgstr ""
 
-#: network/netconnect.pm:502 standalone/drakconnect:820
+#: network/netconnect.pm:474
 #, c-format
-msgid "Domain name"
+msgid "DNS"
 msgstr ""
 
-#: network/netconnect.pm:503 standalone/drakconnect:821
+#: network/netconnect.pm:476 standalone/drakconnect:866
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr ""
 
-#: network/netconnect.pm:504 standalone/drakconnect:822
+#: network/netconnect.pm:477 standalone/drakconnect:867
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr ""
 
-#: network/netconnect.pm:526
+#: network/netconnect.pm:478
+#, c-format
+msgid "Set hostname from IP"
+msgstr ""
+
+#: network/netconnect.pm:490 standalone/drakconnect:312 standalone/drakconnect:859
+#, c-format
+msgid "Gateway"
+msgstr ""
+
+#: network/netconnect.pm:491
+#, c-format
+msgid "Gateway IP address"
+msgstr ""
+
+#: network/netconnect.pm:515
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr ""
 
-#: network/netconnect.pm:527 network/shorewall.pm:77 standalone/drakconnect:493 standalone/drakgw:212
+#: network/netconnect.pm:516 network/shorewall.pm:77 standalone/drakconnect:538 standalone/drakgw:218
 #, c-format
 msgid "Net Device"
 msgstr ""
 
-#: network/netconnect.pm:542
+#: network/netconnect.pm:532
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the Internet.\n"
@@ -8203,17 +8188,22 @@ msgid ""
 "Modifying the fields below will override this configuration."
 msgstr ""
 
-#: network/netconnect.pm:560 network/netconnect.pm:589
+#: network/netconnect.pm:550
+#, c-format
+msgid "Zeroconf hostname resolution"
+msgstr ""
+
+#: network/netconnect.pm:551 network/netconnect.pm:581
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr ""
 
-#: network/netconnect.pm:561
+#: network/netconnect.pm:552
 #, c-format
 msgid "The following protocols can be used to configure an ethernet connection. Please choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:590
+#: network/netconnect.pm:582
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -8221,92 +8211,92 @@ msgid ""
 "notation (for example, 1.2.3.4)."
 msgstr ""
 
-#: network/netconnect.pm:597
+#: network/netconnect.pm:589
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr ""
 
-#: network/netconnect.pm:598
+#: network/netconnect.pm:590
 #, c-format
 msgid "DHCP host name"
 msgstr ""
 
-#: network/netconnect.pm:602 printer/printerdrake.pm:426 standalone/drakconnect:119 standalone/drakconnect:263 standalone/drakconnect:666 standalone/drakups:266
-#, c-format
-msgid "IP address"
-msgstr ""
-
-#: network/netconnect.pm:603 standalone/drakconnect:268 standalone/drakconnect:667 standalone/drakgw:305
+#: network/netconnect.pm:595 standalone/drakconnect:307 standalone/drakconnect:712 standalone/drakgw:313
 #, c-format
 msgid "Netmask"
 msgstr ""
 
-#: network/netconnect.pm:605 standalone/drakconnect:341
+#: network/netconnect.pm:597 standalone/drakconnect:382
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr ""
 
-#: network/netconnect.pm:606 standalone/drakconnect:342
+#: network/netconnect.pm:598 standalone/drakconnect:383
 #, c-format
 msgid "Network Hotplugging"
 msgstr ""
 
-#: network/netconnect.pm:607 standalone/drakconnect:336
+#: network/netconnect.pm:599 standalone/drakconnect:377
 #, c-format
 msgid "Start at boot"
 msgstr ""
 
-#: network/netconnect.pm:615 printer/printerdrake.pm:1340
+#: network/netconnect.pm:600 standalone/drakconnect:715
+#, c-format
+msgid "DHCP client"
+msgstr ""
+
+#: network/netconnect.pm:609 printer/printerdrake.pm:1340
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
-#: network/netconnect.pm:618
+#: network/netconnect.pm:612
 #, c-format
 msgid "Warning : IP address %s is usually reserved !"
 msgstr ""
 
-#: network/netconnect.pm:647
+#: network/netconnect.pm:636
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr ""
 
-#: network/netconnect.pm:649 standalone/drakconnect:306
+#: network/netconnect.pm:638 standalone/drakconnect:347
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: network/netconnect.pm:651 standalone/drakconnect:307
+#: network/netconnect.pm:640 standalone/drakconnect:348
 #, c-format
 msgid "Netwok name (ESSID)"
 msgstr ""
 
-#: network/netconnect.pm:652 standalone/drakconnect:308
+#: network/netconnect.pm:641 standalone/drakconnect:349
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: network/netconnect.pm:653 standalone/drakconnect:309
+#: network/netconnect.pm:642 standalone/drakconnect:350
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: network/netconnect.pm:654 standalone/drakconnect:310
+#: network/netconnect.pm:643 standalone/drakconnect:351
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:655 standalone/drakconnect:311
+#: network/netconnect.pm:644 standalone/drakconnect:352
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: network/netconnect.pm:657 standalone/drakconnect:322
+#: network/netconnect.pm:646 standalone/drakconnect:363
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: network/netconnect.pm:658
+#: network/netconnect.pm:647
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that the\n"
@@ -8317,17 +8307,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:665 standalone/drakconnect:323
+#: network/netconnect.pm:654 standalone/drakconnect:364
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: network/netconnect.pm:666 standalone/drakconnect:324
+#: network/netconnect.pm:655 standalone/drakconnect:365
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:667
+#: network/netconnect.pm:656
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -8336,12 +8326,12 @@ msgid ""
 "See iwpconfig(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:672 standalone/drakconnect:325
+#: network/netconnect.pm:661 standalone/drakconnect:366
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:673
+#: network/netconnect.pm:662
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -8353,12 +8343,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:681 standalone/drakconnect:326
+#: network/netconnect.pm:670 standalone/drakconnect:367
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:682
+#: network/netconnect.pm:671
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless network\n"
@@ -8373,34 +8363,34 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:696
+#: network/netconnect.pm:685
 #, c-format
 msgid "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:700
+#: network/netconnect.pm:689
 #, c-format
 msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:718
+#: network/netconnect.pm:708
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
 "I cannot set up this connection type."
 msgstr ""
 
-#: network/netconnect.pm:722 standalone/drakgw:248 standalone/drakpxe:142
+#: network/netconnect.pm:712 standalone/drakgw:254 standalone/drakpxe:142
 #, c-format
 msgid "Choose the network interface"
 msgstr ""
 
-#: network/netconnect.pm:723
+#: network/netconnect.pm:713
 #, c-format
 msgid "Please choose which network adapter you want to use to connect to Internet."
 msgstr ""
 
-#: network/netconnect.pm:742
+#: network/netconnect.pm:732
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -8409,72 +8399,72 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one."
 msgstr ""
 
-#: network/netconnect.pm:747
+#: network/netconnect.pm:737
 #, c-format
 msgid "Host name"
 msgstr ""
 
-#: network/netconnect.pm:748
+#: network/netconnect.pm:738
 #, c-format
 msgid "DNS server 1"
 msgstr ""
 
-#: network/netconnect.pm:749
+#: network/netconnect.pm:739
 #, c-format
 msgid "DNS server 2"
 msgstr ""
 
-#: network/netconnect.pm:750
+#: network/netconnect.pm:740
 #, c-format
 msgid "DNS server 3"
 msgstr ""
 
-#: network/netconnect.pm:751
+#: network/netconnect.pm:741
 #, c-format
 msgid "Search domain"
 msgstr ""
 
-#: network/netconnect.pm:752
+#: network/netconnect.pm:742
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
-#: network/netconnect.pm:753
+#: network/netconnect.pm:743
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr ""
 
-#: network/netconnect.pm:755
+#: network/netconnect.pm:745
 #, c-format
 msgid "Gateway device"
 msgstr ""
 
-#: network/netconnect.pm:760
+#: network/netconnect.pm:753
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr ""
 
-#: network/netconnect.pm:764
+#: network/netconnect.pm:758
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr ""
 
-#: network/netconnect.pm:777
+#: network/netconnect.pm:772
 #, c-format
 msgid "Enter a Zeroconf host name which will be the one that your machine will get back to other machines on the network:"
 msgstr ""
 
-#: network/netconnect.pm:778
+#: network/netconnect.pm:773
 #, c-format
 msgid "Zeroconf Host name"
 msgstr ""
 
-#: network/netconnect.pm:781
+#: network/netconnect.pm:776
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr ""
 
-#: network/netconnect.pm:790
+#: network/netconnect.pm:785
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -8483,32 +8473,32 @@ msgid ""
 ""
 msgstr ""
 
-#: network/netconnect.pm:791
+#: network/netconnect.pm:786
 #, c-format
 msgid "Internet connection"
 msgstr ""
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:793
 #, c-format
 msgid "Configuration is complete, do you want to apply settings ?"
 msgstr ""
 
-#: network/netconnect.pm:809
+#: network/netconnect.pm:804
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr ""
 
-#: network/netconnect.pm:832
+#: network/netconnect.pm:827
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it ?"
 msgstr ""
 
-#: network/netconnect.pm:837 network/netconnect.pm:902
+#: network/netconnect.pm:832 network/netconnect.pm:897
 #, c-format
 msgid "Network Configuration"
 msgstr ""
 
-#: network/netconnect.pm:838
+#: network/netconnect.pm:833
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -8516,34 +8506,34 @@ msgid ""
 "%s"
 msgstr ""
 
-#: network/netconnect.pm:847
+#: network/netconnect.pm:842
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr ""
 
-#: network/netconnect.pm:855 standalone/drakconnect:860
+#: network/netconnect.pm:850 standalone/drakconnect:905
 #, c-format
 msgid "Testing your connection..."
 msgstr ""
 
-#: network/netconnect.pm:871
+#: network/netconnect.pm:866
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr ""
 
-#: network/netconnect.pm:872
+#: network/netconnect.pm:867
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr ""
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:868
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 
-#: network/netconnect.pm:887
+#: network/netconnect.pm:882
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -8551,19 +8541,19 @@ msgid ""
 ""
 msgstr ""
 
-#: network/netconnect.pm:890
+#: network/netconnect.pm:885
 #, c-format
 msgid "After this is done, we recommend that you restart your X environment to avoid any hostname-related problems."
 msgstr ""
 
-#: network/netconnect.pm:891
+#: network/netconnect.pm:886
 #, c-format
 msgid ""
 "Problems occured during configuration.\n"
 "Test your connection via net_monitor or mcc. If your connection doesn't work, you might want to relaunch the configuration."
 msgstr ""
 
-#: network/netconnect.pm:903
+#: network/netconnect.pm:898
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already configured.\n"
@@ -8571,27 +8561,27 @@ msgid ""
 ""
 msgstr ""
 
-#: network/network.pm:320
+#: network/network.pm:328
 #, c-format
 msgid "Proxies configuration"
 msgstr ""
 
-#: network/network.pm:321
+#: network/network.pm:329
 #, c-format
 msgid "HTTP proxy"
 msgstr ""
 
-#: network/network.pm:322
+#: network/network.pm:330
 #, c-format
 msgid "FTP proxy"
 msgstr ""
 
-#: network/network.pm:325
+#: network/network.pm:333
 #, c-format
 msgid "Proxy should be http://..."
 msgstr ""
 
-#: network/network.pm:326
+#: network/network.pm:334
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr ""
@@ -9513,6 +9503,11 @@ msgstr ""
 msgid "Printer auto-detection"
 msgstr ""
 
+#: printer/printerdrake.pm:921
+#, c-format
+msgid "Detecting devices..."
+msgstr ""
+
 #: printer/printerdrake.pm:943
 #, c-format
 msgid ", network printer \"%s\", port %s"
@@ -9950,7 +9945,7 @@ msgstr ""
 msgid "Name of printer"
 msgstr ""
 
-#: printer/printerdrake.pm:2156 standalone/drakconnect:433 standalone/harddrake2:40 standalone/printerdrake:209 standalone/printerdrake:216
+#: printer/printerdrake.pm:2156 standalone/drakconnect:476 standalone/harddrake2:40 standalone/printerdrake:209 standalone/printerdrake:216
 #, c-format
 msgid "Description"
 msgstr ""
@@ -10595,6 +10590,11 @@ msgstr ""
 msgid "Normal Mode"
 msgstr ""
 
+#: printer/printerdrake.pm:3848
+#, c-format
+msgid "Expert Mode"
+msgstr ""
+
 #: printer/printerdrake.pm:4119 printer/printerdrake.pm:4174 printer/printerdrake.pm:4255 printer/printerdrake.pm:4265
 #, c-format
 msgid "Printer options"
@@ -11709,7 +11709,7 @@ msgid ""
 "about this service, sorry."
 msgstr ""
 
-#: services.pm:226 ugtk2.pm:1131
+#: services.pm:226 ugtk2.pm:1139
 #, c-format
 msgid "Info"
 msgstr ""
@@ -12061,7 +12061,7 @@ msgstr ""
 
 #: share/advertising/dwd-09.pl:12
 #, c-format
-msgid "The free download version does not include commercial software, and therefore may not work with certain proprietary network cards and video cards such as NVIDIA® nForce. To avoid possible compatibiity issues with these devices, we recommend the purchase of one of our retail products that includes commercial drivers and additional software."
+msgid "The free download version does not include commercial software, and therefore may not work with certain proprietary network cards and video cards such as NVIDA(r) nForce. To avoid possible compatibiity issues with these devices, we recommend the purchase of one of our retail products that includes commercial drivers and additional software."
 msgstr ""
 
 #: share/advertising/ppp-01.pl:12
@@ -12114,9 +12114,9 @@ msgstr ""
 msgid "   * Browse the Web with Mozilla and Konqueror"
 msgstr ""
 
-#: share/advertising/ppp-04.pl:14 share/advertising/pwp-04.pl:14
+#: share/advertising/ppp-04.pl:14
 #, c-format
-msgid "   * Participate in online chat with Gaim"
+msgid "   * Participate in online chat with Kopete"
 msgstr ""
 
 #: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
@@ -12249,6 +12249,11 @@ msgstr ""
 msgid "   * Take charge of your personal data with the integrated personal information suites Kontact and Evolution"
 msgstr ""
 
+#: share/advertising/pwp-04.pl:14
+#, c-format
+msgid "   * Participate in online chat with Gaim"
+msgstr ""
+
 #: share/advertising/pwp-05.pl:8 share/advertising/pwp-06.pl:8
 #, c-format
 msgid "Development tools"
@@ -13118,7 +13123,7 @@ msgid ""
 "The parameters of the auto-install are available in the sections on the left"
 msgstr ""
 
-#: standalone/drakautoinst:235 standalone/drakgw:519 standalone/scannerdrake:361
+#: standalone/drakautoinst:235 standalone/drakgw:583 standalone/scannerdrake:361
 #, c-format
 msgid "Congratulations!"
 msgstr ""
@@ -14974,139 +14979,139 @@ msgid ""
 "Do you want to install ntp ?"
 msgstr ""
 
-#: standalone/drakconnect:84
+#: standalone/drakconnect:83
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr ""
 
-#: standalone/drakconnect:95 standalone/drakconnect:588
+#: standalone/drakconnect:94 standalone/drakconnect:633
 #, c-format
 msgid "Gateway:"
 msgstr ""
 
-#: standalone/drakconnect:95 standalone/drakconnect:588
+#: standalone/drakconnect:94 standalone/drakconnect:633
 #, c-format
 msgid "Interface:"
 msgstr ""
 
-#: standalone/drakconnect:99 standalone/net_monitor:110
+#: standalone/drakconnect:98 standalone/net_monitor:110
 #, c-format
 msgid "Wait please"
 msgstr ""
 
-#: standalone/drakconnect:119
+#: standalone/drakconnect:118
 #, c-format
 msgid "Interface"
 msgstr ""
 
-#: standalone/drakconnect:119 standalone/drakconnect:415 standalone/drakconnect:416
+#: standalone/drakconnect:118 standalone/drakconnect:458 standalone/drakconnect:459
 #, c-format
 msgid "Protocol"
 msgstr ""
 
-#: standalone/drakconnect:119 standalone/drakups:233
+#: standalone/drakconnect:118 standalone/drakups:233
 #, c-format
 msgid "Driver"
 msgstr ""
 
-#: standalone/drakconnect:119
+#: standalone/drakconnect:118
 #, c-format
 msgid "State"
 msgstr ""
 
-#: standalone/drakconnect:136
+#: standalone/drakconnect:135
 #, c-format
 msgid "Hostname: "
 msgstr ""
 
-#: standalone/drakconnect:138
+#: standalone/drakconnect:137
 #, c-format
 msgid "Configure hostname..."
 msgstr ""
 
-#: standalone/drakconnect:152 standalone/drakconnect:629
+#: standalone/drakconnect:151 standalone/drakconnect:674
 #, c-format
 msgid "LAN configuration"
 msgstr ""
 
-#: standalone/drakconnect:157
+#: standalone/drakconnect:156
 #, c-format
 msgid "Configure Local Area Network..."
 msgstr ""
 
-#: standalone/drakconnect:165 standalone/drakconnect:224 standalone/drakconnect:228
+#: standalone/drakconnect:164 standalone/drakconnect:231 standalone/drakconnect:235
 #, c-format
 msgid "Apply"
 msgstr ""
 
-#: standalone/drakconnect:273 standalone/drakconnect:814
+#: standalone/drakconnect:202 standalone/drakups:90 standalone/harddrake2:133
 #, c-format
-msgid "Gateway"
+msgid "Detection in progress"
 msgstr ""
 
-#: standalone/drakconnect:280
+#: standalone/drakconnect:319
 #, c-format
 msgid "DNS servers"
 msgstr ""
 
-#: standalone/drakconnect:286
+#: standalone/drakconnect:326
 #, c-format
 msgid "Search Domain"
 msgstr ""
 
-#: standalone/drakconnect:292
+#: standalone/drakconnect:332
 #, c-format
 msgid "static"
 msgstr ""
 
-#: standalone/drakconnect:292
+#: standalone/drakconnect:332
 #, c-format
 msgid "dhcp"
 msgstr ""
 
-#: standalone/drakconnect:434 standalone/harddrake2:58
+#: standalone/drakconnect:477 standalone/harddrake2:58
 #, c-format
 msgid "Media class"
 msgstr ""
 
-#: standalone/drakconnect:435 standalone/drakfloppy:140
+#: standalone/drakconnect:478 standalone/drakfloppy:140
 #, c-format
 msgid "Module name"
 msgstr ""
 
-#: standalone/drakconnect:436
+#: standalone/drakconnect:479
 #, c-format
 msgid "Mac Address"
 msgstr ""
 
-#: standalone/drakconnect:437 standalone/harddrake2:21
+#: standalone/drakconnect:480 standalone/harddrake2:21
 #, c-format
 msgid "Bus"
 msgstr ""
 
-#: standalone/drakconnect:438 standalone/harddrake2:29
+#: standalone/drakconnect:481 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr ""
 
-#: standalone/drakconnect:478
+#: standalone/drakconnect:523
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
 "%s"
 msgstr ""
 
-#: standalone/drakconnect:488
+#: standalone/drakconnect:533
 #, c-format
 msgid "Remove a network interface"
 msgstr ""
 
-#: standalone/drakconnect:492
+#: standalone/drakconnect:537
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr ""
 
-#: standalone/drakconnect:508
+#: standalone/drakconnect:553
 #, c-format
 msgid ""
 "An error occured while deleting the \"%s\" network interface:\n"
@@ -15114,143 +15119,138 @@ msgid ""
 "%s"
 msgstr ""
 
-#: standalone/drakconnect:510
+#: standalone/drakconnect:555
 #, c-format
 msgid "Congratulations, the \"%s\" network interface has been succesfully deleted"
 msgstr ""
 
-#: standalone/drakconnect:527
+#: standalone/drakconnect:572
 #, c-format
 msgid "No Ip"
 msgstr ""
 
-#: standalone/drakconnect:528
+#: standalone/drakconnect:573
 #, c-format
 msgid "No Mask"
 msgstr ""
 
-#: standalone/drakconnect:529 standalone/drakconnect:700
+#: standalone/drakconnect:574 standalone/drakconnect:745
 #, c-format
 msgid "up"
 msgstr ""
 
-#: standalone/drakconnect:529 standalone/drakconnect:700
+#: standalone/drakconnect:574 standalone/drakconnect:745
 #, c-format
 msgid "down"
 msgstr ""
 
-#: standalone/drakconnect:579 standalone/net_monitor:421
+#: standalone/drakconnect:624 standalone/net_monitor:421
 #, c-format
 msgid "Connected"
 msgstr ""
 
-#: standalone/drakconnect:579 standalone/net_monitor:421
+#: standalone/drakconnect:624 standalone/net_monitor:421
 #, c-format
 msgid "Not connected"
 msgstr ""
 
-#: standalone/drakconnect:580
+#: standalone/drakconnect:625
 #, c-format
 msgid "Disconnect..."
 msgstr ""
 
-#: standalone/drakconnect:580
+#: standalone/drakconnect:625
 #, c-format
 msgid "Connect..."
 msgstr ""
 
-#: standalone/drakconnect:609
+#: standalone/drakconnect:654
 #, c-format
 msgid "Warning, another Internet connection has been detected, maybe using your network"
 msgstr ""
 
-#: standalone/drakconnect:625
+#: standalone/drakconnect:670
 #, c-format
 msgid "Deactivate now"
 msgstr ""
 
-#: standalone/drakconnect:625
+#: standalone/drakconnect:670
 #, c-format
 msgid "Activate now"
 msgstr ""
 
-#: standalone/drakconnect:633
+#: standalone/drakconnect:678
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: standalone/drakconnect:647
+#: standalone/drakconnect:692
 #, c-format
 msgid "LAN Configuration"
 msgstr ""
 
-#: standalone/drakconnect:659
+#: standalone/drakconnect:704
 #, c-format
 msgid "Adapter %s: %s"
 msgstr ""
 
-#: standalone/drakconnect:668
+#: standalone/drakconnect:713
 #, c-format
 msgid "Boot Protocol"
 msgstr ""
 
-#: standalone/drakconnect:669
+#: standalone/drakconnect:714
 #, c-format
 msgid "Started on boot"
 msgstr ""
 
-#: standalone/drakconnect:670
-#, c-format
-msgid "DHCP client"
-msgstr ""
-
-#: standalone/drakconnect:705
+#: standalone/drakconnect:750
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
 "Run the \"Add an interface\" assistant from the Mandrake Control Center"
 msgstr ""
 
-#: standalone/drakconnect:760
+#: standalone/drakconnect:805
 #, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
 "Please run \"Internet access\" in control center."
 msgstr ""
 
-#: standalone/drakconnect:768
+#: standalone/drakconnect:813
 #, c-format
 msgid "Internet connection configuration"
 msgstr ""
 
-#: standalone/drakconnect:823
+#: standalone/drakconnect:868
 #, c-format
 msgid "Ethernet Card"
 msgstr ""
 
-#: standalone/drakconnect:824
+#: standalone/drakconnect:869
 #, c-format
 msgid "DHCP Client"
 msgstr ""
 
-#: standalone/drakconnect:853
+#: standalone/drakconnect:898
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr ""
 
-#: standalone/drakconnect:854
+#: standalone/drakconnect:899
 #, c-format
 msgid "Internet access"
 msgstr ""
 
-#: standalone/drakconnect:856 standalone/net_monitor:92
+#: standalone/drakconnect:901 standalone/net_monitor:92
 #, c-format
 msgid "Connection type: "
 msgstr ""
 
-#: standalone/drakconnect:859
+#: standalone/drakconnect:904
 #, c-format
 msgid "Status:"
 msgstr ""
@@ -15685,22 +15685,22 @@ msgstr ""
 msgid "Post Uninstall"
 msgstr ""
 
-#: standalone/drakgw:57 standalone/drakgw:184
+#: standalone/drakgw:59 standalone/drakgw:190
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr ""
 
-#: standalone/drakgw:114
+#: standalone/drakgw:117
 #, c-format
-msgid "Sorry, we support only 2.4 kernels."
+msgid "Sorry, we support only 2.4 and above kernels."
 msgstr ""
 
-#: standalone/drakgw:125
+#: standalone/drakgw:128
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr ""
 
-#: standalone/drakgw:126
+#: standalone/drakgw:129
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -15709,37 +15709,37 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:130
+#: standalone/drakgw:133
 #, c-format
 msgid "disable"
 msgstr ""
 
-#: standalone/drakgw:130 standalone/drakgw:154
+#: standalone/drakgw:133 standalone/drakgw:162
 #, c-format
 msgid "reconfigure"
 msgstr ""
 
-#: standalone/drakgw:130 standalone/drakgw:154
+#: standalone/drakgw:133 standalone/drakgw:162
 #, c-format
 msgid "dismiss"
 msgstr ""
 
-#: standalone/drakgw:133
+#: standalone/drakgw:136
 #, c-format
 msgid "Disabling servers..."
 msgstr ""
 
-#: standalone/drakgw:142
+#: standalone/drakgw:150
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr ""
 
-#: standalone/drakgw:149
+#: standalone/drakgw:157
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr ""
 
-#: standalone/drakgw:150
+#: standalone/drakgw:158
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -15748,22 +15748,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:154
+#: standalone/drakgw:162
 #, c-format
 msgid "enable"
 msgstr ""
 
-#: standalone/drakgw:162
+#: standalone/drakgw:169
 #, c-format
 msgid "Enabling servers..."
 msgstr ""
 
-#: standalone/drakgw:168
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr ""
 
-#: standalone/drakgw:185
+#: standalone/drakgw:191
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -15774,7 +15774,7 @@ msgid ""
 "Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN)."
 msgstr ""
 
-#: standalone/drakgw:205
+#: standalone/drakgw:211
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -15786,32 +15786,32 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakgw:224
+#: standalone/drakgw:230
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr ""
 
-#: standalone/drakgw:225
+#: standalone/drakgw:231
 #, c-format
 msgid "Interface %s"
 msgstr ""
 
-#: standalone/drakgw:234 standalone/drakpxe:137
+#: standalone/drakgw:240 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr ""
 
-#: standalone/drakgw:235 standalone/drakpxe:138
+#: standalone/drakgw:241 standalone/drakpxe:138
 #, c-format
 msgid "No ethernet network adapter has been detected on your system. Please run the hardware configuration tool."
 msgstr ""
 
-#: standalone/drakgw:241
+#: standalone/drakgw:247
 #, c-format
 msgid "Network interface"
 msgstr ""
 
-#: standalone/drakgw:242
+#: standalone/drakgw:248
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -15821,17 +15821,17 @@ msgid ""
 "I am about to setup your Local Area Network with that adapter."
 msgstr ""
 
-#: standalone/drakgw:249
+#: standalone/drakgw:255
 #, c-format
 msgid "Please choose what network adapter will be connected to your Local Area Network."
 msgstr ""
 
-#: standalone/drakgw:275
+#: standalone/drakgw:283
 #, c-format
 msgid "Network interface already configured"
 msgstr ""
 
-#: standalone/drakgw:276
+#: standalone/drakgw:284
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -15841,27 +15841,27 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: standalone/drakgw:281
+#: standalone/drakgw:289
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr ""
 
-#: standalone/drakgw:281
+#: standalone/drakgw:289
 #, c-format
 msgid "No (experts only)"
 msgstr ""
 
-#: standalone/drakgw:282
+#: standalone/drakgw:290
 #, c-format
 msgid "Show current interface configuration"
 msgstr ""
 
-#: standalone/drakgw:283
+#: standalone/drakgw:291
 #, c-format
 msgid "Current interface configuration"
 msgstr ""
 
-#: standalone/drakgw:284
+#: standalone/drakgw:292
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -15872,7 +15872,7 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: standalone/drakgw:297
+#: standalone/drakgw:305
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP server; in that case please verify I correctly read the Network that you use for your local network; I will not reconfigure it and I will not touch your DHCP server configuration.\n"
@@ -15884,94 +15884,93 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakgw:304
+#: standalone/drakgw:312
 #, c-format
 msgid "Local Network adress"
 msgstr ""
 
-#: standalone/drakgw:308
+#: standalone/drakgw:316
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
 "\n"
 "Here you can select different options for the DHCP server configuration.\n"
-"If you don't know the meaning of an option, simply leave it as it is.\n"
-"\n"
-""
+"If you don't know the meaning of an option, simply leave it as it is."
 msgstr ""
 
-#: standalone/drakgw:314
+#: standalone/drakgw:320
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr ""
 
-#: standalone/drakgw:315
+#: standalone/drakgw:321
 #, c-format
 msgid "The DNS Server IP"
 msgstr ""
 
-#: standalone/drakgw:316
+#: standalone/drakgw:322
 #, c-format
 msgid "The internal domain name"
 msgstr ""
 
-#: standalone/drakgw:317
+#: standalone/drakgw:323
 #, c-format
 msgid "The DHCP start range"
 msgstr ""
 
-#: standalone/drakgw:318
+#: standalone/drakgw:324
 #, c-format
 msgid "The DHCP end range"
 msgstr ""
 
-#: standalone/drakgw:319
+#: standalone/drakgw:325
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:320
+#: standalone/drakgw:326
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:321
+#: standalone/drakgw:327
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr ""
 
-#: standalone/drakgw:328
+#: standalone/drakgw:334
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: standalone/drakgw:338
+#: standalone/drakgw:344
 #, c-format
 msgid ""
 "Potential LAN address conflict found in current config of %s!\n"
 ""
 msgstr ""
 
-#: standalone/drakgw:348
+#: standalone/drakgw:354
 #, c-format
 msgid "Configuring..."
 msgstr ""
 
-#: standalone/drakgw:349
+#: standalone/drakgw:355
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 
-#: standalone/drakgw:385 standalone/drakpxe:231
+#: standalone/drakgw:391 standalone/drakpxe:231
 #, c-format
 msgid "Problems installing package %s"
 msgstr ""
 
-#: standalone/drakgw:520
+#: standalone/drakgw:584
 #, c-format
 msgid ""
 "Everything has been configured.\n"
-"You may now share Internet connection with other computers on your Local Area Network, using automatic network configuration (DHCP)."
+"You may now share Internet connection with other computers on your Local Area Network, using automatic network configuration (DHCP) and\n"
+" a Transparent Proxy Cache server (SQUID)."
 msgstr ""
 
 #: standalone/drakhelp:17
@@ -16647,11 +16646,6 @@ msgstr ""
 msgid "Autodetection"
 msgstr ""
 
-#: standalone/drakups:90 standalone/harddrake2:133
-#, c-format
-msgid "Detection in progress"
-msgstr ""
-
 #: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:410
 #, c-format
 msgid "Congratulations"
@@ -18361,27 +18355,27 @@ msgstr ""
 msgid "Exit install"
 msgstr ""
 
-#: ugtk2.pm:897
+#: ugtk2.pm:905
 #, c-format
 msgid "utopia 25"
 msgstr ""
 
-#: ugtk2.pm:1044
+#: ugtk2.pm:1052
 #, c-format
 msgid "Is this correct?"
 msgstr ""
 
-#: ugtk2.pm:1167
+#: ugtk2.pm:1175
 #, c-format
 msgid "Expand Tree"
 msgstr ""
 
-#: ugtk2.pm:1168
+#: ugtk2.pm:1176
 #, c-format
 msgid "Collapse Tree"
 msgstr ""
 
-#: ugtk2.pm:1169
+#: ugtk2.pm:1177
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr ""
diff --git a/perl-install/share/po/uz@Cyrl.po b/perl-install/share/po/uz@Cyrl.po
index d602ad156..ec7637e57 100644
--- a/perl-install/share/po/uz@Cyrl.po
+++ b/perl-install/share/po/uz@Cyrl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-uz@Cyrl\n"
-"POT-Creation-Date: 2004-01-17 16:46+0100\n"
+"POT-Creation-Date: 2004-01-20 17:47+0100\n"
 "PO-Revision-Date: 2003-11-17 13:47+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -79,7 +79,7 @@ msgid ""
 "plug the key again, and launch Mandrake Move again."
 msgstr ""
 
-#: ../move/move.pm:402 help.pm:414 install_steps_interactive.pm:1304
+#: ../move/move.pm:402 help.pm:414 install_steps_interactive.pm:1299
 #, c-format
 msgid "Reboot"
 msgstr "Ўчириб-ёқиш"
@@ -126,19 +126,22 @@ msgstr "Илтимос кутиб туринг, хавфсизлик дараж�
 #: diskdrake/interactive.pm:214 diskdrake/interactive.pm:227
 #: diskdrake/interactive.pm:366 diskdrake/interactive.pm:381
 #: diskdrake/interactive.pm:502 diskdrake/interactive.pm:507
-#: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:252 install_steps.pm:77
+#: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:252 install_steps.pm:81
 #: install_steps_interactive.pm:40 interactive/http.pm:118
-#: interactive/http.pm:119 standalone/drakTermServ:403
-#: standalone/drakTermServ:755 standalone/drakTermServ:767
-#: standalone/drakTermServ:953 standalone/drakTermServ:1338
-#: standalone/drakTermServ:1343 standalone/drakTermServ:1354
-#: standalone/drakTermServ:1373 standalone/drakauth:36
-#: standalone/drakbackup:766 standalone/drakbackup:879
+#: interactive/http.pm:119 network/netconnect.pm:609 network/netconnect.pm:612
+#: network/netconnect.pm:685 network/netconnect.pm:689
+#: network/netconnect.pm:708 network/netconnect.pm:753
+#: network/netconnect.pm:758 network/netconnect.pm:776
+#: standalone/drakTermServ:403 standalone/drakTermServ:755
+#: standalone/drakTermServ:767 standalone/drakTermServ:953
+#: standalone/drakTermServ:1338 standalone/drakTermServ:1343
+#: standalone/drakTermServ:1354 standalone/drakTermServ:1373
+#: standalone/drakauth:36 standalone/drakbackup:766 standalone/drakbackup:879
 #: standalone/drakbackup:1476 standalone/drakbackup:1507
 #: standalone/drakbackup:1988 standalone/drakbackup:2160
 #: standalone/drakbackup:2714 standalone/drakbackup:2781
 #: standalone/drakbackup:4763 standalone/drakboot:225 standalone/drakbug:267
-#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:478
+#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:523
 #: standalone/drakfloppy:301 standalone/drakfloppy:305
 #: standalone/drakfloppy:311 standalone/drakfont:211 standalone/drakfont:224
 #: standalone/drakfont:262 standalone/drakfont:602 standalone/draksplash:21
@@ -147,7 +150,7 @@ msgstr "Илтимос кутиб туринг, хавфсизлик дараж�
 msgid "Error"
 msgstr "Хато"
 
-#: ../move/move.pm:503 install_steps.pm:78
+#: ../move/move.pm:503 install_steps.pm:82
 #, c-format
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
@@ -360,12 +363,12 @@ msgstr ""
 msgid "Xpmac (installation display driver)"
 msgstr "Xpmac (дисплей драйверини ўрнатиш)"
 
-#: Xconfig/main.pm:78 Xconfig/main.pm:79 Xconfig/monitor.pm:106 any.pm:816
+#: Xconfig/main.pm:78 Xconfig/main.pm:79 Xconfig/monitor.pm:106 any.pm:809
 #, c-format
 msgid "Custom"
 msgstr "Бошқа"
 
-#: Xconfig/main.pm:103 diskdrake/dav.pm:28 install_steps_interactive.pm:87
+#: Xconfig/main.pm:103 diskdrake/dav.pm:28 install_steps_interactive.pm:83
 #: printer/printerdrake.pm:3852 standalone/draksplash:114
 #: standalone/harddrake2:187 standalone/logdrake:176
 #: standalone/scannerdrake:432
@@ -428,7 +431,7 @@ msgstr "Plug'n Play"
 msgid "Generic"
 msgstr "Андоза"
 
-#: Xconfig/monitor.pm:109 standalone/drakconnect:432 standalone/harddrake2:68
+#: Xconfig/monitor.pm:109 standalone/drakconnect:475 standalone/harddrake2:68
 #: standalone/harddrake2:69
 #, c-format
 msgid "Vendor"
@@ -512,18 +515,18 @@ msgstr "График карта: %s"
 #: interactive/stdio.pm:143 interactive/stdio.pm:144 interactive/stdio.pm:173
 #: standalone/drakbackup:4257 standalone/drakbackup:4289
 #: standalone/drakbackup:4382 standalone/drakbackup:4399
-#: standalone/drakbackup:4500 standalone/drakconnect:168
-#: standalone/drakconnect:636 standalone/drakconnect:723
-#: standalone/drakconnect:866 standalone/drakups:194 standalone/mousedrake:77
-#: standalone/net_monitor:308 ugtk2.pm:396 ugtk2.pm:494 ugtk2.pm:1044
-#: ugtk2.pm:1067
+#: standalone/drakbackup:4500 standalone/drakconnect:167
+#: standalone/drakconnect:681 standalone/drakconnect:768
+#: standalone/drakconnect:911 standalone/drakups:194 standalone/mousedrake:77
+#: standalone/net_monitor:308 ugtk2.pm:404 ugtk2.pm:502 ugtk2.pm:1052
+#: ugtk2.pm:1075
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: Xconfig/resolution_and_depth.pm:289 any.pm:857 diskdrake/smbnfs_gtk.pm:81
+#: Xconfig/resolution_and_depth.pm:289 any.pm:850 diskdrake/smbnfs_gtk.pm:81
 #: help.pm:192 help.pm:453 install_steps_gtk.pm:500
-#: install_steps_interactive.pm:783 interactive.pm:404 interactive/gtk.pm:765
+#: install_steps_interactive.pm:779 interactive.pm:404 interactive/gtk.pm:765
 #: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:299
 #: interactive/newt.pm:406 interactive/stdio.pm:39 interactive/stdio.pm:143
 #: interactive/stdio.pm:177 printer/printerdrake.pm:2906
@@ -532,28 +535,28 @@ msgstr "Ок"
 #: standalone/drakbackup:4306 standalone/drakbackup:4332
 #: standalone/drakbackup:4358 standalone/drakbackup:4415
 #: standalone/drakbackup:4441 standalone/drakbackup:4471
-#: standalone/drakbackup:4495 standalone/drakconnect:167
-#: standalone/drakconnect:721 standalone/drakconnect:875
+#: standalone/drakbackup:4495 standalone/drakconnect:166
+#: standalone/drakconnect:766 standalone/drakconnect:920
 #: standalone/drakfont:662 standalone/drakfont:739 standalone/drakups:201
 #: standalone/logdrake:176 standalone/mousedrake:76 standalone/net_monitor:304
-#: ugtk2.pm:390 ugtk2.pm:492 ugtk2.pm:501 ugtk2.pm:1044
+#: ugtk2.pm:398 ugtk2.pm:500 ugtk2.pm:509 ugtk2.pm:1052
 #, c-format
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
 #: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154
 #: install_steps_gtk.pm:278 install_steps_gtk.pm:685 interactive.pm:498
-#: interactive/gtk.pm:652 interactive/gtk.pm:654 standalone/drakTermServ:321
+#: interactive/gtk.pm:651 interactive/gtk.pm:653 standalone/drakTermServ:321
 #: standalone/drakbackup:4218 standalone/drakbackup:4245
 #: standalone/drakbackup:4270 standalone/drakbackup:4303
 #: standalone/drakbackup:4329 standalone/drakbackup:4355
 #: standalone/drakbackup:4396 standalone/drakbackup:4412
 #: standalone/drakbackup:4438 standalone/drakbackup:4467
 #: standalone/drakbackup:4492 standalone/drakbackup:4517
-#: standalone/drakbug:157 standalone/drakconnect:163
-#: standalone/drakconnect:223 standalone/drakfont:514 standalone/drakperm:134
-#: standalone/draksec:282 standalone/harddrake2:186 ugtk2.pm:1152
-#: ugtk2.pm:1153
+#: standalone/drakbug:157 standalone/drakconnect:162
+#: standalone/drakconnect:230 standalone/drakfont:514 standalone/drakperm:134
+#: standalone/draksec:282 standalone/harddrake2:186 ugtk2.pm:1160
+#: ugtk2.pm:1161
 #, c-format
 msgid "Help"
 msgstr "Ёрдам"
@@ -691,8 +694,9 @@ msgid "What norm is your TV using?"
 msgstr ""
 
 #: any.pm:98 harddrake/sound.pm:147 interactive.pm:441 standalone/drakbug:259
-#: standalone/drakconnect:170 standalone/drakups:90 standalone/drakxtv:90
-#: standalone/harddrake2:133 standalone/service_harddrake:94
+#: standalone/drakconnect:169 standalone/drakconnect:202 standalone/drakups:90
+#: standalone/drakxtv:90 standalone/harddrake2:133
+#: standalone/service_harddrake:94
 #, c-format
 msgid "Please wait"
 msgstr "Илтимос кутиб туринг"
@@ -807,17 +811,17 @@ msgstr "ACPI'ни ёқиш"
 msgid "Force No APIC"
 msgstr "APIC'ни тақиқлаш"
 
-#: any.pm:221 any.pm:552 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1160 network/netconnect.pm:500
+#: any.pm:221 any.pm:545 diskdrake/smbnfs_gtk.pm:180
+#: install_steps_interactive.pm:1155 network/netconnect.pm:439
 #: printer/printerdrake.pm:1331 printer/printerdrake.pm:1445
 #: standalone/drakbackup:1974 standalone/drakbackup:3826
-#: standalone/drakconnect:818 standalone/drakconnect:846
+#: standalone/drakconnect:863 standalone/drakconnect:891
 #: standalone/drakups:278
 #, c-format
 msgid "Password"
 msgstr "Махфий сўз"
 
-#: any.pm:222 any.pm:553 install_steps_interactive.pm:1161
+#: any.pm:222 any.pm:546 install_steps_interactive.pm:1156
 #, c-format
 msgid "Password (again)"
 msgstr "Махфий сўз (яна)"
@@ -858,13 +862,13 @@ msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: any.pm:235 any.pm:525 install_steps_interactive.pm:1155
+#: any.pm:235 any.pm:518 install_steps_interactive.pm:1150
 #, c-format
 msgid "The passwords do not match"
 msgstr "Махфий сўзлар мос келмайди"
 
-#: any.pm:235 any.pm:525 diskdrake/interactive.pm:1249
-#: install_steps_interactive.pm:1155
+#: any.pm:235 any.pm:518 diskdrake/interactive.pm:1249
+#: install_steps_interactive.pm:1150
 #, c-format
 msgid "Please try again"
 msgstr "Илтимос яна уриниб кўринг"
@@ -904,12 +908,12 @@ msgstr "Андоза ОС?"
 msgid "Image"
 msgstr "Тасвир"
 
-#: any.pm:291 any.pm:302
+#: any.pm:291 any.pm:300
 #, c-format
 msgid "Root"
 msgstr "Дискнинг туб қисми"
 
-#: any.pm:292 any.pm:320
+#: any.pm:292 any.pm:313
 #, c-format
 msgid "Append"
 msgstr ""
@@ -919,88 +923,73 @@ msgstr ""
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:297
-#, c-format
-msgid "Read-write"
-msgstr "Ўқиш-ёзиш"
-
-#: any.pm:304
-#, c-format
-msgid "Table"
-msgstr "Жадвал"
-
-#: any.pm:305
-#, c-format
-msgid "Unsafe"
-msgstr "Хавфли"
-
-#: any.pm:312 any.pm:317 any.pm:319
+#: any.pm:305 any.pm:310 any.pm:312
 #, c-format
 msgid "Label"
 msgstr "Белги"
 
-#: any.pm:314 any.pm:324 harddrake/v4l.pm:236 standalone/drakfloppy:88
+#: any.pm:307 any.pm:317 harddrake/v4l.pm:236 standalone/drakfloppy:88
 #: standalone/drakfloppy:94
 #, c-format
 msgid "Default"
 msgstr "Андоза"
 
-#: any.pm:321
+#: any.pm:314
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd'нинг ҳажми"
 
-#: any.pm:323
+#: any.pm:316
 #, c-format
 msgid "NoVideo"
 msgstr "Видеосиз"
 
-#: any.pm:334
+#: any.pm:327
 #, c-format
 msgid "Empty label not allowed"
 msgstr "Бўш белгини ишлатиш мумкин эмас"
 
-#: any.pm:335
+#: any.pm:328
 #, c-format
 msgid "You must specify a kernel image"
 msgstr ""
 
-#: any.pm:335
+#: any.pm:328
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Дискнинг туб қисмини киритишингиз шарт"
 
-#: any.pm:336
+#: any.pm:329
 #, c-format
 msgid "This label is already used"
 msgstr "Белги аллақачон ишлатилган"
 
-#: any.pm:348
+#: any.pm:341
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Банднинг қайси турини қўшмоқчисиз?"
 
-#: any.pm:349 standalone/drakbackup:1888
+#: any.pm:342 standalone/drakbackup:1888
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:349
+#: any.pm:342
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "Бошқа ОС (SunOS...)"
 
-#: any.pm:350
+#: any.pm:343
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Бошқа ОС (MacOS...)"
 
-#: any.pm:350
+#: any.pm:343
 #, c-format
 msgid "Other OS (windows...)"
 msgstr "Бошқа ОС (window...)"
 
-#: any.pm:378
+#: any.pm:371
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1010,52 +999,52 @@ msgstr ""
 "Қўшимча бандлар яратишингиз ёки мавжуд бўлган бандларни ўзгартиришингиз "
 "мумкин."
 
-#: any.pm:510
+#: any.pm:503
 #, c-format
 msgid "access to X programs"
 msgstr "Х дастурларидан фойдаланишга рухсат этиш"
 
-#: any.pm:511
+#: any.pm:504
 #, c-format
 msgid "access to rpm tools"
 msgstr "RPM воситаларидан фойдаланишга рухсат этиш"
 
-#: any.pm:512
+#: any.pm:505
 #, c-format
 msgid "allow \"su\""
 msgstr "\"su\" буйруғидан фойдаланишга рухсат этиш"
 
-#: any.pm:513
+#: any.pm:506
 #, c-format
 msgid "access to administrative files"
 msgstr "бошқарув файлларига рухсат"
 
-#: any.pm:514
+#: any.pm:507
 #, c-format
 msgid "access to network tools"
 msgstr "тармоқ воситалардан фойдаланишни рухсат этиш"
 
-#: any.pm:515
+#: any.pm:508
 #, c-format
 msgid "access to compilation tools"
 msgstr ""
 
-#: any.pm:521
+#: any.pm:514
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s аллақачон қўшилган)"
 
-#: any.pm:526
+#: any.pm:519
 #, c-format
 msgid "This password is too simple"
 msgstr "Бу махфий сўз жуда оддий"
 
-#: any.pm:527
+#: any.pm:520
 #, c-format
 msgid "Please give a user name"
 msgstr "Илтимос фойдаланувчининг исмини киритинг"
 
-#: any.pm:528
+#: any.pm:521
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -1063,22 +1052,22 @@ msgstr ""
 "Фойдаланувчининг исми фақат кичкина ҳарф, сон, \"-\" ва \"_\" белгиларидан "
 "иборат бўлиши шарт"
 
-#: any.pm:529
+#: any.pm:522
 #, c-format
 msgid "The user name is too long"
 msgstr "Фойдаланувчининг исми жуда узун"
 
-#: any.pm:530
+#: any.pm:523
 #, c-format
 msgid "This user name has already been added"
 msgstr "Фойдаланувчининг исми аллақачон қўшилган"
 
-#: any.pm:534
+#: any.pm:527
 #, c-format
 msgid "Add user"
 msgstr "Фойдаланувчини қўшиш"
 
-#: any.pm:535
+#: any.pm:528
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1087,7 +1076,7 @@ msgstr ""
 "Фойдаланувчини киритинг\n"
 "%s"
 
-#: any.pm:538 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
+#: any.pm:531 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
 #: diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:534
 #: interactive/http.pm:152 printer/printerdrake.pm:160
 #: printer/printerdrake.pm:347 printer/printerdrake.pm:3852
@@ -1097,65 +1086,65 @@ msgstr ""
 msgid "Done"
 msgstr "Тайёр"
 
-#: any.pm:539 help.pm:51
+#: any.pm:532 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Қабул қилиш"
 
-#: any.pm:550
+#: any.pm:543
 #, c-format
 msgid "Real name"
 msgstr "Фойдаланувчининг ҳақиқий исми-шарифи"
 
-#: any.pm:551 help.pm:51 printer/printerdrake.pm:1330
+#: any.pm:544 help.pm:51 printer/printerdrake.pm:1330
 #: printer/printerdrake.pm:1444
 #, c-format
 msgid "User name"
 msgstr "Фойдаланувчи"
 
-#: any.pm:554
+#: any.pm:547
 #, c-format
 msgid "Shell"
 msgstr "Консол"
 
-#: any.pm:556
+#: any.pm:549
 #, c-format
 msgid "Icon"
 msgstr "Нишонча"
 
-#: any.pm:597 security/l10n.pm:14
+#: any.pm:590 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Системага автоматик равишда кириш"
 
-#: any.pm:598
+#: any.pm:591
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 "Мен компютерингизни системага битта фойдаланувчи автоматик равишда киришга "
 "мослашим мумкин."
 
-#: any.pm:599 help.pm:51
+#: any.pm:592 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Бу қулайликдан фойдаланишни истайсизми?"
 
-#: any.pm:600
+#: any.pm:593
 #, c-format
 msgid "Choose the default user:"
 msgstr "Андоза фойдаланувчини танланг:"
 
-#: any.pm:601
+#: any.pm:594
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Ойналар бошқарувчисини танланг:"
 
-#: any.pm:613
+#: any.pm:606
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Илтимос фойдаланиш учун тилни танланг."
 
-#: any.pm:633
+#: any.pm:626
 #, c-format
 msgid ""
 "Mandrake Linux can support multiple languages. Select\n"
@@ -1163,53 +1152,53 @@ msgid ""
 "when your installation is complete and you restart your system."
 msgstr ""
 
-#: any.pm:644 help.pm:634
+#: any.pm:637 help.pm:634
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Андоза сифатида Юникоддан фойдаланиш"
 
-#: any.pm:645 help.pm:634
+#: any.pm:638 help.pm:634
 #, c-format
 msgid "All languages"
 msgstr "Ҳамма тиллар"
 
-#: any.pm:681 help.pm:571 help.pm:951 install_steps_interactive.pm:903
+#: any.pm:674 help.pm:571 help.pm:951 install_steps_interactive.pm:899
 #, c-format
 msgid "Country / Region"
 msgstr "Давлат / Регион"
 
-#: any.pm:682
+#: any.pm:675
 #, c-format
 msgid "Please choose your country."
 msgstr "Давлатингизни танланг."
 
-#: any.pm:684
+#: any.pm:677
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Мавжуд бўлган давлатларнинг тўлиқ рўйхати"
 
-#: any.pm:685 diskdrake/interactive.pm:289 help.pm:534 help.pm:571 help.pm:609
-#: help.pm:951 install_steps_interactive.pm:118
+#: any.pm:678 diskdrake/interactive.pm:289 help.pm:534 help.pm:571 help.pm:609
+#: help.pm:951 install_steps_interactive.pm:114
 #, c-format
 msgid "More"
 msgstr "Кўпроқ"
 
-#: any.pm:816
+#: any.pm:809
 #, c-format
 msgid "No sharing"
 msgstr ""
 
-#: any.pm:816
+#: any.pm:809
 #, c-format
 msgid "Allow all users"
 msgstr "Ҳамма фойдаланувчиларга рухсат"
 
-#: any.pm:826 do_pkgs.pm:21
+#: any.pm:819 do_pkgs.pm:21
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "Пакет (%s) ўрнатилиши керак. Уни ўрнатишни истайсизми?"
 
-#: any.pm:828
+#: any.pm:821
 #, c-format
 msgid ""
 "You can export using NFS or Samba. Please select which you'd like to use."
@@ -1217,12 +1206,12 @@ msgstr ""
 "Сиз NFS ёки Samba ёрдамида экспорт қилишингиз мумкин. Сиз қайсидан "
 "фойдаланишни истайсиз?"
 
-#: any.pm:836 do_pkgs.pm:26
+#: any.pm:829 do_pkgs.pm:26
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Шарт бўлган пакет (%s) етишмаяпти"
 
-#: any.pm:842
+#: any.pm:835
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1232,12 +1221,12 @@ msgid ""
 "\"Custom\" permit a per-user granularity.\n"
 msgstr ""
 
-#: any.pm:857
+#: any.pm:850
 #, c-format
 msgid "Launch userdrake"
 msgstr "Userdrake дастурини ишга тушириш"
 
-#: any.pm:859
+#: any.pm:852
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1332,7 +1321,7 @@ msgid "Can't 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:547
+#: bootloader.pm:535
 #, fuzzy, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1347,37 +1336,37 @@ msgstr ""
 "yoki andoza uchun %d soniya kutib turing.\n"
 "\n"
 
-#: bootloader.pm:679
+#: bootloader.pm:667
 #, c-format
 msgid "SILO"
 msgstr "SILO"
 
-#: bootloader.pm:681 help.pm:729
+#: bootloader.pm:669 help.pm:729
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "LILO (график меню)"
 
-#: bootloader.pm:682 help.pm:729
+#: bootloader.pm:670 help.pm:729
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO (матн меню)"
 
-#: bootloader.pm:684
+#: bootloader.pm:672
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:686
+#: bootloader.pm:674
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1153
+#: bootloader.pm:1142
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot директориясида етарли жой йўқ"
 
-#: bootloader.pm:1181
+#: bootloader.pm:1170
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "Операцион система юклагичини дискнинг %s қисмига ўрнатолмайсиз\n"
@@ -1437,8 +1426,8 @@ msgstr "kdesu дастури етишмаяпти"
 msgid "consolehelper missing"
 msgstr "consolehelper дастури етишмаяпти"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:235 network/netconnect.pm:55
-#: network/netconnect.pm:291
+#: crypto.pm:14 crypto.pm:28 lang.pm:235 network/netconnect.pm:53
+#: network/netconnect.pm:249
 #, c-format
 msgid "France"
 msgstr "Франция"
@@ -1448,8 +1437,8 @@ msgstr "Франция"
 msgid "Costa Rica"
 msgstr "Коста Рика"
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:183 network/netconnect.pm:58
-#: network/netconnect.pm:290
+#: crypto.pm:16 crypto.pm:29 lang.pm:183 network/netconnect.pm:56
+#: network/netconnect.pm:248
 #, c-format
 msgid "Belgium"
 msgstr "Белгия"
@@ -1479,14 +1468,14 @@ msgstr "Норвегия"
 msgid "Sweden"
 msgstr "Швеция"
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:320 network/netconnect.pm:56
-#: network/netconnect.pm:293
+#: crypto.pm:22 crypto.pm:36 lang.pm:320 network/netconnect.pm:54
+#: network/netconnect.pm:251
 #, c-format
 msgid "Netherlands"
 msgstr "Нидерландлар"
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:268 network/netconnect.pm:57
-#: network/netconnect.pm:292 standalone/drakxtv:48
+#: crypto.pm:23 crypto.pm:37 lang.pm:268 network/netconnect.pm:55
+#: network/netconnect.pm:250 standalone/drakxtv:48
 #, c-format
 msgid "Italy"
 msgstr "Италия"
@@ -1496,8 +1485,8 @@ msgstr "Италия"
 msgid "Austria"
 msgstr "Австрия"
 
-#: crypto.pm:35 crypto.pm:61 lang.pm:384 network/netconnect.pm:59
-#: network/netconnect.pm:295
+#: crypto.pm:35 crypto.pm:61 lang.pm:384 network/netconnect.pm:57
+#: network/netconnect.pm:253
 #, c-format
 msgid "United States"
 msgstr "Қўшма Штатлар"
@@ -1746,7 +1735,7 @@ msgstr "Дискнинг қисмлар жадвалини сақламасда�
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "/etc/fstab файлига киритилган ўзгаришларни сақлашни истайсизми?"
 
-#: diskdrake/interactive.pm:274 install_steps_interactive.pm:305
+#: diskdrake/interactive.pm:274 install_steps_interactive.pm:301
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
@@ -1823,12 +1812,10 @@ msgid ""
 msgstr ""
 
 #: diskdrake/interactive.pm:375 harddrake/sound.pm:219 keyboard.pm:311
-#: network/netconnect.pm:400 network/netconnect.pm:409
-#: network/netconnect.pm:430 network/netconnect.pm:435
-#: standalone/drakTermServ:1062 standalone/drakTermServ:1692
-#: standalone/drakbackup:765 standalone/drakbackup:863
-#: standalone/drakclock:200 standalone/drakconnect:758
-#: standalone/drakfloppy:295 standalone/drakups:27
+#: network/netconnect.pm:334 standalone/drakTermServ:1062
+#: standalone/drakTermServ:1692 standalone/drakbackup:765
+#: standalone/drakbackup:863 standalone/drakclock:200
+#: standalone/drakconnect:803 standalone/drakfloppy:295 standalone/drakups:27
 #, c-format
 msgid "Warning"
 msgstr "Диққат"
@@ -2378,8 +2365,8 @@ msgstr "Кодлаш калити жудда содда (у энг ками %d �
 msgid "The encryption keys do not match"
 msgstr "Кодлаш калитлари мос келмайди"
 
-#: diskdrake/interactive.pm:1252 network/netconnect.pm:656
-#: standalone/drakconnect:321
+#: diskdrake/interactive.pm:1252 network/netconnect.pm:645
+#: standalone/drakconnect:362
 #, c-format
 msgid "Encryption key"
 msgstr "Кодлаш калити"
@@ -2440,36 +2427,36 @@ msgstr "Серверларни қидириш"
 msgid "Search new servers"
 msgstr "Янги серверларни қидириш"
 
-#: do_pkgs.pm:136
+#: do_pkgs.pm:137
 #, c-format
 msgid "Installing packages..."
 msgstr "Пакетлар ўрнатилмоқда..."
 
-#: do_pkgs.pm:210
+#: do_pkgs.pm:211
 #, fuzzy, c-format
 msgid "Removing packages..."
 msgstr "\"%s\" олиб ташланмоқда..."
 
-#: fs.pm:397
+#: fs.pm:399
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
 
-#: fs.pm:400
+#: fs.pm:402
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
 
-#: fs.pm:403
+#: fs.pm:405
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 
-#: fs.pm:405
+#: fs.pm:407
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2477,7 +2464,7 @@ msgid ""
 "containing binaries for architectures other than its own."
 msgstr ""
 
-#: fs.pm:409
+#: fs.pm:411
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2485,17 +2472,17 @@ msgid ""
 "have suidperl(1) installed.)"
 msgstr ""
 
-#: fs.pm:413
+#: fs.pm:415
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Файл системаларни фақат ўқишга деб улаш."
 
-#: fs.pm:415
+#: fs.pm:417
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 
-#: fs.pm:419
+#: fs.pm:421
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2506,52 +2493,52 @@ msgid ""
 "user,exec,dev,suid )."
 msgstr ""
 
-#: fs.pm:427
+#: fs.pm:429
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Оддий фойдаланувчиларга ёзиш рухсатини бериш"
 
-#: fs.pm:563 fs.pm:573 fs.pm:577 fs.pm:581 fs.pm:585 fs.pm:589 swap.pm:12
+#: fs.pm:565 fs.pm:575 fs.pm:579 fs.pm:583 fs.pm:587 fs.pm:591 swap.pm:12
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s турида %s'ни формат қилиш муваффақиятсиз тугади"
 
-#: fs.pm:626
+#: fs.pm:628
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "%s'ни %s турида қандай формат қилишни билмайман"
 
-#: fs.pm:633 fs.pm:640
+#: fs.pm:635 fs.pm:642
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Дискнинг қисми (%s) формат қилинмоқда"
 
-#: fs.pm:637
+#: fs.pm:639
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "%s файли яратилмоқда ва формат қилинмоқда"
 
-#: fs.pm:703 fs.pm:756
+#: fs.pm:705 fs.pm:758
 #, c-format
 msgid "Mounting partition %s"
 msgstr "Диск қисми (%s) уланмоқда"
 
-#: fs.pm:704 fs.pm:757
+#: fs.pm:706 fs.pm:759
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "Диск қисмини (%s) директорияга (%s) улаш муваффақиятсиз тугади"
 
-#: fs.pm:724 fs.pm:732
+#: fs.pm:726 fs.pm:734
 #, c-format
 msgid "Checking %s"
 msgstr "%s текширилмоқда"
 
-#: fs.pm:773 partition_table.pm:635
+#: fs.pm:775 partition_table.pm:635
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "%s'ни ажратишда хато: %s"
 
-#: fs.pm:805
+#: fs.pm:807
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr "Дискнинг своп қисми (%s) ёқилмоқда"
@@ -2735,7 +2722,7 @@ msgstr "Процессорлар"
 msgid "Ethernetcard"
 msgstr "Ethernet карта"
 
-#: harddrake/data.pm:66
+#: harddrake/data.pm:66 network/netconnect.pm:347
 #, c-format
 msgid "Modem"
 msgstr "Модем"
@@ -2761,7 +2748,7 @@ msgid "Unknown/Others"
 msgstr "Номаълум/Бошқалар"
 
 #: harddrake/data.pm:74 help.pm:198 help.pm:951
-#: install_steps_interactive.pm:931 printer/printerdrake.pm:671
+#: install_steps_interactive.pm:927 printer/printerdrake.pm:671
 #: printer/printerdrake.pm:3951
 #, c-format
 msgid "Printer"
@@ -2772,7 +2759,7 @@ msgstr "Принтер"
 msgid "Scanner"
 msgstr "Сканнер"
 
-#: harddrake/data.pm:78 help.pm:951 install_steps_interactive.pm:924
+#: harddrake/data.pm:78 help.pm:951 install_steps_interactive.pm:920
 #, c-format
 msgid "Mouse"
 msgstr "Сичқонча"
@@ -2812,7 +2799,7 @@ msgstr "SMBus контроллерлар"
 msgid "cpu # "
 msgstr "процессор # "
 
-#: harddrake/sound.pm:147 standalone/drakconnect:172
+#: harddrake/sound.pm:147 standalone/drakconnect:171
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Илтимос кутиб туринг... Мосламалар қўлланилмоқда"
@@ -3059,8 +3046,8 @@ msgstr ""
 "шартларига рози бўлсангиз, \"%s\"ни танланг. Агар рози бўлмасангиз,\n"
 "компютерингизни ўчиринг."
 
-#: help.pm:13 install_steps_gtk.pm:614 install_steps_interactive.pm:92
-#: install_steps_interactive.pm:693 standalone/drakautoinst:199
+#: help.pm:13 install_steps_gtk.pm:614 install_steps_interactive.pm:88
+#: install_steps_interactive.pm:689 standalone/drakautoinst:199
 #, c-format
 msgid "Accept"
 msgstr "Қабул қилиш"
@@ -3108,9 +3095,9 @@ msgstr ""
 
 #: help.pm:51 help.pm:192 help.pm:440 help.pm:660 help.pm:965
 #: install_steps_gtk.pm:286 interactive.pm:403 interactive/newt.pm:300
-#: network/netconnect.pm:251 network/tools.pm:228 printer/printerdrake.pm:2908
+#: network/netconnect.pm:209 network/tools.pm:228 printer/printerdrake.pm:2908
 #: standalone/drakbackup:4424 standalone/drakbackup:4450
-#: standalone/drakbackup:4480 standalone/drakbackup:4504 ugtk2.pm:494
+#: standalone/drakbackup:4480 standalone/drakbackup:4504 ugtk2.pm:502
 #, c-format
 msgid "Next"
 msgstr "Кейингиси"
@@ -3234,7 +3221,7 @@ msgstr "Тузиш"
 msgid "Graphical Environment"
 msgstr "График муҳит"
 
-#: help.pm:137 install_steps_interactive.pm:555
+#: help.pm:137 install_steps_interactive.pm:551
 #, c-format
 msgid "With X"
 msgstr "X билан"
@@ -3249,7 +3236,7 @@ msgstr "Асосий қўлланмалар билан"
 msgid "Truly minimal install"
 msgstr "Ҳақиқий минимал ўрнатиш"
 
-#: help.pm:137 install_steps_gtk.pm:281 install_steps_interactive.pm:601
+#: help.pm:137 install_steps_gtk.pm:281 install_steps_interactive.pm:597
 #, c-format
 msgid "Individual package selection"
 msgstr "Пакетларни биттама-битта танлаш"
@@ -3297,17 +3284,17 @@ msgid ""
 "create such a floppy."
 msgstr ""
 
-#: help.pm:172 help.pm:294 help.pm:322 help.pm:453 install_any.pm:416
+#: help.pm:172 help.pm:294 help.pm:322 help.pm:453 install_any.pm:415
 #: interactive.pm:149 modules/interactive.pm:69 standalone/harddrake2:217
-#: ugtk2.pm:1043 wizards.pm:155
+#: ugtk2.pm:1051 wizards.pm:155
 #, c-format
 msgid "No"
 msgstr "Йўқ"
 
-#: help.pm:172 help.pm:294 help.pm:453 install_any.pm:416 interactive.pm:149
-#: modules/interactive.pm:69 standalone/drakgw:272 standalone/drakgw:273
-#: standalone/drakgw:281 standalone/drakgw:291 standalone/harddrake2:216
-#: ugtk2.pm:1043 wizards.pm:155
+#: help.pm:172 help.pm:294 help.pm:453 install_any.pm:415 interactive.pm:149
+#: modules/interactive.pm:69 standalone/drakgw:280 standalone/drakgw:281
+#: standalone/drakgw:289 standalone/drakgw:299 standalone/harddrake2:216
+#: ugtk2.pm:1051 wizards.pm:155
 #, c-format
 msgid "Yes"
 msgstr "Ҳа"
@@ -3340,7 +3327,7 @@ msgid ""
 "installed and use the program described there to configure your connection."
 msgstr ""
 
-#: help.pm:192 network/netconnect.pm:158
+#: help.pm:192
 #, c-format
 msgid "Use auto detection"
 msgstr "Авто-аниқлашдан фойдаланиш"
@@ -3399,7 +3386,7 @@ msgid ""
 "other machines on your local network as well."
 msgstr ""
 
-#: help.pm:230 install_steps_interactive.pm:830
+#: help.pm:230 install_steps_interactive.pm:826
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr ""
@@ -3657,17 +3644,17 @@ msgstr ""
 msgid "generate auto-install floppy"
 msgstr "Авто-ўрнатиш дискетни яратиш"
 
-#: help.pm:414 install_steps_interactive.pm:1314
+#: help.pm:414 install_steps_interactive.pm:1309
 #, c-format
 msgid "Replay"
 msgstr "Қайтариш"
 
-#: help.pm:414 install_steps_interactive.pm:1314
+#: help.pm:414 install_steps_interactive.pm:1309
 #, c-format
 msgid "Automated"
 msgstr "Автоматик"
 
-#: help.pm:414 install_steps_interactive.pm:1317
+#: help.pm:414 install_steps_interactive.pm:1312
 #, c-format
 msgid "Save packages selection"
 msgstr "Пакетлар танловини сақлаш"
@@ -3707,7 +3694,7 @@ msgstr ""
 #: standalone/drakbackup:4311 standalone/drakbackup:4337
 #: standalone/drakbackup:4363 standalone/drakbackup:4420
 #: standalone/drakbackup:4446 standalone/drakbackup:4476
-#: standalone/drakbackup:4500 ugtk2.pm:492
+#: standalone/drakbackup:4500 ugtk2.pm:500
 #, c-format
 msgid "Previous"
 msgstr "Олдингиси"
@@ -3729,7 +3716,7 @@ msgid ""
 msgstr ""
 
 #: help.pm:453 help.pm:592 install_steps_gtk.pm:442
-#: install_steps_interactive.pm:152 standalone/drakbackup:4539
+#: install_steps_interactive.pm:148 standalone/drakbackup:4539
 #, c-format
 msgid "Install"
 msgstr "Ўрнатиш"
@@ -4031,7 +4018,7 @@ msgid "authentication"
 msgstr "тасдиқлаш"
 
 #. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:702 install_steps_interactive.pm:1150
+#: help.pm:702 install_steps_interactive.pm:1146
 #, c-format
 msgid "No password"
 msgstr "Махфий сўзсиз"
@@ -4309,8 +4296,8 @@ msgstr ""
 "Агар кўрсатилган товуш картаси системангиздаги товуш картаси\n"
 "билан мос келмаса, тугмани босиб бошқа драйверни танлашингиз мумкин."
 
-#: help.pm:889 help.pm:951 install_steps_interactive.pm:958
-#: install_steps_interactive.pm:975
+#: help.pm:889 help.pm:951 install_steps_interactive.pm:954
+#: install_steps_interactive.pm:971
 #, c-format
 msgid "Sound card"
 msgstr "Товуш карта"
@@ -4380,13 +4367,13 @@ msgid ""
 "idea to review this setup."
 msgstr ""
 
-#: help.pm:951 install_steps_interactive.pm:114
-#: install_steps_interactive.pm:895 standalone/keyboarddrake:23
+#: help.pm:951 install_steps_interactive.pm:110
+#: install_steps_interactive.pm:891 standalone/keyboarddrake:23
 #, c-format
 msgid "Keyboard"
 msgstr ""
 
-#: help.pm:951 install_steps_interactive.pm:917
+#: help.pm:951 install_steps_interactive.pm:913
 #, c-format
 msgid "Timezone"
 msgstr "Вақт зонаси"
@@ -4396,7 +4383,7 @@ msgstr "Вақт зонаси"
 msgid "Graphical Interface"
 msgstr "График интерфейс"
 
-#: help.pm:951 install_steps_interactive.pm:991
+#: help.pm:951 install_steps_interactive.pm:987
 #, c-format
 msgid "TV card"
 msgstr "ТВ карта"
@@ -4406,27 +4393,27 @@ msgstr "ТВ карта"
 msgid "ISDN card"
 msgstr "ISDN karta"
 
-#: help.pm:951 install_steps_interactive.pm:1009 standalone/drakbackup:2374
+#: help.pm:951 install_steps_interactive.pm:1005 standalone/drakbackup:2374
 #, c-format
 msgid "Network"
 msgstr "Тармоқ"
 
-#: help.pm:951 install_steps_interactive.pm:1035
+#: help.pm:951 install_steps_interactive.pm:1031
 #, c-format
 msgid "Security Level"
 msgstr "Хавфсизлик даражаси"
 
-#: help.pm:951 install_steps_interactive.pm:1049
+#: help.pm:951 install_steps_interactive.pm:1045
 #, c-format
 msgid "Firewall"
 msgstr "Файервол"
 
-#: help.pm:951 install_steps_interactive.pm:1063
+#: help.pm:951 install_steps_interactive.pm:1059
 #, c-format
 msgid "Bootloader"
 msgstr "ОС юклагичи"
 
-#: help.pm:951 install_steps_interactive.pm:1073 services.pm:195
+#: help.pm:951 install_steps_interactive.pm:1069 services.pm:195
 #, c-format
 msgid "Services"
 msgstr "Хизматлар"
@@ -4471,7 +4458,7 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "Сиз %s'ни ҳам формат қилишингиз керак"
 
-#: install_any.pm:407
+#: install_any.pm:406
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -4485,7 +4472,7 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: install_any.pm:428
+#: install_any.pm:427
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -4498,29 +4485,29 @@ msgstr ""
 "\n"
 "Уларни ростдан ўчирмоқчимисиз?\n"
 
-#: install_any.pm:806
+#: install_any.pm:805
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Илтимос %s ускунасига формати FAT бўлган дискетни қўйинг"
 
-#: install_any.pm:810
+#: install_any.pm:809
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Бу дискетнинг формати FAT эмас"
 
-#: install_any.pm:822
+#: install_any.pm:821
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
 
-#: install_any.pm:845 partition_table.pm:844
+#: install_any.pm:844 partition_table.pm:844
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s файлини ўқишда хато рўй берди"
 
-#: install_any.pm:962
+#: install_any.pm:961
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -4566,7 +4553,7 @@ msgstr ""
 "\n"
 "Бунга қарамасдан давом этишни истайсизми?"
 
-#: install_interactive.pm:70 install_steps.pm:201
+#: install_interactive.pm:70 install_steps.pm:205
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Сизда /boot/efi нуқтасига уланган дискнинг FAT қисми бўлиши шарт"
@@ -5069,12 +5056,12 @@ msgstr ""
 msgid "http://www.mandrakelinux.com/en/92errata.php3"
 msgstr "http://www.mandrakelinux.com/en/92errata.php3"
 
-#: install_steps.pm:236
+#: install_steps.pm:240
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Бир ҳил улаш нуқталари %s"
 
-#: install_steps.pm:401
+#: install_steps.pm:405
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
@@ -5087,7 +5074,7 @@ msgstr ""
 "Компакт-дискни ўрнатилган компютерда \"rpm -qpl Mandrake/RPMS/*.rpm\" "
 "буйруғи билан текшириб кўринг.\n"
 
-#: install_steps.pm:532
+#: install_steps.pm:536
 #, c-format
 msgid "No floppy drive available"
 msgstr "Ҳеч қандай дискет ускунаси мавжуд эмас"
@@ -5106,12 +5093,12 @@ msgid ""
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: install_steps_gtk.pm:243 install_steps_interactive.pm:583
+#: install_steps_gtk.pm:243 install_steps_interactive.pm:579
 #, c-format
 msgid "Package Group Selection"
 msgstr "Пакетларни гуруҳ бўйича танлаш"
 
-#: install_steps_gtk.pm:303 install_steps_interactive.pm:523
+#: install_steps_gtk.pm:303 install_steps_interactive.pm:519
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Жами: %d / %d Мб"
@@ -5227,12 +5214,12 @@ msgstr "Пакетлар танлови янгиланмоқда"
 msgid "Minimal install"
 msgstr "Минимал ўрнатиш"
 
-#: install_steps_gtk.pm:465 install_steps_interactive.pm:431
+#: install_steps_gtk.pm:465 install_steps_interactive.pm:427
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Сиз ўрнатмоқчи бўлган пакетларни танланг"
 
-#: install_steps_gtk.pm:481 install_steps_interactive.pm:669
+#: install_steps_gtk.pm:481 install_steps_interactive.pm:665
 #, c-format
 msgid "Installing"
 msgstr "Ўрнатилмоқда"
@@ -5267,13 +5254,13 @@ msgstr "%d пакет"
 msgid "Installing package %s"
 msgstr "%s пакети ўрнатилмоқда"
 
-#: install_steps_gtk.pm:614 install_steps_interactive.pm:92
-#: install_steps_interactive.pm:693
+#: install_steps_gtk.pm:614 install_steps_interactive.pm:88
+#: install_steps_interactive.pm:689
 #, c-format
 msgid "Refuse"
 msgstr "Қабул қилмаш"
 
-#: install_steps_gtk.pm:615 install_steps_interactive.pm:694
+#: install_steps_gtk.pm:615 install_steps_interactive.pm:690
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -5288,151 +5275,151 @@ msgstr ""
 "Агар у сизда бўлмаса, бу компакт-дискдан ўрнатишни бекор қилиш учун \"Бекор "
 "қилиш\" тугмасини босинг."
 
-#: install_steps_gtk.pm:630 install_steps_interactive.pm:706
+#: install_steps_gtk.pm:630 install_steps_interactive.pm:702
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Қуйидаги пакетларни саралашда хато рўй берди:"
 
 #: install_steps_gtk.pm:630 install_steps_gtk.pm:634
-#: install_steps_interactive.pm:706 install_steps_interactive.pm:710
+#: install_steps_interactive.pm:702 install_steps_interactive.pm:706
 #, c-format
 msgid "Go on anyway?"
 msgstr "Бунга қарамасдан давом этайми?"
 
-#: install_steps_gtk.pm:634 install_steps_interactive.pm:710
+#: install_steps_gtk.pm:634 install_steps_interactive.pm:706
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "Қуйидаги пакетларни ўрнатишда хато рўй берди:"
 
-#: install_steps_gtk.pm:674 install_steps_interactive.pm:877
-#: install_steps_interactive.pm:1025
+#: install_steps_gtk.pm:674 install_steps_interactive.pm:873
+#: install_steps_interactive.pm:1021
 #, c-format
 msgid "not configured"
 msgstr "мосланмаган"
 
-#: install_steps_interactive.pm:85
+#: install_steps_interactive.pm:81
 #, fuzzy, c-format
 msgid "Do you want to recover your system?"
 msgstr "aboot дастуридан фойдаланишни истайсизми?"
 
-#: install_steps_interactive.pm:86
+#: install_steps_interactive.pm:82
 #, c-format
 msgid "License agreement"
 msgstr "Лицензия келишуви"
 
-#: install_steps_interactive.pm:115
+#: install_steps_interactive.pm:111
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Илтимос тугмалар тартибини танланг."
 
-#: install_steps_interactive.pm:117
+#: install_steps_interactive.pm:113
 #, c-format
 msgid "Here is the full list of keyboards available"
 msgstr "Мавжуд бўлган тугмалар тартибининг рўйхати"
 
-#: install_steps_interactive.pm:147
+#: install_steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Ўрнатиш/Янгилаш"
 
-#: install_steps_interactive.pm:148
+#: install_steps_interactive.pm:144
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Бу ўрнатишми ёки янгилашми?"
 
-#: install_steps_interactive.pm:154
+#: install_steps_interactive.pm:150
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s'ни янгилаш"
 
-#: install_steps_interactive.pm:164
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s учун кодлаш калити"
 
-#: install_steps_interactive.pm:181
+#: install_steps_interactive.pm:177
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Илтимос сичқончанинг турини танланг."
 
-#: install_steps_interactive.pm:190 standalone/mousedrake:56
+#: install_steps_interactive.pm:186 standalone/mousedrake:56
 #, c-format
 msgid "Mouse Port"
 msgstr "Сичқончанинг порти"
 
-#: install_steps_interactive.pm:191 standalone/mousedrake:57
+#: install_steps_interactive.pm:187 standalone/mousedrake:57
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Илтимос сичқонча уланган кетма-кет портини танланг."
 
-#: install_steps_interactive.pm:201
+#: install_steps_interactive.pm:197
 #, c-format
 msgid "Buttons emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:203
+#: install_steps_interactive.pm:199
 #, c-format
 msgid "Button 2 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:204
+#: install_steps_interactive.pm:200
 #, c-format
 msgid "Button 3 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:225
+#: install_steps_interactive.pm:221
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:225
+#: install_steps_interactive.pm:221
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr "PCMCIA карталар мосланмоқда..."
 
-#: install_steps_interactive.pm:232
+#: install_steps_interactive.pm:228
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: install_steps_interactive.pm:232
+#: install_steps_interactive.pm:228
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE'ни мослаш"
 
-#: install_steps_interactive.pm:252 network/tools.pm:217
+#: install_steps_interactive.pm:248 network/tools.pm:217
 #, c-format
 msgid "No partition available"
 msgstr "Дискнинг қисми йўқ."
 
-#: install_steps_interactive.pm:255
+#: install_steps_interactive.pm:251
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Улаш нуқталарини топиш учун дискнинг қисмлари текширилмоқда"
 
-#: install_steps_interactive.pm:262
+#: install_steps_interactive.pm:258
 #, c-format
 msgid "Choose the mount points"
 msgstr "Улаш нуқталарини танланг"
 
-#: install_steps_interactive.pm:292
+#: install_steps_interactive.pm:288
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: install_steps_interactive.pm:329
+#: install_steps_interactive.pm:325
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Формат қилиш учун дискнинг қисмларини танланг"
 
-#: install_steps_interactive.pm:331
+#: install_steps_interactive.pm:327
 #, c-format
 msgid "Check bad blocks?"
 msgstr " Хато блокларни текширайми?"
 
-#: install_steps_interactive.pm:363
+#: install_steps_interactive.pm:359
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
@@ -5441,83 +5428,83 @@ msgstr ""
 "%s файл системасини текшириш муваффақаятсиз тугади. Хатоларни тузатишни "
 "истайсизми? (эсингизда турсин, сиз маълумотни йўқотишингиз мумкин)"
 
-#: install_steps_interactive.pm:366
+#: install_steps_interactive.pm:362
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr ""
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:369
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr ""
 "Мавжуд бўлган пакетларни қидириш ва rpm маълумот базасини бошқадан яратиш "
 "бажарилмоқда..."
 
-#: install_steps_interactive.pm:374 install_steps_interactive.pm:393
+#: install_steps_interactive.pm:370 install_steps_interactive.pm:389
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Мавжуд бўлган пакетлар қидирилмоқда..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:373
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Аллақачон ўрнатилган пакетлар қидирилмоқда..."
 
-#: install_steps_interactive.pm:381
+#: install_steps_interactive.pm:377
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Янгилаш учун пакетлар қидирилмоқда..."
 
-#: install_steps_interactive.pm:402
+#: install_steps_interactive.pm:398
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
 "> %d)"
 msgstr "Системангизда ўрнатиш ёки янгилаш учун етарли жой қолмади (%d > %d)"
 
-#: install_steps_interactive.pm:443
+#: install_steps_interactive.pm:439
 #, c-format
 msgid ""
 "Please choose load or save package selection on floppy.\n"
 "The format is the same as auto_install generated floppies."
 msgstr ""
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:441
 #, c-format
 msgid "Load from floppy"
 msgstr "Дискетдан юклаш"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:441
 #, c-format
 msgid "Save on floppy"
 msgstr "Дискетга сақлаш"
 
-#: install_steps_interactive.pm:449
+#: install_steps_interactive.pm:445
 #, c-format
 msgid "Package selection"
 msgstr "Пакетларни танлаш"
 
-#: install_steps_interactive.pm:449
+#: install_steps_interactive.pm:445
 #, c-format
 msgid "Loading from floppy"
 msgstr "Дискетдан юкланмоқда"
 
-#: install_steps_interactive.pm:454
+#: install_steps_interactive.pm:450
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Пакетлар танлови мавжуд бўлган дискетни қўйинг"
 
-#: install_steps_interactive.pm:536
+#: install_steps_interactive.pm:532
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Танланган ҳажм мавжуд бўлган бўш жойдан катта"
 
-#: install_steps_interactive.pm:551
+#: install_steps_interactive.pm:547
 #, c-format
 msgid "Type of install"
 msgstr "Ўрнатишнинг тури"
 
-#: install_steps_interactive.pm:552
+#: install_steps_interactive.pm:548
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -5526,22 +5513,22 @@ msgstr ""
 "Сиз ҳеч қандай пакетлар гуруҳини танламадингиз.\n"
 "Илтимос сиз истаган минимал ўрнатишни танланг:"
 
-#: install_steps_interactive.pm:556
+#: install_steps_interactive.pm:552
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Асосий қўлланмалар билан (тавсия қилинади!)"
 
-#: install_steps_interactive.pm:557
+#: install_steps_interactive.pm:553
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Ҳақиқий минимал ўрнатиш (хусусан urpmi'сиз)"
 
-#: install_steps_interactive.pm:600 standalone/drakxtv:53
+#: install_steps_interactive.pm:596 standalone/drakxtv:53
 #, c-format
 msgid "All"
 msgstr "Ҳаммаси"
 
-#: install_steps_interactive.pm:644
+#: install_steps_interactive.pm:640
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -5554,17 +5541,17 @@ msgstr ""
 "Агар улардан баъзи бири бўлмаса, уларни танлашни бекор қилинг ва \"Ок\" "
 "тугмасини босинг."
 
-#: install_steps_interactive.pm:649
+#: install_steps_interactive.pm:645
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "\"%s\" белгили компакт-диск"
 
-#: install_steps_interactive.pm:669
+#: install_steps_interactive.pm:665
 #, c-format
 msgid "Preparing installation"
 msgstr "Ўрнатишга таёрланмоқда"
 
-#: install_steps_interactive.pm:678
+#: install_steps_interactive.pm:674
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5573,22 +5560,22 @@ msgstr ""
 "%s пакети ўрнатилмоқда\n"
 "%d%%"
 
-#: install_steps_interactive.pm:724
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Post-install configuration"
 msgstr "Ўрнатишдан кегин мослаш"
 
-#: install_steps_interactive.pm:730
+#: install_steps_interactive.pm:726
 #, c-format
 msgid "Please insert the Boot floppy used in drive %s"
 msgstr "Илтимос ишлатилган юклаш дискетини %s ускунасига қўйинг"
 
-#: install_steps_interactive.pm:736
+#: install_steps_interactive.pm:732
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr ""
 
-#: install_steps_interactive.pm:757
+#: install_steps_interactive.pm:753
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -5601,182 +5588,183 @@ msgid ""
 "Do you want to install the updates ?"
 msgstr ""
 
-#: install_steps_interactive.pm:778
+#: install_steps_interactive.pm:774
 #, c-format
 msgid ""
 "Contacting Mandrake Linux web site to get the list of available mirrors..."
 msgstr ""
 
-#: install_steps_interactive.pm:782
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Пакетларни олиш учун ойнани танланг"
 
-#: install_steps_interactive.pm:796
+#: install_steps_interactive.pm:792
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr ""
 "Мавжуд бўлган пакетларнинг рўйхатини олиш учун ойна билан алоқа "
 "ўрнатилмоқда..."
 
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:796
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Ойна (%s)билан алоқа ўрнатиб бўлмади."
 
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:796
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Бошқадан уриниб кўришни истайсизми?"
 
-#: install_steps_interactive.pm:826 standalone/drakclock:42
+#: install_steps_interactive.pm:822 standalone/drakclock:42
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Вақт зонангизни танланг?"
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:827
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr ""
 
-#: install_steps_interactive.pm:839
+#: install_steps_interactive.pm:835
 #, c-format
 msgid "NTP Server"
 msgstr "NTP сервери"
 
-#: install_steps_interactive.pm:881 steps.pm:30
+#: install_steps_interactive.pm:877 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Ҳисобот"
 
-#: install_steps_interactive.pm:894 install_steps_interactive.pm:902
-#: install_steps_interactive.pm:916 install_steps_interactive.pm:923
-#: install_steps_interactive.pm:1072 services.pm:135
+#: install_steps_interactive.pm:890 install_steps_interactive.pm:898
+#: install_steps_interactive.pm:912 install_steps_interactive.pm:919
+#: install_steps_interactive.pm:1068 services.pm:135
 #: standalone/drakbackup:1921
 #, c-format
 msgid "System"
 msgstr "Система"
 
-#: install_steps_interactive.pm:930 install_steps_interactive.pm:957
-#: install_steps_interactive.pm:974 install_steps_interactive.pm:990
-#: install_steps_interactive.pm:1001
+#: install_steps_interactive.pm:926 install_steps_interactive.pm:953
+#: install_steps_interactive.pm:970 install_steps_interactive.pm:986
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "Hardware"
 msgstr "Асбоб-ускуналар"
 
-#: install_steps_interactive.pm:936 install_steps_interactive.pm:945
+#: install_steps_interactive.pm:932 install_steps_interactive.pm:941
 #, c-format
 msgid "Remote CUPS server"
 msgstr "Масофадаги CUPS сервери"
 
-#: install_steps_interactive.pm:936
+#: install_steps_interactive.pm:932
 #, c-format
 msgid "No printer"
 msgstr "Принтер йўқ"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:974
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Сизда ISA товуш картаси борми?"
 
-#: install_steps_interactive.pm:980
+#: install_steps_interactive.pm:976
 #, c-format
 msgid "Run \"sndconfig\" after installation to configure your sound card"
 msgstr ""
 "Ўрнатишдан кегин, товуш картангизни мослаш учун, \"sndconfig\" дастурини "
 "ишга туширинг."
 
-#: install_steps_interactive.pm:982
+#: install_steps_interactive.pm:978
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Товуш картаси топилмади. Ўрнатишдан кегин \"harddrake\" дастурини синаб "
 "кўринг."
 
-#: install_steps_interactive.pm:1002
+#: install_steps_interactive.pm:998
 #, c-format
 msgid "Graphical interface"
 msgstr "График интерфейс"
 
-#: install_steps_interactive.pm:1008 install_steps_interactive.pm:1023
+#: install_steps_interactive.pm:1004 install_steps_interactive.pm:1019
 #, c-format
 msgid "Network & Internet"
 msgstr "Тармоқ ва Интернет"
 
-#: install_steps_interactive.pm:1024
+#: install_steps_interactive.pm:1020
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Профил "
 
-#: install_steps_interactive.pm:1025
+#: install_steps_interactive.pm:1021
 #, fuzzy, c-format
 msgid "configured"
 msgstr "Бошқадан мослаш"
 
-#: install_steps_interactive.pm:1034 install_steps_interactive.pm:1048
+#: install_steps_interactive.pm:1030 install_steps_interactive.pm:1044
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "Хавфсизлик"
 
-#: install_steps_interactive.pm:1053
+#: install_steps_interactive.pm:1049
 #, c-format
 msgid "activated"
 msgstr "ишлаяпти"
 
-#: install_steps_interactive.pm:1053
+#: install_steps_interactive.pm:1049
 #, c-format
 msgid "disabled"
 msgstr "ўчирилган"
 
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1058
 #, c-format
 msgid "Boot"
 msgstr "Системани юкланиши"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1066
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "%s on %s"
 msgstr "%s %s'да"
 
-#: install_steps_interactive.pm:1077 services.pm:177
+#: install_steps_interactive.pm:1073 services.pm:177
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "Хизматлар: %d ишламоқда %d қайд қилинган"
 
-#: install_steps_interactive.pm:1087
+#: install_steps_interactive.pm:1083
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Сиз X'ни мосламадингиз. Ростдан буни истайсизми?"
 
-#: install_steps_interactive.pm:1145
+#: install_steps_interactive.pm:1141
 #, fuzzy, c-format
 msgid "Set root password and network authentication methods"
 msgstr "Фойдаланувчиларни тасдиқлаш учун махфий сўздан фойдаланиш"
 
-#: install_steps_interactive.pm:1146
+#: install_steps_interactive.pm:1142
 #, c-format
 msgid "Set root password"
 msgstr "Root учун махфий сўз"
 
-#: install_steps_interactive.pm:1157
+#: install_steps_interactive.pm:1152
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "Бу махфий сўз жуда қисқа (у энг ками %d белгидан иборат бўлиши шарт)"
 
-#: install_steps_interactive.pm:1162 network/netconnect.pm:501
-#: standalone/drakauth:26 standalone/drakconnect:819 standalone/logdrake:111
+#: install_steps_interactive.pm:1157 network/netconnect.pm:440
+#: standalone/drakauth:26 standalone/drakconnect:419
+#: standalone/drakconnect:864 standalone/logdrake:111
 #, c-format
 msgid "Authentication"
 msgstr "Тасдиқлаш"
 
-#: install_steps_interactive.pm:1193
+#: install_steps_interactive.pm:1188
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "ОС юклагичи таёрланмоқда..."
 
-#: install_steps_interactive.pm:1203
+#: install_steps_interactive.pm:1198
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -5785,31 +5773,31 @@ msgid ""
 " need to use BootX or some other means to boot your machine"
 msgstr ""
 
-#: install_steps_interactive.pm:1209
+#: install_steps_interactive.pm:1204
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "aboot дастуридан фойдаланишни истайсизми?"
 
-#: install_steps_interactive.pm:1212
+#: install_steps_interactive.pm:1207
 #, c-format
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: install_steps_interactive.pm:1223
+#: install_steps_interactive.pm:1218
 #, c-format
 msgid "Installing bootloader"
 msgstr "ОС юклагичи ўрнатилмоқда"
 
-#: install_steps_interactive.pm:1230
+#: install_steps_interactive.pm:1225
 #, c-format
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 "Операцион система юклагичини ўрнатиш муваффақаятсиз тугади. Қуйидаги хато "
 "рўй берди:"
 
-#: install_steps_interactive.pm:1235
+#: install_steps_interactive.pm:1230
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -5820,17 +5808,17 @@ msgid ""
 "At your next boot you should see the bootloader prompt."
 msgstr ""
 
-#: install_steps_interactive.pm:1277 standalone/drakautoinst:75
+#: install_steps_interactive.pm:1272 standalone/drakautoinst:75
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Бўш дикетни %s ускунасига қўйинг"
 
-#: install_steps_interactive.pm:1281
+#: install_steps_interactive.pm:1276
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Авто-ўрнатиш дикети яратилмоқда..."
 
-#: install_steps_interactive.pm:1292
+#: install_steps_interactive.pm:1287
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -5841,12 +5829,12 @@ msgstr ""
 "\n"
 "Ростдан чиқишни истайсизми?"
 
-#: install_steps_interactive.pm:1307
+#: install_steps_interactive.pm:1302
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Авто-ўрнатиш дикетни яратиш"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1304
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -5878,7 +5866,7 @@ msgstr "Файлни танланг"
 msgid "Basic"
 msgstr "Асосий"
 
-#: interactive.pm:403 interactive/newt.pm:300 ugtk2.pm:494
+#: interactive.pm:403 interactive/newt.pm:300 ugtk2.pm:502
 #, c-format
 msgid "Finish"
 msgstr "Тайёр"
@@ -6876,7 +6864,7 @@ msgstr "Фарер Ороллари"
 msgid "Gabon"
 msgstr "Габон"
 
-#: lang.pm:237 network/netconnect.pm:60 network/netconnect.pm:294
+#: lang.pm:237 network/netconnect.pm:58 network/netconnect.pm:252
 #, c-format
 msgid "United Kingdom"
 msgstr "Буюк Британия"
@@ -7686,13 +7674,7 @@ msgstr ""
 msgid "Remove the logical volumes first\n"
 msgstr ""
 
-#: modules.pm:323
-#, c-format
-msgid ""
-"PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."
-msgstr ""
-
-#: modules/interactive.pm:20 standalone/drakconnect:864
+#: modules/interactive.pm:20 standalone/drakconnect:909
 #, c-format
 msgid "Parameters"
 msgstr "Параметерлар"
@@ -7804,27 +7786,27 @@ msgstr ""
 "%s модулини юклаш муваффақият сиз тугади.\n"
 "Бошқа параметрлар билан яна уриниб кўришни истайсизми?"
 
-#: modules/parameters.pm:46
+#: modules/parameters.pm:45
 #, c-format
 msgid "a number"
 msgstr "сон"
 
-#: modules/parameters.pm:48
+#: modules/parameters.pm:47
 #, c-format
 msgid "%d comma separated numbers"
 msgstr "%d вергул билан ажратилган сонлар"
 
-#: modules/parameters.pm:48
+#: modules/parameters.pm:47
 #, c-format
 msgid "%d comma separated strings"
 msgstr "%d вергул билан ажратилган қаторлар"
 
-#: modules/parameters.pm:50
+#: modules/parameters.pm:49
 #, c-format
 msgid "comma separated numbers"
 msgstr "вергул билан ажратилган сонлар"
 
-#: modules/parameters.pm:50
+#: modules/parameters.pm:49
 #, c-format
 msgid "comma separated strings"
 msgstr "вергул билан ажратилган қаторлар"
@@ -7854,7 +7836,12 @@ msgstr "Ғилдиракли андоза PS2 сичқонча"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: mouse.pm:35
+#: mouse.pm:35 network/modem.pm:24 network/modem.pm:38 network/modem.pm:43
+#: network/modem.pm:75 network/netconnect.pm:429 network/netconnect.pm:430
+#: network/netconnect.pm:431 network/netconnect.pm:451
+#: network/netconnect.pm:456 network/netconnect.pm:469
+#: network/netconnect.pm:474 network/netconnect.pm:490
+#: network/netconnect.pm:492
 #, fuzzy, c-format
 msgid "Automatic"
 msgstr "Автоматик IP"
@@ -8049,7 +8036,7 @@ msgstr "Sagem (pppoa'ни ишлатиб) usb"
 msgid "Sagem (using dhcp) usb"
 msgstr "Sagem (dhcp'ни ишлатиб) usb"
 
-#: network/adsl.pm:36 network/netconnect.pm:304
+#: network/adsl.pm:36
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Интернетга уланиш"
@@ -8228,7 +8215,7 @@ msgstr "Бошқа портлар"
 
 #: network/isdn.pm:127 network/isdn.pm:145 network/isdn.pm:157
 #: network/isdn.pm:163 network/isdn.pm:173 network/isdn.pm:183
-#: network/netconnect.pm:373
+#: network/netconnect.pm:313
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN'ни мослаш"
@@ -8242,7 +8229,7 @@ msgstr ""
 "Провайдерингизни танланг.\n"
 "Агар рўйхатда йўқ бўлса, \"Рўйхатда йўқ\"ни танланг."
 
-#: network/isdn.pm:140 standalone/drakconnect:416
+#: network/isdn.pm:140 standalone/drakconnect:459
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Ойропа протоколи (EDSS1)"
@@ -8252,7 +8239,7 @@ msgstr "Ойропа протоколи (EDSS1)"
 msgid "European protocol"
 msgstr "Ойропа протоколи"
 
-#: network/isdn.pm:142 standalone/drakconnect:417
+#: network/isdn.pm:142 standalone/drakconnect:460
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -8330,137 +8317,139 @@ msgstr "Тўхтатиш"
 msgid "Which of the following is your ISDN card?"
 msgstr "Қуйидагиларнинг қайи бири сизнинг ISDN картангиз?"
 
-#: network/netconnect.pm:88
+#: network/modem.pm:22 network/netconnect.pm:409 network/netconnect.pm:441
+#: standalone/drakconnect:434 standalone/drakconnect:864
+#, c-format
+msgid "Script-based"
+msgstr "Скриптда асосланган"
+
+#: network/modem.pm:22 network/netconnect.pm:409 network/netconnect.pm:441
+#: standalone/drakconnect:434 standalone/drakconnect:864
+#, c-format
+msgid "PAP"
+msgstr "PAP"
+
+#: network/modem.pm:22 network/netconnect.pm:409 network/netconnect.pm:441
+#: standalone/drakconnect:434 standalone/drakconnect:864
+#, c-format
+msgid "Terminal-based"
+msgstr "Терминалда асосланган"
+
+#: network/modem.pm:22 network/netconnect.pm:409 network/netconnect.pm:441
+#: standalone/drakconnect:434 standalone/drakconnect:864
+#, c-format
+msgid "CHAP"
+msgstr "CHAP"
+
+#: network/modem.pm:22 network/netconnect.pm:409 network/netconnect.pm:441
+#, fuzzy, c-format
+msgid "PAP/CHAP"
+msgstr "CHAP"
+
+#: network/netconnect.pm:97
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: network/netconnect.pm:89
+#: network/netconnect.pm:98
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "Тил"
 
-#: network/netconnect.pm:90
+#: network/netconnect.pm:99
 #, fuzzy, c-format
 msgid "Master"
 msgstr "Маёт"
 
-#: network/netconnect.pm:91
+#: network/netconnect.pm:100
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "Тиклаш"
 
-#: network/netconnect.pm:92
+#: network/netconnect.pm:101
 #, fuzzy, c-format
 msgid "Secondary"
 msgstr "Иккиламчи"
 
-#: network/netconnect.pm:93
+#: network/netconnect.pm:102
 #, fuzzy, c-format
 msgid "Auto"
 msgstr "Ҳақида"
 
-#: network/netconnect.pm:96 printer/printerdrake.pm:1109 standalone/drakups:64
+#: network/netconnect.pm:105 printer/printerdrake.pm:1109
+#: standalone/drakups:64
 #, c-format
 msgid "Manual configuration"
 msgstr ""
 
-#: network/netconnect.pm:97 network/netconnect.pm:567
+#: network/netconnect.pm:106
+#, fuzzy, c-format
+msgid "Automatic IP (BOOTP/DHCP)"
+msgstr "Автоматик IP"
+
+#: network/netconnect.pm:108 network/netconnect.pm:558
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr ""
 
-#: network/netconnect.pm:146 standalone/drakconnect:54
+#: network/netconnect.pm:141 standalone/drakconnect:53
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Тармоқ ва Интернетни мослаш"
 
-#: network/netconnect.pm:151
-#, c-format
-msgid ""
-"Welcome to The Network Configuration Wizard.\n"
-"\n"
-"We are about to configure your internet/network connection.\n"
-"If you don't want to use the auto detection, deselect the checkbox.\n"
-msgstr ""
-"Тармоқни мослаш ёрдамчисига марҳамат.\n"
-"Биз Интернетга/тармоққа уланишингизни мослаш арафасидамиз.\n"
-"Агар авто-аниқлашдан фойдаланмоқчи бўлмасангиз, белгини олиб ташланг.\n"
-
-#: network/netconnect.pm:159 printer/printerdrake.pm:3848
-#, c-format
-msgid "Expert Mode"
-msgstr "Эксперт усули"
-
-#: network/netconnect.pm:163
-#, c-format
-msgid "Network Configuration Wizard"
-msgstr "Тармоқни мослаш ёрдамчиси"
-
-#: network/netconnect.pm:163 printer/printerdrake.pm:921
-#, c-format
-msgid "Detecting devices..."
-msgstr "Ускуналар аниқланилмоқда..."
-
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:183
-#, c-format
-msgid "Normal modem connection"
-msgstr "Модем орқали оддий уланиш"
-
-#: network/netconnect.pm:183
+#: network/netconnect.pm:152
 #, fuzzy, c-format
-msgid "(detected on port %s)"
-msgstr "%s портида топилди"
-
-#: network/netconnect.pm:184
-#, c-format
-msgid "Winmodem connection"
+msgid "Modem connection"
 msgstr "Вин-модем орқали уланиш"
 
-#: network/netconnect.pm:184 network/netconnect.pm:186
-#: network/netconnect.pm:187 network/netconnect.pm:188
-#: network/netconnect.pm:190
+#: network/netconnect.pm:152
 #, fuzzy, c-format
-msgid "(detected)"
-msgstr "топилди"
+msgid "(detected on port %s)"
+msgstr "%s портида топилди"
 
-#: network/netconnect.pm:185
+#: network/netconnect.pm:154
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN орқали уланиш"
 
-#: network/netconnect.pm:185
+#: network/netconnect.pm:154
 #, fuzzy, c-format
 msgid "(detected %s)"
 msgstr "%s топилди"
 
-#: network/netconnect.pm:186
+#: network/netconnect.pm:155
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL орқали уланиш"
 
-#: network/netconnect.pm:187
+#: network/netconnect.pm:155 network/netconnect.pm:156
+#: network/netconnect.pm:157 network/netconnect.pm:159
+#, fuzzy, c-format
+msgid "(detected)"
+msgstr "топилди"
+
+#: network/netconnect.pm:156
 #, c-format
 msgid "Cable connection"
 msgstr "Кабел орқали уланиш"
 
-#: network/netconnect.pm:188
+#: network/netconnect.pm:157
 #, c-format
 msgid "LAN connection"
 msgstr "LAN орқали уланиш"
 
-#: network/netconnect.pm:190
+#: network/netconnect.pm:159
 #, fuzzy, c-format
 msgid "Wireless connection"
 msgstr "Кабел орқали уланиш"
 
-#: network/netconnect.pm:209
+#: network/netconnect.pm:178
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Сиз мосламоқчи бўлган уланишни танланг"
 
-#: network/netconnect.pm:250
+#: network/netconnect.pm:208
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -8473,133 +8462,127 @@ msgstr ""
 "\n"
 "Давом этиш учун \"%s\" тугмасини босинг."
 
-#: network/netconnect.pm:260
+#: network/netconnect.pm:218
 #, c-format
 msgid "Connection Configuration"
 msgstr "Алоқани мослаш"
 
-#: network/netconnect.pm:261
+#: network/netconnect.pm:219
 #, c-format
 msgid "Please fill or check the field below"
 msgstr ""
 
-#: network/netconnect.pm:267 standalone/drakconnect:407
-#: standalone/drakconnect:801
+#: network/netconnect.pm:225 standalone/drakconnect:450
+#: standalone/drakconnect:846
 #, c-format
 msgid "Card IRQ"
 msgstr "Картанинг IRQ'си"
 
-#: network/netconnect.pm:268 standalone/drakconnect:408
-#: standalone/drakconnect:802
+#: network/netconnect.pm:226 standalone/drakconnect:451
+#: standalone/drakconnect:847
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Картанинг хотираси (DMA)"
 
-#: network/netconnect.pm:269 standalone/drakconnect:409
-#: standalone/drakconnect:803
+#: network/netconnect.pm:227 standalone/drakconnect:452
+#: standalone/drakconnect:848
 #, c-format
 msgid "Card IO"
 msgstr "Картанинг IO'си"
 
-#: network/netconnect.pm:270 standalone/drakconnect:804
+#: network/netconnect.pm:228 standalone/drakconnect:453
+#: standalone/drakconnect:849
 #, c-format
 msgid "Card IO_0"
 msgstr "Картанинг IO_0'си"
 
-#: network/netconnect.pm:271 standalone/drakconnect:410
-#: standalone/drakconnect:805
+#: network/netconnect.pm:229 standalone/drakconnect:850
 #, c-format
 msgid "Card IO_1"
 msgstr "Картанинг IO_1'си"
 
-#: network/netconnect.pm:272 standalone/drakconnect:806
+#: network/netconnect.pm:230 standalone/drakconnect:851
 #, c-format
 msgid "Your personal phone number"
 msgstr "Шахсий телефон рақамингиз"
 
-#: network/netconnect.pm:273 standalone/drakconnect:807
+#: network/netconnect.pm:231 standalone/drakconnect:852
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "Провайдернинг номи (м-н provider.net)"
 
-#: network/netconnect.pm:274 standalone/drakconnect:808
+#: network/netconnect.pm:232 standalone/drakconnect:431
+#: standalone/drakconnect:853
 #, c-format
 msgid "Provider phone number"
 msgstr "Провайдернинг телефон рақами"
 
-#: network/netconnect.pm:275 standalone/drakconnect:809
+#: network/netconnect.pm:233 standalone/drakconnect:854
 #, c-format
 msgid "Provider dns 1 (optional)"
 msgstr "Провайдернинг DNS 1 (танласа бўлади)"
 
-#: network/netconnect.pm:276 standalone/drakconnect:810
+#: network/netconnect.pm:234 standalone/drakconnect:855
 #, c-format
 msgid "Provider dns 2 (optional)"
 msgstr "Провайдернинг DNS 2 (танласа бўлади)"
 
-#: network/netconnect.pm:277
+#: network/netconnect.pm:235
 #, c-format
 msgid "Choose your country"
 msgstr "Давлатингизни танланг"
 
-#: network/netconnect.pm:278 standalone/drakconnect:348
-#: standalone/drakconnect:813
+#: network/netconnect.pm:236 standalone/drakconnect:389
+#: standalone/drakconnect:858
 #, c-format
 msgid "Dialing mode"
 msgstr ""
 
-#: network/netconnect.pm:279 standalone/drakconnect:353
-#: standalone/drakconnect:825
+#: network/netconnect.pm:237 standalone/drakconnect:394
+#: standalone/drakconnect:870
 #, c-format
 msgid "Connection speed"
 msgstr "Алоқанинг тезлиги"
 
-#: network/netconnect.pm:280 standalone/drakconnect:358
-#: standalone/drakconnect:826
+#: network/netconnect.pm:238 standalone/drakconnect:399
+#: standalone/drakconnect:871
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Алоқа таймаути (сонияда)"
 
-#: network/netconnect.pm:283 standalone/drakconnect:385
-#: standalone/drakconnect:811
+#: network/netconnect.pm:241 standalone/drakconnect:429
+#: standalone/drakconnect:856
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Фойдаланувчи"
 
-#: network/netconnect.pm:284 standalone/drakconnect:386
-#: standalone/drakconnect:812 standalone/drakconnect:846
+#: network/netconnect.pm:242 standalone/drakconnect:430
+#: standalone/drakconnect:857 standalone/drakconnect:891
 #, c-format
 msgid "Account Password"
 msgstr "Махфий сўз"
 
-#: network/netconnect.pm:305
-#, c-format
-msgid "Which dhcp client do you want to use ? (default is dhcp-client)"
-msgstr ""
-"Қайси DHCP клиентидан фойдаланмоқчисиз?\n"
-"Андоза - DHCP-клиенти"
-
-#: network/netconnect.pm:342
+#: network/netconnect.pm:281
 #, c-format
 msgid "What kind is your ISDN connection?"
 msgstr ""
 
-#: network/netconnect.pm:343
+#: network/netconnect.pm:282
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Ички ISDN карта"
 
-#: network/netconnect.pm:343
+#: network/netconnect.pm:282
 #, c-format
 msgid "External ISDN modem"
 msgstr "Ташқи ISDN модем"
 
-#: network/netconnect.pm:373
+#: network/netconnect.pm:313
 #, c-format
 msgid "Do you want to start a new configuration ?"
 msgstr "Янги мослашни бошлашни истайсизми?"
 
-#: network/netconnect.pm:376
+#: network/netconnect.pm:316
 #, c-format
 msgid ""
 "I have detected an ISDN PCI card, but I don't know its type. Please select a "
@@ -8608,18 +8591,13 @@ msgstr ""
 "Мен ISDN PCI картани топдим, аммо менга унинг тури номаълум. Илтимос кейинги "
 "ойнада PCI картани танланг."
 
-#: network/netconnect.pm:385
+#: network/netconnect.pm:325
 #, c-format
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 "ISDN PCI картаси топилмади. Илтимос кейинги ойнада бирортасини танланг."
 
-#: network/netconnect.pm:400 network/netconnect.pm:430
-#, c-format
-msgid "You don't have any winmodem"
-msgstr ""
-
-#: network/netconnect.pm:409 network/netconnect.pm:435
+#: network/netconnect.pm:334
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -8628,101 +8606,120 @@ msgstr ""
 "Модемингизни бу системада ишлатиб бўлмайди.\n"
 "http://www.linmodem.org веб-сайтига қаранг."
 
-#: network/netconnect.pm:411
-#, c-format
-msgid "Title"
-msgstr "Сарлавҳа"
-
-#: network/netconnect.pm:411
-#, c-format
-msgid ""
-"\"%s\" based winmodem detected, do you want to install needed software ?"
-msgstr ""
-"\"%s\"да асосланган вин-модем аниқланди, керак бўлган дастурларни ўрнатишни "
-"истайсизми?"
-
-#: network/netconnect.pm:411
-#, c-format
-msgid "Install rpm"
-msgstr "rpm'ни ўрнатиш"
-
-#: network/netconnect.pm:411
-#, c-format
-msgid "Do nothing"
-msgstr "Ҳеч нима қилмаш"
+#: network/netconnect.pm:345
+#, fuzzy, c-format
+msgid "Select the modem to configure:"
+msgstr "Тармоқ интерфейсини танлаш"
 
-#: network/netconnect.pm:481
+#: network/netconnect.pm:385
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Илтимос, модем уланган кетма-кет портини танланг."
 
-#: network/netconnect.pm:495
-#, c-format
-msgid "Dialup options"
-msgstr ""
+#: network/netconnect.pm:429 network/netconnect.pm:430
+#: network/netconnect.pm:431 network/netconnect.pm:456
+#: network/netconnect.pm:474 network/netconnect.pm:490
+#, fuzzy, c-format
+msgid "Manual"
+msgstr "Мянмар"
 
-#: network/netconnect.pm:497 standalone/drakconnect:815
+#: network/netconnect.pm:433
+#, fuzzy, c-format
+msgid "Dialup: account options"
+msgstr "Улаш параметрлари"
+
+#: network/netconnect.pm:436 standalone/drakconnect:860
 #, c-format
 msgid "Connection name"
 msgstr "Уланишнинг номи"
 
-#: network/netconnect.pm:498 standalone/drakconnect:816
+#: network/netconnect.pm:437 standalone/drakconnect:861
 #, c-format
 msgid "Phone number"
 msgstr "Телефон рақами"
 
-#: network/netconnect.pm:499 standalone/drakconnect:817
+#: network/netconnect.pm:438 standalone/drakconnect:862
 #, c-format
 msgid "Login ID"
 msgstr "Фойдаланувчи"
 
-#: network/netconnect.pm:501 standalone/drakconnect:819
-#, c-format
-msgid "PAP"
-msgstr "PAP"
+#: network/netconnect.pm:453 network/netconnect.pm:487
+#, fuzzy, c-format
+msgid "Dialup: IP parameters"
+msgstr "Параметерлар"
 
-#: network/netconnect.pm:501 standalone/drakconnect:819
+#: network/netconnect.pm:456 network/netconnect.pm:594
+#: printer/printerdrake.pm:426 standalone/drakconnect:118
+#: standalone/drakconnect:302 standalone/drakconnect:711
+#: standalone/drakups:266
 #, c-format
-msgid "Terminal-based"
-msgstr "Терминалда асосланган"
+msgid "IP address"
+msgstr "IP рақами"
 
-#: network/netconnect.pm:501 standalone/drakconnect:819
+#: network/netconnect.pm:457 network/netconnect.pm:475
+#: standalone/drakconnect:865
 #, c-format
-msgid "Script-based"
-msgstr "Скриптда асосланган"
+msgid "Domain name"
+msgstr ""
 
-#: network/netconnect.pm:501 standalone/drakconnect:819
-#, c-format
-msgid "CHAP"
-msgstr "CHAP"
+#: network/netconnect.pm:458
+#, fuzzy, c-format
+msgid "IP adress"
+msgstr "IP рақами"
+
+#: network/netconnect.pm:459
+#, fuzzy, c-format
+msgid "Subnet mask"
+msgstr "Тармоқ маскаси"
 
-#: network/netconnect.pm:502 standalone/drakconnect:820
+#: network/netconnect.pm:471
 #, c-format
-msgid "Domain name"
+msgid "Dialup: DNS parameters"
 msgstr ""
 
-#: network/netconnect.pm:503 standalone/drakconnect:821
+#: network/netconnect.pm:474
+#, fuzzy, c-format
+msgid "DNS"
+msgstr "NIS"
+
+#: network/netconnect.pm:476 standalone/drakconnect:866
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "Биринчи DNS сервери (танлаб бўлади)"
 
-#: network/netconnect.pm:504 standalone/drakconnect:822
+#: network/netconnect.pm:477 standalone/drakconnect:867
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "Иккинчи DNS сервери (танлаб бўлади)"
 
-#: network/netconnect.pm:526
+#: network/netconnect.pm:478
+#, fuzzy, c-format
+msgid "Set hostname from IP"
+msgstr "Компютернинг номи ёки IP рақами"
+
+#: network/netconnect.pm:490 standalone/drakconnect:312
+#: standalone/drakconnect:859
+#, c-format
+msgid "Gateway"
+msgstr "Гейтвэй"
+
+#: network/netconnect.pm:491
+#, fuzzy, c-format
+msgid "Gateway IP address"
+msgstr "IP рақами"
+
+#: network/netconnect.pm:515
 #, fuzzy, c-format
 msgid "Select the network interface to configure:"
 msgstr "Тармоқ интерфейсини танлаш"
 
-#: network/netconnect.pm:527 network/shorewall.pm:77
-#: standalone/drakconnect:493 standalone/drakgw:212
+#: network/netconnect.pm:516 network/shorewall.pm:77
+#: standalone/drakconnect:538 standalone/drakgw:218
 #, c-format
 msgid "Net Device"
 msgstr "Тармоқ ускунаси"
 
-#: network/netconnect.pm:542
+#: network/netconnect.pm:532
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
@@ -8731,19 +8728,24 @@ msgid ""
 "Modifying the fields below will override this configuration."
 msgstr ""
 
-#: network/netconnect.pm:560 network/netconnect.pm:589
+#: network/netconnect.pm:550
+#, fuzzy, c-format
+msgid "Zeroconf hostname resolution"
+msgstr "Zeroconf компютернинг номи"
+
+#: network/netconnect.pm:551 network/netconnect.pm:581
 #, fuzzy, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Тармоқ ускунаси (%s) мосланмоқда"
 
-#: network/netconnect.pm:561
+#: network/netconnect.pm:552
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:590
+#: network/netconnect.pm:582
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -8754,95 +8756,93 @@ msgstr ""
 "Ёзувнинг ҳар қайси нуқта билан ажратилган ўнлик сон шаклида\n"
 "IP рақам бўлиши керак (м-н 1.2.3.4)."
 
-#: network/netconnect.pm:597
+#: network/netconnect.pm:589
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr ""
 
-#: network/netconnect.pm:598
+#: network/netconnect.pm:590
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP хостнинг номи"
 
-#: network/netconnect.pm:602 printer/printerdrake.pm:426
-#: standalone/drakconnect:119 standalone/drakconnect:263
-#: standalone/drakconnect:666 standalone/drakups:266
-#, c-format
-msgid "IP address"
-msgstr "IP рақами"
-
-#: network/netconnect.pm:603 standalone/drakconnect:268
-#: standalone/drakconnect:667 standalone/drakgw:305
+#: network/netconnect.pm:595 standalone/drakconnect:307
+#: standalone/drakconnect:712 standalone/drakgw:313
 #, c-format
 msgid "Netmask"
 msgstr "Тармоқ маскаси"
 
-#: network/netconnect.pm:605 standalone/drakconnect:341
+#: network/netconnect.pm:597 standalone/drakconnect:382
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr ""
 
-#: network/netconnect.pm:606 standalone/drakconnect:342
+#: network/netconnect.pm:598 standalone/drakconnect:383
 #, c-format
 msgid "Network Hotplugging"
 msgstr ""
 
-#: network/netconnect.pm:607 standalone/drakconnect:336
+#: network/netconnect.pm:599 standalone/drakconnect:377
 #, c-format
 msgid "Start at boot"
 msgstr "Система юкланаётганда ишга тушириш"
 
-#: network/netconnect.pm:615 printer/printerdrake.pm:1340
+#: network/netconnect.pm:600 standalone/drakconnect:715
+#, c-format
+msgid "DHCP client"
+msgstr "DHCP клиенти"
+
+#: network/netconnect.pm:609 printer/printerdrake.pm:1340
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP рақами қуйидаги форматда бўлиши шарт: 1.2.3.4"
 
-#: network/netconnect.pm:618
+#: network/netconnect.pm:612
 #, c-format
 msgid "Warning : IP address %s is usually reserved !"
 msgstr ""
 
-#: network/netconnect.pm:647
+#: network/netconnect.pm:636
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr ""
 
-#: network/netconnect.pm:649 standalone/drakconnect:306
+#: network/netconnect.pm:638 standalone/drakconnect:347
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Эксперт усули"
 
-#: network/netconnect.pm:651 standalone/drakconnect:307
+#: network/netconnect.pm:640 standalone/drakconnect:348
 #, c-format
 msgid "Netwok name (ESSID)"
 msgstr ""
 
-#: network/netconnect.pm:652 standalone/drakconnect:308
+#: network/netconnect.pm:641 standalone/drakconnect:349
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Тармоқ"
 
-#: network/netconnect.pm:653 standalone/drakconnect:309
+#: network/netconnect.pm:642 standalone/drakconnect:350
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: network/netconnect.pm:654 standalone/drakconnect:310
+#: network/netconnect.pm:643 standalone/drakconnect:351
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:655 standalone/drakconnect:311
+#: network/netconnect.pm:644 standalone/drakconnect:352
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: network/netconnect.pm:657 standalone/drakconnect:322
+#: network/netconnect.pm:646 standalone/drakconnect:363
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: network/netconnect.pm:658
+#: network/netconnect.pm:647
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -8856,17 +8856,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:665 standalone/drakconnect:323
+#: network/netconnect.pm:654 standalone/drakconnect:364
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Ўйин станцияси"
 
-#: network/netconnect.pm:666 standalone/drakconnect:324
+#: network/netconnect.pm:655 standalone/drakconnect:365
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:667
+#: network/netconnect.pm:656
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -8876,12 +8876,12 @@ msgid ""
 "See iwpconfig(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:672 standalone/drakconnect:325
+#: network/netconnect.pm:661 standalone/drakconnect:366
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:673
+#: network/netconnect.pm:662
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -8893,12 +8893,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:681 standalone/drakconnect:326
+#: network/netconnect.pm:670 standalone/drakconnect:367
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:682
+#: network/netconnect.pm:671
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -8916,7 +8916,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:696
+#: network/netconnect.pm:685
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -8925,14 +8925,14 @@ msgstr ""
 "Частота \"M\" ёки \"G\" билан тугаши керак (масалан, 2.46 GHz учун\n"
 "\"2.46G\"), ёки етарлича \"0\" (нол) қўшинг."
 
-#: network/netconnect.pm:700
+#: network/netconnect.pm:689
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:718
+#: network/netconnect.pm:708
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
@@ -8941,12 +8941,12 @@ msgstr ""
 "Сизнинг системангизда ethernet тармоқ адаптери топилмади.\n"
 "Мен алоқанинг бундай турини ўрнатолмайман."
 
-#: network/netconnect.pm:722 standalone/drakgw:248 standalone/drakpxe:142
+#: network/netconnect.pm:712 standalone/drakgw:254 standalone/drakpxe:142
 #, c-format
 msgid "Choose the network interface"
 msgstr "Тармоқ интерфейсини танлаш"
 
-#: network/netconnect.pm:723
+#: network/netconnect.pm:713
 #, c-format
 msgid ""
 "Please choose which network adapter you want to use to connect to Internet."
@@ -8954,7 +8954,7 @@ msgstr ""
 "Илтимос, Интернетга уланиш учун қайси тармоқ адаптеридан фойдаланишни "
 "танланг."
 
-#: network/netconnect.pm:742
+#: network/netconnect.pm:732
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -8963,74 +8963,74 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one."
 msgstr ""
 
-#: network/netconnect.pm:747
+#: network/netconnect.pm:737
 #, c-format
 msgid "Host name"
 msgstr "Компютернинг номи"
 
-#: network/netconnect.pm:748
+#: network/netconnect.pm:738
 #, fuzzy, c-format
 msgid "DNS server 1"
 msgstr "DNS сервери"
 
-#: network/netconnect.pm:749
+#: network/netconnect.pm:739
 #, fuzzy, c-format
 msgid "DNS server 2"
 msgstr "DNS сервери"
 
-#: network/netconnect.pm:750
+#: network/netconnect.pm:740
 #, fuzzy, c-format
 msgid "DNS server 3"
 msgstr "DNS сервери"
 
-#: network/netconnect.pm:751
+#: network/netconnect.pm:741
 #, fuzzy, c-format
 msgid "Search domain"
 msgstr "Қидириш:"
 
-#: network/netconnect.pm:752
+#: network/netconnect.pm:742
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
-#: network/netconnect.pm:753
+#: network/netconnect.pm:743
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Гейтвэй (м-н %s)"
 
-#: network/netconnect.pm:755
+#: network/netconnect.pm:745
 #, c-format
 msgid "Gateway device"
 msgstr "Гейтвэй ускунаси"
 
-#: network/netconnect.pm:760
+#: network/netconnect.pm:753
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS сервернинг манзили қуйидаги форматда бўлиши шарт: 1.2.3.4"
 
-#: network/netconnect.pm:764
+#: network/netconnect.pm:758
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr ""
 
-#: network/netconnect.pm:777
+#: network/netconnect.pm:772
 #, c-format
 msgid ""
 "Enter a Zeroconf host name which will be the one that your machine will get "
 "back to other machines on the network:"
 msgstr ""
 
-#: network/netconnect.pm:778
+#: network/netconnect.pm:773
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf компютернинг номи"
 
-#: network/netconnect.pm:781
+#: network/netconnect.pm:776
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf компютернинг номида \".\" белгиси бўлмаши керкак"
 
-#: network/netconnect.pm:790
+#: network/netconnect.pm:785
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -9041,33 +9041,33 @@ msgstr ""
 "Фойданиш учун биттасини танланг.\n"
 "\n"
 
-#: network/netconnect.pm:791
+#: network/netconnect.pm:786
 #, c-format
 msgid "Internet connection"
 msgstr "Интернетга уланиш"
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:793
 #, c-format
 msgid "Configuration is complete, do you want to apply settings ?"
 msgstr "Мослаш бажарилди, мосламаларни қўллашни истайсизми?"
 
-#: network/netconnect.pm:809
+#: network/netconnect.pm:804
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Система юкланаётганда уланишни истайсизми?"
 
-#: network/netconnect.pm:832
+#: network/netconnect.pm:827
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it ?"
 msgstr ""
 "Тармоқни бошқадан ишга тушириш керак. Уни бошқадан ишга туширишни истайсизми?"
 
-#: network/netconnect.pm:837 network/netconnect.pm:902
+#: network/netconnect.pm:832 network/netconnect.pm:897
 #, c-format
 msgid "Network Configuration"
 msgstr "Тармоқни мослаш"
 
-#: network/netconnect.pm:838
+#: network/netconnect.pm:833
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -9078,27 +9078,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:847
+#: network/netconnect.pm:842
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Интернетга уланишга уриниб кўришни истайсизми?"
 
-#: network/netconnect.pm:855 standalone/drakconnect:860
+#: network/netconnect.pm:850 standalone/drakconnect:905
 #, c-format
 msgid "Testing your connection..."
 msgstr "Алоқа синаб кўрилмоқда..."
 
-#: network/netconnect.pm:871
+#: network/netconnect.pm:866
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Система Интернетга уланган."
 
-#: network/netconnect.pm:872
+#: network/netconnect.pm:867
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr ""
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:868
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -9107,7 +9107,7 @@ msgstr ""
 "Система Интернетга уланмаганга ўхшайди.\n"
 "Алоқани бошқадан мослашга уриниб кўринг."
 
-#: network/netconnect.pm:887
+#: network/netconnect.pm:882
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -9116,7 +9116,7 @@ msgstr ""
 "Табриклаймиз, тармоқни ва Интернетни мослаш тугади.\n"
 "\n"
 
-#: network/netconnect.pm:890
+#: network/netconnect.pm:885
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -9126,7 +9126,7 @@ msgstr ""
 "олдини олиш учун X муҳитингизни бошқадан ишга туширишни биз тавсия қиламиз."
 
 # next_start
-#: network/netconnect.pm:891
+#: network/netconnect.pm:886
 #, c-format
 msgid ""
 "Problems occured during configuration.\n"
@@ -9134,7 +9134,7 @@ msgid ""
 "work, you might want to relaunch the configuration."
 msgstr ""
 
-#: network/netconnect.pm:903
+#: network/netconnect.pm:898
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -9146,27 +9146,27 @@ msgstr ""
 "Тармоқни мосламаларини сақлаб қолиш учун \"Ок\" тугмасини босинг, Интернетга "
 "ва тармоқга уланишни бошқадан мослаш учун \"Бекор қилиш\" тугмасини босинг.\n"
 
-#: network/network.pm:320
+#: network/network.pm:328
 #, c-format
 msgid "Proxies configuration"
 msgstr "Проксиларни мослаш"
 
-#: network/network.pm:321
+#: network/network.pm:329
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP прокси"
 
-#: network/network.pm:322
+#: network/network.pm:330
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP прокси"
 
-#: network/network.pm:325
+#: network/network.pm:333
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Прокси \"http://...\" бўлиши керак"
 
-#: network/network.pm:326
+#: network/network.pm:334
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL \"'ftp:\" ёки \"http:\" билан бошланиши шарт"
@@ -10283,6 +10283,11 @@ msgstr ""
 msgid "Printer auto-detection"
 msgstr "Принтерни авто-аниқлаш"
 
+#: printer/printerdrake.pm:921
+#, c-format
+msgid "Detecting devices..."
+msgstr "Ускуналар аниқланилмоқда..."
+
 #: printer/printerdrake.pm:943
 #, c-format
 msgid ", network printer \"%s\", port %s"
@@ -10817,7 +10822,7 @@ msgstr ""
 msgid "Name of printer"
 msgstr "Принтернинг номи"
 
-#: printer/printerdrake.pm:2156 standalone/drakconnect:433
+#: printer/printerdrake.pm:2156 standalone/drakconnect:476
 #: standalone/harddrake2:40 standalone/printerdrake:209
 #: standalone/printerdrake:216
 #, c-format
@@ -11613,6 +11618,11 @@ msgstr "Босиб чиқариш системасини ўзгартириш"
 msgid "Normal Mode"
 msgstr "Оддий усул"
 
+#: printer/printerdrake.pm:3848
+#, c-format
+msgid "Expert Mode"
+msgstr "Эксперт усули"
+
 #: printer/printerdrake.pm:4119 printer/printerdrake.pm:4174
 #: printer/printerdrake.pm:4255 printer/printerdrake.pm:4265
 #, c-format
@@ -12801,7 +12811,7 @@ msgstr ""
 "Узр, бу хизмат ҳақида\n"
 "қўшимча маълумот йўқ."
 
-#: services.pm:226 ugtk2.pm:1131
+#: services.pm:226 ugtk2.pm:1139
 #, c-format
 msgid "Info"
 msgstr "Маълумот"
@@ -13247,7 +13257,7 @@ msgstr ""
 msgid ""
 "The free download version does not include commercial software, and "
 "therefore may not work with certain proprietary network cards and video "
-"cards such as NVIDIA® nForce. To avoid possible compatibiity issues with "
+"cards such as NVIDA(r) nForce. To avoid possible compatibiity issues with "
 "these devices, we recommend the purchase of one of our retail products that "
 "includes commercial drivers and additional software."
 msgstr ""
@@ -13316,9 +13326,9 @@ msgstr ""
 msgid "   * Browse the Web with Mozilla and Konqueror"
 msgstr ""
 
-#: share/advertising/ppp-04.pl:14 share/advertising/pwp-04.pl:14
+#: share/advertising/ppp-04.pl:14
 #, c-format
-msgid "   * Participate in online chat with Gaim"
+msgid "   * Participate in online chat with Kopete"
 msgstr ""
 
 #: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
@@ -13470,6 +13480,11 @@ msgid ""
 "information suites Kontact and Evolution"
 msgstr ""
 
+#: share/advertising/pwp-04.pl:14
+#, c-format
+msgid "   * Participate in online chat with Gaim"
+msgstr ""
+
 #: share/advertising/pwp-05.pl:8 share/advertising/pwp-06.pl:8
 #, fuzzy, c-format
 msgid "Development tools"
@@ -14425,7 +14440,7 @@ msgstr ""
 "\n"
 "Автоматик равишда ўрнатишнинг параметрлари чап тарафдаги бўлимларда мавжуд"
 
-#: standalone/drakautoinst:235 standalone/drakgw:519
+#: standalone/drakautoinst:235 standalone/drakgw:583
 #: standalone/scannerdrake:361
 #, c-format
 msgid "Congratulations!"
@@ -16318,141 +16333,141 @@ msgid ""
 "Do you want to install ntp ?"
 msgstr ""
 
-#: standalone/drakconnect:84
+#: standalone/drakconnect:83
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Тармоқнинг мосламаси (%d адаптер)"
 
-#: standalone/drakconnect:95 standalone/drakconnect:588
+#: standalone/drakconnect:94 standalone/drakconnect:633
 #, c-format
 msgid "Gateway:"
 msgstr "Гейтвэй:"
 
-#: standalone/drakconnect:95 standalone/drakconnect:588
+#: standalone/drakconnect:94 standalone/drakconnect:633
 #, c-format
 msgid "Interface:"
 msgstr "Интерфейс:"
 
-#: standalone/drakconnect:99 standalone/net_monitor:110
+#: standalone/drakconnect:98 standalone/net_monitor:110
 #, c-format
 msgid "Wait please"
 msgstr "Илтимос кутиб туринг"
 
-#: standalone/drakconnect:119
+#: standalone/drakconnect:118
 #, c-format
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: standalone/drakconnect:119 standalone/drakconnect:415
-#: standalone/drakconnect:416
+#: standalone/drakconnect:118 standalone/drakconnect:458
+#: standalone/drakconnect:459
 #, c-format
 msgid "Protocol"
 msgstr "Протокол"
 
-#: standalone/drakconnect:119 standalone/drakups:233
+#: standalone/drakconnect:118 standalone/drakups:233
 #, c-format
 msgid "Driver"
 msgstr "Драйвер"
 
-#: standalone/drakconnect:119
+#: standalone/drakconnect:118
 #, c-format
 msgid "State"
 msgstr "Ҳолати"
 
-#: standalone/drakconnect:136
+#: standalone/drakconnect:135
 #, c-format
 msgid "Hostname: "
 msgstr "Компютернинг номи:"
 
-#: standalone/drakconnect:138
+#: standalone/drakconnect:137
 #, c-format
 msgid "Configure hostname..."
 msgstr "Компютернинг номини мослаш"
 
-#: standalone/drakconnect:152 standalone/drakconnect:629
+#: standalone/drakconnect:151 standalone/drakconnect:674
 #, c-format
 msgid "LAN configuration"
 msgstr "Локал тармоқни мослаш"
 
-#: standalone/drakconnect:157
+#: standalone/drakconnect:156
 #, c-format
 msgid "Configure Local Area Network..."
 msgstr "Локал тармоқни мослаш"
 
-#: standalone/drakconnect:165 standalone/drakconnect:224
-#: standalone/drakconnect:228
+#: standalone/drakconnect:164 standalone/drakconnect:231
+#: standalone/drakconnect:235
 #, c-format
 msgid "Apply"
 msgstr "Қўллаш"
 
-#: standalone/drakconnect:273 standalone/drakconnect:814
+#: standalone/drakconnect:202 standalone/drakups:90 standalone/harddrake2:133
 #, c-format
-msgid "Gateway"
-msgstr "Гейтвэй"
+msgid "Detection in progress"
+msgstr "Аниқлаш кетаяпти"
 
-#: standalone/drakconnect:280
+#: standalone/drakconnect:319
 #, fuzzy, c-format
 msgid "DNS servers"
 msgstr "DNS сервери"
 
-#: standalone/drakconnect:286
+#: standalone/drakconnect:326
 #, fuzzy, c-format
 msgid "Search Domain"
 msgstr "Қидириш:"
 
-#: standalone/drakconnect:292
+#: standalone/drakconnect:332
 #, fuzzy, c-format
 msgid "static"
 msgstr "Автоматик IP"
 
-#: standalone/drakconnect:292
+#: standalone/drakconnect:332
 #, fuzzy, c-format
 msgid "dhcp"
 msgstr "dhcp'дан фойдаланиш"
 
-#: standalone/drakconnect:434 standalone/harddrake2:58
+#: standalone/drakconnect:477 standalone/harddrake2:58
 #, c-format
 msgid "Media class"
 msgstr "Маълумот ташувчининг синфи"
 
-#: standalone/drakconnect:435 standalone/drakfloppy:140
+#: standalone/drakconnect:478 standalone/drakfloppy:140
 #, c-format
 msgid "Module name"
 msgstr "Модулнинг номи"
 
-#: standalone/drakconnect:436
+#: standalone/drakconnect:479
 #, fuzzy, c-format
 msgid "Mac Address"
 msgstr "IP рақами"
 
-#: standalone/drakconnect:437 standalone/harddrake2:21
+#: standalone/drakconnect:480 standalone/harddrake2:21
 #, c-format
 msgid "Bus"
 msgstr ""
 
-#: standalone/drakconnect:438 standalone/harddrake2:29
+#: standalone/drakconnect:481 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr ""
 
-#: standalone/drakconnect:478
+#: standalone/drakconnect:523
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
 "%s"
 msgstr ""
 
-#: standalone/drakconnect:488
+#: standalone/drakconnect:533
 #, fuzzy, c-format
 msgid "Remove a network interface"
 msgstr "Тармоқ интерфейсини танлаш"
 
-#: standalone/drakconnect:492
+#: standalone/drakconnect:537
 #, fuzzy, c-format
 msgid "Select the network interface to remove:"
 msgstr "Тармоқ интерфейсини танлаш"
 
-#: standalone/drakconnect:508
+#: standalone/drakconnect:553
 #, fuzzy, c-format
 msgid ""
 "An error occured while deleting the \"%s\" network interface:\n"
@@ -16463,70 +16478,70 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:510
+#: standalone/drakconnect:555
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been succesfully deleted"
 msgstr ""
 
-#: standalone/drakconnect:527
+#: standalone/drakconnect:572
 #, c-format
 msgid "No Ip"
 msgstr "Йўқ"
 
-#: standalone/drakconnect:528
+#: standalone/drakconnect:573
 #, c-format
 msgid "No Mask"
 msgstr "Маскасиз"
 
-#: standalone/drakconnect:529 standalone/drakconnect:700
+#: standalone/drakconnect:574 standalone/drakconnect:745
 #, c-format
 msgid "up"
 msgstr "ишлаяпти"
 
-#: standalone/drakconnect:529 standalone/drakconnect:700
+#: standalone/drakconnect:574 standalone/drakconnect:745
 #, c-format
 msgid "down"
 msgstr "ишламаяпти"
 
-#: standalone/drakconnect:579 standalone/net_monitor:421
+#: standalone/drakconnect:624 standalone/net_monitor:421
 #, c-format
 msgid "Connected"
 msgstr "Уланган"
 
-#: standalone/drakconnect:579 standalone/net_monitor:421
+#: standalone/drakconnect:624 standalone/net_monitor:421
 #, c-format
 msgid "Not connected"
 msgstr "Уланмаган"
 
-#: standalone/drakconnect:580
+#: standalone/drakconnect:625
 #, c-format
 msgid "Disconnect..."
 msgstr "Узиш..."
 
-#: standalone/drakconnect:580
+#: standalone/drakconnect:625
 #, c-format
 msgid "Connect..."
 msgstr "Уланиш..."
 
-#: standalone/drakconnect:609
+#: standalone/drakconnect:654
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/drakconnect:625
+#: standalone/drakconnect:670
 #, c-format
 msgid "Deactivate now"
 msgstr "Ўчириш"
 
-#: standalone/drakconnect:625
+#: standalone/drakconnect:670
 #, c-format
 msgid "Activate now"
 msgstr "Ёқиш"
 
-#: standalone/drakconnect:633
+#: standalone/drakconnect:678
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -16535,32 +16550,27 @@ msgstr ""
 "Сизда мосланган интерфейс йўқ.\n"
 "Аввало, уларни \"Мослаш\"ни босиб мосланг."
 
-#: standalone/drakconnect:647
+#: standalone/drakconnect:692
 #, c-format
 msgid "LAN Configuration"
 msgstr "Локал тармоқни мослаш"
 
-#: standalone/drakconnect:659
+#: standalone/drakconnect:704
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Адаптер %s: %s"
 
-#: standalone/drakconnect:668
+#: standalone/drakconnect:713
 #, c-format
 msgid "Boot Protocol"
 msgstr ""
 
-#: standalone/drakconnect:669
+#: standalone/drakconnect:714
 #, c-format
 msgid "Started on boot"
 msgstr "Система юкланганда ишга туширилган"
 
-#: standalone/drakconnect:670
-#, c-format
-msgid "DHCP client"
-msgstr "DHCP клиенти"
-
-#: standalone/drakconnect:705
+#: standalone/drakconnect:750
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
@@ -16569,44 +16579,44 @@ msgstr ""
 "Бу интерфейс ҳали мослангани йўқ.\n"
 "Мошлаш ёрдамчисини асосий ойнадан ишга туширинг."
 
-#: standalone/drakconnect:760
+#: standalone/drakconnect:805
 #, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
 "Please run \"Internet access\" in control center."
 msgstr ""
 
-#: standalone/drakconnect:768
+#: standalone/drakconnect:813
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Интернетга уланишни мослаш"
 
-#: standalone/drakconnect:823
+#: standalone/drakconnect:868
 #, c-format
 msgid "Ethernet Card"
 msgstr "Ethernet карта"
 
-#: standalone/drakconnect:824
+#: standalone/drakconnect:869
 #, c-format
 msgid "DHCP Client"
 msgstr "DHCP клиенти"
 
-#: standalone/drakconnect:853
+#: standalone/drakconnect:898
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Интернетга уланишни мослаш"
 
-#: standalone/drakconnect:854
+#: standalone/drakconnect:899
 #, c-format
 msgid "Internet access"
 msgstr "Интернетга уланиш"
 
-#: standalone/drakconnect:856 standalone/net_monitor:92
+#: standalone/drakconnect:901 standalone/net_monitor:92
 #, c-format
 msgid "Connection type: "
 msgstr "Уланишнинг тури: "
 
-#: standalone/drakconnect:859
+#: standalone/drakconnect:904
 #, c-format
 msgid "Status:"
 msgstr "Ҳолати:"
@@ -17042,22 +17052,22 @@ msgstr "Системангиздан шрифтларни олиб ташлаш"
 msgid "Post Uninstall"
 msgstr ""
 
-#: standalone/drakgw:57 standalone/drakgw:184
+#: standalone/drakgw:59 standalone/drakgw:190
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr ""
 
-#: standalone/drakgw:114
+#: standalone/drakgw:117
 #, c-format
-msgid "Sorry, we support only 2.4 kernels."
+msgid "Sorry, we support only 2.4 and above kernels."
 msgstr ""
 
-#: standalone/drakgw:125
+#: standalone/drakgw:128
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr ""
 
-#: standalone/drakgw:126
+#: standalone/drakgw:129
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -17066,37 +17076,37 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:130
+#: standalone/drakgw:133
 #, c-format
 msgid "disable"
 msgstr "ўчириш"
 
-#: standalone/drakgw:130 standalone/drakgw:154
+#: standalone/drakgw:133 standalone/drakgw:162
 #, c-format
 msgid "reconfigure"
 msgstr "Бошқадан мослаш"
 
-#: standalone/drakgw:130 standalone/drakgw:154
+#: standalone/drakgw:133 standalone/drakgw:162
 #, c-format
 msgid "dismiss"
 msgstr "воз кечиш"
 
-#: standalone/drakgw:133
+#: standalone/drakgw:136
 #, c-format
 msgid "Disabling servers..."
 msgstr "Серверлар ўчирилмоқда..."
 
-#: standalone/drakgw:142
+#: standalone/drakgw:150
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr ""
 
-#: standalone/drakgw:149
+#: standalone/drakgw:157
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr ""
 
-#: standalone/drakgw:150
+#: standalone/drakgw:158
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -17105,22 +17115,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:154
+#: standalone/drakgw:162
 #, c-format
 msgid "enable"
 msgstr "ёқиш"
 
-#: standalone/drakgw:162
+#: standalone/drakgw:169
 #, c-format
 msgid "Enabling servers..."
 msgstr "Серверлар ёқилмоқда..."
 
-#: standalone/drakgw:168
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr ""
 
-#: standalone/drakgw:185
+#: standalone/drakgw:191
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -17134,7 +17144,7 @@ msgid ""
 "(LAN)."
 msgstr ""
 
-#: standalone/drakgw:205
+#: standalone/drakgw:211
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -17151,22 +17161,22 @@ msgstr ""
 "\t\teth0 ёки eth1 кабел орқали уланиш учун,\n"
 "\t\tippp+ ISDN орқали уланиш учун.\n"
 
-#: standalone/drakgw:224
+#: standalone/drakgw:230
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Интерфейс %s (%s модули ишлатилмоқда)"
 
-#: standalone/drakgw:225
+#: standalone/drakgw:231
 #, c-format
 msgid "Interface %s"
 msgstr "Интерфейс %s"
 
-#: standalone/drakgw:234 standalone/drakpxe:137
+#: standalone/drakgw:240 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Системада тармоқ адаптери мавжуд эмас!"
 
-#: standalone/drakgw:235 standalone/drakpxe:138
+#: standalone/drakgw:241 standalone/drakpxe:138
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -17175,12 +17185,12 @@ msgstr ""
 "Системангизда тармоқ адаптери аниқланмади. Илтимос асбоб-ускунани мословчи "
 "воситани ишга туширинг."
 
-#: standalone/drakgw:241
+#: standalone/drakgw:247
 #, c-format
 msgid "Network interface"
 msgstr "Тармоқнинг интерфейси"
 
-#: standalone/drakgw:242
+#: standalone/drakgw:248
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -17195,19 +17205,19 @@ msgstr ""
 "\n"
 "Мен шу адаптер билан локал тармоғингизни ўрнатаман."
 
-#: standalone/drakgw:249
+#: standalone/drakgw:255
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Илтимос локал тармоғингизга уланадиган тармоқ адаптерини танланг."
 
-#: standalone/drakgw:275
+#: standalone/drakgw:283
 #, c-format
 msgid "Network interface already configured"
 msgstr "Тармоқ интерфейси аллақачон мосланган"
 
-#: standalone/drakgw:276
+#: standalone/drakgw:284
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -17217,27 +17227,27 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: standalone/drakgw:281
+#: standalone/drakgw:289
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Автоматик равишда бошқадан мослаш"
 
-#: standalone/drakgw:281
+#: standalone/drakgw:289
 #, c-format
 msgid "No (experts only)"
 msgstr "Йўқ (фақат экспертлар учун)"
 
-#: standalone/drakgw:282
+#: standalone/drakgw:290
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Жорий интерфейснинг мосламасини кўрсатиш"
 
-#: standalone/drakgw:283
+#: standalone/drakgw:291
 #, c-format
 msgid "Current interface configuration"
 msgstr "Жорий интерфейсни мослаш"
 
-#: standalone/drakgw:284
+#: standalone/drakgw:292
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -17248,7 +17258,7 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: standalone/drakgw:297
+#: standalone/drakgw:305
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -17264,19 +17274,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakgw:304
+#: standalone/drakgw:312
 #, c-format
 msgid "Local Network adress"
 msgstr "Локал тармоқнинг манзили"
 
-#: standalone/drakgw:308
-#, c-format
+#: standalone/drakgw:316
+#, fuzzy, c-format
 msgid ""
 "DHCP Server Configuration.\n"
 "\n"
 "Here you can select different options for the DHCP server configuration.\n"
-"If you don't know the meaning of an option, simply leave it as it is.\n"
-"\n"
+"If you don't know the meaning of an option, simply leave it as it is."
 msgstr ""
 "DHCP серверни мослаш.\n"
 "\n"
@@ -17284,78 +17293,79 @@ msgstr ""
 "Агар бирор параметрнинг маъносини билмасангиз, уни шундай қолдиринг.\n"
 "\n"
 
-#: standalone/drakgw:314
+#: standalone/drakgw:320
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(Бу) DHCP сервернинг IP рақами"
 
-#: standalone/drakgw:315
+#: standalone/drakgw:321
 #, c-format
 msgid "The DNS Server IP"
 msgstr "DNS серверининг IP рақами"
 
-#: standalone/drakgw:316
+#: standalone/drakgw:322
 #, c-format
 msgid "The internal domain name"
 msgstr ""
 
-#: standalone/drakgw:317
+#: standalone/drakgw:323
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP'нинг пастги чегараси"
 
-#: standalone/drakgw:318
+#: standalone/drakgw:324
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP'нинг юқори чегараси"
 
-#: standalone/drakgw:319
+#: standalone/drakgw:325
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:320
+#: standalone/drakgw:326
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:321
+#: standalone/drakgw:327
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Интерфейсни ва DHCP серверини бошқадан мослаш"
 
-#: standalone/drakgw:328
+#: standalone/drakgw:334
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: standalone/drakgw:338
+#: standalone/drakgw:344
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 
-#: standalone/drakgw:348
+#: standalone/drakgw:354
 #, c-format
 msgid "Configuring..."
 msgstr "Мосланмоқда..."
 
-#: standalone/drakgw:349
+#: standalone/drakgw:355
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Скриптлар мосланмоқда, дастурлар ўрнатилмоқда, серверлар ишга туширилмоқда..."
 
-#: standalone/drakgw:385 standalone/drakpxe:231
+#: standalone/drakgw:391 standalone/drakpxe:231
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Пакетни (%s) ўрнатишда муаммолар пайдо бўлди"
 
-#: standalone/drakgw:520
+#: standalone/drakgw:584
 #, c-format
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
-"Area Network, using automatic network configuration (DHCP)."
+"Area Network, using automatic network configuration (DHCP) and\n"
+" a Transparent Proxy Cache server (SQUID)."
 msgstr ""
 
 #: standalone/drakhelp:17
@@ -18078,11 +18088,6 @@ msgstr ""
 msgid "Autodetection"
 msgstr "Авто-аниқлаш"
 
-#: standalone/drakups:90 standalone/harddrake2:133
-#, c-format
-msgid "Detection in progress"
-msgstr "Аниқлаш кетаяпти"
-
 #: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:410
 #, fuzzy, c-format
 msgid "Congratulations"
@@ -19866,27 +19871,27 @@ msgstr "Янгиланишларни ўрнатиш"
 msgid "Exit install"
 msgstr "Ўрнатишдан чиқиш"
 
-#: ugtk2.pm:897
+#: ugtk2.pm:905
 #, c-format
 msgid "utopia 25"
 msgstr "utopia 25"
 
-#: ugtk2.pm:1044
+#: ugtk2.pm:1052
 #, c-format
 msgid "Is this correct?"
 msgstr "Бу тўғрими?"
 
-#: ugtk2.pm:1167
+#: ugtk2.pm:1175
 #, c-format
 msgid "Expand Tree"
 msgstr "Рўйхатни ёйиш"
 
-#: ugtk2.pm:1168
+#: ugtk2.pm:1176
 #, c-format
 msgid "Collapse Tree"
 msgstr "Рўйхатни йиғиш"
 
-#: ugtk2.pm:1169
+#: ugtk2.pm:1177
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr ""
@@ -20080,12 +20085,54 @@ msgstr ""
 "Хат-хабар ва янгиликларни ўқиш ва жўнатиш ва Интернетни кўриш воситалар "
 "тўплами."
 
+#~ msgid "Read-write"
+#~ msgstr "Ўқиш-ёзиш"
+
+#~ msgid "Table"
+#~ msgstr "Жадвал"
+
+#~ msgid "Unsafe"
+#~ msgstr "Хавфли"
+
+#~ msgid ""
+#~ "Welcome to The Network Configuration Wizard.\n"
+#~ "\n"
+#~ "We are about to configure your internet/network connection.\n"
+#~ "If you don't want to use the auto detection, deselect the checkbox.\n"
+#~ msgstr ""
+#~ "Тармоқни мослаш ёрдамчисига марҳамат.\n"
+#~ "Биз Интернетга/тармоққа уланишингизни мослаш арафасидамиз.\n"
+#~ "Агар авто-аниқлашдан фойдаланмоқчи бўлмасангиз, белгини олиб ташланг.\n"
+
+#~ msgid "Network Configuration Wizard"
+#~ msgstr "Тармоқни мослаш ёрдамчиси"
+
+#~ msgid "Normal modem connection"
+#~ msgstr "Модем орқали оддий уланиш"
+
+#~ msgid "Which dhcp client do you want to use ? (default is dhcp-client)"
+#~ msgstr ""
+#~ "Қайси DHCP клиентидан фойдаланмоқчисиз?\n"
+#~ "Андоза - DHCP-клиенти"
+
+#~ msgid "Title"
+#~ msgstr "Сарлавҳа"
+
+#~ msgid ""
+#~ "\"%s\" based winmodem detected, do you want to install needed software ?"
+#~ msgstr ""
+#~ "\"%s\"да асосланган вин-модем аниқланди, керак бўлган дастурларни "
+#~ "ўрнатишни истайсизми?"
+
+#~ msgid "Install rpm"
+#~ msgstr "rpm'ни ўрнатиш"
+
+#~ msgid "Do nothing"
+#~ msgstr "Ҳеч нима қилмаш"
+
 #~ msgid " (driver %s)"
 #~ msgstr " (драйвер %s)"
 
-#~ msgid "Automatic IP"
-#~ msgstr "Автоматик IP"
-
 #~ msgid "(bootp/dhcp/zeroconf)"
 #~ msgstr "(bootp/dhcp/zeroconf)"