better english (writing style rather than spoken one)

3 files changed, 578 insertions, 577 deletions

diff --git a/perl-install/share/advertising/05.pl b/perl-install/share/advertising/05.pl
index 511ecad64..f527b58e7 100644
--- a/perl-install/share/advertising/05.pl
+++ b/perl-install/share/advertising/05.pl
@@ -14,8 +14,8 @@ $border = 10;  #- for leftish text
          ' ',
 	 N("You are now installing <b>Mandrakelinux Download</b>. This is the free version that Mandrakesoft wants to keep <b>available to everyone</b>."),
 		 ' ',
-         N("The Download version <b>cannot include</b> all the software that is not open source. Therefore, you won't find in the Download version:"),
+         N("The Download version <b>cannot include</b> all the software that is not open source. Therefore, you will not find in the Download version:"),
 	 N("	* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."),
 	 N("	* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, Flash™, etc.)."),
 	 ' ',
-	 N("You won't have access to the <b>services included</b> in the other Mandrakesoft products either."));
+	 N("You will not have access to the <b>services included</b> in the other Mandrakesoft products either."));
diff --git a/perl-install/share/advertising/12.pl b/perl-install/share/advertising/12.pl
index b4ce8799b..f9e56e2f8 100644
--- a/perl-install/share/advertising/12.pl
+++ b/perl-install/share/advertising/12.pl
@@ -14,6 +14,6 @@ $border = 10;  #- for leftish text
 	' ',
 	N("With your Discovery, you will be introduced to <b>KDE</b>, the most advanced and user-friendly <b>graphical desktop environment</b> available."),
 	' ',
-	N("KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you won't ever think of running another operating system!"),
+	N("KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you will not ever think of running another operating system!"),
 	' ',
 	N("KDE also includes a lot of <b>well integrated applications</b> such as Konqueror, the web browser and Kontact, the personal information manager."));
\ No newline at end of file
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 3afaac167..2161d7e22 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-12-02 12:38+0100\n"
+"POT-Creation-Date: 2004-12-13 15:52+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"
@@ -29,7 +29,7 @@ msgstr ""
 
 #: ../move/move.pm:448 ../move/move.pm:460
 #, c-format
-msgid "Key isn't writable"
+msgid "Key is not writable"
 msgstr ""
 
 #: ../move/move.pm:450
@@ -52,7 +52,7 @@ msgstr ""
 #: ../move/move.pm:462
 #, c-format
 msgid ""
-"The USB key seems to have write protection enabled, but we can't safely\n"
+"The USB key seems to have write protection enabled, but we can not safely\n"
 "unplug it now.\n"
 "\n"
 "\n"
@@ -60,7 +60,7 @@ msgid ""
 "plug the key again, and launch Mandrake Move again."
 msgstr ""
 
-#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1356
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1331
 #, c-format
 msgid "Reboot"
 msgstr ""
@@ -68,7 +68,7 @@ msgstr ""
 #: ../move/move.pm:473
 #, c-format
 msgid ""
-"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
+"Your USB key does not have any valid Windows (FAT) partitions.\n"
 "We need one to continue (beside, it's more standard so that you\n"
 "will be able to move and access your files from machines\n"
 "running Windows). Please plug in an USB key containing a\n"
@@ -83,7 +83,7 @@ msgstr ""
 #: ../move/move.pm:483
 #, c-format
 msgid ""
-"We didn't detect any USB key on your system. If you\n"
+"We did not detect any USB key on your system. If you\n"
 "plug in an USB key now, Mandrake Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
@@ -131,7 +131,7 @@ msgstr ""
 msgid "Please wait, detecting and configuring devices..."
 msgstr ""
 
-#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664 diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:227 diskdrake/interactive.pm:240 diskdrake/interactive.pm:386 diskdrake/interactive.pm:401 diskdrake/interactive.pm:523 diskdrake/interactive.pm:528 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:179 install_steps.pm:82 install_steps_interactive.pm:38 interactive/http.pm:117 interactive/http.pm:118 network/netconnect.pm:999 network/netconnect.pm:1003 network/netconnect.pm:1008 network/netconnect.pm:1049 network/netconnect.pm:1053 network/netconnect.pm:1191 network/netconnect.pm:1196 network/netconnect.pm:1214 network/netconnect.pm:1397 printer/printerdrake.pm:238 printer/printerdrake.pm:245 printer/printerdrake.pm:270 printer/printerdrake.pm:416 printer/printerdrake.pm:421 printer/printerdrake.pm:434 printer/printerdrake.pm:444 printer/printerdrake.pm:508 printer/printerdrake.pm:1182 printer/printerdrake.pm:1229 printer/printerdrake.pm:1266 printer/printerdrake.pm:1310 printer/printerdrake.pm:1314 printer/printerdrake.pm:1328 printer/printerdrake.pm:1418 printer/printerdrake.pm:1498 printer/printerdrake.pm:1502 printer/printerdrake.pm:1506 printer/printerdrake.pm:1555 printer/printerdrake.pm:1612 printer/printerdrake.pm:1616 printer/printerdrake.pm:1630 printer/printerdrake.pm:1740 printer/printerdrake.pm:1744 printer/printerdrake.pm:1781 printer/printerdrake.pm:1846 printer/printerdrake.pm:1864 printer/printerdrake.pm:1873 printer/printerdrake.pm:1882 printer/printerdrake.pm:1893 printer/printerdrake.pm:1955 printer/printerdrake.pm:2408 printer/printerdrake.pm:2672 printer/printerdrake.pm:2678 printer/printerdrake.pm:3188 printer/printerdrake.pm:3192 printer/printerdrake.pm:3196 printer/printerdrake.pm:3606 printer/printerdrake.pm:3846 printer/printerdrake.pm:3866 printer/printerdrake.pm:3942 printer/printerdrake.pm:4007 printer/printerdrake.pm:4123 standalone/drakTermServ:381 standalone/drakTermServ:739 standalone/drakTermServ:746 standalone/drakTermServ:766 standalone/drakTermServ:985 standalone/drakTermServ:1459 standalone/drakTermServ:1464 standalone/drakTermServ:1471 standalone/drakTermServ:1482 standalone/drakTermServ:1503 standalone/drakauth:37 standalone/drakbackup:512 standalone/drakbackup:626 standalone/drakbackup:1128 standalone/drakbackup:1161 standalone/drakbackup:1665 standalone/drakbackup:1821 standalone/drakbackup:2415 standalone/drakbackup:4104 standalone/drakbackup:4324 standalone/drakbug:235 standalone/drakbug:254 standalone/drakbug:260 standalone/drakclock:125 standalone/drakconnect:648 standalone/drakconnect:651 standalone/drakconnect:670 standalone/drakfloppy:297 standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:209 standalone/drakfont:222 standalone/drakfont:258 standalone/drakfont:603 standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:107 standalone/logdrake:169 standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59 standalone/scannerdrake:196 standalone/scannerdrake:255 standalone/scannerdrake:684 standalone/scannerdrake:695 standalone/scannerdrake:834 standalone/scannerdrake:845 standalone/scannerdrake:915 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664 diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:227 diskdrake/interactive.pm:240 diskdrake/interactive.pm:386 diskdrake/interactive.pm:401 diskdrake/interactive.pm:523 diskdrake/interactive.pm:528 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:179 install_steps.pm:82 install_steps_interactive.pm:38 interactive/http.pm:117 interactive/http.pm:118 network/netconnect.pm:999 network/netconnect.pm:1003 network/netconnect.pm:1008 network/netconnect.pm:1049 network/netconnect.pm:1053 network/netconnect.pm:1191 network/netconnect.pm:1196 network/netconnect.pm:1214 network/netconnect.pm:1399 printer/printerdrake.pm:238 printer/printerdrake.pm:245 printer/printerdrake.pm:270 printer/printerdrake.pm:416 printer/printerdrake.pm:421 printer/printerdrake.pm:434 printer/printerdrake.pm:444 printer/printerdrake.pm:508 printer/printerdrake.pm:1182 printer/printerdrake.pm:1229 printer/printerdrake.pm:1266 printer/printerdrake.pm:1310 printer/printerdrake.pm:1314 printer/printerdrake.pm:1328 printer/printerdrake.pm:1418 printer/printerdrake.pm:1498 printer/printerdrake.pm:1502 printer/printerdrake.pm:1506 printer/printerdrake.pm:1555 printer/printerdrake.pm:1612 printer/printerdrake.pm:1616 printer/printerdrake.pm:1630 printer/printerdrake.pm:1740 printer/printerdrake.pm:1744 printer/printerdrake.pm:1781 printer/printerdrake.pm:1846 printer/printerdrake.pm:1864 printer/printerdrake.pm:1873 printer/printerdrake.pm:1882 printer/printerdrake.pm:1893 printer/printerdrake.pm:1955 printer/printerdrake.pm:2408 printer/printerdrake.pm:2672 printer/printerdrake.pm:2678 printer/printerdrake.pm:3188 printer/printerdrake.pm:3192 printer/printerdrake.pm:3196 printer/printerdrake.pm:3606 printer/printerdrake.pm:3846 printer/printerdrake.pm:3866 printer/printerdrake.pm:3942 printer/printerdrake.pm:4007 printer/printerdrake.pm:4123 standalone/drakTermServ:381 standalone/drakTermServ:739 standalone/drakTermServ:746 standalone/drakTermServ:766 standalone/drakTermServ:985 standalone/drakTermServ:1459 standalone/drakTermServ:1464 standalone/drakTermServ:1471 standalone/drakTermServ:1482 standalone/drakTermServ:1503 standalone/drakauth:35 standalone/drakbackup:512 standalone/drakbackup:626 standalone/drakbackup:1128 standalone/drakbackup:1161 standalone/drakbackup:1665 standalone/drakbackup:1821 standalone/drakbackup:2415 standalone/drakbackup:4104 standalone/drakbackup:4324 standalone/drakbug:235 standalone/drakbug:254 standalone/drakbug:260 standalone/drakclock:125 standalone/drakconnect:648 standalone/drakconnect:651 standalone/drakconnect:670 standalone/drakfloppy:297 standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:209 standalone/drakfont:222 standalone/drakfont:258 standalone/drakfont:603 standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:107 standalone/finish-install:39 standalone/logdrake:169 standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59 standalone/scannerdrake:196 standalone/scannerdrake:255 standalone/scannerdrake:684 standalone/scannerdrake:695 standalone/scannerdrake:834 standalone/scannerdrake:845 standalone/scannerdrake:915 wizards.pm:95 wizards.pm:99 wizards.pm:121 wizards2.pm:95 wizards2.pm:99 wizards2.pm:121
 #, c-format
 msgid "Error"
 msgstr ""
@@ -139,7 +139,7 @@ msgstr ""
 #: ../move/move.pm:605 install_steps.pm:83
 #, c-format
 msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
+"An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
 
@@ -201,7 +201,7 @@ msgstr ""
 #: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
-"You can't use another CDROM when the following programs are running: \n"
+"You can not use another CDROM when the following programs are running: \n"
 "%s"
 msgstr ""
 
@@ -279,7 +279,7 @@ msgstr ""
 
 #: Xconfig/card.pm:259
 #, c-format
-msgid "Can't install Xorg package: %s"
+msgid "Can not install Xorg package: %s"
 msgstr ""
 
 #: Xconfig/card.pm:269
@@ -339,12 +339,12 @@ msgid ""
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
 msgstr ""
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:919
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:917
 #, c-format
 msgid "Custom"
 msgstr ""
 
-#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14 install_steps_interactive.pm:88 printer/printerdrake.pm:712 printer/printerdrake.pm:3937 printer/printerdrake.pm:4382 standalone/draksplash:120 standalone/harddrake2:280 standalone/logdrake:174 standalone/net_applet:160 standalone/scannerdrake:446
+#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14 install_steps_interactive.pm:86 printer/printerdrake.pm:712 printer/printerdrake.pm:3937 printer/printerdrake.pm:4382 standalone/draksplash:120 standalone/harddrake2:282 standalone/logdrake:174 standalone/net_applet:160 standalone/scannerdrake:446
 #, c-format
 msgid "Quit"
 msgstr ""
@@ -369,7 +369,7 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:427 diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80 standalone/drakfont:493 standalone/drakfont:555 standalone/harddrake2:277
+#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:427 diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80 standalone/drakfont:493 standalone/drakfont:555 standalone/harddrake2:279
 #, c-format
 msgid "Options"
 msgstr ""
@@ -475,17 +475,17 @@ msgstr ""
 msgid "Graphics card: %s"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:282 interactive.pm:403 interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156 interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakTermServ:203 standalone/drakTermServ:476 standalone/drakbackup:3961 standalone/drakbackup:4021 standalone/drakbackup:4065 standalone/drakconnect:165 standalone/drakconnect:851 standalone/drakconnect:938 standalone/drakconnect:1037 standalone/drakfont:576 standalone/drakroam:388 standalone/drakups:208 standalone/net_monitor:344 ugtk2.pm:414 ugtk2.pm:512 ugtk2.pm:1119 ugtk2.pm:1142
+#: Xconfig/resolution_and_depth.pm:282 interactive.pm:403 interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156 interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakTermServ:203 standalone/drakTermServ:476 standalone/drakbackup:3961 standalone/drakbackup:4021 standalone/drakbackup:4065 standalone/drakconnect:165 standalone/drakconnect:851 standalone/drakconnect:938 standalone/drakconnect:1037 standalone/drakfont:576 standalone/drakroam:388 standalone/drakups:208 standalone/net_monitor:344 ugtk2.pm:411 ugtk2.pm:508 ugtk2.pm:1038 ugtk2.pm:1061
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:282 diskdrake/smbnfs_gtk.pm:81 help.pm:89 help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:425 install_steps_interactive.pm:843 interactive.pm:404 interactive/gtk.pm:770 interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316 interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:3266 standalone/drakautoinst:217 standalone/drakbackup:3887 standalone/drakbackup:3891 standalone/drakbackup:3949 standalone/drakconnect:164 standalone/drakconnect:936 standalone/drakconnect:1036 standalone/drakfont:666 standalone/drakfont:743 standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:343 ugtk2.pm:408 ugtk2.pm:510 ugtk2.pm:519 ugtk2.pm:1119
+#: Xconfig/resolution_and_depth.pm:282 diskdrake/smbnfs_gtk.pm:81 help.pm:89 help.pm:444 install_steps_gtk.pm:459 install_steps_interactive.pm:423 install_steps_interactive.pm:841 interactive.pm:404 interactive/gtk.pm:770 interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316 interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:3266 standalone/drakautoinst:217 standalone/drakbackup:3887 standalone/drakbackup:3891 standalone/drakbackup:3949 standalone/drakconnect:164 standalone/drakconnect:936 standalone/drakconnect:1036 standalone/drakfont:666 standalone/drakfont:743 standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:343 ugtk2.pm:405 ugtk2.pm:506 ugtk2.pm:515 ugtk2.pm:1038
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:282 diskdrake/hd_gtk.pm:153 install_steps_gtk.pm:239 install_steps_gtk.pm:645 interactive.pm:498 interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:282 standalone/drakbackup:3883 standalone/drakbug:128 standalone/drakconnect:160 standalone/drakconnect:245 standalone/drakfont:511 standalone/drakperm:134 standalone/draksec:337 standalone/draksec:339 standalone/draksec:357 standalone/draksec:359 standalone/harddrake2:276 ugtk2.pm:1232 ugtk2.pm:1233
+#: Xconfig/resolution_and_depth.pm:282 diskdrake/hd_gtk.pm:153 install_steps_gtk.pm:240 install_steps_gtk.pm:646 interactive.pm:498 interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:282 standalone/drakbackup:3883 standalone/drakbug:128 standalone/drakconnect:160 standalone/drakconnect:245 standalone/drakfont:511 standalone/drakperm:134 standalone/draksec:337 standalone/draksec:339 standalone/draksec:357 standalone/draksec:359 standalone/harddrake2:278 ugtk2.pm:1151 ugtk2.pm:1152
 #, c-format
 msgid "Help"
 msgstr ""
@@ -629,17 +629,17 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: any.pm:116 harddrake/sound.pm:180 interactive.pm:441 standalone/drakbug:227 standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68 standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:226 standalone/service_harddrake:200
+#: any.pm:144 harddrake/sound.pm:180 interactive.pm:441 standalone/drakbug:227 standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68 standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:228 standalone/service_harddrake:202
 #, c-format
 msgid "Please wait"
 msgstr ""
 
-#: any.pm:116
+#: any.pm:144
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr ""
 
-#: any.pm:127
+#: any.pm:155
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
@@ -649,23 +649,23 @@ msgid ""
 "Assign a new Volume ID?"
 msgstr ""
 
-#: any.pm:138
+#: any.pm:166
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
 msgstr ""
 
-#: any.pm:144
+#: any.pm:172
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader.  If you don't see the bootloader prompt at\n"
+" enable the bootloader.  If you do not see the bootloader prompt at\n"
 " reboot, hold down Command-Option-O-F at reboot and enter:\n"
 " setenv boot-device %s,\\\\:tbxi\n"
 " Then type: shut-down\n"
 "At your next boot you should see the bootloader prompt."
 msgstr ""
 
-#: any.pm:182
+#: any.pm:210
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -674,396 +674,396 @@ msgid ""
 "On which drive are you booting?"
 msgstr ""
 
-#: any.pm:205 help.pm:739
+#: any.pm:233 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr ""
 
-#: any.pm:206
+#: any.pm:234
 #, c-format
 msgid "First sector of the root partition"
 msgstr ""
 
-#: any.pm:208
+#: any.pm:236
 #, c-format
 msgid "On Floppy"
 msgstr ""
 
-#: any.pm:210 help.pm:739 printer/printerdrake.pm:3603
+#: any.pm:238 help.pm:739 printer/printerdrake.pm:3603
 #, c-format
 msgid "Skip"
 msgstr ""
 
-#: any.pm:214
+#: any.pm:242
 #, c-format
 msgid "LILO/grub Installation"
 msgstr ""
 
-#: any.pm:215
+#: any.pm:243
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
-#: any.pm:240 standalone/drakboot:307
+#: any.pm:268 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr ""
 
-#: any.pm:242 any.pm:274
+#: any.pm:270 any.pm:302
 #, c-format
 msgid "Bootloader main options"
 msgstr ""
 
-#: any.pm:246
+#: any.pm:274
 #, c-format
 msgid "Give the ram size in MB"
 msgstr ""
 
-#: any.pm:248
+#: any.pm:276
 #, c-format
 msgid "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: any.pm:249 any.pm:593 install_steps_interactive.pm:1218
+#: any.pm:277 any.pm:610 authentication.pm:165
 #, c-format
 msgid "The passwords do not match"
 msgstr ""
 
-#: any.pm:249 any.pm:593 diskdrake/interactive.pm:1256 install_steps_interactive.pm:1218
+#: any.pm:277 any.pm:610 authentication.pm:165 diskdrake/interactive.pm:1256
 #, c-format
 msgid "Please try again"
 msgstr ""
 
-#: any.pm:254 any.pm:277
+#: any.pm:282 any.pm:305
 #, c-format
 msgid "Bootloader to use"
 msgstr ""
 
-#: any.pm:256 any.pm:279
+#: any.pm:284 any.pm:307
 #, c-format
 msgid "Boot device"
 msgstr ""
 
-#: any.pm:258
+#: any.pm:286
 #, c-format
 msgid "Delay before booting default image"
 msgstr ""
 
-#: any.pm:259
+#: any.pm:287
 #, c-format
 msgid "Enable ACPI"
 msgstr ""
 
-#: any.pm:261
+#: any.pm:289
 #, c-format
 msgid "Force no APIC"
 msgstr ""
 
-#: any.pm:263
+#: any.pm:291
 #, c-format
 msgid "Force No Local APIC"
 msgstr ""
 
-#: any.pm:265 any.pm:620 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1223 network/netconnect.pm:599 printer/printerdrake.pm:1489 printer/printerdrake.pm:1609 standalone/drakbackup:1647 standalone/drakbackup:3489 standalone/drakups:295
+#: any.pm:293 any.pm:637 authentication.pm:170 diskdrake/smbnfs_gtk.pm:180 network/netconnect.pm:599 printer/printerdrake.pm:1489 printer/printerdrake.pm:1609 standalone/drakbackup:1647 standalone/drakbackup:3489 standalone/drakups:295
 #, c-format
 msgid "Password"
 msgstr ""
 
-#: any.pm:266 any.pm:621 install_steps_interactive.pm:1224
+#: any.pm:294 any.pm:638 authentication.pm:171
 #, c-format
 msgid "Password (again)"
 msgstr ""
 
-#: any.pm:267
+#: any.pm:295
 #, c-format
 msgid "Restrict command line options"
 msgstr ""
 
-#: any.pm:267
+#: any.pm:295
 #, c-format
 msgid "restrict"
 msgstr ""
 
-#: any.pm:269
+#: any.pm:297
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: any.pm:270
+#: any.pm:298
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 
-#: any.pm:278
+#: any.pm:306
 #, c-format
 msgid "Init Message"
 msgstr ""
 
-#: any.pm:280
+#: any.pm:308
 #, c-format
 msgid "Open Firmware Delay"
 msgstr ""
 
-#: any.pm:281
+#: any.pm:309
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr ""
 
-#: any.pm:282
+#: any.pm:310
 #, c-format
 msgid "Enable CD Boot?"
 msgstr ""
 
-#: any.pm:283
+#: any.pm:311
 #, c-format
 msgid "Enable OF Boot?"
 msgstr ""
 
-#: any.pm:284
+#: any.pm:312
 #, c-format
 msgid "Default OS?"
 msgstr ""
 
-#: any.pm:337
+#: any.pm:365
 #, c-format
 msgid "Image"
 msgstr ""
 
-#: any.pm:338 any.pm:348
+#: any.pm:366 any.pm:376
 #, c-format
 msgid "Root"
 msgstr ""
 
-#: any.pm:339 any.pm:361
+#: any.pm:367 any.pm:389
 #, c-format
 msgid "Append"
 msgstr ""
 
-#: any.pm:341 standalone/drakboot:309 standalone/drakboot:313
+#: any.pm:369 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr ""
 
-#: any.pm:343
+#: any.pm:371
 #, c-format
 msgid "Initrd"
 msgstr ""
 
-#: any.pm:344
+#: any.pm:372
 #, c-format
 msgid "Network profile"
 msgstr ""
 
-#: any.pm:353 any.pm:358 any.pm:360
+#: any.pm:381 any.pm:386 any.pm:388
 #, c-format
 msgid "Label"
 msgstr ""
 
-#: any.pm:355 any.pm:365 harddrake/v4l.pm:275 standalone/drakfloppy:84 standalone/drakfloppy:90 standalone/draksec:52
+#: any.pm:383 any.pm:393 harddrake/v4l.pm:275 standalone/drakfloppy:84 standalone/drakfloppy:90 standalone/draksec:52
 #, c-format
 msgid "Default"
 msgstr ""
 
-#: any.pm:362
+#: any.pm:390
 #, c-format
 msgid "Initrd-size"
 msgstr ""
 
-#: any.pm:364
+#: any.pm:392
 #, c-format
 msgid "NoVideo"
 msgstr ""
 
-#: any.pm:375
+#: any.pm:403
 #, c-format
 msgid "Empty label not allowed"
 msgstr ""
 
-#: any.pm:376
+#: any.pm:404
 #, c-format
 msgid "You must specify a kernel image"
 msgstr ""
 
-#: any.pm:376
+#: any.pm:404
 #, c-format
 msgid "You must specify a root partition"
 msgstr ""
 
-#: any.pm:377
+#: any.pm:405
 #, c-format
 msgid "This label is already used"
 msgstr ""
 
-#: any.pm:391
+#: any.pm:419
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr ""
 
-#: any.pm:392
+#: any.pm:420
 #, c-format
 msgid "Linux"
 msgstr ""
 
-#: any.pm:392
+#: any.pm:420
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr ""
 
-#: any.pm:393
+#: any.pm:421
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr ""
 
-#: any.pm:393
+#: any.pm:421
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr ""
 
-#: any.pm:421
+#: any.pm:449
 #, 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:579
+#: any.pm:596
 #, c-format
 msgid "access to X programs"
 msgstr ""
 
-#: any.pm:580
+#: any.pm:597
 #, c-format
 msgid "access to rpm tools"
 msgstr ""
 
-#: any.pm:581
+#: any.pm:598
 #, c-format
 msgid "allow \"su\""
 msgstr ""
 
-#: any.pm:582
+#: any.pm:599
 #, c-format
 msgid "access to administrative files"
 msgstr ""
 
-#: any.pm:583
+#: any.pm:600
 #, c-format
 msgid "access to network tools"
 msgstr ""
 
-#: any.pm:584
+#: any.pm:601
 #, c-format
 msgid "access to compilation tools"
 msgstr ""
 
-#: any.pm:589
+#: any.pm:606
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: any.pm:594
+#: any.pm:611
 #, c-format
 msgid "This password is too simple"
 msgstr ""
 
-#: any.pm:595
+#: any.pm:612
 #, c-format
 msgid "Please give a user name"
 msgstr ""
 
-#: any.pm:596
+#: any.pm:613
 #, c-format
 msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: any.pm:597
+#: any.pm:614
 #, c-format
 msgid "The user name is too long"
 msgstr ""
 
-#: any.pm:598
+#: any.pm:615
 #, c-format
 msgid "This user name has already been added"
 msgstr ""
 
-#: any.pm:602
+#: any.pm:619
 #, c-format
 msgid "Add user"
 msgstr ""
 
-#: any.pm:603
+#: any.pm:620
 #, c-format
 msgid ""
 "Enter a user\n"
 "%s"
 msgstr ""
 
-#: any.pm:606 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157 diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530 interactive/http.pm:151 printer/printerdrake.pm:191 printer/printerdrake.pm:376 printer/printerdrake.pm:4382 standalone/drakbackup:2702 standalone/scannerdrake:637 standalone/scannerdrake:787
+#: any.pm:623 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157 diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530 interactive/http.pm:151 printer/printerdrake.pm:191 printer/printerdrake.pm:376 printer/printerdrake.pm:4382 standalone/drakbackup:2702 standalone/scannerdrake:637 standalone/scannerdrake:787
 #, c-format
 msgid "Done"
 msgstr ""
 
-#: any.pm:607 help.pm:51
+#: any.pm:624 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr ""
 
-#: any.pm:618
+#: any.pm:635
 #, c-format
 msgid "Real name"
 msgstr ""
 
-#: any.pm:619 standalone/drakbackup:1642
+#: any.pm:636 standalone/drakbackup:1642
 #, c-format
 msgid "Login name"
 msgstr ""
 
-#: any.pm:622
+#: any.pm:639
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: any.pm:624
+#: any.pm:641
 #, c-format
 msgid "Icon"
 msgstr ""
 
-#: any.pm:671 security/l10n.pm:14
+#: any.pm:688 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr ""
 
-#: any.pm:672
+#: any.pm:689
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 
-#: any.pm:673 help.pm:51
+#: any.pm:690 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr ""
 
-#: any.pm:674
+#: any.pm:691
 #, c-format
 msgid "Choose the default user:"
 msgstr ""
 
-#: any.pm:675
+#: any.pm:692
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr ""
 
-#: any.pm:687
+#: any.pm:704
 #, c-format
 msgid "Please choose a language to use."
 msgstr ""
 
-#: any.pm:688
+#: any.pm:705
 #, c-format
 msgid "Language choice"
 msgstr ""
 
-#: any.pm:714
+#: any.pm:731
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1071,57 +1071,57 @@ msgid ""
 "when your installation is complete and you restart your system."
 msgstr ""
 
-#: any.pm:732 help.pm:647
+#: any.pm:749 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr ""
 
-#: any.pm:733 help.pm:647
+#: any.pm:750 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr ""
 
-#: any.pm:772 help.pm:566 help.pm:855 install_steps_interactive.pm:963
+#: any.pm:789 help.pm:566 help.pm:855 install_steps_interactive.pm:961
 #, c-format
 msgid "Country / Region"
 msgstr ""
 
-#: any.pm:773
+#: any.pm:790
 #, c-format
 msgid "Please choose your country."
 msgstr ""
 
-#: any.pm:775
+#: any.pm:792
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr ""
 
-#: any.pm:776
+#: any.pm:793
 #, c-format
 msgid "Other Countries"
 msgstr ""
 
-#: any.pm:784
+#: any.pm:801
 #, c-format
 msgid "Input method:"
 msgstr ""
 
-#: any.pm:785 install_any.pm:420 printer/printerdrake.pm:99
+#: any.pm:802 install_any.pm:420 printer/printerdrake.pm:99
 #, c-format
 msgid "None"
 msgstr ""
 
-#: any.pm:919
+#: any.pm:917
 #, c-format
 msgid "No sharing"
 msgstr ""
 
-#: any.pm:919
+#: any.pm:917
 #, c-format
 msgid "Allow all users"
 msgstr ""
 
-#: any.pm:923
+#: any.pm:921
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1131,32 +1131,32 @@ msgid ""
 ""
 msgstr ""
 
-#: any.pm:935
+#: any.pm:933
 #, c-format
 msgid "NFS: the traditional Unix file sharing system, with less support on Mac and Windows."
 msgstr ""
 
-#: any.pm:938
+#: any.pm:936
 #, c-format
 msgid "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux systems."
 msgstr ""
 
-#: any.pm:946
+#: any.pm:944
 #, c-format
 msgid "You can export using NFS or SMB. Please select which you would like to use."
 msgstr ""
 
-#: any.pm:971
+#: any.pm:969
 #, c-format
 msgid "Launch userdrake"
 msgstr ""
 
-#: any.pm:971 printer/printerdrake.pm:3478 printer/printerdrake.pm:3481 printer/printerdrake.pm:3482 printer/printerdrake.pm:3483 printer/printerdrake.pm:4676 standalone/drakTermServ:291 standalone/drakbackup:4083 standalone/drakbug:151 standalone/drakfont:499 standalone/drakfont:593 standalone/net_monitor:123 standalone/printerdrake:561
+#: any.pm:969 printer/printerdrake.pm:3478 printer/printerdrake.pm:3481 printer/printerdrake.pm:3482 printer/printerdrake.pm:3483 printer/printerdrake.pm:4676 standalone/drakTermServ:291 standalone/drakbackup:4083 standalone/drakbug:151 standalone/drakfont:499 standalone/drakfont:593 standalone/net_monitor:123 standalone/printerdrake:561
 #, c-format
 msgid "Close"
 msgstr ""
 
-#: any.pm:973
+#: any.pm:971
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Smart Card"
 msgstr ""
 
-#: authentication.pm:20 authentication.pm:128
+#: authentication.pm:20 authentication.pm:138
 #, c-format
 msgid "Windows Domain"
 msgstr ""
@@ -1198,152 +1198,152 @@ msgstr ""
 msgid "Active Directory with Winbind"
 msgstr ""
 
-#: authentication.pm:31
+#: authentication.pm:41
 #, c-format
 msgid "Local file:"
 msgstr ""
 
-#: authentication.pm:31
+#: authentication.pm:41
 #, c-format
 msgid "Use local for all authentication and information user tell in local file"
 msgstr ""
 
-#: authentication.pm:32
+#: authentication.pm:42
 #, c-format
 msgid "LDAP:"
 msgstr ""
 
-#: authentication.pm:32
+#: authentication.pm:42
 #, c-format
 msgid "Tells your computer to use LDAP for some or all authentication. LDAP consolidates certain types of information within your organization."
 msgstr ""
 
-#: authentication.pm:33
+#: authentication.pm:43
 #, c-format
 msgid "NIS:"
 msgstr ""
 
-#: authentication.pm:33
+#: authentication.pm:43
 #, c-format
 msgid "Allows you to run a group of computers in the same Network Information Service domain with a common password and group file."
 msgstr ""
 
-#: authentication.pm:34
+#: authentication.pm:44
 #, c-format
 msgid "Windows Domain:"
 msgstr ""
 
-#: authentication.pm:34
+#: authentication.pm:44
 #, c-format
 msgid "Winbind allows the system to retrieve information and authenticate users in a Windows domain."
 msgstr ""
 
-#: authentication.pm:35
+#: authentication.pm:45
 #, c-format
 msgid "Active Directory with SFU:"
 msgstr ""
 
-#: authentication.pm:35 authentication.pm:36
+#: authentication.pm:45 authentication.pm:46
 #, c-format
 msgid "Kerberos is a secure system for providing network authentication services."
 msgstr ""
 
-#: authentication.pm:36
+#: authentication.pm:46
 #, c-format
 msgid "Active Directory with Winbind:"
 msgstr ""
 
-#: authentication.pm:61
+#: authentication.pm:71
 #, c-format
 msgid "Authentication LDAP"
 msgstr ""
 
-#: authentication.pm:62
+#: authentication.pm:72
 #, c-format
 msgid "LDAP Base dn"
 msgstr ""
 
-#: authentication.pm:63 share/compssUsers.pl:101
+#: authentication.pm:73 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr ""
 
-#: authentication.pm:76 fsedit.pm:21
+#: authentication.pm:86 fsedit.pm:21
 #, c-format
 msgid "simple"
 msgstr ""
 
-#: authentication.pm:77
+#: authentication.pm:87
 #, c-format
 msgid "TLS"
 msgstr ""
 
-#: authentication.pm:78
+#: authentication.pm:88
 #, c-format
 msgid "SSL"
 msgstr ""
 
-#: authentication.pm:79
+#: authentication.pm:89
 #, c-format
 msgid "security layout (SASL/Kerberos)"
 msgstr ""
 
-#: authentication.pm:86 authentication.pm:124
+#: authentication.pm:96 authentication.pm:134
 #, c-format
 msgid "Authentication Active Directory"
 msgstr ""
 
-#: authentication.pm:87 authentication.pm:126 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:97 authentication.pm:136 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr ""
 
-#: authentication.pm:89 diskdrake/dav.pm:63 help.pm:146 printer/printerdrake.pm:135 share/compssUsers.pl:81
+#: authentication.pm:99 diskdrake/dav.pm:63 help.pm:146 printer/printerdrake.pm:135 share/compssUsers.pl:81
 #, c-format
 msgid "Server"
 msgstr ""
 
-#: authentication.pm:90
+#: authentication.pm:100
 #, c-format
 msgid "LDAP users database"
 msgstr ""
 
-#: authentication.pm:91
+#: authentication.pm:101
 #, c-format
 msgid "Use Anonymous BIND "
 msgstr ""
 
-#: authentication.pm:92
+#: authentication.pm:102
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
 msgstr ""
 
-#: authentication.pm:93
+#: authentication.pm:103
 #, c-format
 msgid "Password for user"
 msgstr ""
 
-#: authentication.pm:94
+#: authentication.pm:104
 #, c-format
 msgid "Encryption"
 msgstr ""
 
-#: authentication.pm:105
+#: authentication.pm:115
 #, c-format
 msgid "Authentication NIS"
 msgstr ""
 
-#: authentication.pm:106
+#: authentication.pm:116
 #, c-format
 msgid "NIS Domain"
 msgstr ""
 
-#: authentication.pm:107
+#: authentication.pm:117
 #, c-format
 msgid "NIS Server"
 msgstr ""
 
-#: authentication.pm:112
+#: authentication.pm:122
 #, c-format
 msgid ""
 "For this to work for a W2K PDC, you will probably need to have the admin run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add and reboot the server.\n"
@@ -1353,34 +1353,60 @@ msgid ""
 "The command 'wbinfo -t' will test whether your authentication secrets are good."
 msgstr ""
 
-#: authentication.pm:124
+#: authentication.pm:134
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr ""
 
-#: authentication.pm:129
+#: authentication.pm:139
 #, c-format
 msgid "Domain Admin User Name"
 msgstr ""
 
-#: authentication.pm:130
+#: authentication.pm:140
 #, c-format
 msgid "Domain Admin Password"
 msgstr ""
 
-#: authentication.pm:131
+#: authentication.pm:141
 #, c-format
 msgid "Use Idmap for store UID/SID "
 msgstr ""
 
-#: authentication.pm:132
+#: authentication.pm:142
 #, c-format
 msgid "Default Idmap "
 msgstr ""
 
-#: authentication.pm:239
+#: authentication.pm:155
+#, c-format
+msgid "Set root password and network authentication methods"
+msgstr ""
+
+#: authentication.pm:156
+#, c-format
+msgid "Set root password"
+msgstr ""
+
+#. -PO: keep this short or else the buttons will not fit in the window
+#: authentication.pm:161 help.pm:722
+#, c-format
+msgid "No password"
+msgstr ""
+
+#: authentication.pm:167
+#, c-format
+msgid "This password is too short (it must be at least %d characters long)"
+msgstr ""
+
+#: authentication.pm:172 network/netconnect.pm:600 standalone/drakauth:23 standalone/drakauth:25 standalone/drakconnect:457
+#, c-format
+msgid "Authentication"
+msgstr ""
+
+#: authentication.pm:285
 #, c-format
-msgid "Can't use broadcast with no NIS domain"
+msgid "Can not use broadcast with no NIS domain"
 msgstr ""
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
@@ -1395,49 +1421,49 @@ msgid ""
 ""
 msgstr ""
 
-#: bootloader.pm:844
+#: bootloader.pm:817
 #, c-format
 msgid "LILO with graphical menu"
 msgstr ""
 
-#: bootloader.pm:845
+#: bootloader.pm:818
 #, c-format
 msgid "LILO with text menu"
 msgstr ""
 
-#: bootloader.pm:846
+#: bootloader.pm:819
 #, c-format
 msgid "Grub"
 msgstr ""
 
-#: bootloader.pm:847
+#: bootloader.pm:820
 #, c-format
 msgid "Yaboot"
 msgstr ""
 
-#: bootloader.pm:909
+#: bootloader.pm:882
 #, c-format
 msgid "not enough room in /boot"
 msgstr ""
 
-#: bootloader.pm:1321
+#: bootloader.pm:1294
 #, c-format
 msgid ""
-"You can't install the bootloader on a %s partition\n"
+"You can not install the bootloader on a %s partition\n"
 ""
 msgstr ""
 
-#: bootloader.pm:1366
+#: bootloader.pm:1339
 #, c-format
 msgid "Your bootloader configuration must be updated because partition has been renumbered"
 msgstr ""
 
-#: bootloader.pm:1381
+#: bootloader.pm:1354
 #, c-format
-msgid "The bootloader can't be installed correctly. You have to boot rescue and choose \"%s\""
+msgid "The bootloader can not be installed correctly. You have to boot rescue and choose \"%s\""
 msgstr ""
 
-#: bootloader.pm:1382
+#: bootloader.pm:1355
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr ""
@@ -1479,7 +1505,7 @@ msgstr ""
 
 #: common.pm:195
 #, c-format
-msgid "Can't make screenshots before partitioning"
+msgid "Can not make screenshots before partitioning"
 msgstr ""
 
 #: common.pm:202
@@ -1497,17 +1523,17 @@ msgstr ""
 msgid "consolehelper missing"
 msgstr ""
 
-#: crypto.pm:14 crypto.pm:43 lang.pm:194 network/adsl_consts.pm:39 network/adsl_consts.pm:47 network/adsl_consts.pm:55
+#: crypto.pm:14 crypto.pm:43 lang.pm:194 network/adsl_consts.pm:38 network/adsl_consts.pm:46 network/adsl_consts.pm:54
 #, c-format
 msgid "Austria"
 msgstr ""
 
-#: crypto.pm:15 crypto.pm:34 lang.pm:201 network/adsl_consts.pm:62 network/adsl_consts.pm:69 network/adsl_consts.pm:80 network/adsl_consts.pm:88 network/netconnect.pm:50
+#: crypto.pm:15 crypto.pm:34 lang.pm:201 network/adsl_consts.pm:61 network/adsl_consts.pm:68 network/adsl_consts.pm:79 network/adsl_consts.pm:87 network/netconnect.pm:50
 #, c-format
 msgid "Belgium"
 msgstr ""
 
-#: crypto.pm:16 lang.pm:222 network/adsl_consts.pm:611 network/adsl_consts.pm:618
+#: crypto.pm:16 lang.pm:222 network/adsl_consts.pm:610 network/adsl_consts.pm:617
 #, c-format
 msgid "Switzerland"
 msgstr ""
@@ -1522,32 +1548,32 @@ msgstr ""
 msgid "Czech Republic"
 msgstr ""
 
-#: crypto.pm:19 crypto.pm:36 lang.pm:236 network/adsl_consts.pm:413 network/adsl_consts.pm:421
+#: crypto.pm:19 crypto.pm:36 lang.pm:236 network/adsl_consts.pm:412 network/adsl_consts.pm:420
 #, c-format
 msgid "Germany"
 msgstr ""
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:254 network/adsl_consts.pm:320 network/adsl_consts.pm:331 network/adsl_consts.pm:341 network/adsl_consts.pm:351 network/adsl_consts.pm:361 network/adsl_consts.pm:372 network/adsl_consts.pm:383 network/adsl_consts.pm:393 network/adsl_consts.pm:403 network/netconnect.pm:47
+#: crypto.pm:20 crypto.pm:33 lang.pm:254 network/adsl_consts.pm:319 network/adsl_consts.pm:330 network/adsl_consts.pm:340 network/adsl_consts.pm:350 network/adsl_consts.pm:360 network/adsl_consts.pm:371 network/adsl_consts.pm:382 network/adsl_consts.pm:392 network/adsl_consts.pm:402 network/netconnect.pm:47
 #, c-format
 msgid "France"
 msgstr ""
 
-#: crypto.pm:21 crypto.pm:37 lang.pm:267 network/adsl_consts.pm:431
+#: crypto.pm:21 crypto.pm:37 lang.pm:267 network/adsl_consts.pm:430
 #, c-format
 msgid "Greece"
 msgstr ""
 
-#: crypto.pm:22 lang.pm:278 network/adsl_consts.pm:439
+#: crypto.pm:22 lang.pm:278 network/adsl_consts.pm:438
 #, c-format
 msgid "Hungary"
 msgstr ""
 
-#: crypto.pm:23 crypto.pm:42 lang.pm:287 network/adsl_consts.pm:463 network/adsl_consts.pm:473 network/adsl_consts.pm:480 network/netconnect.pm:49 standalone/drakxtv:47
+#: crypto.pm:23 crypto.pm:42 lang.pm:287 network/adsl_consts.pm:462 network/adsl_consts.pm:472 network/adsl_consts.pm:479 network/netconnect.pm:49 standalone/drakxtv:47
 #, c-format
 msgid "Italy"
 msgstr ""
 
-#: crypto.pm:24 crypto.pm:41 lang.pm:339 network/adsl_consts.pm:506 network/adsl_consts.pm:514 network/adsl_consts.pm:522 network/adsl_consts.pm:530 network/netconnect.pm:48
+#: crypto.pm:24 crypto.pm:41 lang.pm:339 network/adsl_consts.pm:505 network/adsl_consts.pm:513 network/adsl_consts.pm:521 network/adsl_consts.pm:529 network/netconnect.pm:48
 #, c-format
 msgid "Netherlands"
 msgstr ""
@@ -1557,12 +1583,12 @@ msgstr ""
 msgid "Norway"
 msgstr ""
 
-#: crypto.pm:26 lang.pm:352 network/adsl_consts.pm:538 network/adsl_consts.pm:548
+#: crypto.pm:26 lang.pm:352 network/adsl_consts.pm:537 network/adsl_consts.pm:547
 #, c-format
 msgid "Poland"
 msgstr ""
 
-#: crypto.pm:27 crypto.pm:39 lang.pm:369 network/adsl_consts.pm:604
+#: crypto.pm:27 crypto.pm:39 lang.pm:369 network/adsl_consts.pm:603
 #, c-format
 msgid "Sweden"
 msgstr ""
@@ -1671,7 +1697,7 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474 standalone/drakbackup:2937 standalone/drakbackup:2997
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:475 standalone/drakbackup:2937 standalone/drakbackup:2997
 #, c-format
 msgid "Details"
 msgstr ""
@@ -1711,7 +1737,7 @@ msgstr ""
 msgid "Windows"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:339 install_steps_gtk.pm:298 mouse.pm:168 services.pm:162 standalone/drakbackup:1603 standalone/drakperm:250
+#: diskdrake/hd_gtk.pm:339 install_steps_gtk.pm:299 mouse.pm:168 services.pm:162 standalone/drakbackup:1603 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr ""
@@ -1736,7 +1762,7 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:368 diskdrake/interactive.pm:426 diskdrake/interactive.pm:588 diskdrake/removable.pm:25 diskdrake/removable.pm:48 standalone/harddrake2:101 standalone/harddrake2:110
+#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:368 diskdrake/interactive.pm:426 diskdrake/interactive.pm:588 diskdrake/removable.pm:25 diskdrake/removable.pm:48 standalone/harddrake2:103 standalone/harddrake2:112
 #, c-format
 msgid "Type"
 msgstr ""
@@ -1810,7 +1836,7 @@ msgstr ""
 msgid "Do you want to save /etc/fstab modifications"
 msgstr ""
 
-#: diskdrake/interactive.pm:294 install_steps_interactive.pm:323
+#: diskdrake/interactive.pm:294 install_steps_interactive.pm:321
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
@@ -1825,7 +1851,7 @@ msgstr ""
 msgid "Auto allocate"
 msgstr ""
 
-#: diskdrake/interactive.pm:309 help.pm:530 help.pm:566 help.pm:606 help.pm:855 install_steps_interactive.pm:124
+#: diskdrake/interactive.pm:309 help.pm:530 help.pm:566 help.pm:606 help.pm:855 install_steps_interactive.pm:122
 #, c-format
 msgid "More"
 msgstr ""
@@ -1842,7 +1868,7 @@ msgstr ""
 
 #: diskdrake/interactive.pm:347
 #, c-format
-msgid "I can't add any more partitions"
+msgid "I can not add any more partitions"
 msgstr ""
 
 #: diskdrake/interactive.pm:348
@@ -1982,7 +2008,7 @@ msgstr ""
 #: diskdrake/interactive.pm:523
 #, c-format
 msgid ""
-"You can't create a new partition\n"
+"You can not create a new partition\n"
 "(since you reached the maximal number of primary partitions).\n"
 "First remove a primary partition and create an extended partition."
 msgstr ""
@@ -2025,7 +2051,7 @@ msgstr ""
 #: diskdrake/interactive.pm:628
 #, c-format
 msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
+"Can not unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 
@@ -2098,7 +2124,7 @@ msgstr ""
 
 #: diskdrake/interactive.pm:866
 #, c-format
-msgid "This partition can't be used for loopback"
+msgid "This partition can not be used for loopback"
 msgstr ""
 
 #: diskdrake/interactive.pm:879
@@ -2240,7 +2266,7 @@ msgstr ""
 msgid "Type: "
 msgstr ""
 
-#: diskdrake/interactive.pm:1164 install_steps_gtk.pm:310
+#: diskdrake/interactive.pm:1164 install_steps_gtk.pm:311
 #, c-format
 msgid "Name: "
 msgstr ""
@@ -2446,7 +2472,7 @@ msgstr ""
 
 #: diskdrake/smbnfs_gtk.pm:163
 #, c-format
-msgid "Can't login using username %s (bad password?)"
+msgid "Can not login using username %s (bad password?)"
 msgstr ""
 
 #: diskdrake/smbnfs_gtk.pm:167 diskdrake/smbnfs_gtk.pm:176
@@ -2529,22 +2555,22 @@ msgstr ""
 msgid "Enabling swap partition %s"
 msgstr ""
 
-#: fs/format.pm:39 fs/format.pm:46
+#: fs/format.pm:44 fs/format.pm:51
 #, c-format
 msgid "Formatting partition %s"
 msgstr ""
 
-#: fs/format.pm:43
+#: fs/format.pm:48
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr ""
 
-#: fs/format.pm:78
+#: fs/format.pm:83
 #, c-format
-msgid "I don't know how to format %s in type %s"
+msgid "I do not know how to format %s in type %s"
 msgstr ""
 
-#: fs/format.pm:80
+#: fs/format.pm:85
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr ""
@@ -2616,12 +2642,12 @@ msgstr ""
 
 #: fs/type.pm:364
 #, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
+msgid "You can not use JFS for partitions smaller than 16MB"
 msgstr ""
 
 #: fs/type.pm:365
 #, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgid "You can not use ReiserFS for partitions smaller than 32MB"
 msgstr ""
 
 #: fsedit.pm:25
@@ -2637,7 +2663,7 @@ msgstr ""
 #: fsedit.pm:180
 #, c-format
 msgid ""
-"I can't read the partition table of device %s, it's too corrupted for me :(\n"
+"I can not read the partition table of device %s, it's too corrupted for me :(\n"
 "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
 "The other solution is to not allow DrakX to modify the partition table.\n"
 "(the error is %s)\n"
@@ -2673,7 +2699,7 @@ msgstr ""
 
 #: fsedit.pm:404
 #, c-format
-msgid "You can't use a LVM Logical Volume for mount point %s"
+msgid "You can not use a LVM Logical Volume for mount point %s"
 msgstr ""
 
 #: fsedit.pm:406
@@ -2686,7 +2712,7 @@ msgstr ""
 
 #: fsedit.pm:409
 #, c-format
-msgid "You may not be able to install lilo (since lilo doesn't handle a LV on multiple PVs)"
+msgid "You may not be able to install lilo (since lilo does not handle a LV on multiple PVs)"
 msgstr ""
 
 #: fsedit.pm:412 fsedit.pm:414
@@ -2703,7 +2729,7 @@ msgstr ""
 
 #: fsedit.pm:420
 #, c-format
-msgid "You can't use an encrypted file system for mount point %s"
+msgid "You can not use an encrypted file system for mount point %s"
 msgstr ""
 
 #: fsedit.pm:481
@@ -2816,7 +2842,7 @@ msgstr ""
 msgid "Bridges and system controllers"
 msgstr ""
 
-#: harddrake/data.pm:270 help.pm:186 help.pm:855 install_steps_interactive.pm:995 printer/printerdrake.pm:875
+#: harddrake/data.pm:270 help.pm:186 help.pm:855 install_steps_interactive.pm:993 printer/printerdrake.pm:875
 #, c-format
 msgid "Printer"
 msgstr ""
@@ -2846,52 +2872,52 @@ msgstr ""
 msgid "PCMCIA controllers"
 msgstr ""
 
-#: harddrake/data.pm:330
+#: harddrake/data.pm:326
 #, c-format
 msgid "SCSI controllers"
 msgstr ""
 
-#: harddrake/data.pm:339
+#: harddrake/data.pm:335
 #, c-format
 msgid "USB controllers"
 msgstr ""
 
-#: harddrake/data.pm:348
+#: harddrake/data.pm:344
 #, c-format
 msgid "USB ports"
 msgstr ""
 
-#: harddrake/data.pm:357
+#: harddrake/data.pm:353
 #, c-format
 msgid "SMBus controllers"
 msgstr ""
 
-#: harddrake/data.pm:366
+#: harddrake/data.pm:362
 #, c-format
 msgid "UPS"
 msgstr ""
 
-#: harddrake/data.pm:375 help.pm:855 install_steps_interactive.pm:120 install_steps_interactive.pm:955 standalone/keyboarddrake:24
+#: harddrake/data.pm:371 help.pm:855 install_steps_interactive.pm:118 install_steps_interactive.pm:953 standalone/keyboarddrake:24
 #, c-format
 msgid "Keyboard"
 msgstr ""
 
-#: harddrake/data.pm:388 help.pm:855 install_steps_interactive.pm:988
+#: harddrake/data.pm:384 help.pm:855 install_steps_interactive.pm:986
 #, c-format
 msgid "Mouse"
 msgstr ""
 
-#: harddrake/data.pm:402
+#: harddrake/data.pm:398
 #, c-format
 msgid "Scanner"
 msgstr ""
 
-#: harddrake/data.pm:412 standalone/harddrake2:447
+#: harddrake/data.pm:408 standalone/harddrake2:449
 #, c-format
 msgid "Unknown/Others"
 msgstr ""
 
-#: harddrake/data.pm:440
+#: harddrake/data.pm:436
 #, c-format
 msgid "cpu # "
 msgstr ""
@@ -3118,7 +3144,7 @@ msgid ""
 "button will reboot your computer."
 msgstr ""
 
-#: help.pm:14 install_steps_gtk.pm:567 install_steps_interactive.pm:94 install_steps_interactive.pm:748 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:568 install_steps_interactive.pm:92 install_steps_interactive.pm:746 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr ""
@@ -3128,16 +3154,16 @@ msgstr ""
 msgid ""
 "GNU/Linux is a multi-user system which means each user can have his or her\n"
 "own preferences, own files and so on. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point won't be authorized\n"
+"system administrator, the users you add at this point will not be authorized\n"
 "to change anything except their own files and their own configurations,\n"
 "protecting the system from unintentional or malicious changes which could\n"
 "impact on the system as a whole. You'll have to create at least one regular\n"
 "user for yourself -- this is the account which you should use for routine,\n"
 "day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
 "anything and everything, it may also be very dangerous! A very simple\n"
-"mistake could mean that your system won't work any more. If you make a\n"
+"mistake could mean that your system will not work any more. If you make a\n"
 "serious mistake as a regular user, the worst that can happen is that you'll\n"
-"lose some information, but you won't affect the entire system.\n"
+"lose some information, but you will not affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
@@ -3158,7 +3184,7 @@ msgid ""
 "\n"
 "When you're finished adding users, you'll be asked to choose a user who\n"
 "will be automatically logged into the system when the computer boots up. If\n"
-"you're interested in that feature (and don't care much about local\n"
+"you're interested in that feature (and do not care much about local\n"
 "security), choose the desired user and window manager, then click on\n"
 "\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
@@ -3168,7 +3194,7 @@ msgstr ""
 msgid "User name"
 msgstr ""
 
-#: help.pm:51 help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:247 interactive.pm:403 interactive/newt.pm:317 network/netconnect.pm:280 network/tools.pm:201 printer/printerdrake.pm:3268 standalone/drakTermServ:374 standalone/drakbackup:3940 standalone/drakbackup:4034 standalone/drakbackup:4051 standalone/drakbackup:4069 ugtk2.pm:512
+#: help.pm:51 help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:248 interactive.pm:403 interactive/newt.pm:317 network/netconnect.pm:280 network/tools.pm:201 printer/printerdrake.pm:3268 standalone/drakTermServ:374 standalone/drakbackup:3940 standalone/drakbackup:4034 standalone/drakbackup:4051 standalone/drakbackup:4069 ugtk2.pm:508
 #, c-format
 msgid "Next"
 msgstr ""
@@ -3297,7 +3323,7 @@ msgstr ""
 msgid "Graphical Environment"
 msgstr ""
 
-#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:659
+#: help.pm:146 install_steps_gtk.pm:243 install_steps_interactive.pm:657
 #, c-format
 msgid "Individual package selection"
 msgstr ""
@@ -3307,7 +3333,7 @@ msgstr ""
 msgid "Upgrade"
 msgstr ""
 
-#: help.pm:146 install_steps_interactive.pm:613
+#: help.pm:146 install_steps_interactive.pm:611
 #, c-format
 msgid "With X"
 msgstr ""
@@ -3340,7 +3366,7 @@ msgid ""
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you don't know what a particular service is supposed to do or\n"
+"finalized. If you do not know what a particular service is supposed to do or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
 "\n"
@@ -3359,12 +3385,12 @@ msgid ""
 "such a floppy."
 msgstr ""
 
-#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:729 interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2502 standalone/draksec:54 standalone/harddrake2:314 ugtk2.pm:1118 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:741 interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2502 standalone/draksec:54 standalone/harddrake2:316 ugtk2.pm:1037 wizards.pm:156 wizards2.pm:158
 #, c-format
 msgid "No"
 msgstr ""
 
-#: help.pm:180 help.pm:285 help.pm:444 help.pm:444 install_any.pm:729 interactive.pm:149 modules/interactive.pm:71 printer/printerdrake.pm:711 standalone/drakbackup:2502 standalone/drakgw:290 standalone/drakgw:291 standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:55 standalone/harddrake2:313 ugtk2.pm:1118 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:444 help.pm:444 install_any.pm:741 interactive.pm:149 modules/interactive.pm:71 printer/printerdrake.pm:711 standalone/drakbackup:2502 standalone/drakgw:290 standalone/drakgw:291 standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:55 standalone/harddrake2:315 ugtk2.pm:1037 wizards.pm:156 wizards2.pm:158
 #, c-format
 msgid "Yes"
 msgstr ""
@@ -3383,7 +3409,7 @@ msgid ""
 "manual is similar to the one used during installation."
 msgstr ""
 
-#: help.pm:186 help.pm:566 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 install_steps_gtk.pm:623 standalone/drakbackup:2328 standalone/drakbackup:2332 standalone/drakbackup:2336 standalone/drakbackup:2340
+#: help.pm:186 help.pm:566 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 install_steps_gtk.pm:624 standalone/drakbackup:2328 standalone/drakbackup:2332 standalone/drakbackup:2336 standalone/drakbackup:2340
 #, c-format
 msgid "Configure"
 msgstr ""
@@ -3395,7 +3421,7 @@ msgid ""
 "time.\n"
 "\n"
 "DrakX will list all services available on the current installation. Review\n"
-"each one of them carefully and uncheck those which aren't needed at boot\n"
+"each one of them carefully and uncheck those which are not needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
@@ -3403,7 +3429,7 @@ msgid ""
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you probably don't want to start any services which you don't need.\n"
+"server: you probably do not want to start any services which you do not need.\n"
 "Please remember that some services can be dangerous if they're enabled on a\n"
 "server. In general, select only those services you really need. !!"
 msgstr ""
@@ -3425,7 +3451,7 @@ msgid ""
 "server which can be used by other machines on your local network as well."
 msgstr ""
 
-#: help.pm:217 install_steps_interactive.pm:890
+#: help.pm:217 install_steps_interactive.pm:888
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr ""
@@ -3594,7 +3620,7 @@ msgid ""
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
 "your hard drive and replace them with your new Mandrakelinux system, choose\n"
-"this option. Be careful, because you won't be able to undo this operation\n"
+"this option. Be careful, because you will not be able to undo this operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
@@ -3647,7 +3673,7 @@ msgstr ""
 #, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Do not forget\n"
 "to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
 "boot-loader menu, giving you the choice of which operating system to start.\n"
@@ -3686,17 +3712,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr ""
 
-#: help.pm:409 install_steps_interactive.pm:1367
+#: help.pm:409 install_steps_interactive.pm:1342
 #, c-format
 msgid "Replay"
 msgstr ""
 
-#: help.pm:409 install_steps_interactive.pm:1367
+#: help.pm:409 install_steps_interactive.pm:1342
 #, c-format
 msgid "Automated"
 msgstr ""
 
-#: help.pm:409 install_steps_interactive.pm:1370
+#: help.pm:409 install_steps_interactive.pm:1345
 #, c-format
 msgid "Save packages selection"
 msgstr ""
@@ -3710,12 +3736,12 @@ msgid ""
 "\n"
 "Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to reformat\n"
 "partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
 "Please be careful when selecting partitions. After the formatting is\n"
 "completed, all data on the selected partitions will be deleted and you\n"
-"won't be able to recover it.\n"
+"will not be able to recover it.\n"
 "\n"
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
@@ -3726,7 +3752,7 @@ msgid ""
 "bad blocks on the disk."
 msgstr ""
 
-#: help.pm:431 install_steps_gtk.pm:402 interactive.pm:404 interactive/newt.pm:316 printer/printerdrake.pm:3266 standalone/drakTermServ:353 standalone/drakbackup:3900 standalone/drakbackup:3939 standalone/drakbackup:4050 standalone/drakbackup:4065 ugtk2.pm:510
+#: help.pm:431 install_steps_gtk.pm:403 interactive.pm:404 interactive/newt.pm:316 printer/printerdrake.pm:3266 standalone/drakTermServ:353 standalone/drakbackup:3900 standalone/drakbackup:3939 standalone/drakbackup:4050 standalone/drakbackup:4065 ugtk2.pm:506
 #, c-format
 msgid "Previous"
 msgstr ""
@@ -3747,7 +3773,7 @@ msgid ""
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
 
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:401 install_steps_interactive.pm:158 standalone/drakbackup:4097
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:402 install_steps_interactive.pm:156 standalone/drakbackup:4097
 #, c-format
 msgid "Install"
 msgstr ""
@@ -3761,7 +3787,7 @@ msgid ""
 "exposed to the Internet. The trade-off that a higher security level is\n"
 "generally obtained at the expense of ease of use.\n"
 "\n"
-"If you don't know what to choose, keep the default option. You'll be able\n"
+"If you do not know what to choose, keep the default option. You'll be able\n"
 "to change it later with the draksec tool, which is part of Mandrakelinux\n"
 "Control Center.\n"
 "\n"
@@ -3804,7 +3830,7 @@ msgid ""
 "floppy disk.\n"
 "\n"
 " * \"%s\": if your partition table is damaged, you can try to recover it\n"
-"using this option. Please be careful and remember that it doesn't always\n"
+"using this option. Please be careful and remember that it does not always\n"
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
@@ -3897,7 +3923,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\"%s\": check the current country selection. If you're not in this country,\n"
-"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"click on the \"%s\" button and choose another. If your country is not in the\n"
 "list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 
@@ -3918,7 +3944,7 @@ msgid ""
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mandrakelinux system. Your current partitioning\n"
-"scheme and user data won't be altered. Most of the other configuration\n"
+"scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
@@ -3937,7 +3963,7 @@ msgid ""
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard don't match. In either case, this installation step\n"
+"country-set keyboard do not match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
 "Click on the \"%s\" button to be shown a list of supported keyboards.\n"
@@ -4070,10 +4096,10 @@ msgid ""
 "characters long. Never write down the \"root\" password -- it makes it far\n"
 "too easy to compromise your system.\n"
 "\n"
-"One caveat: don't make the password too long or too complicated because you\n"
+"One caveat: do not make the password too long or too complicated because you\n"
 "must be able to remember it!\n"
 "\n"
-"The password won't be displayed on screen as you type it. To reduce the\n"
+"The password will not be displayed on screen as you type it. To reduce the\n"
 "chance of a blind typing error you'll need to enter the password twice. If\n"
 "you do happen to make the same typing error twice, you'll have to use this\n"
 "``incorrect'' password the first time you'll try to connect as \"root\".\n"
@@ -4082,7 +4108,7 @@ msgid ""
 "click on the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one for \"%s\". If you don't know which\n"
+"services, select the appropriate one for \"%s\". If you do not know which\n"
 "one to use, you should ask your network administrator.\n"
 "\n"
 "If you happen to have problems with remembering passwords, or if your\n"
@@ -4095,12 +4121,6 @@ msgstr ""
 msgid "authentication"
 msgstr ""
 
-#. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:722 install_steps_interactive.pm:1214
-#, c-format
-msgid "No password"
-msgstr ""
-
 #: help.pm:725
 #, c-format
 msgid ""
@@ -4115,9 +4135,9 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"If DrakX can not determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
-"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"Choosing \"%s\" will not install any boot loader. Use this option only if you\n"
 "know what you're doing."
 msgstr ""
 
@@ -4128,9 +4148,9 @@ msgid ""
 "operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
-" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
+" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
 "within networks.) It's recommended that you use \"pdq\" if this is your\n"
 "first experience with GNU/Linux.\n"
@@ -4145,7 +4165,7 @@ msgid ""
 "\"%s\" includes graphical front-ends for printing or choosing printer\n"
 "options and for managing the printer.\n"
 "\n"
-"If you make a choice now, and later find that you don't like your printing\n"
+"If you make a choice now, and later find that you do not like your printing\n"
 "system you may change it by running PrinterDrake from the Mandrakelinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
@@ -4190,11 +4210,11 @@ msgstr ""
 #, c-format
 msgid ""
 "\"%s\": if a sound card is detected on your system, it'll be displayed\n"
-"here. If you notice the sound card isn't the one actually present on your\n"
+"here. If you notice the sound card is not the one actually present on your\n"
 "system, you can click on the button and choose a different driver."
 msgstr ""
 
-#: help.pm:788 help.pm:855 install_steps_interactive.pm:1022 install_steps_interactive.pm:1039
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1020 install_steps_interactive.pm:1037
 #, c-format
 msgid "Sound card"
 msgstr ""
@@ -4213,7 +4233,7 @@ msgid ""
 "\n"
 " * \"%s\": check the current country selection. If you're not in this\n"
 "country, click on the \"%s\" button and choose another. If your country\n"
-"isn't in the list shown, click on the \"%s\" button to get the complete\n"
+"is not in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
 " * \"%s\": by default, DrakX deduces your time zone based on the country\n"
@@ -4229,18 +4249,18 @@ msgid ""
 "presented in our manual is similar to the one used during installation.\n"
 "\n"
 " * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
-"here. If you notice the sound card isn't the one actually present on your\n"
+"here. If you notice the sound card is not the one actually present on your\n"
 "system, you can click on the button and choose a different driver.\n"
 "\n"
 " * \"%s\": if you have a TV card, this is where information about its\n"
-"configuration will be displayed. If you have a TV card and it isn't\n"
+"configuration will be displayed. If you have a TV card and it is not\n"
 "detected, click on \"%s\" to try to configure it manually.\n"
 "\n"
 " * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
 "the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
@@ -4269,12 +4289,12 @@ msgid ""
 "idea to review this setup."
 msgstr ""
 
-#: help.pm:855 install_steps_interactive.pm:981 standalone/drakclock:101
+#: help.pm:855 install_steps_interactive.pm:979 standalone/drakclock:101
 #, c-format
 msgid "Timezone"
 msgstr ""
 
-#: help.pm:855 install_steps_interactive.pm:1055
+#: help.pm:855 install_steps_interactive.pm:1053
 #, c-format
 msgid "TV card"
 msgstr ""
@@ -4289,32 +4309,32 @@ msgstr ""
 msgid "Graphical Interface"
 msgstr ""
 
-#: help.pm:855 install_steps_interactive.pm:1073 standalone/drakbackup:2030
+#: help.pm:855 install_steps_interactive.pm:1071 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr ""
 
-#: help.pm:855 install_steps_interactive.pm:1088
+#: help.pm:855 install_steps_interactive.pm:1086
 #, c-format
 msgid "Proxies"
 msgstr ""
 
-#: help.pm:855 install_steps_interactive.pm:1099
+#: help.pm:855 install_steps_interactive.pm:1097
 #, c-format
 msgid "Security Level"
 msgstr ""
 
-#: help.pm:855 install_steps_interactive.pm:1113
+#: help.pm:855 install_steps_interactive.pm:1111
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: help.pm:855 install_steps_interactive.pm:1127
+#: help.pm:855 install_steps_interactive.pm:1125
 #, c-format
 msgid "Bootloader"
 msgstr ""
 
-#: help.pm:855 install_steps_interactive.pm:1140 services.pm:193
+#: help.pm:855 install_steps_interactive.pm:1138 services.pm:193
 #, c-format
 msgid "Services"
 msgstr ""
@@ -4351,7 +4371,7 @@ msgstr ""
 
 #: install2.pm:117
 #, c-format
-msgid "Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)"
+msgid "Can not access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)"
 msgstr ""
 
 #: install2.pm:167
@@ -4406,29 +4426,34 @@ msgstr ""
 msgid "Insert the CD"
 msgstr ""
 
-#: install_any.pm:493
+#: install_any.pm:474
+#, c-format
+msgid "Unable to mount CD-ROM"
+msgstr ""
+
+#: install_any.pm:497
 #, c-format
 msgid "Insert the CD 1 again"
 msgstr ""
 
-#: install_any.pm:503 install_any.pm:507
+#: install_any.pm:507 install_any.pm:511
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: install_any.pm:539
+#: install_any.pm:543
 #, c-format
-msgid "Can't find hdlist file on this mirror"
+msgid "Can not find hdlist file on this mirror"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:720
+#: install_any.pm:732
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
 "\n"
 "\n"
-"These servers are activated by default. They don't have any known security\n"
+"These servers are activated by default. They do not have any known security\n"
 "issues, but some new ones could be found. In that case, you must make sure\n"
 "to upgrade as soon as possible.\n"
 "\n"
@@ -4438,7 +4463,7 @@ msgid ""
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:743
+#: install_any.pm:755
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -4448,37 +4473,37 @@ msgid ""
 ""
 msgstr ""
 
-#: install_any.pm:1123
+#: install_any.pm:1139
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr ""
 
-#: install_any.pm:1127
+#: install_any.pm:1143
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr ""
 
-#: install_any.pm:1139
+#: install_any.pm:1155
 #, c-format
 msgid "To use this saved packages selection, boot installation with ``linux defcfg=floppy''"
 msgstr ""
 
-#: install_any.pm:1167 partition_table.pm:599
+#: install_any.pm:1183 partition_table.pm:599
 #, c-format
 msgid "Error reading file %s"
 msgstr ""
 
-#: install_any.pm:1366
+#: install_any.pm:1382
 #, c-format
 msgid "The "
 msgstr ""
 
-#: install_any.pm:1368
+#: install_any.pm:1384
 #, c-format
 msgid "%s (was %s)"
 msgstr ""
 
-#: install_any.pm:1406
+#: install_any.pm:1422
 #, 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 ""
@@ -4511,7 +4536,7 @@ msgstr ""
 #: install_interactive.pm:67
 #, c-format
 msgid ""
-"You don't have a swap partition.\n"
+"You do not have a swap partition.\n"
 "\n"
 "Continue anyway?"
 msgstr ""
@@ -4653,12 +4678,12 @@ msgstr ""
 #, c-format
 msgid ""
 "You can now partition %s.\n"
-"When you are done, don't forget to save using `w'"
+"When you are done, do not forget to save using `w'"
 msgstr ""
 
 #: install_interactive.pm:271
 #, c-format
-msgid "I can't find any room for installing"
+msgid "I can not find any room for installing"
 msgstr ""
 
 #: install_interactive.pm:275
@@ -4841,13 +4866,13 @@ msgstr ""
 #: install_steps.pm:477
 #, c-format
 msgid ""
-"Some important packages didn't get installed properly.\n"
+"Some important packages did not get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
 "Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n"
 ""
 msgstr ""
 
-#: install_steps.pm:603
+#: install_steps.pm:604
 #, c-format
 msgid "No floppy drive available"
 msgstr ""
@@ -4859,7 +4884,7 @@ msgid ""
 ""
 msgstr ""
 
-#: install_steps_gtk.pm:184
+#: install_steps_gtk.pm:185
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -4867,433 +4892,428 @@ msgid ""
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: install_steps_gtk.pm:235 install_steps_interactive.pm:641
+#: install_steps_gtk.pm:236 install_steps_interactive.pm:639
 #, c-format
 msgid "Package Group Selection"
 msgstr ""
 
-#: install_steps_gtk.pm:264 install_steps_interactive.pm:580
+#: install_steps_gtk.pm:265 install_steps_interactive.pm:578
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr ""
 
-#: install_steps_gtk.pm:309
+#: install_steps_gtk.pm:310
 #, c-format
 msgid "Bad package"
 msgstr ""
 
-#: install_steps_gtk.pm:311
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Version: "
 msgstr ""
 
-#: install_steps_gtk.pm:312
+#: install_steps_gtk.pm:313
 #, c-format
 msgid "Size: "
 msgstr ""
 
-#: install_steps_gtk.pm:312
+#: install_steps_gtk.pm:313
 #, c-format
 msgid ""
 "%d KB\n"
 ""
 msgstr ""
 
-#: install_steps_gtk.pm:313
+#: install_steps_gtk.pm:314
 #, c-format
 msgid "Importance: "
 msgstr ""
 
-#: install_steps_gtk.pm:346
+#: install_steps_gtk.pm:347
 #, c-format
-msgid "You can't select/unselect this package"
+msgid "You can not select/unselect this package"
 msgstr ""
 
-#: install_steps_gtk.pm:350
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: install_steps_gtk.pm:351
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: install_steps_gtk.pm:352
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: install_steps_gtk.pm:353
+#: install_steps_gtk.pm:354
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: install_steps_gtk.pm:358
+#: install_steps_gtk.pm:359
 #, c-format
-msgid "You can't select this package as there is not enough space left to install it"
+msgid "You can not select this package as there is not enough space left to install it"
 msgstr ""
 
-#: install_steps_gtk.pm:361
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr ""
 
-#: install_steps_gtk.pm:362
+#: install_steps_gtk.pm:363
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr ""
 
-#: install_steps_gtk.pm:386
+#: install_steps_gtk.pm:387
 #, c-format
-msgid "This is a mandatory package, it can't be unselected"
+msgid "This is a mandatory package, it can not be unselected"
 msgstr ""
 
-#: install_steps_gtk.pm:388
+#: install_steps_gtk.pm:389
 #, c-format
-msgid "You can't unselect this package. It is already installed"
+msgid "You can not unselect this package. It is already installed"
 msgstr ""
 
-#: install_steps_gtk.pm:391
+#: install_steps_gtk.pm:392
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
 "Are you sure you want to deselect it?"
 msgstr ""
 
-#: install_steps_gtk.pm:394
+#: install_steps_gtk.pm:395
 #, c-format
-msgid "You can't unselect this package. It must be upgraded"
+msgid "You can not unselect this package. It must be upgraded"
 msgstr ""
 
-#: install_steps_gtk.pm:399
+#: install_steps_gtk.pm:400
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: install_steps_gtk.pm:404
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Load/Save on floppy"
 msgstr ""
 
-#: install_steps_gtk.pm:405
+#: install_steps_gtk.pm:406
 #, c-format
 msgid "Updating package selection"
 msgstr ""
 
-#: install_steps_gtk.pm:410
+#: install_steps_gtk.pm:411
 #, c-format
 msgid "Minimal install"
 msgstr ""
 
-#: install_steps_gtk.pm:424 install_steps_interactive.pm:494
+#: install_steps_gtk.pm:425 install_steps_interactive.pm:492
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: install_steps_gtk.pm:440 install_steps_interactive.pm:723
+#: install_steps_gtk.pm:441 install_steps_interactive.pm:721
 #, c-format
 msgid "Installing"
 msgstr ""
 
-#: install_steps_gtk.pm:447
+#: install_steps_gtk.pm:448
 #, c-format
 msgid "Estimating"
 msgstr ""
 
-#: install_steps_gtk.pm:453
+#: install_steps_gtk.pm:454
 #, c-format
 msgid "Time remaining "
 msgstr ""
 
-#: install_steps_gtk.pm:464
+#: install_steps_gtk.pm:465
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr ""
 
-#: install_steps_gtk.pm:474
+#: install_steps_gtk.pm:475
 #, c-format
 msgid "No details"
 msgstr ""
 
-#: install_steps_gtk.pm:527
+#: install_steps_gtk.pm:528
 #, c-format
 msgid "%d packages"
 msgstr ""
 
-#: install_steps_gtk.pm:532
+#: install_steps_gtk.pm:533
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: install_steps_gtk.pm:567 install_steps_interactive.pm:94 install_steps_interactive.pm:748
+#: install_steps_gtk.pm:568 install_steps_interactive.pm:92 install_steps_interactive.pm:746
 #, c-format
 msgid "Refuse"
 msgstr ""
 
-#: install_steps_gtk.pm:571 install_steps_interactive.pm:752
+#: install_steps_gtk.pm:572 install_steps_interactive.pm:750
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
 "Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n"
-"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
+"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: install_steps_gtk.pm:586 install_steps_interactive.pm:763
+#: install_steps_gtk.pm:587 install_steps_interactive.pm:761
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: install_steps_gtk.pm:586 install_steps_gtk.pm:590 install_steps_interactive.pm:763 install_steps_interactive.pm:767
+#: install_steps_gtk.pm:587 install_steps_gtk.pm:591 install_steps_interactive.pm:761 install_steps_interactive.pm:765
 #, c-format
 msgid "Go on anyway?"
 msgstr ""
 
-#: install_steps_gtk.pm:590 install_steps_interactive.pm:767
+#: install_steps_gtk.pm:591 install_steps_interactive.pm:765
 #, c-format
 msgid "There was an error installing packages:"
 msgstr ""
 
-#: install_steps_gtk.pm:633 install_steps_interactive.pm:937 install_steps_interactive.pm:1089
+#: install_steps_gtk.pm:634 install_steps_interactive.pm:935 install_steps_interactive.pm:1087
 #, c-format
 msgid "not configured"
 msgstr ""
 
-#: install_steps_interactive.pm:86
-#, c-format
-msgid "Do you want to recover your system?"
-msgstr ""
-
-#: install_steps_interactive.pm:87
+#: install_steps_interactive.pm:85
 #, c-format
 msgid "License agreement"
 msgstr ""
 
-#: install_steps_interactive.pm:91 install_steps_interactive.pm:91
+#: install_steps_interactive.pm:89 install_steps_interactive.pm:89
 #, c-format
 msgid "Release Notes"
 msgstr ""
 
-#: install_steps_interactive.pm:121
+#: install_steps_interactive.pm:119
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr ""
 
-#: install_steps_interactive.pm:123
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr ""
 
-#: install_steps_interactive.pm:153
+#: install_steps_interactive.pm:151
 #, c-format
 msgid "Install/Upgrade"
 msgstr ""
 
-#: install_steps_interactive.pm:154
+#: install_steps_interactive.pm:152
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:158
 #, c-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: install_steps_interactive.pm:170
+#: install_steps_interactive.pm:168
 #, c-format
 msgid "Encryption key for %s"
 msgstr ""
 
-#: install_steps_interactive.pm:187
+#: install_steps_interactive.pm:185
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr ""
 
-#: install_steps_interactive.pm:196 standalone/mousedrake:46
+#: install_steps_interactive.pm:194 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr ""
 
-#: install_steps_interactive.pm:197 standalone/mousedrake:47
+#: install_steps_interactive.pm:195 standalone/mousedrake:47
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr ""
 
-#: install_steps_interactive.pm:207
+#: install_steps_interactive.pm:205
 #, c-format
 msgid "Buttons emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:209
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Button 2 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:210
+#: install_steps_interactive.pm:208
 #, c-format
 msgid "Button 3 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:229
 #, c-format
 msgid "PCMCIA"
 msgstr ""
 
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:229
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr ""
 
-#: install_steps_interactive.pm:238
+#: install_steps_interactive.pm:236
 #, c-format
 msgid "IDE"
 msgstr ""
 
-#: install_steps_interactive.pm:238
+#: install_steps_interactive.pm:236
 #, c-format
 msgid "Configuring IDE"
 msgstr ""
 
-#: install_steps_interactive.pm:258 network/tools.pm:191
+#: install_steps_interactive.pm:256 network/tools.pm:191
 #, c-format
 msgid "No partition available"
 msgstr ""
 
-#: install_steps_interactive.pm:261
+#: install_steps_interactive.pm:259
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr ""
 
-#: install_steps_interactive.pm:268
+#: install_steps_interactive.pm:266
 #, c-format
 msgid "Choose the mount points"
 msgstr ""
 
-#: install_steps_interactive.pm:306
+#: install_steps_interactive.pm:304
 #, 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:311
+#: install_steps_interactive.pm:309
 #, c-format
 msgid "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: install_steps_interactive.pm:347
+#: install_steps_interactive.pm:345
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr ""
 
-#: install_steps_interactive.pm:349
+#: install_steps_interactive.pm:347
 #, c-format
 msgid "Check bad blocks?"
 msgstr ""
 
-#: install_steps_interactive.pm:381
+#: install_steps_interactive.pm:379
 #, 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:384
+#: install_steps_interactive.pm:382
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr ""
 
-#: install_steps_interactive.pm:391
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr ""
 
-#: install_steps_interactive.pm:392 install_steps_interactive.pm:455
+#: install_steps_interactive.pm:390 install_steps_interactive.pm:453
 #, c-format
 msgid "Looking for available packages..."
 msgstr ""
 
-#: install_steps_interactive.pm:395
+#: install_steps_interactive.pm:393
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 
-#: install_steps_interactive.pm:399
+#: install_steps_interactive.pm:397
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: install_steps_interactive.pm:424 install_steps_interactive.pm:842
+#: install_steps_interactive.pm:422 install_steps_interactive.pm:840
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: install_steps_interactive.pm:464
+#: install_steps_interactive.pm:462
 #, c-format
 msgid "Your system does not have enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 
-#: install_steps_interactive.pm:506
+#: install_steps_interactive.pm:504
 #, 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:508
+#: install_steps_interactive.pm:506
 #, c-format
 msgid "Load from floppy"
 msgstr ""
 
-#: install_steps_interactive.pm:508
+#: install_steps_interactive.pm:506
 #, c-format
 msgid "Save on floppy"
 msgstr ""
 
-#: install_steps_interactive.pm:512
+#: install_steps_interactive.pm:510
 #, c-format
 msgid "Package selection"
 msgstr ""
 
-#: install_steps_interactive.pm:512
+#: install_steps_interactive.pm:510
 #, c-format
 msgid "Loading from floppy"
 msgstr ""
 
-#: install_steps_interactive.pm:517
+#: install_steps_interactive.pm:515
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr ""
 
-#: install_steps_interactive.pm:594
+#: install_steps_interactive.pm:592
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: install_steps_interactive.pm:609
+#: install_steps_interactive.pm:607
 #, c-format
 msgid "Type of install"
 msgstr ""
 
-#: install_steps_interactive.pm:610
+#: install_steps_interactive.pm:608
 #, c-format
 msgid ""
-"You haven't selected any group of packages.\n"
+"You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: install_steps_interactive.pm:614
+#: install_steps_interactive.pm:612
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: install_steps_interactive.pm:615
+#: install_steps_interactive.pm:613
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: install_steps_interactive.pm:658 standalone/drakxtv:52
+#: install_steps_interactive.pm:656 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr ""
 
-#: install_steps_interactive.pm:697
+#: install_steps_interactive.pm:695
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -5301,34 +5321,34 @@ msgid ""
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: install_steps_interactive.pm:702
+#: install_steps_interactive.pm:700
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr ""
 
-#: install_steps_interactive.pm:723
+#: install_steps_interactive.pm:721
 #, c-format
 msgid "Preparing installation"
 msgstr ""
 
-#: install_steps_interactive.pm:732
+#: install_steps_interactive.pm:730
 #, c-format
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
 
-#: install_steps_interactive.pm:781
+#: install_steps_interactive.pm:779
 #, c-format
 msgid "Post-install configuration"
 msgstr ""
 
-#: install_steps_interactive.pm:787
+#: install_steps_interactive.pm:785
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr ""
 
-#: install_steps_interactive.pm:816
+#: install_steps_interactive.pm:814
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -5341,195 +5361,175 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: install_steps_interactive.pm:837
+#: install_steps_interactive.pm:835
 #, c-format
 msgid "Contacting Mandrakelinux web site to get the list of available mirrors..."
 msgstr ""
 
-#: install_steps_interactive.pm:856
+#: install_steps_interactive.pm:854
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr ""
 
-#: install_steps_interactive.pm:860
+#: install_steps_interactive.pm:858
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr ""
 
-#: install_steps_interactive.pm:860
+#: install_steps_interactive.pm:858
 #, c-format
 msgid "Would you like to try again?"
 msgstr ""
 
-#: install_steps_interactive.pm:886 standalone/drakclock:46
+#: install_steps_interactive.pm:884 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr ""
 
-#: install_steps_interactive.pm:891
+#: install_steps_interactive.pm:889
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr ""
 
-#: install_steps_interactive.pm:899
+#: install_steps_interactive.pm:897
 #, c-format
 msgid "NTP Server"
 msgstr ""
 
-#: install_steps_interactive.pm:941 steps.pm:30
+#: install_steps_interactive.pm:939 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr ""
 
-#: install_steps_interactive.pm:954 install_steps_interactive.pm:962 install_steps_interactive.pm:980 install_steps_interactive.pm:987 install_steps_interactive.pm:1139 services.pm:133 standalone/drakbackup:1593
+#: install_steps_interactive.pm:952 install_steps_interactive.pm:960 install_steps_interactive.pm:978 install_steps_interactive.pm:985 install_steps_interactive.pm:1137 services.pm:133 standalone/drakbackup:1593
 #, c-format
 msgid "System"
 msgstr ""
 
-#: install_steps_interactive.pm:994 install_steps_interactive.pm:1021 install_steps_interactive.pm:1038 install_steps_interactive.pm:1054 install_steps_interactive.pm:1065
+#: install_steps_interactive.pm:992 install_steps_interactive.pm:1019 install_steps_interactive.pm:1036 install_steps_interactive.pm:1052 install_steps_interactive.pm:1063
 #, c-format
 msgid "Hardware"
 msgstr ""
 
-#: install_steps_interactive.pm:1000 install_steps_interactive.pm:1009
+#: install_steps_interactive.pm:998 install_steps_interactive.pm:1007
 #, c-format
 msgid "Remote CUPS server"
 msgstr ""
 
-#: install_steps_interactive.pm:1000
+#: install_steps_interactive.pm:998
 #, c-format
 msgid "No printer"
 msgstr ""
 
-#: install_steps_interactive.pm:1042
+#: install_steps_interactive.pm:1040
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr ""
 
-#: install_steps_interactive.pm:1044
+#: install_steps_interactive.pm:1042
 #, c-format
 msgid "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card"
 msgstr ""
 
-#: install_steps_interactive.pm:1046
+#: install_steps_interactive.pm:1044
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: install_steps_interactive.pm:1066
+#: install_steps_interactive.pm:1064
 #, c-format
 msgid "Graphical interface"
 msgstr ""
 
-#: install_steps_interactive.pm:1072 install_steps_interactive.pm:1087
+#: install_steps_interactive.pm:1070 install_steps_interactive.pm:1085
 #, c-format
 msgid "Network & Internet"
 msgstr ""
 
-#: install_steps_interactive.pm:1089
+#: install_steps_interactive.pm:1087
 #, c-format
 msgid "configured"
 msgstr ""
 
-#: install_steps_interactive.pm:1098 install_steps_interactive.pm:1112 steps.pm:20
+#: install_steps_interactive.pm:1096 install_steps_interactive.pm:1110 steps.pm:20
 #, c-format
 msgid "Security"
 msgstr ""
 
-#: install_steps_interactive.pm:1117
+#: install_steps_interactive.pm:1115
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: install_steps_interactive.pm:1117
+#: install_steps_interactive.pm:1115
 #, c-format
 msgid "disabled"
 msgstr ""
 
-#: install_steps_interactive.pm:1126
+#: install_steps_interactive.pm:1124
 #, c-format
 msgid "Boot"
 msgstr ""
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1130
+#: install_steps_interactive.pm:1128
 #, c-format
 msgid "%s on %s"
 msgstr ""
 
-#: install_steps_interactive.pm:1144 services.pm:175
+#: install_steps_interactive.pm:1142 services.pm:175
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr ""
 
-#: install_steps_interactive.pm:1154
+#: install_steps_interactive.pm:1152
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: install_steps_interactive.pm:1208
-#, c-format
-msgid "Set root password and network authentication methods"
-msgstr ""
-
-#: install_steps_interactive.pm:1209
-#, c-format
-msgid "Set root password"
-msgstr ""
-
-#: install_steps_interactive.pm:1220
-#, c-format
-msgid "This password is too short (it must be at least %d characters long)"
-msgstr ""
-
-#: install_steps_interactive.pm:1225 network/netconnect.pm:600 standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457
-#, c-format
-msgid "Authentication"
-msgstr ""
-
-#: install_steps_interactive.pm:1257
+#: install_steps_interactive.pm:1232
 #, c-format
 msgid "Preparing bootloader..."
 msgstr ""
 
-#: install_steps_interactive.pm:1267
+#: install_steps_interactive.pm:1242
 #, c-format
 msgid "You appear to have an OldWorld or Unknown machine, the yaboot bootloader will not work for you. The install will continue, but you'll need to use BootX or some other means to boot your machine. The kernel argument for the root fs is: root=%s"
 msgstr ""
 
-#: install_steps_interactive.pm:1273
+#: install_steps_interactive.pm:1248
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr ""
 
-#: install_steps_interactive.pm:1276
+#: install_steps_interactive.pm:1251
 #, c-format
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: install_steps_interactive.pm:1297
+#: install_steps_interactive.pm:1272
 #, c-format
 msgid "In this security level, access to the files in the Windows partition is restricted to the administrator."
 msgstr ""
 
-#: install_steps_interactive.pm:1325 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1300 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: install_steps_interactive.pm:1330
+#: install_steps_interactive.pm:1305
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr ""
 
-#: install_steps_interactive.pm:1332
+#: install_steps_interactive.pm:1307
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr ""
 
-#: install_steps_interactive.pm:1344
+#: install_steps_interactive.pm:1319
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -5537,12 +5537,12 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: install_steps_interactive.pm:1360
+#: install_steps_interactive.pm:1335
 #, c-format
 msgid "Generate auto install floppy"
 msgstr ""
 
-#: install_steps_interactive.pm:1362
+#: install_steps_interactive.pm:1337
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -5589,7 +5589,7 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:512
+#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:508
 #, c-format
 msgid "Finish"
 msgstr ""
@@ -6457,7 +6457,7 @@ msgstr ""
 msgid "Andorra"
 msgstr ""
 
-#: lang.pm:183 network/adsl_consts.pm:636
+#: lang.pm:183 network/adsl_consts.pm:635
 #, c-format
 msgid "United Arab Emirates"
 msgstr ""
@@ -6502,7 +6502,7 @@ msgstr ""
 msgid "Antarctica"
 msgstr ""
 
-#: lang.pm:192 network/adsl_consts.pm:31 standalone/drakxtv:50
+#: lang.pm:192 network/adsl_consts.pm:30 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr ""
@@ -6547,7 +6547,7 @@ msgstr ""
 msgid "Burkina Faso"
 msgstr ""
 
-#: lang.pm:203 network/adsl_consts.pm:129 network/adsl_consts.pm:137
+#: lang.pm:203 network/adsl_consts.pm:128 network/adsl_consts.pm:136
 #, c-format
 msgid "Bulgaria"
 msgstr ""
@@ -6582,7 +6582,7 @@ msgstr ""
 msgid "Bolivia"
 msgstr ""
 
-#: lang.pm:210 network/adsl_consts.pm:95 network/adsl_consts.pm:105 network/adsl_consts.pm:113 network/adsl_consts.pm:121
+#: lang.pm:210 network/adsl_consts.pm:94 network/adsl_consts.pm:104 network/adsl_consts.pm:112 network/adsl_consts.pm:120
 #, c-format
 msgid "Brazil"
 msgstr ""
@@ -6662,7 +6662,7 @@ msgstr ""
 msgid "Cameroon"
 msgstr ""
 
-#: lang.pm:227 network/adsl_consts.pm:145 network/adsl_consts.pm:153 network/adsl_consts.pm:161 network/adsl_consts.pm:169 network/adsl_consts.pm:177 network/adsl_consts.pm:185 network/adsl_consts.pm:193 network/adsl_consts.pm:201 network/adsl_consts.pm:209 network/adsl_consts.pm:217 network/adsl_consts.pm:225 network/adsl_consts.pm:233 network/adsl_consts.pm:241 network/adsl_consts.pm:249 network/adsl_consts.pm:257 network/adsl_consts.pm:265 network/adsl_consts.pm:273 network/adsl_consts.pm:281 network/adsl_consts.pm:289 network/adsl_consts.pm:297
+#: lang.pm:227 network/adsl_consts.pm:144 network/adsl_consts.pm:152 network/adsl_consts.pm:160 network/adsl_consts.pm:168 network/adsl_consts.pm:176 network/adsl_consts.pm:184 network/adsl_consts.pm:192 network/adsl_consts.pm:200 network/adsl_consts.pm:208 network/adsl_consts.pm:216 network/adsl_consts.pm:224 network/adsl_consts.pm:232 network/adsl_consts.pm:240 network/adsl_consts.pm:248 network/adsl_consts.pm:256 network/adsl_consts.pm:264 network/adsl_consts.pm:272 network/adsl_consts.pm:280 network/adsl_consts.pm:288 network/adsl_consts.pm:296
 #, c-format
 msgid "China"
 msgstr ""
@@ -6702,7 +6702,7 @@ msgstr ""
 msgid "Djibouti"
 msgstr ""
 
-#: lang.pm:238 network/adsl_consts.pm:305
+#: lang.pm:238 network/adsl_consts.pm:304
 #, c-format
 msgid "Denmark"
 msgstr ""
@@ -6747,7 +6747,7 @@ msgstr ""
 msgid "Eritrea"
 msgstr ""
 
-#: lang.pm:247 network/adsl_consts.pm:574 network/adsl_consts.pm:583 network/adsl_consts.pm:594
+#: lang.pm:247 network/adsl_consts.pm:573 network/adsl_consts.pm:582 network/adsl_consts.pm:593
 #, c-format
 msgid "Spain"
 msgstr ""
@@ -6757,7 +6757,7 @@ msgstr ""
 msgid "Ethiopia"
 msgstr ""
 
-#: lang.pm:249 network/adsl_consts.pm:312
+#: lang.pm:249 network/adsl_consts.pm:311
 #, c-format
 msgid "Finland"
 msgstr ""
@@ -6787,7 +6787,7 @@ msgstr ""
 msgid "Gabon"
 msgstr ""
 
-#: lang.pm:256 network/adsl_consts.pm:644 network/adsl_consts.pm:652 network/netconnect.pm:52
+#: lang.pm:256 network/adsl_consts.pm:643 network/adsl_consts.pm:651 network/netconnect.pm:52
 #, c-format
 msgid "United Kingdom"
 msgstr ""
@@ -6897,12 +6897,12 @@ msgstr ""
 msgid "Indonesia"
 msgstr ""
 
-#: lang.pm:280 network/adsl_consts.pm:447 standalone/drakxtv:47
+#: lang.pm:280 network/adsl_consts.pm:446 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr ""
 
-#: lang.pm:281 network/adsl_consts.pm:455
+#: lang.pm:281 network/adsl_consts.pm:454
 #, c-format
 msgid "Israel"
 msgstr ""
@@ -7037,7 +7037,7 @@ msgstr ""
 msgid "Lesotho"
 msgstr ""
 
-#: lang.pm:309 network/adsl_consts.pm:490
+#: lang.pm:309 network/adsl_consts.pm:489
 #, c-format
 msgid "Lithuania"
 msgstr ""
@@ -7057,7 +7057,7 @@ msgstr ""
 msgid "Libya"
 msgstr ""
 
-#: lang.pm:313 network/adsl_consts.pm:498
+#: lang.pm:313 network/adsl_consts.pm:497
 #, c-format
 msgid "Morocco"
 msgstr ""
@@ -7262,7 +7262,7 @@ msgstr ""
 msgid "Palestine"
 msgstr ""
 
-#: lang.pm:357 network/adsl_consts.pm:556
+#: lang.pm:357 network/adsl_consts.pm:555
 #, c-format
 msgid "Portugal"
 msgstr ""
@@ -7332,7 +7332,7 @@ msgstr ""
 msgid "Saint Helena"
 msgstr ""
 
-#: lang.pm:372 network/adsl_consts.pm:563
+#: lang.pm:372 network/adsl_consts.pm:562
 #, c-format
 msgid "Slovenia"
 msgstr ""
@@ -7407,7 +7407,7 @@ msgstr ""
 msgid "Togo"
 msgstr ""
 
-#: lang.pm:388 network/adsl_consts.pm:628
+#: lang.pm:388 network/adsl_consts.pm:627
 #, c-format
 msgid "Thailand"
 msgstr ""
@@ -7962,7 +7962,7 @@ msgstr ""
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
 "Some connections use PPTP, a few use DHCP.\n"
-"If you don't know, choose 'use PPPoE'"
+"If you do not know, choose 'use PPPoE'"
 msgstr ""
 
 #: network/adsl.pm:41 network/netconnect.pm:808
@@ -8094,7 +8094,7 @@ msgstr ""
 
 #: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
-msgid "I don't know"
+msgid "I do not know"
 msgstr ""
 
 #: network/isdn.pm:169 network/netconnect.pm:388
@@ -8454,7 +8454,7 @@ msgstr ""
 msgid "External ISDN modem"
 msgstr ""
 
-#: network/netconnect.pm:377 standalone/harddrake2:205
+#: network/netconnect.pm:377 standalone/harddrake2:207
 #, c-format
 msgid "Select a device!"
 msgstr ""
@@ -8499,7 +8499,7 @@ msgstr ""
 msgid "A CAPI driver is available for this modem. This CAPI driver can offer more capabilities than the free driver (like sending faxes). Which driver do you want to use?"
 msgstr ""
 
-#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247 standalone/harddrake2:126
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247 standalone/harddrake2:128
 #, c-format
 msgid "Driver"
 msgstr ""
@@ -8518,7 +8518,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Select your provider.\n"
-"If it isn't listed, choose Unlisted."
+"If it is not listed, choose Unlisted."
 msgstr ""
 
 #: network/netconnect.pm:455 network/netconnect.pm:567 network/netconnect.pm:723
@@ -8529,7 +8529,7 @@ msgstr ""
 #: network/netconnect.pm:470
 #, c-format
 msgid ""
-"Your modem isn't supported by the system.\n"
+"Your modem is not supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
 
@@ -9090,7 +9090,7 @@ msgstr ""
 #: network/netconnect.pm:1330
 #, c-format
 msgid ""
-"The system doesn't seem to be connected to the Internet.\n"
+"The system does not seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 
@@ -9103,7 +9103,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
-"Test your connection via net_monitor or mcc. If your connection doesn't work, you might want to relaunch the configuration."
+"Test your connection via net_monitor or mcc. If your connection does not work, you might want to relaunch the configuration."
 msgstr ""
 
 #: network/netconnect.pm:1361
@@ -9114,34 +9114,34 @@ msgid ""
 ""
 msgstr ""
 
-#: network/netconnect.pm:1397
+#: network/netconnect.pm:1399
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
 "%s"
 msgstr ""
 
-#: network/network.pm:318
+#: network/network.pm:319
 #, c-format
 msgid "Proxies configuration"
 msgstr ""
 
-#: network/network.pm:319
+#: network/network.pm:320
 #, c-format
 msgid "HTTP proxy"
 msgstr ""
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "FTP proxy"
 msgstr ""
 
-#: network/network.pm:323
+#: network/network.pm:324
 #, c-format
 msgid "Proxy should be http://..."
 msgstr ""
 
-#: network/network.pm:324
+#: network/network.pm:325
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr ""
@@ -9196,7 +9196,7 @@ msgstr ""
 #: partition_table.pm:520
 #, c-format
 msgid ""
-"You have a hole in your partition table but I can't use it.\n"
+"You have a hole in your partition table but I can not use it.\n"
 "The only solution is to move your primary partitions to have the hole next to the extended partitions."
 msgstr ""
 
@@ -9275,7 +9275,7 @@ msgstr ""
 
 #: printer/data.pm:40
 #, c-format
-msgid "PDQ - Print, Don't Queue"
+msgid "PDQ - Print, Do not Queue"
 msgstr ""
 
 #: printer/data.pm:41
@@ -10023,7 +10023,7 @@ msgid ""
 "\n"
 "Please plug in and turn on all printers connected to this machine so that it/they can be auto-detected. Also your network printer(s) and your Windows machines must be connected and turned on.\n"
 "\n"
-"Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you don't need it.\n"
+"Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you do not need it.\n"
 "\n"
 " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."
 msgstr ""
@@ -10051,7 +10051,7 @@ msgid ""
 "\n"
 "If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected. Also your network printer(s) must be connected and turned on.\n"
 "\n"
-"Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you don't need it.\n"
+"Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you do not need it.\n"
 "\n"
 " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."
 msgstr ""
@@ -10280,7 +10280,7 @@ msgstr ""
 msgid "Remote printer name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914 standalone/drakTermServ:431 standalone/drakTermServ:733 standalone/drakTermServ:750 standalone/drakTermServ:1461 standalone/drakTermServ:1469 standalone/drakTermServ:1480 standalone/drakbackup:513 standalone/drakbackup:619 standalone/drakbackup:654 standalone/drakbackup:774 standalone/harddrake2:252
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914 standalone/drakTermServ:431 standalone/drakTermServ:733 standalone/drakTermServ:750 standalone/drakTermServ:1461 standalone/drakTermServ:1469 standalone/drakTermServ:1480 standalone/drakbackup:513 standalone/drakbackup:619 standalone/drakbackup:654 standalone/drakbackup:774 standalone/harddrake2:254
 #, c-format
 msgid "Information"
 msgstr ""
@@ -11446,7 +11446,7 @@ msgstr ""
 
 #: raid.pm:42
 #, c-format
-msgid "Can't add a partition to _formatted_ RAID %s"
+msgid "Can not add a partition to _formatted_ RAID %s"
 msgstr ""
 
 #: raid.pm:144
@@ -12323,8 +12323,8 @@ msgstr ""
 #, c-format
 msgid ""
 "PCMCIA support is usually to support things like ethernet and\n"
-"modems in laptops.  It won't get started unless configured so it is safe to have\n"
-"it installed on machines that don't need it."
+"modems in laptops.  It will not get started unless configured so it is safe to have\n"
+"it installed on machines that do not need it."
 msgstr ""
 
 #: services.pm:70
@@ -12457,7 +12457,7 @@ msgid ""
 "about this service, sorry."
 msgstr ""
 
-#: services.pm:224 ugtk2.pm:1211
+#: services.pm:224 ugtk2.pm:1130
 #, c-format
 msgid "Info"
 msgstr ""
@@ -12569,7 +12569,7 @@ msgstr ""
 
 #: share/advertising/05.pl:17
 #, c-format
-msgid "The Download version <b>cannot include</b> all the software that is not open source. Therefore, you won't find in the Download version:"
+msgid "The Download version <b>cannot include</b> all the software that is not open source. Therefore, you will not find in the Download version:"
 msgstr ""
 
 #: share/advertising/05.pl:18
@@ -12584,7 +12584,7 @@ msgstr ""
 
 #: share/advertising/05.pl:21
 #, c-format
-msgid "You won't have access to the <b>services included</b> in the other Mandrakesoft products either."
+msgid "You will not have access to the <b>services included</b> in the other Mandrakesoft products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -12724,7 +12724,7 @@ msgstr ""
 
 #: share/advertising/12.pl:17
 #, c-format
-msgid "KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you won't ever think of running another operating system!"
+msgid "KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you will not ever think of running another operating system!"
 msgstr ""
 
 #: share/advertising/12.pl:19
@@ -13608,7 +13608,7 @@ msgid ""
 "--disconnect : disconnect to internet if already connected\n"
 "--force : used with (dis)connect : force (dis)connection.\n"
 "--status : returns 1 if connected 0 otherwise, then exit.\n"
-"--quiet : don't be interactive. To be used with (dis)connect."
+"--quiet : do not be interactive. To be used with (dis)connect."
 msgstr ""
 
 #: standalone.pm:107
@@ -13620,8 +13620,8 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      don't ask first confirmation question in MandrakeUpdate mode\n"
-"  --no-verify-rpm        don't verify packages signatures\n"
+"  --no-confirmation      do not ask first confirmation question in MandrakeUpdate mode\n"
+"  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
@@ -14124,7 +14124,7 @@ msgstr ""
 
 #: standalone/drakTermServ:1137
 #, c-format
-msgid "Thin clients won't work with autologin. Disable autologin?"
+msgid "Thin clients will not work with autologin. Disable autologin?"
 msgstr ""
 
 #: standalone/drakTermServ:1153
@@ -14212,7 +14212,7 @@ msgstr ""
 
 #: standalone/drakTermServ:1459
 #, c-format
-msgid "Couldn't access the floppy!"
+msgid "Could not access the floppy!"
 msgstr ""
 
 #: standalone/drakTermServ:1461
@@ -14316,7 +14316,7 @@ msgstr ""
 
 #: standalone/drakautoinst:39
 #, c-format
-msgid "I can't find needed image file `%s'."
+msgid "I can not find needed image file `%s'."
 msgstr ""
 
 #: standalone/drakautoinst:41
@@ -14583,7 +14583,7 @@ msgstr ""
 
 #: standalone/drakbackup:646
 #, c-format
-msgid "Can't find %s on %s"
+msgid "Can not find %s on %s"
 msgstr ""
 
 #: standalone/drakbackup:650
@@ -14740,7 +14740,7 @@ msgstr ""
 
 #: standalone/drakbackup:1192
 #, c-format
-msgid "Can't create catalog!"
+msgid "Can not create catalog!"
 msgstr ""
 
 #: standalone/drakbackup:1414
@@ -14937,7 +14937,7 @@ msgstr ""
 
 #: standalone/drakbackup:1878
 #, c-format
-msgid "Don't rewind tape after backup"
+msgid "Do not rewind tape after backup"
 msgstr ""
 
 #: standalone/drakbackup:1884
@@ -15149,7 +15149,7 @@ msgstr ""
 
 #: standalone/drakbackup:2151
 #, c-format
-msgid "If your machine isn't on all the time, you might want to install anacron."
+msgid "If your machine is not on all the time, you might want to install anacron."
 msgstr ""
 
 #: standalone/drakbackup:2152
@@ -15955,7 +15955,7 @@ msgstr ""
 msgid "System mode"
 msgstr ""
 
-#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:182 standalone/harddrake2:183 standalone/logdrake:70 standalone/printerdrake:157 standalone/printerdrake:158 standalone/printerdrake:159
+#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:184 standalone/harddrake2:185 standalone/logdrake:70 standalone/printerdrake:157 standalone/printerdrake:158 standalone/printerdrake:159
 #, c-format
 msgid "/_File"
 msgstr ""
@@ -15965,7 +15965,7 @@ msgstr ""
 msgid "/File/_Quit"
 msgstr ""
 
-#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:183 standalone/logdrake:76 standalone/printerdrake:159
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:185 standalone/logdrake:76 standalone/printerdrake:159
 #, c-format
 msgid "<control>Q"
 msgstr ""
@@ -16014,7 +16014,7 @@ msgstr ""
 
 #: standalone/drakboot:197
 #, c-format
-msgid "No, I don't want autologin"
+msgid "No, I do not want autologin"
 msgstr ""
 
 #: standalone/drakboot:198
@@ -16446,7 +16446,7 @@ msgstr ""
 msgid "Mac Address"
 msgstr ""
 
-#: standalone/drakconnect:572 standalone/harddrake2:23 standalone/harddrake2:113
+#: standalone/drakconnect:572 standalone/harddrake2:23 standalone/harddrake2:115
 #, c-format
 msgid "Bus"
 msgstr ""
@@ -16542,7 +16542,7 @@ msgstr ""
 #: standalone/drakconnect:848
 #, c-format
 msgid ""
-"You don't have any configured interface.\n"
+"You do not have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
@@ -16577,7 +16577,7 @@ msgstr ""
 #: standalone/drakconnect:975 standalone/net_applet:46
 #, c-format
 msgid ""
-"You don't have any configured Internet connection.\n"
+"You do not have any configured Internet connection.\n"
 "Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"
 msgstr ""
 
@@ -16669,7 +16669,7 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: standalone/drakfloppy:82 standalone/harddrake2:140
+#: standalone/drakfloppy:82 standalone/harddrake2:142
 #, c-format
 msgid "Device"
 msgstr ""
@@ -17271,7 +17271,7 @@ 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."
+"If you do not know the meaning of an option, simply leave it as it is."
 msgstr ""
 
 #: standalone/drakgw:330
@@ -17601,7 +17601,7 @@ msgstr ""
 
 #: standalone/drakperm:297
 #, c-format
-msgid "When checked, owner and group won't be changed"
+msgid "When checked, owner and group will not be changed"
 msgstr ""
 
 #: standalone/drakperm:307
@@ -17763,7 +17763,7 @@ msgid ""
 "maximum"
 msgstr ""
 
-#: standalone/draksec:154 standalone/harddrake2:197
+#: standalone/draksec:154 standalone/harddrake2:199
 #, c-format
 msgid ""
 "Description of the fields:\n"
@@ -18040,7 +18040,7 @@ msgstr ""
 msgid "Autodetection"
 msgstr ""
 
-#: standalone/drakups:101 standalone/harddrake2:226
+#: standalone/drakups:101 standalone/harddrake2:228
 #, c-format
 msgid "Detection in progress"
 msgstr ""
@@ -18117,7 +18117,7 @@ msgstr ""
 msgid "UPS devices"
 msgstr ""
 
-#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282 standalone/harddrake2:80 standalone/harddrake2:104 standalone/harddrake2:111
+#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282 standalone/harddrake2:80 standalone/harddrake2:106 standalone/harddrake2:113
 #, c-format
 msgid "Name"
 msgstr ""
@@ -18465,7 +18465,7 @@ msgid ""
 "\n"
 "Here you define the default settings. \n"
 "All the other sections will follow this one.\n"
-"The left settings are optional. If don't define\n"
+"The left settings are optional. If do not define\n"
 "them here, globally, you can define them in each\n"
 "section.\n"
 ""
@@ -18610,7 +18610,7 @@ msgstr ""
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit!"
+msgid "Can not edit!"
 msgstr ""
 
 #: standalone/drakvpn:591
@@ -19493,7 +19493,7 @@ msgstr ""
 msgid "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr ""
 
-#: standalone/harddrake2:26 standalone/harddrake2:139
+#: standalone/harddrake2:26 standalone/harddrake2:141
 #, c-format
 msgid "Bus identification"
 msgstr ""
@@ -19925,204 +19925,205 @@ msgid ""
 "channel number, a target id and a logical unit number"
 msgstr ""
 
-#: standalone/harddrake2:99
+#. -PO: here, "size" is the size of the ram chip (eg: 128Mo, 256Mo, ...)
+#: standalone/harddrake2:101
 #, c-format
 msgid "Installed size"
 msgstr ""
 
-#: standalone/harddrake2:99
+#: standalone/harddrake2:101
 #, c-format
 msgid "Installed size of the memory bank"
 msgstr ""
 
-#: standalone/harddrake2:100
+#: standalone/harddrake2:102
 #, c-format
 msgid "Enabled Size"
 msgstr ""
 
-#: standalone/harddrake2:100
+#: standalone/harddrake2:102
 #, c-format
 msgid "Enabled size of the memory bank"
 msgstr ""
 
-#: standalone/harddrake2:101
+#: standalone/harddrake2:103
 #, c-format
 msgid "type of the memory device"
 msgstr ""
 
-#: standalone/harddrake2:102
+#: standalone/harddrake2:104
 #, c-format
 msgid "Speed"
 msgstr ""
 
-#: standalone/harddrake2:102
+#: standalone/harddrake2:104
 #, c-format
 msgid "Speed of the memory bank"
 msgstr ""
 
-#: standalone/harddrake2:103
+#: standalone/harddrake2:105
 #, c-format
 msgid "Bank connections"
 msgstr ""
 
-#: standalone/harddrake2:104
+#: standalone/harddrake2:106
 #, c-format
 msgid "Socket designation of the memory bank"
 msgstr ""
 
-#: standalone/harddrake2:108
+#: standalone/harddrake2:110
 #, c-format
 msgid "Device file"
 msgstr ""
 
-#: standalone/harddrake2:108
+#: standalone/harddrake2:110
 #, c-format
 msgid "the device file used to communicate with the kernel driver for the mouse"
 msgstr ""
 
-#: standalone/harddrake2:109
+#: standalone/harddrake2:111
 #, c-format
 msgid "Emulated wheel"
 msgstr ""
 
-#: standalone/harddrake2:109
+#: standalone/harddrake2:111
 #, c-format
 msgid "whether the wheel is emulated or not"
 msgstr ""
 
-#: standalone/harddrake2:110
+#: standalone/harddrake2:112
 #, c-format
 msgid "the type of the mouse"
 msgstr ""
 
-#: standalone/harddrake2:111
+#: standalone/harddrake2:113
 #, c-format
 msgid "the name of the mouse"
 msgstr ""
 
-#: standalone/harddrake2:112
+#: standalone/harddrake2:114
 #, c-format
 msgid "Number of buttons"
 msgstr ""
 
-#: standalone/harddrake2:112
+#: standalone/harddrake2:114
 #, c-format
 msgid "the number of buttons the mouse has"
 msgstr ""
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:115
 #, c-format
 msgid "the type of bus on which the mouse is connected"
 msgstr ""
 
-#: standalone/harddrake2:114
+#: standalone/harddrake2:116
 #, c-format
 msgid "Mouse protocol used by X11"
 msgstr ""
 
-#: standalone/harddrake2:114
+#: standalone/harddrake2:116
 #, c-format
 msgid "the protocol that the graphical desktop use with the mouse"
 msgstr ""
 
-#: standalone/harddrake2:121 standalone/harddrake2:130 standalone/harddrake2:137 standalone/harddrake2:145 standalone/harddrake2:324 standalone/harddrake2:324
+#: standalone/harddrake2:123 standalone/harddrake2:132 standalone/harddrake2:139 standalone/harddrake2:147 standalone/harddrake2:326 standalone/harddrake2:326
 #, c-format
 msgid "Identification"
 msgstr ""
 
-#: standalone/harddrake2:122 standalone/harddrake2:138
+#: standalone/harddrake2:124 standalone/harddrake2:140
 #, c-format
 msgid "Connection"
 msgstr ""
 
-#: standalone/harddrake2:131
+#: standalone/harddrake2:133
 #, c-format
 msgid "Performances"
 msgstr ""
 
-#: standalone/harddrake2:132
+#: standalone/harddrake2:134
 #, c-format
 msgid "Bugs"
 msgstr ""
 
-#: standalone/harddrake2:133
+#: standalone/harddrake2:135
 #, c-format
 msgid "FPU"
 msgstr ""
 
-#: standalone/harddrake2:141
+#: standalone/harddrake2:143
 #, c-format
 msgid "Partitions"
 msgstr ""
 
-#: standalone/harddrake2:146
+#: standalone/harddrake2:148
 #, c-format
 msgid "Features"
 msgstr ""
 
 #. -PO: please keep all "/" characters !!!
-#: standalone/harddrake2:169 standalone/logdrake:77 standalone/printerdrake:153 standalone/printerdrake:166
+#: standalone/harddrake2:171 standalone/logdrake:77 standalone/printerdrake:153 standalone/printerdrake:166
 #, c-format
 msgid "/_Options"
 msgstr ""
 
-#: standalone/harddrake2:170 standalone/harddrake2:192 standalone/logdrake:79 standalone/printerdrake:178 standalone/printerdrake:180 standalone/printerdrake:180 standalone/printerdrake:183 standalone/printerdrake:185
+#: standalone/harddrake2:172 standalone/harddrake2:194 standalone/logdrake:79 standalone/printerdrake:178 standalone/printerdrake:180 standalone/printerdrake:180 standalone/printerdrake:183 standalone/printerdrake:185
 #, c-format
 msgid "/_Help"
 msgstr ""
 
-#: standalone/harddrake2:174
+#: standalone/harddrake2:176
 #, c-format
 msgid "/Autodetect _printers"
 msgstr ""
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:177
 #, c-format
 msgid "/Autodetect _modems"
 msgstr ""
 
-#: standalone/harddrake2:176
+#: standalone/harddrake2:178
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr ""
 
-#: standalone/harddrake2:183 standalone/printerdrake:159
+#: standalone/harddrake2:185 standalone/printerdrake:159
 #, c-format
 msgid "/_Quit"
 msgstr ""
 
-#: standalone/harddrake2:194
+#: standalone/harddrake2:196
 #, c-format
 msgid "/_Fields description"
 msgstr ""
 
-#: standalone/harddrake2:196
+#: standalone/harddrake2:198
 #, c-format
 msgid "Harddrake help"
 msgstr ""
 
-#: standalone/harddrake2:205
+#: standalone/harddrake2:207
 #, c-format
 msgid "Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"
 msgstr ""
 
-#: standalone/harddrake2:211 standalone/printerdrake:183
+#: standalone/harddrake2:213 standalone/printerdrake:183
 #, c-format
 msgid "/_Report Bug"
 msgstr ""
 
-#: standalone/harddrake2:213 standalone/printerdrake:185
+#: standalone/harddrake2:215 standalone/printerdrake:185
 #, c-format
 msgid "/_About..."
 msgstr ""
 
-#: standalone/harddrake2:214
+#: standalone/harddrake2:216
 #, c-format
 msgid "About Harddrake"
 msgstr ""
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:216
+#: standalone/harddrake2:218
 #, c-format
 msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
@@ -20132,62 +20133,62 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/harddrake2:233
+#: standalone/harddrake2:235
 #, c-format
 msgid "Harddrake2"
 msgstr ""
 
-#: standalone/harddrake2:249
+#: standalone/harddrake2:251
 #, c-format
 msgid "Detected hardware"
 msgstr ""
 
-#: standalone/harddrake2:254
+#: standalone/harddrake2:256
 #, c-format
 msgid "Configure module"
 msgstr ""
 
-#: standalone/harddrake2:261
+#: standalone/harddrake2:263
 #, c-format
 msgid "Run config tool"
 msgstr ""
 
-#: standalone/harddrake2:311 standalone/net_monitor:108 standalone/net_monitor:109 standalone/net_monitor:114
+#: standalone/harddrake2:313 standalone/net_monitor:108 standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr ""
 
-#: standalone/harddrake2:312 standalone/printerdrake:313 standalone/printerdrake:350
+#: standalone/harddrake2:314 standalone/printerdrake:313 standalone/printerdrake:350
 #, c-format
 msgid "Unknown"
 msgstr ""
 
-#: standalone/harddrake2:332
+#: standalone/harddrake2:334
 #, c-format
 msgid "Misc"
 msgstr ""
 
-#: standalone/harddrake2:347
+#: standalone/harddrake2:349
 #, c-format
 msgid "Click on a device in the left tree in order to display its information here."
 msgstr ""
 
-#: standalone/harddrake2:399
+#: standalone/harddrake2:401
 #, c-format
 msgid "secondary"
 msgstr ""
 
-#: standalone/harddrake2:399
+#: standalone/harddrake2:401
 #, c-format
 msgid "primary"
 msgstr ""
 
-#: standalone/harddrake2:403
+#: standalone/harddrake2:405
 #, c-format
 msgid "burner"
 msgstr ""
 
-#: standalone/harddrake2:403
+#: standalone/harddrake2:405
 #, c-format
 msgid "DVD"
 msgstr ""
@@ -21199,7 +21200,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/service_harddrake:200
+#: standalone/service_harddrake:202
 #, c-format
 msgid "Hardware probing in progress"
 msgstr ""
@@ -21304,34 +21305,34 @@ msgstr ""
 msgid "Exit install"
 msgstr ""
 
-#: ugtk2.pm:1119
+#: ugtk2.pm:1038
 #, c-format
 msgid "Is this correct?"
 msgstr ""
 
-#: ugtk2.pm:1247
+#: ugtk2.pm:1165
 #, c-format
 msgid "Expand Tree"
 msgstr ""
 
-#: ugtk2.pm:1248
+#: ugtk2.pm:1166
 #, c-format
 msgid "Collapse Tree"
 msgstr ""
 
-#: ugtk2.pm:1249
+#: ugtk2.pm:1167
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr ""
 
-#: wizards.pm:95
+#: wizards.pm:95 wizards2.pm:95
 #, c-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: wizards.pm:99
+#: wizards.pm:99 wizards2.pm:99
 #, c-format
 msgid "Installation failed"
 msgstr ""