This commit was manufactured by cvs2svn to create tag 'MDK-10_0'.MDK-10_0

1 files changed, 2362 insertions, 3069 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 9b84e9cab..14e0ca2c7 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-03-19 14:32+0100\n"
+"POT-Creation-Date: 2004-02-16 23:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -76,7 +76,7 @@ msgid ""
 "plug the key again, and launch Mandrake Move again."
 msgstr ""
 
-#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1319
+#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1310
 #, c-format
 msgid "Reboot"
 msgstr ""
@@ -118,7 +118,7 @@ msgstr ""
 msgid "Please wait, detecting and configuring devices..."
 msgstr ""
 
-#: ../move/move.pm:502 ../move/move.pm:559 ../move/move.pm:563 ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117 diskdrake/interactive.pm:215 diskdrake/interactive.pm:228 diskdrake/interactive.pm:369 diskdrake/interactive.pm:384 diskdrake/interactive.pm:505 diskdrake/interactive.pm:510 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:253 install_steps.pm:82 install_steps_interactive.pm:40 interactive/http.pm:118 interactive/http.pm:119 network/netconnect.pm:929 network/netconnect.pm:932 network/netconnect.pm:977 network/netconnect.pm:981 network/netconnect.pm:1048 network/netconnect.pm:1098 network/netconnect.pm:1103 network/netconnect.pm:1118 network/netconnect.pm:1327 printer/printerdrake.pm:213 printer/printerdrake.pm:220 printer/printerdrake.pm:245 printer/printerdrake.pm:393 printer/printerdrake.pm:398 printer/printerdrake.pm:411 printer/printerdrake.pm:421 printer/printerdrake.pm:1067 printer/printerdrake.pm:1114 printer/printerdrake.pm:1151 printer/printerdrake.pm:1195 printer/printerdrake.pm:1199 printer/printerdrake.pm:1213 printer/printerdrake.pm:1303 printer/printerdrake.pm:1383 printer/printerdrake.pm:1387 printer/printerdrake.pm:1391 printer/printerdrake.pm:1440 printer/printerdrake.pm:1497 printer/printerdrake.pm:1501 printer/printerdrake.pm:1515 printer/printerdrake.pm:1625 printer/printerdrake.pm:1629 printer/printerdrake.pm:1666 printer/printerdrake.pm:1731 printer/printerdrake.pm:1749 printer/printerdrake.pm:1758 printer/printerdrake.pm:1767 printer/printerdrake.pm:1778 printer/printerdrake.pm:1840 printer/printerdrake.pm:2285 printer/printerdrake.pm:2551 printer/printerdrake.pm:2557 printer/printerdrake.pm:3010 printer/printerdrake.pm:3014 printer/printerdrake.pm:3018 printer/printerdrake.pm:3421 printer/printerdrake.pm:3664 printer/printerdrake.pm:3677 printer/printerdrake.pm:3817 printer/printerdrake.pm:3909 standalone/drakTermServ:415 standalone/drakTermServ:768 standalone/drakTermServ:775 standalone/drakTermServ:970 standalone/drakTermServ:1415 standalone/drakTermServ:1420 standalone/drakTermServ:1427 standalone/drakTermServ:1438 standalone/drakTermServ:1458 standalone/drakauth:36 standalone/drakbackup:581 standalone/drakbackup:694 standalone/drakbackup:1187 standalone/drakbackup:1220 standalone/drakbackup:1735 standalone/drakbackup:1898 standalone/drakbackup:2513 standalone/drakbackup:4286 standalone/drakbackup:4509 standalone/drakboot:237 standalone/drakbug:267 standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:608 standalone/drakconnect:611 standalone/drakconnect:632 standalone/drakfloppy:301 standalone/drakfloppy:305 standalone/drakfloppy:311 standalone/drakfont:210 standalone/drakfont:223 standalone/drakfont:259 standalone/drakfont:600 standalone/draksplash:21 standalone/logdrake:170 standalone/logdrake:467 standalone/logdrake:472 standalone/scannerdrake:58 standalone/scannerdrake:200 standalone/scannerdrake:259 standalone/scannerdrake:683 standalone/scannerdrake:694 standalone/scannerdrake:833 standalone/scannerdrake:844 standalone/scannerdrake:914 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: ../move/move.pm:502 ../move/move.pm:559 ../move/move.pm:563 ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117 diskdrake/interactive.pm:215 diskdrake/interactive.pm:228 diskdrake/interactive.pm:369 diskdrake/interactive.pm:384 diskdrake/interactive.pm:505 diskdrake/interactive.pm:510 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:252 install_steps.pm:82 install_steps_interactive.pm:40 interactive/http.pm:118 interactive/http.pm:119 network/netconnect.pm:753 network/netconnect.pm:846 network/netconnect.pm:849 network/netconnect.pm:894 network/netconnect.pm:898 network/netconnect.pm:965 network/netconnect.pm:1014 network/netconnect.pm:1019 network/netconnect.pm:1034 printer/printerdrake.pm:213 printer/printerdrake.pm:220 printer/printerdrake.pm:245 printer/printerdrake.pm:393 printer/printerdrake.pm:398 printer/printerdrake.pm:411 printer/printerdrake.pm:421 printer/printerdrake.pm:1048 printer/printerdrake.pm:1095 printer/printerdrake.pm:1170 printer/printerdrake.pm:1174 printer/printerdrake.pm:1345 printer/printerdrake.pm:1349 printer/printerdrake.pm:1353 printer/printerdrake.pm:1453 printer/printerdrake.pm:1457 printer/printerdrake.pm:1574 printer/printerdrake.pm:1578 printer/printerdrake.pm:1664 printer/printerdrake.pm:1751 printer/printerdrake.pm:2149 printer/printerdrake.pm:2415 printer/printerdrake.pm:2421 printer/printerdrake.pm:2838 printer/printerdrake.pm:2842 printer/printerdrake.pm:2846 printer/printerdrake.pm:3237 standalone/drakTermServ:399 standalone/drakTermServ:730 standalone/drakTermServ:737 standalone/drakTermServ:931 standalone/drakTermServ:1330 standalone/drakTermServ:1335 standalone/drakTermServ:1342 standalone/drakTermServ:1353 standalone/drakTermServ:1372 standalone/drakauth:36 standalone/drakbackup:766 standalone/drakbackup:881 standalone/drakbackup:1461 standalone/drakbackup:1494 standalone/drakbackup:2011 standalone/drakbackup:2183 standalone/drakbackup:2742 standalone/drakbackup:2809 standalone/drakbackup:4830 standalone/drakboot:235 standalone/drakbug:267 standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:563 standalone/drakconnect:565 standalone/drakconnect:581 standalone/drakfloppy:301 standalone/drakfloppy:305 standalone/drakfloppy:311 standalone/drakfont:208 standalone/drakfont:221 standalone/drakfont:257 standalone/drakfont:597 standalone/draksplash:21 standalone/logdrake:171 standalone/logdrake:415 standalone/logdrake:420 standalone/scannerdrake:52 standalone/scannerdrake:194 standalone/scannerdrake:253 standalone/scannerdrake:676 standalone/scannerdrake:687 standalone/scannerdrake:826 standalone/scannerdrake:837 standalone/scannerdrake:902 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr ""
@@ -341,12 +341,12 @@ msgstr ""
 msgid "Xpmac (installation display driver)"
 msgstr ""
 
-#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:823
+#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:810
 #, c-format
 msgid "Custom"
 msgstr ""
 
-#: Xconfig/main.pm:113 diskdrake/dav.pm:28 help.pm:14 install_steps_interactive.pm:83 printer/printerdrake.pm:608 printer/printerdrake.pm:4076 standalone/draksplash:120 standalone/harddrake2:188 standalone/logdrake:175 standalone/scannerdrake:445
+#: Xconfig/main.pm:113 diskdrake/dav.pm:28 help.pm:14 install_steps_interactive.pm:83 printer/printerdrake.pm:3862 standalone/draksplash:114 standalone/harddrake2:182 standalone/logdrake:176 standalone/scannerdrake:438
 #, c-format
 msgid "Quit"
 msgstr ""
@@ -371,7 +371,7 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: Xconfig/main.pm:131 diskdrake/dav.pm:67 diskdrake/interactive.pm:410 diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80 standalone/drakconnect:263 standalone/drakconnect:272 standalone/drakconnect:292 standalone/drakconnect:298 standalone/drakconnect:404 standalone/drakconnect:405 standalone/drakconnect:576 standalone/drakfont:494 standalone/drakfont:554 standalone/harddrake2:185
+#: Xconfig/main.pm:131 diskdrake/dav.pm:67 diskdrake/interactive.pm:410 diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80 standalone/drakconnect:253 standalone/drakconnect:258 standalone/drakconnect:272 standalone/drakconnect:278 standalone/drakconnect:376 standalone/drakconnect:377 standalone/drakconnect:535 standalone/drakfont:491 standalone/drakfont:551 standalone/harddrake2:180
 #, c-format
 msgid "Options"
 msgstr ""
@@ -400,7 +400,7 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: Xconfig/monitor.pm:109 standalone/drakconnect:556 standalone/harddrake2:68 standalone/harddrake2:69
+#: Xconfig/monitor.pm:109 standalone/drakconnect:515 standalone/harddrake2:68 standalone/harddrake2:69
 #, c-format
 msgid "Vendor"
 msgstr ""
@@ -472,17 +472,17 @@ msgstr ""
 msgid "Graphics card: %s"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:289 interactive.pm:403 interactive/gtk.pm:759 interactive/http.pm:103 interactive/http.pm:157 interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakbackup:4045 standalone/drakbackup:4075 standalone/drakbackup:4162 standalone/drakbackup:4175 standalone/drakbackup:4247 standalone/drakconnect:165 standalone/drakconnect:776 standalone/drakconnect:863 standalone/drakconnect:962 standalone/drakups:194 standalone/net_monitor:303 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1075 ugtk2.pm:1098
+#: Xconfig/resolution_and_depth.pm:289 interactive.pm:403 interactive/gtk.pm:734 interactive/http.pm:103 interactive/http.pm:157 interactive/newt.pm:300 interactive/newt.pm:402 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakbackup:4324 standalone/drakbackup:4356 standalone/drakbackup:4449 standalone/drakbackup:4466 standalone/drakbackup:4567 standalone/drakconnect:161 standalone/drakconnect:726 standalone/drakconnect:813 standalone/drakconnect:956 standalone/net_monitor:303 ugtk2.pm:412 ugtk2.pm:510 ugtk2.pm:1051 ugtk2.pm:1074
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:289 any.pm:863 diskdrake/smbnfs_gtk.pm:81 help.pm:197 help.pm:457 install_steps_gtk.pm:488 install_steps_interactive.pm:788 interactive.pm:404 interactive/gtk.pm:763 interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307 interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:3088 standalone/drakautoinst:217 standalone/drakbackup:4009 standalone/drakbackup:4035 standalone/drakbackup:4058 standalone/drakbackup:4089 standalone/drakbackup:4113 standalone/drakbackup:4137 standalone/drakbackup:4189 standalone/drakbackup:4216 standalone/drakbackup:4241 standalone/drakconnect:164 standalone/drakconnect:861 standalone/drakconnect:961 standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201 standalone/logdrake:175 standalone/net_monitor:299 ugtk2.pm:407 ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1075
+#: Xconfig/resolution_and_depth.pm:289 any.pm:850 diskdrake/smbnfs_gtk.pm:81 help.pm:197 help.pm:457 install_steps_gtk.pm:489 install_steps_interactive.pm:787 interactive.pm:404 interactive/gtk.pm:738 interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:299 interactive/newt.pm:406 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:2916 standalone/drakautoinst:200 standalone/drakbackup:4288 standalone/drakbackup:4315 standalone/drakbackup:4340 standalone/drakbackup:4373 standalone/drakbackup:4399 standalone/drakbackup:4425 standalone/drakbackup:4482 standalone/drakbackup:4508 standalone/drakbackup:4538 standalone/drakbackup:4562 standalone/drakconnect:160 standalone/drakconnect:811 standalone/drakconnect:965 standalone/drakfont:657 standalone/drakfont:734 standalone/logdrake:176 standalone/net_monitor:299 ugtk2.pm:406 ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1051
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154 install_steps_gtk.pm:267 install_steps_gtk.pm:668 interactive.pm:498 interactive/gtk.pm:623 interactive/gtk.pm:625 standalone/drakTermServ:316 standalone/drakbackup:4010 standalone/drakbackup:4039 standalone/drakbackup:4062 standalone/drakbackup:4093 standalone/drakbackup:4117 standalone/drakbackup:4141 standalone/drakbackup:4174 standalone/drakbackup:4193 standalone/drakbackup:4220 standalone/drakbackup:4245 standalone/drakbackup:4264 standalone/drakbug:157 standalone/drakconnect:160 standalone/drakconnect:236 standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:296 standalone/harddrake2:184 ugtk2.pm:1188 ugtk2.pm:1189
+#: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154 install_steps_gtk.pm:267 install_steps_gtk.pm:668 interactive.pm:498 interactive/gtk.pm:620 interactive/gtk.pm:622 standalone/drakTermServ:313 standalone/drakbackup:4285 standalone/drakbackup:4312 standalone/drakbackup:4337 standalone/drakbackup:4370 standalone/drakbackup:4396 standalone/drakbackup:4422 standalone/drakbackup:4463 standalone/drakbackup:4479 standalone/drakbackup:4505 standalone/drakbackup:4534 standalone/drakbackup:4559 standalone/drakbackup:4584 standalone/drakbug:157 standalone/drakconnect:156 standalone/drakconnect:226 standalone/drakfont:509 standalone/drakperm:134 standalone/draksec:285 standalone/harddrake2:181 ugtk2.pm:1159 ugtk2.pm:1160
 #, c-format
 msgid "Help"
 msgstr ""
@@ -633,17 +633,17 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: any.pm:103 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259 standalone/drakconnect:167 standalone/draksec:56 standalone/drakups:90 standalone/drakxtv:90 standalone/harddrake2:134 standalone/service_harddrake:98
+#: any.pm:98 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259 standalone/drakconnect:163 standalone/drakxtv:90 standalone/harddrake2:133 standalone/service_harddrake:94
 #, c-format
 msgid "Please wait"
 msgstr ""
 
-#: any.pm:103
+#: any.pm:98
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr ""
 
-#: any.pm:142
+#: any.pm:137
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -652,449 +652,449 @@ msgid ""
 "On which drive are you booting?"
 msgstr ""
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:160 any.pm:192 help.pm:800
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr ""
 
-#: any.pm:166
+#: any.pm:161
 #, c-format
 msgid "First sector of the root partition"
 msgstr ""
 
-#: any.pm:168
+#: any.pm:163
 #, c-format
 msgid "On Floppy"
 msgstr ""
 
-#: any.pm:170 help.pm:768 help.pm:800 printer/printerdrake.pm:3418
+#: any.pm:165 help.pm:768 help.pm:800 printer/printerdrake.pm:3234
 #, c-format
 msgid "Skip"
 msgstr ""
 
-#: any.pm:175
+#: any.pm:170
 #, c-format
 msgid "SILO Installation"
 msgstr ""
 
-#: any.pm:175
+#: any.pm:170
 #, c-format
 msgid "LILO/grub Installation"
 msgstr ""
 
-#: any.pm:176
+#: any.pm:171
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
-#: any.pm:197
+#: any.pm:192
 #, c-format
 msgid "First sector of boot partition"
 msgstr ""
 
-#: any.pm:208
+#: any.pm:204 any.pm:239
 #, c-format
-msgid "Boot Style Configuration"
+msgid "Bootloader main options"
 msgstr ""
 
-#: any.pm:210 any.pm:244
+#: any.pm:205
 #, c-format
-msgid "Bootloader main options"
+msgid "Boot Style Configuration"
 msgstr ""
 
-#: any.pm:214
+#: any.pm:209
 #, c-format
 msgid "Give the ram size in MB"
 msgstr ""
 
-#: any.pm:216
+#: any.pm:211
 #, c-format
 msgid "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: any.pm:217 any.pm:524 install_steps_interactive.pm:1163
+#: any.pm:212 any.pm:519 install_steps_interactive.pm:1158
 #, c-format
 msgid "The passwords do not match"
 msgstr ""
 
-#: any.pm:217 any.pm:524 diskdrake/interactive.pm:1255 install_steps_interactive.pm:1163
+#: any.pm:212 any.pm:519 diskdrake/interactive.pm:1255 install_steps_interactive.pm:1158
 #, c-format
 msgid "Please try again"
 msgstr ""
 
-#: any.pm:222 any.pm:247 help.pm:768
+#: any.pm:217 any.pm:242 help.pm:768
 #, c-format
 msgid "Bootloader to use"
 msgstr ""
 
-#: any.pm:224
+#: any.pm:219
 #, c-format
 msgid "Bootloader installation"
 msgstr ""
 
-#: any.pm:226 any.pm:249 help.pm:768
+#: any.pm:221 any.pm:244 help.pm:768
 #, c-format
 msgid "Boot device"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:223
 #, c-format
 msgid "Delay before booting default image"
 msgstr ""
 
-#: any.pm:229 help.pm:768
+#: any.pm:224 help.pm:768
 #, c-format
 msgid "Enable ACPI"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:225
 #, c-format
 msgid "Force No APIC"
 msgstr ""
 
-#: any.pm:232 any.pm:551 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1168 network/netconnect.pm:562 printer/printerdrake.pm:1374 printer/printerdrake.pm:1494 standalone/drakbackup:1717 standalone/drakbackup:3592 standalone/drakups:278
+#: any.pm:227 any.pm:546 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1163 network/netconnect.pm:491 printer/printerdrake.pm:1336 printer/printerdrake.pm:1450 standalone/drakbackup:1997 standalone/drakbackup:3879 standalone/drakconnect:908 standalone/drakconnect:936
 #, c-format
 msgid "Password"
 msgstr ""
 
-#: any.pm:233 any.pm:552 install_steps_interactive.pm:1169
+#: any.pm:228 any.pm:547 install_steps_interactive.pm:1164
 #, c-format
 msgid "Password (again)"
 msgstr ""
 
-#: any.pm:234
+#: any.pm:229
 #, c-format
 msgid "Restrict command line options"
 msgstr ""
 
-#: any.pm:234
+#: any.pm:229
 #, c-format
 msgid "restrict"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:231
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: any.pm:237
+#: any.pm:232
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 
-#: any.pm:239
+#: any.pm:234
 #, c-format
 msgid "Enable multiple profiles"
 msgstr ""
 
-#: any.pm:248
+#: any.pm:243
 #, c-format
 msgid "Init Message"
 msgstr ""
 
-#: any.pm:250
+#: any.pm:245
 #, c-format
 msgid "Open Firmware Delay"
 msgstr ""
 
-#: any.pm:251
+#: any.pm:246
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr ""
 
-#: any.pm:252
+#: any.pm:247
 #, c-format
 msgid "Enable CD Boot?"
 msgstr ""
 
-#: any.pm:253
+#: any.pm:248
 #, c-format
 msgid "Enable OF Boot?"
 msgstr ""
 
-#: any.pm:254
+#: any.pm:249
 #, c-format
 msgid "Default OS?"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:290
 #, c-format
 msgid "Image"
 msgstr ""
 
-#: any.pm:296 any.pm:305
+#: any.pm:291 any.pm:300
 #, c-format
 msgid "Root"
 msgstr ""
 
-#: any.pm:297 any.pm:318
+#: any.pm:292 any.pm:313
 #, c-format
 msgid "Append"
 msgstr ""
 
-#: any.pm:299
+#: any.pm:294
 #, c-format
 msgid "Video mode"
 msgstr ""
 
-#: any.pm:301
+#: any.pm:296
 #, c-format
 msgid "Initrd"
 msgstr ""
 
-#: any.pm:310 any.pm:315 any.pm:317
+#: any.pm:305 any.pm:310 any.pm:312
 #, c-format
 msgid "Label"
 msgstr ""
 
-#: any.pm:312 any.pm:322 harddrake/v4l.pm:236 standalone/drakfloppy:88 standalone/drakfloppy:94
+#: any.pm:307 any.pm:317 harddrake/v4l.pm:236 standalone/drakfloppy:88 standalone/drakfloppy:94
 #, c-format
 msgid "Default"
 msgstr ""
 
-#: any.pm:319
+#: any.pm:314
 #, c-format
 msgid "Initrd-size"
 msgstr ""
 
-#: any.pm:321
+#: any.pm:316
 #, c-format
 msgid "NoVideo"
 msgstr ""
 
-#: any.pm:332
+#: any.pm:327
 #, c-format
 msgid "Empty label not allowed"
 msgstr ""
 
-#: any.pm:333
+#: any.pm:328
 #, c-format
 msgid "You must specify a kernel image"
 msgstr ""
 
-#: any.pm:333
+#: any.pm:328
 #, c-format
 msgid "You must specify a root partition"
 msgstr ""
 
-#: any.pm:334
+#: any.pm:329
 #, c-format
 msgid "This label is already used"
 msgstr ""
 
-#: any.pm:347
+#: any.pm:342
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr ""
 
-#: any.pm:348
+#: any.pm:343 standalone/drakbackup:1911
 #, c-format
 msgid "Linux"
 msgstr ""
 
-#: any.pm:348
+#: any.pm:343
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr ""
 
-#: any.pm:349
+#: any.pm:344
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr ""
 
-#: any.pm:349
+#: any.pm:344
 #, c-format
 msgid "Other OS (windows...)"
 msgstr ""
 
-#: any.pm:377
+#: any.pm:372
 #, 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:509
+#: any.pm:504
 #, c-format
 msgid "access to X programs"
 msgstr ""
 
-#: any.pm:510
+#: any.pm:505
 #, c-format
 msgid "access to rpm tools"
 msgstr ""
 
-#: any.pm:511
+#: any.pm:506
 #, c-format
 msgid "allow \"su\""
 msgstr ""
 
-#: any.pm:512
+#: any.pm:507
 #, c-format
 msgid "access to administrative files"
 msgstr ""
 
-#: any.pm:513
+#: any.pm:508
 #, c-format
 msgid "access to network tools"
 msgstr ""
 
-#: any.pm:514
+#: any.pm:509
 #, c-format
 msgid "access to compilation tools"
 msgstr ""
 
-#: any.pm:520
+#: any.pm:515
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: any.pm:525
+#: any.pm:520
 #, c-format
 msgid "This password is too simple"
 msgstr ""
 
-#: any.pm:526
+#: any.pm:521
 #, c-format
 msgid "Please give a user name"
 msgstr ""
 
-#: any.pm:527
+#: any.pm:522
 #, c-format
 msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: any.pm:528
+#: any.pm:523
 #, c-format
 msgid "The user name is too long"
 msgstr ""
 
-#: any.pm:529
+#: any.pm:524
 #, c-format
 msgid "This user name has already been added"
 msgstr ""
 
-#: any.pm:533
+#: any.pm:528
 #, c-format
 msgid "Add user"
 msgstr ""
 
-#: any.pm:534
+#: any.pm:529
 #, c-format
 msgid ""
 "Enter a user\n"
 "%s"
 msgstr ""
 
-#: any.pm:537 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158 diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544 interactive/http.pm:152 printer/printerdrake.pm:165 printer/printerdrake.pm:352 printer/printerdrake.pm:4076 standalone/drakbackup:2802 standalone/scannerdrake:636 standalone/scannerdrake:786
+#: any.pm:532 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158 diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544 interactive/http.pm:152 printer/printerdrake.pm:165 printer/printerdrake.pm:352 printer/printerdrake.pm:3862 standalone/drakbackup:3098 standalone/scannerdrake:629 standalone/scannerdrake:779
 #, c-format
 msgid "Done"
 msgstr ""
 
-#: any.pm:538 help.pm:52
+#: any.pm:533 help.pm:52
 #, c-format
 msgid "Accept user"
 msgstr ""
 
-#: any.pm:549
+#: any.pm:544
 #, c-format
 msgid "Real name"
 msgstr ""
 
-#: any.pm:550 help.pm:52 printer/printerdrake.pm:1373 printer/printerdrake.pm:1493
+#: any.pm:545 help.pm:52 printer/printerdrake.pm:1335 printer/printerdrake.pm:1449
 #, c-format
 msgid "User name"
 msgstr ""
 
-#: any.pm:553
+#: any.pm:548
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: any.pm:555
+#: any.pm:550
 #, c-format
 msgid "Icon"
 msgstr ""
 
-#: any.pm:596 security/l10n.pm:14
+#: any.pm:591 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr ""
 
-#: any.pm:597
+#: any.pm:592
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 
-#: any.pm:598 help.pm:52
+#: any.pm:593 help.pm:52
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr ""
 
-#: any.pm:599
+#: any.pm:594
 #, c-format
 msgid "Choose the default user:"
 msgstr ""
 
-#: any.pm:600
+#: any.pm:595
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr ""
 
-#: any.pm:612
+#: any.pm:607
 #, c-format
 msgid "Please choose a language to use."
 msgstr ""
 
-#: any.pm:633
+#: any.pm:627
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrake Linux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
 
-#: any.pm:651 help.pm:660
+#: any.pm:638 help.pm:660
 #, c-format
 msgid "Use Unicode by default"
 msgstr ""
 
-#: any.pm:652 help.pm:660
+#: any.pm:639 help.pm:660
 #, c-format
 msgid "All languages"
 msgstr ""
 
-#: any.pm:688 help.pm:581 help.pm:991 install_steps_interactive.pm:908
+#: any.pm:675 help.pm:581 help.pm:991 install_steps_interactive.pm:907
 #, c-format
 msgid "Country / Region"
 msgstr ""
 
-#: any.pm:689
+#: any.pm:676
 #, c-format
 msgid "Please choose your country."
 msgstr ""
 
-#: any.pm:691
+#: any.pm:678
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr ""
 
-#: any.pm:692 diskdrake/interactive.pm:292 help.pm:544 help.pm:581 help.pm:621 help.pm:991 install_steps_interactive.pm:114
+#: any.pm:679 diskdrake/interactive.pm:292 help.pm:544 help.pm:581 help.pm:621 help.pm:991 install_steps_interactive.pm:114
 #, c-format
 msgid "More"
 msgstr ""
 
-#: any.pm:823
+#: any.pm:810
 #, c-format
 msgid "No sharing"
 msgstr ""
 
-#: any.pm:823
+#: any.pm:810
 #, c-format
 msgid "Allow all users"
 msgstr ""
 
-#: any.pm:827
+#: any.pm:814
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1104,22 +1104,22 @@ msgid ""
 ""
 msgstr ""
 
-#: any.pm:843
+#: any.pm:830
 #, c-format
 msgid "You can export using NFS or Samba. Please select which you'd like to use."
 msgstr ""
 
-#: any.pm:851
+#: any.pm:838
 #, c-format
 msgid "The package %s is going to be removed."
 msgstr ""
 
-#: any.pm:863
+#: any.pm:850
 #, c-format
 msgid "Launch userdrake"
 msgstr ""
 
-#: any.pm:865
+#: any.pm:852
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1207,7 +1207,7 @@ msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:533
+#: bootloader.pm:540
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1218,54 +1218,54 @@ msgid ""
 ""
 msgstr ""
 
-#: bootloader.pm:665
+#: bootloader.pm:672
 #, c-format
 msgid "SILO"
 msgstr ""
 
-#: bootloader.pm:668 help.pm:768
+#: bootloader.pm:674 help.pm:768
 #, c-format
 msgid "LILO with graphical menu"
 msgstr ""
 
-#: bootloader.pm:670 help.pm:768
+#: bootloader.pm:675 help.pm:768
 #, c-format
 msgid "LILO with text menu"
 msgstr ""
 
-#: bootloader.pm:672
+#: bootloader.pm:677
 #, c-format
 msgid "Grub"
 msgstr ""
 
-#: bootloader.pm:674
+#: bootloader.pm:679
 #, c-format
 msgid "Yaboot"
 msgstr ""
 
-#: bootloader.pm:1147
+#: bootloader.pm:1148
 #, c-format
 msgid "not enough room in /boot"
 msgstr ""
 
-#: bootloader.pm:1175
+#: bootloader.pm:1176
 #, c-format
 msgid ""
 "You can't install the bootloader on a %s partition\n"
 ""
 msgstr ""
 
-#: bootloader.pm:1219
+#: bootloader.pm:1216
 #, c-format
 msgid "Your bootloader configuration must be updated because partition has been renumbered"
 msgstr ""
 
-#: bootloader.pm:1226
+#: bootloader.pm:1223
 #, c-format
 msgid "The bootloader can't be installed correctly. You have to boot rescue and choose \"%s\""
 msgstr ""
 
-#: bootloader.pm:1227
+#: bootloader.pm:1224
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr ""
@@ -1305,82 +1305,82 @@ msgstr ""
 msgid "%d seconds"
 msgstr ""
 
-#: common.pm:197
+#: common.pm:196
 #, c-format
 msgid "Can't make screenshots before partitioning"
 msgstr ""
 
-#: common.pm:204
+#: common.pm:203
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 
-#: common.pm:269
+#: common.pm:268
 #, c-format
 msgid "kdesu missing"
 msgstr ""
 
-#: common.pm:272
+#: common.pm:271
 #, c-format
 msgid "consolehelper missing"
 msgstr ""
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:236 network/adsl_consts.pm:44 network/adsl_consts.pm:55 network/adsl_consts.pm:65 network/adsl_consts.pm:75 network/adsl_consts.pm:86 network/adsl_consts.pm:97 network/adsl_consts.pm:107 network/adsl_consts.pm:117 network/adsl_consts.pm:264 network/adsl_consts.pm:264 network/netconnect.pm:46
+#: crypto.pm:14 crypto.pm:28 lang.pm:231 network/adsl_consts.pm:37 network/adsl_consts.pm:48 network/adsl_consts.pm:58 network/adsl_consts.pm:68 network/adsl_consts.pm:79 network/adsl_consts.pm:90 network/adsl_consts.pm:100 network/adsl_consts.pm:110 network/netconnect.pm:46
 #, c-format
 msgid "France"
 msgstr ""
 
-#: crypto.pm:15 lang.pm:212
+#: crypto.pm:15 lang.pm:207
 #, c-format
 msgid "Costa Rica"
 msgstr ""
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:184 network/adsl_consts.pm:26 network/adsl_consts.pm:36 network/netconnect.pm:49
+#: crypto.pm:16 crypto.pm:29 lang.pm:179 network/adsl_consts.pm:20 network/adsl_consts.pm:30 network/netconnect.pm:49
 #, c-format
 msgid "Belgium"
 msgstr ""
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:217
+#: crypto.pm:17 crypto.pm:30 lang.pm:212
 #, c-format
 msgid "Czech Republic"
 msgstr ""
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:218 network/adsl_consts.pm:134 network/adsl_consts.pm:142
+#: crypto.pm:18 crypto.pm:31 lang.pm:213 network/adsl_consts.pm:126 network/adsl_consts.pm:134
 #, c-format
 msgid "Germany"
 msgstr ""
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:249
+#: crypto.pm:19 crypto.pm:32 lang.pm:244
 #, c-format
 msgid "Greece"
 msgstr ""
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:322
+#: crypto.pm:20 crypto.pm:33 lang.pm:317
 #, c-format
 msgid "Norway"
 msgstr ""
 
-#: crypto.pm:21 crypto.pm:34 lang.pm:351 network/adsl_consts.pm:240
+#: crypto.pm:21 crypto.pm:34 lang.pm:346 network/adsl_consts.pm:230
 #, c-format
 msgid "Sweden"
 msgstr ""
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:321 network/adsl_consts.pm:178 network/netconnect.pm:47
+#: crypto.pm:22 crypto.pm:36 lang.pm:316 network/adsl_consts.pm:170 network/netconnect.pm:47
 #, c-format
 msgid "Netherlands"
 msgstr ""
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:269 network/adsl_consts.pm:158 network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:48
+#: crypto.pm:23 crypto.pm:37 lang.pm:264 network/adsl_consts.pm:150 network/adsl_consts.pm:160 network/netconnect.pm:48 standalone/drakxtv:48
 #, c-format
 msgid "Italy"
 msgstr ""
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:177
+#: crypto.pm:24 crypto.pm:38 lang.pm:172
 #, c-format
 msgid "Austria"
 msgstr ""
 
-#: crypto.pm:35 crypto.pm:65 lang.pm:385 network/netconnect.pm:50
+#: crypto.pm:35 crypto.pm:61 lang.pm:380 network/netconnect.pm:50
 #, c-format
 msgid "United States"
 msgstr ""
@@ -1457,7 +1457,7 @@ msgstr ""
 #: diskdrake/hd_gtk.pm:99
 #, c-format
 msgid ""
-"If you plan to use aboot, be careful to leave a free space (2048 sectors is enough)\n"
+"If you plan to use aboot, be carefull to leave a free space (2048 sectors is enough)\n"
 "at the beginning of the disk"
 msgstr ""
 
@@ -1484,7 +1484,7 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:475 standalone/drakbackup:3040 standalone/drakbackup:3102
+#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:476
 #, c-format
 msgid "Details"
 msgstr ""
@@ -1524,7 +1524,7 @@ msgstr ""
 msgid "Windows"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:327 mouse.pm:167 services.pm:164 standalone/drakbackup:1673 standalone/drakperm:250
+#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:327 mouse.pm:167 services.pm:164 standalone/drakbackup:1954 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr ""
@@ -1641,7 +1641,7 @@ msgstr ""
 
 #: diskdrake/interactive.pm:330
 #, c-format
-msgid "I can't add any more partitions"
+msgid "I can't add any more partition"
 msgstr ""
 
 #: diskdrake/interactive.pm:331
@@ -1686,7 +1686,7 @@ msgid ""
 "Still continue?"
 msgstr ""
 
-#: diskdrake/interactive.pm:378 harddrake/sound.pm:226 keyboard.pm:314 network/netconnect.pm:438 network/netconnect.pm:457 network/netconnect.pm:641 printer/printerdrake.pm:936 printer/printerdrake.pm:1891 printer/printerdrake.pm:1953 printer/printerdrake.pm:1987 printer/printerdrake.pm:2291 printer/printerdrake.pm:3149 printer/printerdrake.pm:3426 printer/printerdrake.pm:3545 printer/printerdrake.pm:4543 standalone/drakTermServ:351 standalone/drakTermServ:1082 standalone/drakTermServ:1138 standalone/drakTermServ:1801 standalone/drakbackup:580 standalone/drakbackup:678 standalone/drakboot:138 standalone/drakclock:204 standalone/drakconnect:898 standalone/drakfloppy:295 standalone/drakups:27 standalone/scannerdrake:50 standalone/scannerdrake:908
+#: diskdrake/interactive.pm:378 harddrake/sound.pm:222 keyboard.pm:311 network/netconnect.pm:353 printer/printerdrake.pm:2155 printer/printerdrake.pm:3242 printer/printerdrake.pm:4329 standalone/drakTermServ:1040 standalone/drakTermServ:1715 standalone/drakbackup:765 standalone/drakbackup:865 standalone/drakboot:137 standalone/drakclock:200 standalone/drakconnect:848 standalone/drakfloppy:295
 #, c-format
 msgid "Warning"
 msgstr ""
@@ -2253,7 +2253,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr ""
 
-#: diskdrake/interactive.pm:1258 network/netconnect.pm:972 standalone/drakconnect:393
+#: diskdrake/interactive.pm:1258 network/netconnect.pm:889 standalone/drakconnect:365
 #, c-format
 msgid "Encryption key"
 msgstr ""
@@ -2293,7 +2293,7 @@ msgstr ""
 msgid "Please enter your username, password and domain name to access this host."
 msgstr ""
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3591
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3878
 #, c-format
 msgid "Username"
 msgstr ""
@@ -2323,36 +2323,36 @@ msgstr ""
 msgid "Mandatory package %s is missing"
 msgstr ""
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:136
 #, c-format
 msgid "Installing packages..."
 msgstr ""
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:210
 #, c-format
 msgid "Removing packages..."
 msgstr ""
 
-#: fs.pm:409
+#: fs.pm:399
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
 
-#: fs.pm:412
+#: fs.pm:402
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
 
-#: fs.pm:415
+#: fs.pm:405
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 
-#: fs.pm:417
+#: fs.pm:407
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2360,7 +2360,7 @@ msgid ""
 "containing binaries for architectures other than its own."
 msgstr ""
 
-#: fs.pm:421
+#: fs.pm:411
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2368,17 +2368,17 @@ msgid ""
 "have suidperl(1) installed.)"
 msgstr ""
 
-#: fs.pm:425
+#: fs.pm:415
 #, c-format
 msgid "Mount the file system read-only."
 msgstr ""
 
-#: fs.pm:427
+#: fs.pm:417
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 
-#: fs.pm:431
+#: fs.pm:421
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2388,57 +2388,52 @@ msgid ""
 "user,exec,dev,suid )."
 msgstr ""
 
-#: fs.pm:439
+#: fs.pm:429
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr ""
 
-#: fs.pm:441
-#, c-format
-msgid "Give read-only access to ordinary users"
-msgstr ""
-
-#: fs.pm:580 fs.pm:590 fs.pm:594 fs.pm:598 fs.pm:602 fs.pm:606 swap.pm:12
+#: fs.pm:565 fs.pm:575 fs.pm:579 fs.pm:583 fs.pm:587 fs.pm:591 swap.pm:12
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr ""
 
-#: fs.pm:647
+#: fs.pm:628
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr ""
 
-#: fs.pm:654 fs.pm:661
+#: fs.pm:635 fs.pm:642
 #, c-format
 msgid "Formatting partition %s"
 msgstr ""
 
-#: fs.pm:658
+#: fs.pm:639
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr ""
 
-#: fs.pm:718 fs.pm:771
+#: fs.pm:705 fs.pm:758
 #, c-format
 msgid "Mounting partition %s"
 msgstr ""
 
-#: fs.pm:719 fs.pm:772
+#: fs.pm:706 fs.pm:759
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr ""
 
-#: fs.pm:739 fs.pm:747
+#: fs.pm:726 fs.pm:734
 #, c-format
 msgid "Checking %s"
 msgstr ""
 
-#: fs.pm:788 partition_table.pm:638
+#: fs.pm:775 partition_table.pm:636
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr ""
 
-#: fs.pm:820
+#: fs.pm:807
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr ""
@@ -2458,7 +2453,7 @@ msgstr ""
 msgid "server"
 msgstr ""
 
-#: fsedit.pm:254
+#: fsedit.pm:253
 #, c-format
 msgid ""
 "I can't read the partition table of device %s, it's too corrupted for me :(\n"
@@ -2512,45 +2507,37 @@ msgstr ""
 
 #: fsedit.pm:542
 #, c-format
-msgid ""
-"You've selected a LVM Logical Volume as root (/).\n"
-"The bootloader is not able to handle this without a /boot partition.\n"
-"Please be sure to add a /boot partition"
-msgstr ""
-
-#: fsedit.pm:545
-#, c-format
 msgid "You may not be able to install lilo (since lilo doesn't handle a LV on multiple PVs)"
 msgstr ""
 
-#: fsedit.pm:548 fsedit.pm:550
+#: fsedit.pm:545 fsedit.pm:547
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr ""
 
-#: fsedit.pm:552
+#: fsedit.pm:549
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount point\n"
 ""
 msgstr ""
 
-#: fsedit.pm:554
+#: fsedit.pm:551
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr ""
 
-#: fsedit.pm:615
+#: fsedit.pm:612
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr ""
 
-#: fsedit.pm:617
+#: fsedit.pm:614
 #, c-format
 msgid "Nothing to do"
 msgstr ""
 
-#: fsedit.pm:713
+#: fsedit.pm:710
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr ""
@@ -2585,7 +2572,7 @@ msgstr ""
 msgid "DVD-ROM"
 msgstr ""
 
-#: harddrake/data.pm:59 standalone/drakbackup:2116
+#: harddrake/data.pm:59 standalone/drakbackup:2412
 #, c-format
 msgid "Tape"
 msgstr ""
@@ -2625,37 +2612,32 @@ msgstr ""
 msgid "ISDN adapters"
 msgstr ""
 
-#: harddrake/data.pm:70
+#: harddrake/data.pm:71
 #, c-format
 msgid "Ethernetcard"
 msgstr ""
 
-#: harddrake/data.pm:78 network/netconnect.pm:452 standalone/drakconnect:272 standalone/drakconnect:292 standalone/drakconnect:472 standalone/drakconnect:473 standalone/drakconnect:576
+#: harddrake/data.pm:79 network/netconnect.pm:366 standalone/drakconnect:272 standalone/drakconnect:442 standalone/drakconnect:443 standalone/drakconnect:535
 #, c-format
 msgid "Modem"
 msgstr ""
 
-#: harddrake/data.pm:79
+#: harddrake/data.pm:80
 #, c-format
 msgid "ADSL adapters"
 msgstr ""
 
-#: harddrake/data.pm:81
-#, c-format
-msgid "AGP controllers"
-msgstr ""
-
 #: harddrake/data.pm:82
 #, c-format
 msgid "Bridges and system controllers"
 msgstr ""
 
-#: harddrake/data.pm:83 help.pm:203 help.pm:991 install_steps_interactive.pm:940 printer/printerdrake.pm:687 printer/printerdrake.pm:4175
+#: harddrake/data.pm:83 help.pm:203 help.pm:991 install_steps_interactive.pm:935 printer/printerdrake.pm:676 printer/printerdrake.pm:3961
 #, c-format
 msgid "Printer"
 msgstr ""
 
-#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:933
+#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:928
 #, c-format
 msgid "Mouse"
 msgstr ""
@@ -2670,67 +2652,67 @@ msgstr ""
 msgid "(E)IDE/ATA controllers"
 msgstr ""
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:93
 #, c-format
 msgid "Firewire controllers"
 msgstr ""
 
-#: harddrake/data.pm:95
+#: harddrake/data.pm:94
 #, c-format
 msgid "SCSI controllers"
 msgstr ""
 
-#: harddrake/data.pm:96
+#: harddrake/data.pm:95
 #, c-format
 msgid "USB controllers"
 msgstr ""
 
-#: harddrake/data.pm:97
+#: harddrake/data.pm:96
 #, c-format
 msgid "SMBus controllers"
 msgstr ""
 
-#: harddrake/data.pm:98
+#: harddrake/data.pm:97
 #, c-format
 msgid "Scanner"
 msgstr ""
 
-#: harddrake/data.pm:100 standalone/harddrake2:319
+#: harddrake/data.pm:99 standalone/harddrake2:309
 #, c-format
 msgid "Unknown/Others"
 msgstr ""
 
-#: harddrake/data.pm:114
+#: harddrake/data.pm:113
 #, c-format
 msgid "cpu # "
 msgstr ""
 
-#: harddrake/sound.pm:150 standalone/drakconnect:169
+#: harddrake/sound.pm:150 standalone/drakconnect:165
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr ""
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:182
 #, c-format
 msgid "No alternative driver"
 msgstr ""
 
-#: harddrake/sound.pm:187
+#: harddrake/sound.pm:183
 #, c-format
 msgid "There's no known OSS/ALSA alternative driver for your sound card (%s) which currently uses \"%s\""
 msgstr ""
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:189
 #, c-format
 msgid "Sound configuration"
 msgstr ""
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:191
 #, c-format
 msgid "Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s)."
 msgstr ""
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:193
 #, c-format
 msgid ""
 "\n"
@@ -2738,7 +2720,7 @@ msgid ""
 "Your card currently use the %s\"%s\" driver (default driver for your card is \"%s\")"
 msgstr ""
 
-#: harddrake/sound.pm:199
+#: harddrake/sound.pm:195
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX(tm) systems) but it's a very basic and limited API.\n"
@@ -2755,17 +2737,17 @@ msgid ""
 ""
 msgstr ""
 
-#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134
+#: harddrake/sound.pm:209 harddrake/sound.pm:289
 #, c-format
 msgid "Driver:"
 msgstr ""
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:214
 #, c-format
 msgid "Trouble shooting"
 msgstr ""
 
-#: harddrake/sound.pm:226
+#: harddrake/sound.pm:222
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -2775,42 +2757,42 @@ msgid ""
 "The new \"%s\" driver'll only be used on next bootstrap."
 msgstr ""
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:230
 #, c-format
 msgid "No open source driver"
 msgstr ""
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:231
 #, c-format
 msgid "There's no free driver for your sound card (%s), but there's a proprietary driver at \"%s\"."
 msgstr ""
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:234
 #, c-format
 msgid "No known driver"
 msgstr ""
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:235
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr ""
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:239
 #, c-format
 msgid "Unknown driver"
 msgstr ""
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:240
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr ""
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:253
 #, c-format
 msgid "Sound trouble shooting"
 msgstr ""
 
-#: harddrake/sound.pm:258
+#: harddrake/sound.pm:254
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -2835,17 +2817,17 @@ msgid ""
 ""
 msgstr ""
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:280
 #, c-format
 msgid "Let me pick any driver"
 msgstr ""
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:283
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr ""
 
-#: harddrake/sound.pm:288
+#: harddrake/sound.pm:284
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your card\n"
@@ -2920,12 +2902,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
+"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
 "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 "will reboot your computer."
 msgstr ""
 
-#: help.pm:14 install_steps_gtk.pm:596 install_steps_interactive.pm:88 install_steps_interactive.pm:697 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:597 install_steps_interactive.pm:88 install_steps_interactive.pm:697 standalone/drakautoinst:199
 #, c-format
 msgid "Accept"
 msgstr ""
@@ -2971,7 +2953,7 @@ msgid ""
 "not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 
-#: help.pm:52 help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005 help.pm:1005 install_steps_gtk.pm:275 interactive.pm:403 interactive/newt.pm:308 network/netconnect.pm:262 network/tools.pm:206 printer/printerdrake.pm:3090 standalone/drakTermServ:408 standalone/drakbackup:4199 standalone/drakbackup:4229 standalone/drakbackup:4251 ugtk2.pm:510
+#: help.pm:52 help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005 help.pm:1005 install_steps_gtk.pm:275 interactive.pm:403 interactive/newt.pm:300 network/netconnect.pm:242 network/tools.pm:208 printer/printerdrake.pm:2918 standalone/drakTermServ:392 standalone/drakbackup:4491 standalone/drakbackup:4517 standalone/drakbackup:4547 standalone/drakbackup:4571 ugtk2.pm:510
 #, c-format
 msgid "Next"
 msgstr ""
@@ -3018,7 +3000,7 @@ msgstr ""
 #: help.pm:86
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the correct CD as required."
 msgstr ""
@@ -3027,12 +3009,12 @@ msgstr ""
 #, c-format
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrakelinux, and\n"
+"system. There are thousands of packages available for Mandrake Linux, and\n"
 "to make it simpler to manage the packages have been placed into groups of\n"
 "similar applications.\n"
 "\n"
 "Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
+"machine. Mandrake Linux sorts packages groups in four categories. You can\n"
 "mix and match applications from the various categories, so a\n"
 "``Workstation'' installation can still have applications from the\n"
 "``Development'' category installed.\n"
@@ -3129,10 +3111,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you will be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrake Linux will automatically start any installed\n"
 "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 that\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrake Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
 "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
@@ -3153,12 +3135,12 @@ msgid ""
 "create such a floppy."
 msgstr ""
 
-#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:420 interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:219 ugtk2.pm:1074 wizards.pm:156
+#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:422 interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:212 ugtk2.pm:1050 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr ""
 
-#: help.pm:172 help.pm:301 help.pm:457 help.pm:457 install_any.pm:420 interactive.pm:149 modules/interactive.pm:71 printer/printerdrake.pm:607 standalone/drakgw:288 standalone/drakgw:289 standalone/drakgw:297 standalone/drakgw:307 standalone/harddrake2:218 ugtk2.pm:1074 wizards.pm:156
+#: help.pm:172 help.pm:301 help.pm:457 help.pm:457 install_any.pm:422 interactive.pm:149 modules/interactive.pm:71 standalone/drakgw:280 standalone/drakgw:281 standalone/drakgw:289 standalone/drakgw:299 standalone/harddrake2:211 ugtk2.pm:1050 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr ""
@@ -3173,7 +3155,7 @@ msgstr ""
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
+"Mandrake Linux will attempt to auto-detect network devices and modems. If\n"
 "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 "configure the network, or to do it later, in which case clicking the \"%s\"\n"
 "button will take you to the next step.\n"
@@ -3188,7 +3170,7 @@ msgid ""
 "\n"
 "About Winmodem Connection. Winmodems are special integrated low-end modems\n"
 "that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrakelinux, some others do not. You\n"
+"those modems actually work under Mandrake Linux, some others do not. You\n"
 "can consult the list of supported modems at LinModems.\n"
 "\n"
 "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -3210,7 +3192,7 @@ msgid ""
 "similar to the one used during installation."
 msgstr ""
 
-#: help.pm:203 help.pm:581 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 install_steps_gtk.pm:646 standalone/drakbackup:2406 standalone/drakbackup:2414 standalone/drakbackup:2422 standalone/drakbackup:2430
+#: help.pm:203 help.pm:581 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 install_steps_gtk.pm:647 standalone/drakbackup:2684 standalone/drakbackup:2694 standalone/drakbackup:2704 standalone/drakbackup:2714
 #, c-format
 msgid "Configure"
 msgstr ""
@@ -3253,7 +3235,7 @@ msgid ""
 "other machines on your local network as well."
 msgstr ""
 
-#: help.pm:235 install_steps_interactive.pm:835
+#: help.pm:235 install_steps_interactive.pm:834
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr ""
@@ -3282,7 +3264,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
 "\n"
 "You will be presented with a list of different parameters to change to get\n"
 "an optimal graphical display: Graphic Card\n"
@@ -3383,7 +3365,7 @@ msgid ""
 "if an existing operating system is using all the available space you will\n"
 "have to partition the drive. Basically, partitioning a hard drive consists\n"
 "of logically dividing it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrake Linux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to lost data if there is an existing operating system already\n"
@@ -3410,7 +3392,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you have previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended.. Using this option is\n"
-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrake Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3419,7 +3401,7 @@ msgid ""
 "Windows to store your data or to install new software.\n"
 "\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,\n"
+"your hard drive and replace them with your new Mandrake Linux system,\n"
 "choose this option. Be careful, because you will not be able to undo your\n"
 "choice after you confirm.\n"
 "\n"
@@ -3505,17 +3487,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr ""
 
-#: help.pm:418 install_steps_interactive.pm:1329
+#: help.pm:418 install_steps_interactive.pm:1320
 #, c-format
 msgid "Replay"
 msgstr ""
 
-#: help.pm:418 install_steps_interactive.pm:1329
+#: help.pm:418 install_steps_interactive.pm:1320
 #, c-format
 msgid "Automated"
 msgstr ""
 
-#: help.pm:418 install_steps_interactive.pm:1332
+#: help.pm:418 install_steps_interactive.pm:1323
 #, c-format
 msgid "Save packages selection"
 msgstr ""
@@ -3543,13 +3525,13 @@ msgid ""
 "Click on \"%s\" when you are ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions that will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
 
-#: help.pm:444 help.pm:1005 install_steps_gtk.pm:431 interactive.pm:404 interactive/newt.pm:307 printer/printerdrake.pm:3088 standalone/drakTermServ:387 standalone/drakbackup:4012 standalone/drakbackup:4041 standalone/drakbackup:4095 standalone/drakbackup:4119 standalone/drakbackup:4143 standalone/drakbackup:4195 standalone/drakbackup:4225 standalone/drakbackup:4247 ugtk2.pm:508
+#: help.pm:444 help.pm:1005 install_steps_gtk.pm:432 interactive.pm:404 interactive/newt.pm:299 printer/printerdrake.pm:2916 standalone/drakTermServ:371 standalone/drakbackup:4292 standalone/drakbackup:4320 standalone/drakbackup:4378 standalone/drakbackup:4404 standalone/drakbackup:4430 standalone/drakbackup:4487 standalone/drakbackup:4513 standalone/drakbackup:4543 standalone/drakbackup:4567 ugtk2.pm:508
 #, c-format
 msgid "Previous"
 msgstr ""
@@ -3557,7 +3539,7 @@ msgstr ""
 #: help.pm:447
 #, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
+"At the time you are installing Mandrake Linux, it is likely that some\n"
 "packages will have been updated since the initial release. Bugs may have\n"
 "been fixed, security issues resolved. To allow you to benefit from these\n"
 "updates, you are now able to download them from the Internet. Check \"%s\"\n"
@@ -3570,7 +3552,7 @@ msgid ""
 "selected package(s), or \"%s\" to abort."
 msgstr ""
 
-#: help.pm:457 help.pm:602 install_steps_gtk.pm:430 install_steps_interactive.pm:148 standalone/drakbackup:4279
+#: help.pm:457 help.pm:602 install_steps_gtk.pm:431 install_steps_interactive.pm:148 standalone/drakbackup:4606
 #, c-format
 msgid "Install"
 msgstr ""
@@ -3602,7 +3584,7 @@ msgstr ""
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrake Linux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -3688,7 +3670,7 @@ msgstr ""
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrakelinux operating system.\n"
+"Mandrake Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -3733,7 +3715,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"of an existing Mandrake Linux system:\n"
 "\n"
 " * \"%s\": For the most part, this completely wipes out the old system. If\n"
 "you wish to change how your hard drives are partitioned, or change the file\n"
@@ -3741,13 +3723,13 @@ msgid ""
 "scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
 " * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
+"currently installed on your Mandrake Linux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
 "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrake Linux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:605
@@ -3787,7 +3769,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
+"still under development. For that reason, Mandrake Linux will be using it\n"
 "or not depending on the user choices:\n"
 "\n"
 " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -3912,7 +3894,7 @@ msgid "authentication"
 msgstr ""
 
 #. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:733 install_steps_interactive.pm:1159
+#: help.pm:733 install_steps_interactive.pm:1154
 #, c-format
 msgid "No password"
 msgstr ""
@@ -3947,7 +3929,7 @@ msgid ""
 "checking this box.\n"
 "\n"
 "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
 "system! Be sure you know what you are doing before changing any of the\n"
 "options. !!\n"
 "\n"
@@ -4004,7 +3986,7 @@ msgid ""
 "operating systems!"
 msgstr ""
 
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480 standalone/drakbackup:1604 standalone/drakfont:589 standalone/drakfont:655 standalone/drakups:280 standalone/drakups:329 standalone/drakups:349 standalone/drakvpn:331 standalone/drakvpn:692
+#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480 standalone/drakbackup:1850 standalone/drakfont:586 standalone/drakfont:649 standalone/drakvpn:325 standalone/drakvpn:708
 #, c-format
 msgid "Add"
 msgstr ""
@@ -4014,7 +3996,7 @@ msgstr ""
 msgid "Modify"
 msgstr ""
 
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480 standalone/drakups:282 standalone/drakups:331 standalone/drakups:351 standalone/drakvpn:331 standalone/drakvpn:692
+#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480 standalone/drakvpn:325 standalone/drakvpn:708
 #, c-format
 msgid "Remove"
 msgstr ""
@@ -4042,7 +4024,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
+"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
 "is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -4072,7 +4054,7 @@ msgstr ""
 msgid "pdq"
 msgstr ""
 
-#: help.pm:826 help.pm:826 printer/cups.pm:115 printer/data.pm:83
+#: help.pm:826 help.pm:826 printer/cups.pm:99 printer/data.pm:82
 #, c-format
 msgid "CUPS"
 msgstr ""
@@ -4192,7 +4174,7 @@ msgid ""
 "driver."
 msgstr ""
 
-#: help.pm:929 help.pm:991 install_steps_interactive.pm:967 install_steps_interactive.pm:984
+#: help.pm:929 help.pm:991 install_steps_interactive.pm:962 install_steps_interactive.pm:979
 #, c-format
 msgid "Sound card"
 msgstr ""
@@ -4262,12 +4244,12 @@ msgid ""
 "idea to review this setup."
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:110 install_steps_interactive.pm:900 standalone/keyboarddrake:23
+#: help.pm:991 install_steps_interactive.pm:110 install_steps_interactive.pm:899 standalone/keyboarddrake:23
 #, c-format
 msgid "Keyboard"
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:926
+#: help.pm:991 install_steps_interactive.pm:921
 #, c-format
 msgid "Timezone"
 msgstr ""
@@ -4277,7 +4259,7 @@ msgstr ""
 msgid "Graphical Interface"
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:1000
+#: help.pm:991 install_steps_interactive.pm:995
 #, c-format
 msgid "TV card"
 msgstr ""
@@ -4287,27 +4269,27 @@ msgstr ""
 msgid "ISDN card"
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:1018 standalone/drakbackup:2101
+#: help.pm:991 install_steps_interactive.pm:1013 standalone/drakbackup:2397
 #, c-format
 msgid "Network"
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:1044
+#: help.pm:991 install_steps_interactive.pm:1039
 #, c-format
 msgid "Security Level"
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:1058
+#: help.pm:991 install_steps_interactive.pm:1053
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:1072
+#: help.pm:991 install_steps_interactive.pm:1067
 #, c-format
 msgid "Bootloader"
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:1082 services.pm:195
+#: help.pm:991 install_steps_interactive.pm:1077 services.pm:195
 #, c-format
 msgid "Services"
 msgstr ""
@@ -4316,7 +4298,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrake Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -4342,7 +4324,7 @@ msgstr ""
 msgid "You must also format %s"
 msgstr ""
 
-#: install_any.pm:411
+#: install_any.pm:413
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -4357,7 +4339,7 @@ msgid ""
 ""
 msgstr ""
 
-#: install_any.pm:432
+#: install_any.pm:434
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -4367,27 +4349,27 @@ msgid ""
 ""
 msgstr ""
 
-#: install_any.pm:827
+#: install_any.pm:812
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr ""
 
-#: install_any.pm:831
+#: install_any.pm:816
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr ""
 
-#: install_any.pm:843
+#: install_any.pm:828
 #, c-format
 msgid "To use this saved packages selection, boot installation with ``linux defcfg=floppy''"
 msgstr ""
 
-#: install_any.pm:871 partition_table.pm:847
+#: install_any.pm:851 partition_table.pm:845
 #, c-format
 msgid "Error reading file %s"
 msgstr ""
 
-#: install_any.pm:995
+#: install_any.pm:968
 #, 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 ""
@@ -4494,7 +4476,7 @@ msgstr ""
 
 #: install_interactive.pm:163
 #, c-format
-msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrakelinux installation."
+msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrake Linux installation."
 msgstr ""
 
 #: install_interactive.pm:164
@@ -4594,10 +4576,10 @@ msgstr ""
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandrakelinux distribution \n"
+"The operating system and the different components available in the Mandrake Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related to the operating \n"
-"system and the different components of the Mandrakelinux distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4632,7 +4614,7 @@ msgid ""
 "limitation damages for loss of business, interruption of business, financial loss, legal fees \n"
 "and penalties resulting from a court judgment, or any other consequential loss) arising out \n"
 "of the possession and use of software components or arising out of  downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some countries by local laws.\n"
+"from one of Mandrake Linux sites  which are prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong cryptography components \n"
 "included in the Software Products.\n"
 "\n"
@@ -4656,7 +4638,7 @@ msgid ""
 "protected by intellectual property and copyright laws applicable to software programs.\n"
 "MandrakeSoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of MandrakeSoft S.A.  \n"
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of MandrakeSoft S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -4722,7 +4704,7 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandrakelinux,\n"
+"For information on fixes which are available for this release of Mandrake Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -4730,7 +4712,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 
 #: install_messages.pm:141
@@ -4743,7 +4725,7 @@ msgstr ""
 msgid "Duplicate mount point %s"
 msgstr ""
 
-#: install_steps.pm:406
+#: install_steps.pm:410
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
@@ -4752,7 +4734,7 @@ msgid ""
 ""
 msgstr ""
 
-#: install_steps.pm:535
+#: install_steps.pm:541
 #, c-format
 msgid "No floppy drive available"
 msgstr ""
@@ -4768,7 +4750,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For this,\n"
+"Mandrake Linux. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
@@ -4849,94 +4831,94 @@ msgstr ""
 msgid "The following packages are going to be removed"
 msgstr ""
 
-#: install_steps_gtk.pm:415
+#: install_steps_gtk.pm:416
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr ""
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:418
 #, c-format
 msgid "You can't unselect this package. It is already installed"
 msgstr ""
 
-#: install_steps_gtk.pm:420
+#: install_steps_gtk.pm:421
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
 "Are you sure you want to deselect it?"
 msgstr ""
 
-#: install_steps_gtk.pm:423
+#: install_steps_gtk.pm:424
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr ""
 
-#: install_steps_gtk.pm:428
+#: install_steps_gtk.pm:429
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: install_steps_gtk.pm:433
+#: install_steps_gtk.pm:434
 #, c-format
 msgid "Load/Save on floppy"
 msgstr ""
 
-#: install_steps_gtk.pm:434
+#: install_steps_gtk.pm:435
 #, c-format
 msgid "Updating package selection"
 msgstr ""
 
-#: install_steps_gtk.pm:439
+#: install_steps_gtk.pm:440
 #, c-format
 msgid "Minimal install"
 msgstr ""
 
-#: install_steps_gtk.pm:453 install_steps_interactive.pm:427
+#: install_steps_gtk.pm:454 install_steps_interactive.pm:427
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: install_steps_gtk.pm:469 install_steps_interactive.pm:673
+#: install_steps_gtk.pm:470 install_steps_interactive.pm:673
 #, c-format
 msgid "Installing"
 msgstr ""
 
-#: install_steps_gtk.pm:475
+#: install_steps_gtk.pm:476
 #, c-format
 msgid "No details"
 msgstr ""
 
-#: install_steps_gtk.pm:476
+#: install_steps_gtk.pm:477
 #, c-format
 msgid "Estimating"
 msgstr ""
 
-#: install_steps_gtk.pm:482
+#: install_steps_gtk.pm:483
 #, c-format
 msgid "Time remaining "
 msgstr ""
 
-#: install_steps_gtk.pm:494
+#: install_steps_gtk.pm:495
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr ""
 
-#: install_steps_gtk.pm:555
+#: install_steps_gtk.pm:556
 #, c-format
 msgid "%d packages"
 msgstr ""
 
-#: install_steps_gtk.pm:560
+#: install_steps_gtk.pm:561
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: install_steps_gtk.pm:596 install_steps_interactive.pm:88 install_steps_interactive.pm:697
+#: install_steps_gtk.pm:597 install_steps_interactive.pm:88 install_steps_interactive.pm:697
 #, c-format
 msgid "Refuse"
 msgstr ""
 
-#: install_steps_gtk.pm:597 install_steps_interactive.pm:698
+#: install_steps_gtk.pm:598 install_steps_interactive.pm:698
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4945,22 +4927,22 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: install_steps_gtk.pm:612 install_steps_interactive.pm:710
+#: install_steps_gtk.pm:613 install_steps_interactive.pm:710
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: install_steps_gtk.pm:612 install_steps_gtk.pm:616 install_steps_interactive.pm:710 install_steps_interactive.pm:714
+#: install_steps_gtk.pm:613 install_steps_gtk.pm:617 install_steps_interactive.pm:710 install_steps_interactive.pm:714
 #, c-format
 msgid "Go on anyway?"
 msgstr ""
 
-#: install_steps_gtk.pm:616 install_steps_interactive.pm:714
+#: install_steps_gtk.pm:617 install_steps_interactive.pm:714
 #, c-format
 msgid "There was an error installing packages:"
 msgstr ""
 
-#: install_steps_gtk.pm:656 install_steps_interactive.pm:882 install_steps_interactive.pm:1034
+#: install_steps_gtk.pm:657 install_steps_interactive.pm:881 install_steps_interactive.pm:1029
 #, c-format
 msgid "not configured"
 msgstr ""
@@ -5055,7 +5037,7 @@ msgstr ""
 msgid "Configuring IDE"
 msgstr ""
 
-#: install_steps_interactive.pm:248 network/tools.pm:195
+#: install_steps_interactive.pm:248 network/tools.pm:197
 #, c-format
 msgid "No partition available"
 msgstr ""
@@ -5247,166 +5229,166 @@ msgstr ""
 
 #: install_steps_interactive.pm:782
 #, c-format
-msgid "Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgid "Contacting Mandrake Linux web site to get the list of available mirrors..."
 msgstr ""
 
-#: install_steps_interactive.pm:787
+#: install_steps_interactive.pm:786
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: install_steps_interactive.pm:801
+#: install_steps_interactive.pm:800
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr ""
 
-#: install_steps_interactive.pm:805
+#: install_steps_interactive.pm:804
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr ""
 
-#: install_steps_interactive.pm:805
+#: install_steps_interactive.pm:804
 #, c-format
 msgid "Would you like to try again?"
 msgstr ""
 
-#: install_steps_interactive.pm:831 standalone/drakclock:42
+#: install_steps_interactive.pm:830 standalone/drakclock:42
 #, c-format
 msgid "Which is your timezone?"
 msgstr ""
 
-#: install_steps_interactive.pm:836
+#: install_steps_interactive.pm:835
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr ""
 
-#: install_steps_interactive.pm:844
+#: install_steps_interactive.pm:843
 #, c-format
 msgid "NTP Server"
 msgstr ""
 
-#: install_steps_interactive.pm:886 steps.pm:30
+#: install_steps_interactive.pm:885 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr ""
 
-#: install_steps_interactive.pm:899 install_steps_interactive.pm:907 install_steps_interactive.pm:925 install_steps_interactive.pm:932 install_steps_interactive.pm:1081 services.pm:135 standalone/drakbackup:1663
+#: install_steps_interactive.pm:898 install_steps_interactive.pm:906 install_steps_interactive.pm:920 install_steps_interactive.pm:927 install_steps_interactive.pm:1076 services.pm:135 standalone/drakbackup:1944
 #, c-format
 msgid "System"
 msgstr ""
 
-#: install_steps_interactive.pm:939 install_steps_interactive.pm:966 install_steps_interactive.pm:983 install_steps_interactive.pm:999 install_steps_interactive.pm:1010
+#: install_steps_interactive.pm:934 install_steps_interactive.pm:961 install_steps_interactive.pm:978 install_steps_interactive.pm:994 install_steps_interactive.pm:1005
 #, c-format
 msgid "Hardware"
 msgstr ""
 
-#: install_steps_interactive.pm:945 install_steps_interactive.pm:954
+#: install_steps_interactive.pm:940 install_steps_interactive.pm:949
 #, c-format
 msgid "Remote CUPS server"
 msgstr ""
 
-#: install_steps_interactive.pm:945
+#: install_steps_interactive.pm:940
 #, c-format
 msgid "No printer"
 msgstr ""
 
-#: install_steps_interactive.pm:987
+#: install_steps_interactive.pm:982
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr ""
 
-#: install_steps_interactive.pm:989
+#: install_steps_interactive.pm:984
 #, c-format
 msgid "Run \"sndconfig\" after installation to configure your sound card"
 msgstr ""
 
-#: install_steps_interactive.pm:991
+#: install_steps_interactive.pm:986
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: install_steps_interactive.pm:1011
+#: install_steps_interactive.pm:1006
 #, c-format
 msgid "Graphical interface"
 msgstr ""
 
-#: install_steps_interactive.pm:1017 install_steps_interactive.pm:1032
+#: install_steps_interactive.pm:1012 install_steps_interactive.pm:1027
 #, c-format
 msgid "Network & Internet"
 msgstr ""
 
-#: install_steps_interactive.pm:1033
+#: install_steps_interactive.pm:1028
 #, c-format
 msgid "Proxies"
 msgstr ""
 
-#: install_steps_interactive.pm:1034
+#: install_steps_interactive.pm:1029
 #, c-format
 msgid "configured"
 msgstr ""
 
-#: install_steps_interactive.pm:1043 install_steps_interactive.pm:1057 steps.pm:20
+#: install_steps_interactive.pm:1038 install_steps_interactive.pm:1052 steps.pm:20
 #, c-format
 msgid "Security"
 msgstr ""
 
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1057
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1057
 #, c-format
 msgid "disabled"
 msgstr ""
 
-#: install_steps_interactive.pm:1071
+#: install_steps_interactive.pm:1066
 #, c-format
 msgid "Boot"
 msgstr ""
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1075
+#: install_steps_interactive.pm:1070
 #, c-format
 msgid "%s on %s"
 msgstr ""
 
-#: install_steps_interactive.pm:1086 services.pm:177
+#: install_steps_interactive.pm:1081 services.pm:177
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr ""
 
-#: install_steps_interactive.pm:1096
+#: install_steps_interactive.pm:1091
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: install_steps_interactive.pm:1154
+#: install_steps_interactive.pm:1149
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr ""
 
-#: install_steps_interactive.pm:1155
+#: install_steps_interactive.pm:1150
 #, c-format
 msgid "Set root password"
 msgstr ""
 
-#: install_steps_interactive.pm:1165
+#: install_steps_interactive.pm:1160
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr ""
 
-#: install_steps_interactive.pm:1170 network/netconnect.pm:563 standalone/drakauth:26 standalone/drakconnect:451
+#: install_steps_interactive.pm:1165 network/netconnect.pm:492 standalone/drakauth:26 standalone/drakconnect:423 standalone/drakconnect:909
 #, c-format
 msgid "Authentication"
 msgstr ""
 
-#: install_steps_interactive.pm:1201
+#: install_steps_interactive.pm:1196
 #, c-format
 msgid "Preparing bootloader..."
 msgstr ""
 
-#: install_steps_interactive.pm:1211
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -5415,29 +5397,29 @@ msgid ""
 " need to use BootX or some other means to boot your machine"
 msgstr ""
 
-#: install_steps_interactive.pm:1217
+#: install_steps_interactive.pm:1212
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr ""
 
-#: install_steps_interactive.pm:1220
+#: install_steps_interactive.pm:1215
 #, c-format
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: install_steps_interactive.pm:1231
+#: install_steps_interactive.pm:1226
 #, c-format
 msgid "Installing bootloader"
 msgstr ""
 
-#: install_steps_interactive.pm:1238
+#: install_steps_interactive.pm:1233
 #, c-format
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 
-#: install_steps_interactive.pm:1243
+#: install_steps_interactive.pm:1238
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -5448,27 +5430,22 @@ msgid ""
 "At your next boot you should see the bootloader prompt."
 msgstr ""
 
-#: install_steps_interactive.pm:1256
+#: install_steps_interactive.pm:1251
 #, 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:1288 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1283 standalone/drakautoinst:75
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: install_steps_interactive.pm:1293
-#, c-format
-msgid "Please insert another floppy for drivers disk"
-msgstr ""
-
-#: install_steps_interactive.pm:1295
+#: install_steps_interactive.pm:1287
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr ""
 
-#: install_steps_interactive.pm:1307
+#: install_steps_interactive.pm:1298
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -5476,12 +5453,12 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: install_steps_interactive.pm:1322
+#: install_steps_interactive.pm:1313
 #, c-format
 msgid "Generate auto install floppy"
 msgstr ""
 
-#: install_steps_interactive.pm:1324
+#: install_steps_interactive.pm:1315
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -5494,7 +5471,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrake Linux Installation %s"
 msgstr ""
 
 #: install_steps_newt.pm:33
@@ -5512,7 +5489,7 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510
+#: interactive.pm:403 interactive/newt.pm:300 ugtk2.pm:510
 #, c-format
 msgid "Finish"
 msgstr ""
@@ -5623,7 +5600,7 @@ msgstr ""
 msgid "French"
 msgstr ""
 
-#: keyboard.pm:143 keyboard.pm:220
+#: keyboard.pm:143 keyboard.pm:217
 #, c-format
 msgid "Norwegian"
 msgstr ""
@@ -5633,22 +5610,22 @@ msgstr ""
 msgid "Polish"
 msgstr ""
 
-#: keyboard.pm:145 keyboard.pm:229
+#: keyboard.pm:145 keyboard.pm:226
 #, c-format
 msgid "Russian"
 msgstr ""
 
-#: keyboard.pm:147 keyboard.pm:233
+#: keyboard.pm:147 keyboard.pm:230
 #, c-format
 msgid "Swedish"
 msgstr ""
 
-#: keyboard.pm:148 keyboard.pm:252
+#: keyboard.pm:148 keyboard.pm:249
 #, c-format
 msgid "UK keyboard"
 msgstr ""
 
-#: keyboard.pm:149 keyboard.pm:253
+#: keyboard.pm:149 keyboard.pm:250
 #, c-format
 msgid "US keyboard"
 msgstr ""
@@ -5843,312 +5820,312 @@ msgstr ""
 msgid "Inuktitut"
 msgstr ""
 
-#: keyboard.pm:200
+#: keyboard.pm:197
 #, c-format
 msgid "Japanese 106 keys"
 msgstr ""
 
-#: keyboard.pm:201
+#: keyboard.pm:198
 #, c-format
 msgid "Kannada"
 msgstr ""
 
-#: keyboard.pm:204
+#: keyboard.pm:201
 #, c-format
 msgid "Korean keyboard"
 msgstr ""
 
-#: keyboard.pm:205
+#: keyboard.pm:202
 #, c-format
 msgid "Latin American"
 msgstr ""
 
-#: keyboard.pm:206
+#: keyboard.pm:203
 #, c-format
 msgid "Laotian"
 msgstr ""
 
-#: keyboard.pm:207
+#: keyboard.pm:204
 #, c-format
 msgid "Lithuanian AZERTY (old)"
 msgstr ""
 
-#: keyboard.pm:209
+#: keyboard.pm:206
 #, c-format
 msgid "Lithuanian AZERTY (new)"
 msgstr ""
 
-#: keyboard.pm:210
+#: keyboard.pm:207
 #, c-format
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr ""
 
-#: keyboard.pm:211
+#: keyboard.pm:208
 #, c-format
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr ""
 
-#: keyboard.pm:212
+#: keyboard.pm:209
 #, c-format
 msgid "Latvian"
 msgstr ""
 
-#: keyboard.pm:213
+#: keyboard.pm:210
 #, c-format
 msgid "Malayalam"
 msgstr ""
 
-#: keyboard.pm:214
+#: keyboard.pm:211
 #, c-format
 msgid "Macedonian"
 msgstr ""
 
-#: keyboard.pm:215
+#: keyboard.pm:212
 #, c-format
 msgid "Myanmar (Burmese)"
 msgstr ""
 
-#: keyboard.pm:216
+#: keyboard.pm:213
 #, c-format
 msgid "Mongolian (cyrillic)"
 msgstr ""
 
-#: keyboard.pm:217
+#: keyboard.pm:214
 #, c-format
 msgid "Maltese (UK)"
 msgstr ""
 
-#: keyboard.pm:218
+#: keyboard.pm:215
 #, c-format
 msgid "Maltese (US)"
 msgstr ""
 
-#: keyboard.pm:219
+#: keyboard.pm:216
 #, c-format
 msgid "Dutch"
 msgstr ""
 
-#: keyboard.pm:221
+#: keyboard.pm:218
 #, c-format
 msgid "Oriya"
 msgstr ""
 
-#: keyboard.pm:222
+#: keyboard.pm:219
 #, c-format
 msgid "Polish (qwerty layout)"
 msgstr ""
 
-#: keyboard.pm:223
+#: keyboard.pm:220
 #, c-format
 msgid "Polish (qwertz layout)"
 msgstr ""
 
-#: keyboard.pm:224
+#: keyboard.pm:221
 #, c-format
 msgid "Portuguese"
 msgstr ""
 
-#: keyboard.pm:225
+#: keyboard.pm:222
 #, c-format
 msgid "Canadian (Quebec)"
 msgstr ""
 
-#: keyboard.pm:227
+#: keyboard.pm:224
 #, c-format
 msgid "Romanian (qwertz)"
 msgstr ""
 
-#: keyboard.pm:228
+#: keyboard.pm:225
 #, c-format
 msgid "Romanian (qwerty)"
 msgstr ""
 
-#: keyboard.pm:230
+#: keyboard.pm:227
 #, c-format
 msgid "Russian (Phonetic)"
 msgstr ""
 
-#: keyboard.pm:231
+#: keyboard.pm:228
 #, c-format
 msgid "Saami (norwegian)"
 msgstr ""
 
-#: keyboard.pm:232
+#: keyboard.pm:229
 #, c-format
 msgid "Saami (swedish/finnish)"
 msgstr ""
 
-#: keyboard.pm:234
+#: keyboard.pm:231
 #, c-format
 msgid "Slovenian"
 msgstr ""
 
-#: keyboard.pm:235
+#: keyboard.pm:232
 #, c-format
 msgid "Slovakian (QWERTZ)"
 msgstr ""
 
-#: keyboard.pm:236
+#: keyboard.pm:233
 #, c-format
 msgid "Slovakian (QWERTY)"
 msgstr ""
 
-#: keyboard.pm:238
+#: keyboard.pm:235
 #, c-format
 msgid "Serbian (cyrillic)"
 msgstr ""
 
-#: keyboard.pm:239
+#: keyboard.pm:236
 #, c-format
 msgid "Syriac"
 msgstr ""
 
-#: keyboard.pm:240
+#: keyboard.pm:237
 #, c-format
 msgid "Syriac (phonetic)"
 msgstr ""
 
-#: keyboard.pm:241
+#: keyboard.pm:238
 #, c-format
 msgid "Telugu"
 msgstr ""
 
-#: keyboard.pm:243
+#: keyboard.pm:240
 #, c-format
 msgid "Tamil (ISCII-layout)"
 msgstr ""
 
-#: keyboard.pm:244
+#: keyboard.pm:241
 #, c-format
 msgid "Tamil (Typewriter-layout)"
 msgstr ""
 
-#: keyboard.pm:245
+#: keyboard.pm:242
 #, c-format
 msgid "Thai keyboard"
 msgstr ""
 
-#: keyboard.pm:247
+#: keyboard.pm:244
 #, c-format
 msgid "Tajik keyboard"
 msgstr ""
 
-#: keyboard.pm:248
+#: keyboard.pm:245
 #, c-format
 msgid "Turkish (traditional \"F\" model)"
 msgstr ""
 
-#: keyboard.pm:249
+#: keyboard.pm:246
 #, c-format
 msgid "Turkish (modern \"Q\" model)"
 msgstr ""
 
-#: keyboard.pm:251
+#: keyboard.pm:248
 #, c-format
 msgid "Ukrainian"
 msgstr ""
 
-#: keyboard.pm:254
+#: keyboard.pm:251
 #, c-format
 msgid "US keyboard (international)"
 msgstr ""
 
-#: keyboard.pm:255
+#: keyboard.pm:252
 #, c-format
 msgid "Uzbek (cyrillic)"
 msgstr ""
 
-#: keyboard.pm:256
+#: keyboard.pm:253
 #, c-format
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr ""
 
-#: keyboard.pm:257
+#: keyboard.pm:254
 #, c-format
 msgid "Yugoslavian (latin)"
 msgstr ""
 
-#: keyboard.pm:264
+#: keyboard.pm:261
 #, c-format
 msgid "Right Alt key"
 msgstr ""
 
-#: keyboard.pm:265
+#: keyboard.pm:262
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:266
+#: keyboard.pm:263
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:267
+#: keyboard.pm:264
 #, c-format
 msgid "CapsLock key"
 msgstr ""
 
-#: keyboard.pm:268
+#: keyboard.pm:265
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:269
+#: keyboard.pm:266
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:270
+#: keyboard.pm:267
 #, c-format
 msgid "\"Menu\" key"
 msgstr ""
 
-#: keyboard.pm:271
+#: keyboard.pm:268
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr ""
 
-#: keyboard.pm:272
+#: keyboard.pm:269
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr ""
 
-#: keyboard.pm:273
+#: keyboard.pm:270
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:274
+#: keyboard.pm:271
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:275
+#: keyboard.pm:272
 #, c-format
 msgid "Left Shift key"
 msgstr ""
 
-#: keyboard.pm:276
+#: keyboard.pm:273
 #, c-format
 msgid "Right Shift key"
 msgstr ""
 
-#: keyboard.pm:277
+#: keyboard.pm:274
 #, c-format
 msgid "Left Alt key"
 msgstr ""
 
-#: keyboard.pm:278
+#: keyboard.pm:275
 #, c-format
 msgid "Left Control key"
 msgstr ""
 
-#: keyboard.pm:279
+#: keyboard.pm:276
 #, c-format
 msgid "Right Control key"
 msgstr ""
 
-#: keyboard.pm:310
+#: keyboard.pm:307
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -6156,7 +6133,7 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr ""
 
-#: keyboard.pm:315
+#: keyboard.pm:312
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -6164,1142 +6141,1142 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: lang.pm:149
+#: lang.pm:144
 #, c-format
 msgid "default:LTR"
 msgstr ""
 
-#: lang.pm:165
+#: lang.pm:160
 #, c-format
 msgid "Afghanistan"
 msgstr ""
 
-#: lang.pm:166
+#: lang.pm:161
 #, c-format
 msgid "Andorra"
 msgstr ""
 
-#: lang.pm:167
+#: lang.pm:162
 #, c-format
 msgid "United Arab Emirates"
 msgstr ""
 
-#: lang.pm:168
+#: lang.pm:163
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr ""
 
-#: lang.pm:169
+#: lang.pm:164
 #, c-format
 msgid "Anguilla"
 msgstr ""
 
-#: lang.pm:170
+#: lang.pm:165
 #, c-format
 msgid "Albania"
 msgstr ""
 
-#: lang.pm:171
+#: lang.pm:166
 #, c-format
 msgid "Armenia"
 msgstr ""
 
-#: lang.pm:172
+#: lang.pm:167
 #, c-format
 msgid "Netherlands Antilles"
 msgstr ""
 
-#: lang.pm:173
+#: lang.pm:168
 #, c-format
 msgid "Angola"
 msgstr ""
 
-#: lang.pm:174
+#: lang.pm:169
 #, c-format
 msgid "Antarctica"
 msgstr ""
 
-#: lang.pm:175 standalone/drakxtv:51
+#: lang.pm:170 standalone/drakxtv:51
 #, c-format
 msgid "Argentina"
 msgstr ""
 
-#: lang.pm:176
+#: lang.pm:171
 #, c-format
 msgid "American Samoa"
 msgstr ""
 
-#: lang.pm:178 network/adsl_consts.pm:20 standalone/drakxtv:49
+#: lang.pm:173 standalone/drakxtv:49
 #, c-format
 msgid "Australia"
 msgstr ""
 
-#: lang.pm:179
+#: lang.pm:174
 #, c-format
 msgid "Aruba"
 msgstr ""
 
-#: lang.pm:180
+#: lang.pm:175
 #, c-format
 msgid "Azerbaijan"
 msgstr ""
 
-#: lang.pm:181
+#: lang.pm:176
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
-#: lang.pm:182
+#: lang.pm:177
 #, c-format
 msgid "Barbados"
 msgstr ""
 
-#: lang.pm:183
+#: lang.pm:178
 #, c-format
 msgid "Bangladesh"
 msgstr ""
 
-#: lang.pm:185
+#: lang.pm:180
 #, c-format
 msgid "Burkina Faso"
 msgstr ""
 
-#: lang.pm:186
+#: lang.pm:181
 #, c-format
 msgid "Bulgaria"
 msgstr ""
 
-#: lang.pm:187
+#: lang.pm:182
 #, c-format
 msgid "Bahrain"
 msgstr ""
 
-#: lang.pm:188
+#: lang.pm:183
 #, c-format
 msgid "Burundi"
 msgstr ""
 
-#: lang.pm:189
+#: lang.pm:184
 #, c-format
 msgid "Benin"
 msgstr ""
 
-#: lang.pm:190
+#: lang.pm:185
 #, c-format
 msgid "Bermuda"
 msgstr ""
 
-#: lang.pm:191
+#: lang.pm:186
 #, c-format
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: lang.pm:192
+#: lang.pm:187
 #, c-format
 msgid "Bolivia"
 msgstr ""
 
-#: lang.pm:193
+#: lang.pm:188
 #, c-format
 msgid "Brazil"
 msgstr ""
 
-#: lang.pm:194
+#: lang.pm:189
 #, c-format
 msgid "Bahamas"
 msgstr ""
 
-#: lang.pm:195
+#: lang.pm:190
 #, c-format
 msgid "Bhutan"
 msgstr ""
 
-#: lang.pm:196
+#: lang.pm:191
 #, c-format
 msgid "Bouvet Island"
 msgstr ""
 
-#: lang.pm:197
+#: lang.pm:192
 #, c-format
 msgid "Botswana"
 msgstr ""
 
-#: lang.pm:198
+#: lang.pm:193
 #, c-format
 msgid "Belarus"
 msgstr ""
 
-#: lang.pm:199
+#: lang.pm:194
 #, c-format
 msgid "Belize"
 msgstr ""
 
-#: lang.pm:200
+#: lang.pm:195
 #, c-format
 msgid "Canada"
 msgstr ""
 
-#: lang.pm:201
+#: lang.pm:196
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
-#: lang.pm:202
+#: lang.pm:197
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr ""
 
-#: lang.pm:203
+#: lang.pm:198
 #, c-format
 msgid "Central African Republic"
 msgstr ""
 
-#: lang.pm:204
+#: lang.pm:199
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr ""
 
-#: lang.pm:205
+#: lang.pm:200
 #, c-format
 msgid "Switzerland"
 msgstr ""
 
-#: lang.pm:206
+#: lang.pm:201
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: lang.pm:207
+#: lang.pm:202
 #, c-format
 msgid "Cook Islands"
 msgstr ""
 
-#: lang.pm:208
+#: lang.pm:203
 #, c-format
 msgid "Chile"
 msgstr ""
 
-#: lang.pm:209
+#: lang.pm:204
 #, c-format
 msgid "Cameroon"
 msgstr ""
 
-#: lang.pm:210
+#: lang.pm:205
 #, c-format
 msgid "China"
 msgstr ""
 
-#: lang.pm:211
+#: lang.pm:206
 #, c-format
 msgid "Colombia"
 msgstr ""
 
-#: lang.pm:213
+#: lang.pm:208
 #, c-format
 msgid "Cuba"
 msgstr ""
 
-#: lang.pm:214
+#: lang.pm:209
 #, c-format
 msgid "Cape Verde"
 msgstr ""
 
-#: lang.pm:215
+#: lang.pm:210
 #, c-format
 msgid "Christmas Island"
 msgstr ""
 
-#: lang.pm:216
+#: lang.pm:211
 #, c-format
 msgid "Cyprus"
 msgstr ""
 
-#: lang.pm:219
+#: lang.pm:214
 #, c-format
 msgid "Djibouti"
 msgstr ""
 
-#: lang.pm:220
+#: lang.pm:215
 #, c-format
 msgid "Denmark"
 msgstr ""
 
-#: lang.pm:221
+#: lang.pm:216
 #, c-format
 msgid "Dominica"
 msgstr ""
 
-#: lang.pm:222
+#: lang.pm:217
 #, c-format
 msgid "Dominican Republic"
 msgstr ""
 
-#: lang.pm:223
+#: lang.pm:218
 #, c-format
 msgid "Algeria"
 msgstr ""
 
-#: lang.pm:224
+#: lang.pm:219
 #, c-format
 msgid "Ecuador"
 msgstr ""
 
-#: lang.pm:225
+#: lang.pm:220
 #, c-format
 msgid "Estonia"
 msgstr ""
 
-#: lang.pm:226
+#: lang.pm:221
 #, c-format
 msgid "Egypt"
 msgstr ""
 
-#: lang.pm:227
+#: lang.pm:222
 #, c-format
 msgid "Western Sahara"
 msgstr ""
 
-#: lang.pm:228
+#: lang.pm:223
 #, c-format
 msgid "Eritrea"
 msgstr ""
 
-#: lang.pm:229 network/adsl_consts.pm:202 network/adsl_consts.pm:210 network/adsl_consts.pm:219 network/adsl_consts.pm:230
+#: lang.pm:224 network/adsl_consts.pm:193 network/adsl_consts.pm:200 network/adsl_consts.pm:209 network/adsl_consts.pm:220
 #, c-format
 msgid "Spain"
 msgstr ""
 
-#: lang.pm:230
+#: lang.pm:225
 #, c-format
 msgid "Ethiopia"
 msgstr ""
 
-#: lang.pm:231 network/adsl_consts.pm:127
+#: lang.pm:226 network/adsl_consts.pm:119
 #, c-format
 msgid "Finland"
 msgstr ""
 
-#: lang.pm:232
+#: lang.pm:227
 #, c-format
 msgid "Fiji"
 msgstr ""
 
-#: lang.pm:233
+#: lang.pm:228
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr ""
 
-#: lang.pm:234
+#: lang.pm:229
 #, c-format
 msgid "Micronesia"
 msgstr ""
 
-#: lang.pm:235
+#: lang.pm:230
 #, c-format
 msgid "Faroe Islands"
 msgstr ""
 
-#: lang.pm:237
+#: lang.pm:232
 #, c-format
 msgid "Gabon"
 msgstr ""
 
-#: lang.pm:238 network/adsl_consts.pm:247 network/adsl_consts.pm:255 network/netconnect.pm:51
+#: lang.pm:233 network/adsl_consts.pm:237 network/adsl_consts.pm:244 network/netconnect.pm:51
 #, c-format
 msgid "United Kingdom"
 msgstr ""
 
-#: lang.pm:239
+#: lang.pm:234
 #, c-format
 msgid "Grenada"
 msgstr ""
 
-#: lang.pm:240
+#: lang.pm:235
 #, c-format
 msgid "Georgia"
 msgstr ""
 
-#: lang.pm:241
+#: lang.pm:236
 #, c-format
 msgid "French Guiana"
 msgstr ""
 
-#: lang.pm:242
+#: lang.pm:237
 #, c-format
 msgid "Ghana"
 msgstr ""
 
-#: lang.pm:243
+#: lang.pm:238
 #, c-format
 msgid "Gibraltar"
 msgstr ""
 
-#: lang.pm:244
+#: lang.pm:239
 #, c-format
 msgid "Greenland"
 msgstr ""
 
-#: lang.pm:245
+#: lang.pm:240
 #, c-format
 msgid "Gambia"
 msgstr ""
 
-#: lang.pm:246
+#: lang.pm:241
 #, c-format
 msgid "Guinea"
 msgstr ""
 
-#: lang.pm:247
+#: lang.pm:242
 #, c-format
 msgid "Guadeloupe"
 msgstr ""
 
-#: lang.pm:248
+#: lang.pm:243
 #, c-format
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: lang.pm:250
+#: lang.pm:245
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr ""
 
-#: lang.pm:251
+#: lang.pm:246
 #, c-format
 msgid "Guatemala"
 msgstr ""
 
-#: lang.pm:252
+#: lang.pm:247
 #, c-format
 msgid "Guam"
 msgstr ""
 
-#: lang.pm:253
+#: lang.pm:248
 #, c-format
 msgid "Guinea-Bissau"
 msgstr ""
 
-#: lang.pm:254
+#: lang.pm:249
 #, c-format
 msgid "Guyana"
 msgstr ""
 
-#: lang.pm:255
+#: lang.pm:250
 #, c-format
 msgid "China (Hong Kong)"
 msgstr ""
 
-#: lang.pm:256
+#: lang.pm:251
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr ""
 
-#: lang.pm:257
+#: lang.pm:252
 #, c-format
 msgid "Honduras"
 msgstr ""
 
-#: lang.pm:258
+#: lang.pm:253
 #, c-format
 msgid "Croatia"
 msgstr ""
 
-#: lang.pm:259
+#: lang.pm:254
 #, c-format
 msgid "Haiti"
 msgstr ""
 
-#: lang.pm:260 network/adsl_consts.pm:152
+#: lang.pm:255 network/adsl_consts.pm:144
 #, c-format
 msgid "Hungary"
 msgstr ""
 
-#: lang.pm:261
+#: lang.pm:256
 #, c-format
 msgid "Indonesia"
 msgstr ""
 
-#: lang.pm:262 standalone/drakxtv:48
+#: lang.pm:257 standalone/drakxtv:48
 #, c-format
 msgid "Ireland"
 msgstr ""
 
-#: lang.pm:263
+#: lang.pm:258
 #, c-format
 msgid "Israel"
 msgstr ""
 
-#: lang.pm:264
+#: lang.pm:259
 #, c-format
 msgid "India"
 msgstr ""
 
-#: lang.pm:265
+#: lang.pm:260
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: lang.pm:266
+#: lang.pm:261
 #, c-format
 msgid "Iraq"
 msgstr ""
 
-#: lang.pm:267
+#: lang.pm:262
 #, c-format
 msgid "Iran"
 msgstr ""
 
-#: lang.pm:268
+#: lang.pm:263
 #, c-format
 msgid "Iceland"
 msgstr ""
 
-#: lang.pm:270
+#: lang.pm:265
 #, c-format
 msgid "Jamaica"
 msgstr ""
 
-#: lang.pm:271
+#: lang.pm:266
 #, c-format
 msgid "Jordan"
 msgstr ""
 
-#: lang.pm:272
+#: lang.pm:267
 #, c-format
 msgid "Japan"
 msgstr ""
 
-#: lang.pm:273
+#: lang.pm:268
 #, c-format
 msgid "Kenya"
 msgstr ""
 
-#: lang.pm:274
+#: lang.pm:269
 #, c-format
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: lang.pm:275
+#: lang.pm:270
 #, c-format
 msgid "Cambodia"
 msgstr ""
 
-#: lang.pm:276
+#: lang.pm:271
 #, c-format
 msgid "Kiribati"
 msgstr ""
 
-#: lang.pm:277
+#: lang.pm:272
 #, c-format
 msgid "Comoros"
 msgstr ""
 
-#: lang.pm:278
+#: lang.pm:273
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr ""
 
-#: lang.pm:279
+#: lang.pm:274
 #, c-format
 msgid "Korea (North)"
 msgstr ""
 
-#: lang.pm:280
+#: lang.pm:275
 #, c-format
 msgid "Korea"
 msgstr ""
 
-#: lang.pm:281
+#: lang.pm:276
 #, c-format
 msgid "Kuwait"
 msgstr ""
 
-#: lang.pm:282
+#: lang.pm:277
 #, c-format
 msgid "Cayman Islands"
 msgstr ""
 
-#: lang.pm:283
+#: lang.pm:278
 #, c-format
 msgid "Kazakhstan"
 msgstr ""
 
-#: lang.pm:284
+#: lang.pm:279
 #, c-format
 msgid "Laos"
 msgstr ""
 
-#: lang.pm:285
+#: lang.pm:280
 #, c-format
 msgid "Lebanon"
 msgstr ""
 
-#: lang.pm:286
+#: lang.pm:281
 #, c-format
 msgid "Saint Lucia"
 msgstr ""
 
-#: lang.pm:287
+#: lang.pm:282
 #, c-format
 msgid "Liechtenstein"
 msgstr ""
 
-#: lang.pm:288
+#: lang.pm:283
 #, c-format
 msgid "Sri Lanka"
 msgstr ""
 
-#: lang.pm:289
+#: lang.pm:284
 #, c-format
 msgid "Liberia"
 msgstr ""
 
-#: lang.pm:290
+#: lang.pm:285
 #, c-format
 msgid "Lesotho"
 msgstr ""
 
-#: lang.pm:291
+#: lang.pm:286
 #, c-format
 msgid "Lithuania"
 msgstr ""
 
-#: lang.pm:292
+#: lang.pm:287
 #, c-format
 msgid "Luxembourg"
 msgstr ""
 
-#: lang.pm:293
+#: lang.pm:288
 #, c-format
 msgid "Latvia"
 msgstr ""
 
-#: lang.pm:294
+#: lang.pm:289
 #, c-format
 msgid "Libya"
 msgstr ""
 
-#: lang.pm:295
+#: lang.pm:290
 #, c-format
 msgid "Morocco"
 msgstr ""
 
-#: lang.pm:296
+#: lang.pm:291
 #, c-format
 msgid "Monaco"
 msgstr ""
 
-#: lang.pm:297
+#: lang.pm:292
 #, c-format
 msgid "Moldova"
 msgstr ""
 
-#: lang.pm:298
+#: lang.pm:293
 #, c-format
 msgid "Madagascar"
 msgstr ""
 
-#: lang.pm:299
+#: lang.pm:294
 #, c-format
 msgid "Marshall Islands"
 msgstr ""
 
-#: lang.pm:300
+#: lang.pm:295
 #, c-format
 msgid "Macedonia"
 msgstr ""
 
-#: lang.pm:301
+#: lang.pm:296
 #, c-format
 msgid "Mali"
 msgstr ""
 
-#: lang.pm:302
+#: lang.pm:297
 #, c-format
 msgid "Myanmar"
 msgstr ""
 
-#: lang.pm:303
+#: lang.pm:298
 #, c-format
 msgid "Mongolia"
 msgstr ""
 
-#: lang.pm:304
+#: lang.pm:299
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: lang.pm:305
+#: lang.pm:300
 #, c-format
 msgid "Martinique"
 msgstr ""
 
-#: lang.pm:306
+#: lang.pm:301
 #, c-format
 msgid "Mauritania"
 msgstr ""
 
-#: lang.pm:307
+#: lang.pm:302
 #, c-format
 msgid "Montserrat"
 msgstr ""
 
-#: lang.pm:308
+#: lang.pm:303
 #, c-format
 msgid "Malta"
 msgstr ""
 
-#: lang.pm:309
+#: lang.pm:304
 #, c-format
 msgid "Mauritius"
 msgstr ""
 
-#: lang.pm:310
+#: lang.pm:305
 #, c-format
 msgid "Maldives"
 msgstr ""
 
-#: lang.pm:311
+#: lang.pm:306
 #, c-format
 msgid "Malawi"
 msgstr ""
 
-#: lang.pm:312
+#: lang.pm:307
 #, c-format
 msgid "Mexico"
 msgstr ""
 
-#: lang.pm:313
+#: lang.pm:308
 #, c-format
 msgid "Malaysia"
 msgstr ""
 
-#: lang.pm:314
+#: lang.pm:309
 #, c-format
 msgid "Mozambique"
 msgstr ""
 
-#: lang.pm:315
+#: lang.pm:310
 #, c-format
 msgid "Namibia"
 msgstr ""
 
-#: lang.pm:316
+#: lang.pm:311
 #, c-format
 msgid "New Caledonia"
 msgstr ""
 
-#: lang.pm:317
+#: lang.pm:312
 #, c-format
 msgid "Niger"
 msgstr ""
 
-#: lang.pm:318
+#: lang.pm:313
 #, c-format
 msgid "Norfolk Island"
 msgstr ""
 
-#: lang.pm:319
+#: lang.pm:314
 #, c-format
 msgid "Nigeria"
 msgstr ""
 
-#: lang.pm:320
+#: lang.pm:315
 #, c-format
 msgid "Nicaragua"
 msgstr ""
 
-#: lang.pm:323
+#: lang.pm:318
 #, c-format
 msgid "Nepal"
 msgstr ""
 
-#: lang.pm:324
+#: lang.pm:319
 #, c-format
 msgid "Nauru"
 msgstr ""
 
-#: lang.pm:325
+#: lang.pm:320
 #, c-format
 msgid "Niue"
 msgstr ""
 
-#: lang.pm:326
+#: lang.pm:321
 #, c-format
 msgid "New Zealand"
 msgstr ""
 
-#: lang.pm:327
+#: lang.pm:322
 #, c-format
 msgid "Oman"
 msgstr ""
 
-#: lang.pm:328
+#: lang.pm:323
 #, c-format
 msgid "Panama"
 msgstr ""
 
-#: lang.pm:329
+#: lang.pm:324
 #, c-format
 msgid "Peru"
 msgstr ""
 
-#: lang.pm:330
+#: lang.pm:325
 #, c-format
 msgid "French Polynesia"
 msgstr ""
 
-#: lang.pm:331
+#: lang.pm:326
 #, c-format
 msgid "Papua New Guinea"
 msgstr ""
 
-#: lang.pm:332
+#: lang.pm:327
 #, c-format
 msgid "Philippines"
 msgstr ""
 
-#: lang.pm:333
+#: lang.pm:328
 #, c-format
 msgid "Pakistan"
 msgstr ""
 
-#: lang.pm:334 network/adsl_consts.pm:186
+#: lang.pm:329 network/adsl_consts.pm:177
 #, c-format
 msgid "Poland"
 msgstr ""
 
-#: lang.pm:335
+#: lang.pm:330
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr ""
 
-#: lang.pm:336
+#: lang.pm:331
 #, c-format
 msgid "Pitcairn"
 msgstr ""
 
-#: lang.pm:337
+#: lang.pm:332
 #, c-format
 msgid "Puerto Rico"
 msgstr ""
 
-#: lang.pm:338
+#: lang.pm:333
 #, c-format
 msgid "Palestine"
 msgstr ""
 
-#: lang.pm:339 network/adsl_consts.pm:196
+#: lang.pm:334 network/adsl_consts.pm:187
 #, c-format
 msgid "Portugal"
 msgstr ""
 
-#: lang.pm:340
+#: lang.pm:335
 #, c-format
 msgid "Paraguay"
 msgstr ""
 
-#: lang.pm:341
+#: lang.pm:336
 #, c-format
 msgid "Palau"
 msgstr ""
 
-#: lang.pm:342
+#: lang.pm:337
 #, c-format
 msgid "Qatar"
 msgstr ""
 
-#: lang.pm:343
+#: lang.pm:338
 #, c-format
 msgid "Reunion"
 msgstr ""
 
-#: lang.pm:344
+#: lang.pm:339
 #, c-format
 msgid "Romania"
 msgstr ""
 
-#: lang.pm:345
+#: lang.pm:340
 #, c-format
 msgid "Russia"
 msgstr ""
 
-#: lang.pm:346
+#: lang.pm:341
 #, c-format
 msgid "Rwanda"
 msgstr ""
 
-#: lang.pm:347
+#: lang.pm:342
 #, c-format
 msgid "Saudi Arabia"
 msgstr ""
 
-#: lang.pm:348
+#: lang.pm:343
 #, c-format
 msgid "Solomon Islands"
 msgstr ""
 
-#: lang.pm:349
+#: lang.pm:344
 #, c-format
 msgid "Seychelles"
 msgstr ""
 
-#: lang.pm:350
+#: lang.pm:345
 #, c-format
 msgid "Sudan"
 msgstr ""
 
-#: lang.pm:352
+#: lang.pm:347
 #, c-format
 msgid "Singapore"
 msgstr ""
 
-#: lang.pm:353
+#: lang.pm:348
 #, c-format
 msgid "Saint Helena"
 msgstr ""
 
-#: lang.pm:354
+#: lang.pm:349
 #, c-format
 msgid "Slovenia"
 msgstr ""
 
-#: lang.pm:355
+#: lang.pm:350
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr ""
 
-#: lang.pm:356
+#: lang.pm:351
 #, c-format
 msgid "Slovakia"
 msgstr ""
 
-#: lang.pm:357
+#: lang.pm:352
 #, c-format
 msgid "Sierra Leone"
 msgstr ""
 
-#: lang.pm:358
+#: lang.pm:353
 #, c-format
 msgid "San Marino"
 msgstr ""
 
-#: lang.pm:359
+#: lang.pm:354
 #, c-format
 msgid "Senegal"
 msgstr ""
 
-#: lang.pm:360
+#: lang.pm:355
 #, c-format
 msgid "Somalia"
 msgstr ""
 
-#: lang.pm:361
+#: lang.pm:356
 #, c-format
 msgid "Suriname"
 msgstr ""
 
-#: lang.pm:362
+#: lang.pm:357
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr ""
 
-#: lang.pm:363
+#: lang.pm:358
 #, c-format
 msgid "El Salvador"
 msgstr ""
 
-#: lang.pm:364
+#: lang.pm:359
 #, c-format
 msgid "Syria"
 msgstr ""
 
-#: lang.pm:365
+#: lang.pm:360
 #, c-format
 msgid "Swaziland"
 msgstr ""
 
-#: lang.pm:366
+#: lang.pm:361
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr ""
 
-#: lang.pm:367
+#: lang.pm:362
 #, c-format
 msgid "Chad"
 msgstr ""
 
-#: lang.pm:368
+#: lang.pm:363
 #, c-format
 msgid "French Southern Territories"
 msgstr ""
 
-#: lang.pm:369
+#: lang.pm:364
 #, c-format
 msgid "Togo"
 msgstr ""
 
-#: lang.pm:370
+#: lang.pm:365
 #, c-format
 msgid "Thailand"
 msgstr ""
 
-#: lang.pm:371
+#: lang.pm:366
 #, c-format
 msgid "Tajikistan"
 msgstr ""
 
-#: lang.pm:372
+#: lang.pm:367
 #, c-format
 msgid "Tokelau"
 msgstr ""
 
-#: lang.pm:373
+#: lang.pm:368
 #, c-format
 msgid "East Timor"
 msgstr ""
 
-#: lang.pm:374
+#: lang.pm:369
 #, c-format
 msgid "Turkmenistan"
 msgstr ""
 
-#: lang.pm:375
+#: lang.pm:370
 #, c-format
 msgid "Tunisia"
 msgstr ""
 
-#: lang.pm:376
+#: lang.pm:371
 #, c-format
 msgid "Tonga"
 msgstr ""
 
-#: lang.pm:377
+#: lang.pm:372
 #, c-format
 msgid "Turkey"
 msgstr ""
 
-#: lang.pm:378
+#: lang.pm:373
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr ""
 
-#: lang.pm:379
+#: lang.pm:374
 #, c-format
 msgid "Tuvalu"
 msgstr ""
 
-#: lang.pm:380
+#: lang.pm:375
 #, c-format
 msgid "Taiwan"
 msgstr ""
 
-#: lang.pm:381
+#: lang.pm:376
 #, c-format
 msgid "Tanzania"
 msgstr ""
 
-#: lang.pm:382
+#: lang.pm:377
 #, c-format
 msgid "Ukraine"
 msgstr ""
 
-#: lang.pm:383
+#: lang.pm:378
 #, c-format
 msgid "Uganda"
 msgstr ""
 
-#: lang.pm:384
+#: lang.pm:379
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: lang.pm:386
+#: lang.pm:381
 #, c-format
 msgid "Uruguay"
 msgstr ""
 
-#: lang.pm:387
+#: lang.pm:382
 #, c-format
 msgid "Uzbekistan"
 msgstr ""
 
-#: lang.pm:388
+#: lang.pm:383
 #, c-format
 msgid "Vatican"
 msgstr ""
 
-#: lang.pm:389
+#: lang.pm:384
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr ""
 
-#: lang.pm:390
+#: lang.pm:385
 #, c-format
 msgid "Venezuela"
 msgstr ""
 
-#: lang.pm:391
+#: lang.pm:386
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr ""
 
-#: lang.pm:392
+#: lang.pm:387
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr ""
 
-#: lang.pm:393
+#: lang.pm:388
 #, c-format
 msgid "Vietnam"
 msgstr ""
 
-#: lang.pm:394
+#: lang.pm:389
 #, c-format
 msgid "Vanuatu"
 msgstr ""
 
-#: lang.pm:395
+#: lang.pm:390
 #, c-format
 msgid "Wallis and Futuna"
 msgstr ""
 
-#: lang.pm:396
+#: lang.pm:391
 #, c-format
 msgid "Samoa"
 msgstr ""
 
-#: lang.pm:397
+#: lang.pm:392
 #, c-format
 msgid "Yemen"
 msgstr ""
 
-#: lang.pm:398
+#: lang.pm:393
 #, c-format
 msgid "Mayotte"
 msgstr ""
 
-#: lang.pm:399
+#: lang.pm:394
 #, c-format
 msgid "Serbia & Montenegro"
 msgstr ""
 
-#: lang.pm:400 standalone/drakxtv:50
+#: lang.pm:395 standalone/drakxtv:50
 #, c-format
 msgid "South Africa"
 msgstr ""
 
-#: lang.pm:401
+#: lang.pm:396
 #, c-format
 msgid "Zambia"
 msgstr ""
 
-#: lang.pm:402
+#: lang.pm:397
 #, c-format
 msgid "Zimbabwe"
 msgstr ""
 
-#: lang.pm:983
+#: lang.pm:967
 #, c-format
 msgid "Welcome to %s"
 msgstr ""
@@ -7318,7 +7295,7 @@ msgid ""
 ""
 msgstr ""
 
-#: modules/interactive.pm:21 standalone/drakconnect:959
+#: modules/interactive.pm:21 standalone/drakconnect:954
 #, c-format
 msgid "Parameters"
 msgstr ""
@@ -7473,7 +7450,7 @@ msgstr ""
 msgid "GlidePoint"
 msgstr ""
 
-#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44 network/modem.pm:58 network/modem.pm:72 network/modem.pm:77 network/modem.pm:108 network/netconnect.pm:574 network/netconnect.pm:579 network/netconnect.pm:591 network/netconnect.pm:596 network/netconnect.pm:612 network/netconnect.pm:614
+#: mouse.pm:36 network/modem.pm:23 network/modem.pm:37 network/modem.pm:42 network/modem.pm:73 network/netconnect.pm:481 network/netconnect.pm:482 network/netconnect.pm:483 network/netconnect.pm:503 network/netconnect.pm:508 network/netconnect.pm:520 network/netconnect.pm:525 network/netconnect.pm:541 network/netconnect.pm:543
 #, c-format
 msgid "Automatic"
 msgstr ""
@@ -7618,7 +7595,7 @@ msgstr ""
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: mouse.pm:92 standalone/drakvpn:1138
+#: mouse.pm:92
 #, c-format
 msgid "none"
 msgstr ""
@@ -7628,17 +7605,17 @@ msgstr ""
 msgid "No mouse"
 msgstr ""
 
-#: mouse.pm:515
+#: mouse.pm:512
 #, c-format
 msgid "Please test the mouse"
 msgstr ""
 
-#: mouse.pm:517
+#: mouse.pm:514
 #, c-format
 msgid "To activate the mouse,"
 msgstr ""
 
-#: mouse.pm:518
+#: mouse.pm:515
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr ""
@@ -7678,12 +7655,12 @@ msgstr ""
 msgid "Sagem (using dhcp) usb"
 msgstr ""
 
-#: network/adsl.pm:35 network/netconnect.pm:754
+#: network/adsl.pm:35 network/netconnect.pm:679
 #, c-format
 msgid "Connect to the Internet"
 msgstr ""
 
-#: network/adsl.pm:36 network/netconnect.pm:755
+#: network/adsl.pm:36 network/netconnect.pm:680
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
@@ -7691,7 +7668,7 @@ msgid ""
 "If you don't know, choose 'use pppoe'"
 msgstr ""
 
-#: network/adsl.pm:41 network/netconnect.pm:759
+#: network/adsl.pm:41 network/netconnect.pm:684
 #, c-format
 msgid "ADSL connection type :"
 msgstr ""
@@ -7756,7 +7733,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -7779,7 +7756,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
-"Valid examples are: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
+"Valid examples are: 139/tcp 139/udp.\n"
 "Have a look at /etc/services for information."
 msgstr ""
 
@@ -7803,265 +7780,307 @@ msgstr ""
 msgid "Other ports"
 msgstr ""
 
-#: network/isdn.pm:113 network/netconnect.pm:424
+#: network/isdn.pm:127 network/isdn.pm:145 network/isdn.pm:157 network/isdn.pm:163 network/isdn.pm:173 network/isdn.pm:183 network/netconnect.pm:332
 #, c-format
-msgid "Unlisted - edit manually"
+msgid "ISDN Configuration"
 msgstr ""
 
-#: network/isdn.pm:156 network/netconnect.pm:376
+#: network/isdn.pm:127
 #, c-format
-msgid "ISA / PCMCIA"
+msgid ""
+"Select your provider.\n"
+"If it isn't listed, choose Unlisted."
 msgstr ""
 
-#: network/isdn.pm:156 network/netconnect.pm:376
+#: network/isdn.pm:140 standalone/drakconnect:498
 #, c-format
-msgid "I don't know"
+msgid "European protocol (EDSS1)"
+msgstr ""
+
+#: network/isdn.pm:140
+#, c-format
+msgid "European protocol"
+msgstr ""
+
+#: network/isdn.pm:142 standalone/drakconnect:499
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+
+#: network/isdn.pm:142
+#, c-format
+msgid "Protocol for the rest of the world"
+msgstr ""
+
+#: network/isdn.pm:146
+#, c-format
+msgid "Which protocol do you want to use?"
 msgstr ""
 
-#: network/isdn.pm:157 network/netconnect.pm:376
+#: network/isdn.pm:157
+#, c-format
+msgid "Found \"%s\" interface do you want to use it ?"
+msgstr ""
+
+#: network/isdn.pm:164
+#, c-format
+msgid "What kind of card do you have?"
+msgstr ""
+
+#: network/isdn.pm:165
+#, c-format
+msgid "ISA / PCMCIA"
+msgstr ""
+
+#: network/isdn.pm:165
 #, c-format
 msgid "PCI"
 msgstr ""
 
-#: network/isdn.pm:158 network/netconnect.pm:376
+#: network/isdn.pm:165
 #, c-format
 msgid "USB"
 msgstr ""
 
-#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44 network/netconnect.pm:579 network/netconnect.pm:596 network/netconnect.pm:612
+#: network/isdn.pm:165
 #, c-format
-msgid "Manual"
+msgid "I don't know"
 msgstr ""
 
-#: network/netconnect.pm:88 network/netconnect.pm:453 network/netconnect.pm:463 network/netconnect.pm:822 network/netconnect.pm:827
+#: network/isdn.pm:174
 #, c-format
-msgid "Manual choice"
+msgid ""
+"\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
+"\n"
+"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.\n"
+""
 msgstr ""
 
-#: network/netconnect.pm:88
+#: network/isdn.pm:178
 #, c-format
-msgid "Internal ISDN card"
+msgid "Continue"
 msgstr ""
 
-#: network/netconnect.pm:97
+#: network/isdn.pm:178
+#, c-format
+msgid "Abort"
+msgstr ""
+
+#: network/isdn.pm:184
+#, c-format
+msgid "Which of the following is your ISDN card?"
+msgstr ""
+
+#: network/netconnect.pm:95
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:96
 #, c-format
 msgid "Managed"
 msgstr ""
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:97
 #, c-format
 msgid "Master"
 msgstr ""
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:98
 #, c-format
 msgid "Repeater"
 msgstr ""
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:99
 #, c-format
 msgid "Secondary"
 msgstr ""
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:100
 #, c-format
 msgid "Auto"
 msgstr ""
 
-#: network/netconnect.pm:105 printer/printerdrake.pm:1133 standalone/drakups:64
+#: network/netconnect.pm:103 printer/printerdrake.pm:1114
 #, c-format
 msgid "Manual configuration"
 msgstr ""
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:104
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:106
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr ""
 
-#: network/netconnect.pm:111
-#, c-format
-msgid "Protocol for the rest of the world"
-msgstr ""
-
-#: network/netconnect.pm:113 standalone/drakconnect:528
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr ""
-
-#: network/netconnect.pm:114 standalone/drakconnect:529
+#: network/netconnect.pm:156
 #, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
+msgid "Alcatel speedtouch USB modem"
 msgstr ""
 
-#: network/netconnect.pm:146
+#: network/netconnect.pm:157
 #, c-format
-msgid "Alcatel speedtouch USB modem"
+msgid "Sagem USB modem"
 msgstr ""
 
-#: network/netconnect.pm:147
+#: network/netconnect.pm:158
 #, c-format
-msgid "Sagem USB modem"
+msgid "Bewan USB modem"
 msgstr ""
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:159
 #, c-format
-msgid "Bewan modem"
+msgid "Bewan PCI modem"
 msgstr ""
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:160
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr ""
 
-#: network/netconnect.pm:153
+#: network/netconnect.pm:164
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:165
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr ""
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:166
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr ""
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:167
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr ""
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:168
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr ""
 
-#: network/netconnect.pm:161
+#: network/netconnect.pm:172
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr ""
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:173
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr ""
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:174
 #, c-format
 msgid "Routed IP LLC"
 msgstr ""
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:175
 #, c-format
 msgid "Routed IP VC"
 msgstr ""
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:176
 #, c-format
 msgid "PPPOA LLC"
 msgstr ""
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:177
 #, c-format
 msgid "PPPOA VC"
 msgstr ""
 
-#: network/netconnect.pm:170 standalone/drakconnect:466
+#: network/netconnect.pm:181 standalone/drakconnect:438 standalone/drakconnect:909
 #, c-format
 msgid "Script-based"
 msgstr ""
 
-#: network/netconnect.pm:171 standalone/drakconnect:466
+#: network/netconnect.pm:182 standalone/drakconnect:438 standalone/drakconnect:909
 #, c-format
 msgid "PAP"
 msgstr ""
 
-#: network/netconnect.pm:172 standalone/drakconnect:466
+#: network/netconnect.pm:183 standalone/drakconnect:438 standalone/drakconnect:909
 #, c-format
 msgid "Terminal-based"
 msgstr ""
 
-#: network/netconnect.pm:173 standalone/drakconnect:466
+#: network/netconnect.pm:184 standalone/drakconnect:438 standalone/drakconnect:909
 #, c-format
 msgid "CHAP"
 msgstr ""
 
-#: network/netconnect.pm:174 standalone/drakconnect:466
+#: network/netconnect.pm:185
 #, c-format
 msgid "PAP/CHAP"
 msgstr ""
 
-#: network/netconnect.pm:219 standalone/drakconnect:55
+#: network/netconnect.pm:199 standalone/drakconnect:53
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr ""
 
-#: network/netconnect.pm:225
+#: network/netconnect.pm:205
 #, c-format
 msgid "(detected on port %s)"
 msgstr ""
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:227
+#: network/netconnect.pm:207
 #, c-format
 msgid "(detected %s)"
 msgstr ""
 
-#: network/netconnect.pm:227
+#: network/netconnect.pm:207
 #, c-format
 msgid "(detected)"
 msgstr ""
 
-#: network/netconnect.pm:229
+#: network/netconnect.pm:209
 #, c-format
 msgid "Modem connection"
 msgstr ""
 
-#: network/netconnect.pm:230
+#: network/netconnect.pm:210
 #, c-format
 msgid "ISDN connection"
 msgstr ""
 
-#: network/netconnect.pm:231
+#: network/netconnect.pm:211
 #, c-format
 msgid "ADSL connection"
 msgstr ""
 
-#: network/netconnect.pm:232
+#: network/netconnect.pm:212
 #, c-format
 msgid "Cable connection"
 msgstr ""
 
-#: network/netconnect.pm:233
+#: network/netconnect.pm:213
 #, c-format
 msgid "LAN connection"
 msgstr ""
 
-#: network/netconnect.pm:234 network/netconnect.pm:248
+#: network/netconnect.pm:214 network/netconnect.pm:228
 #, c-format
 msgid "Wireless connection"
 msgstr ""
 
-#: network/netconnect.pm:244
+#: network/netconnect.pm:224
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr ""
 
-#: network/netconnect.pm:261
+#: network/netconnect.pm:241
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -8070,286 +8089,254 @@ msgid ""
 "Press \"%s\" to continue."
 msgstr ""
 
-#: network/netconnect.pm:269 network/netconnect.pm:781
+#: network/netconnect.pm:249 network/netconnect.pm:710
 #, c-format
 msgid "Connection Configuration"
 msgstr ""
 
-#: network/netconnect.pm:270 network/netconnect.pm:782
+#: network/netconnect.pm:250 network/netconnect.pm:711
 #, c-format
 msgid "Please fill or check the field below"
 msgstr ""
 
-#: network/netconnect.pm:277 standalone/drakconnect:519
+#: network/netconnect.pm:256 standalone/drakconnect:489 standalone/drakconnect:891
 #, c-format
 msgid "Card IRQ"
 msgstr ""
 
-#: network/netconnect.pm:278 standalone/drakconnect:520
+#: network/netconnect.pm:257 standalone/drakconnect:490 standalone/drakconnect:892
 #, c-format
 msgid "Card mem (DMA)"
 msgstr ""
 
-#: network/netconnect.pm:279 standalone/drakconnect:521
+#: network/netconnect.pm:258 standalone/drakconnect:491 standalone/drakconnect:893
 #, c-format
 msgid "Card IO"
 msgstr ""
 
-#: network/netconnect.pm:280 standalone/drakconnect:522
+#: network/netconnect.pm:259 standalone/drakconnect:492 standalone/drakconnect:894
 #, c-format
 msgid "Card IO_0"
 msgstr ""
 
-#: network/netconnect.pm:281
+#: network/netconnect.pm:260 standalone/drakconnect:895
 #, c-format
 msgid "Card IO_1"
 msgstr ""
 
-#: network/netconnect.pm:282
+#: network/netconnect.pm:261 standalone/drakconnect:896
 #, c-format
 msgid "Your personal phone number"
 msgstr ""
 
-#: network/netconnect.pm:283 network/netconnect.pm:785
+#: network/netconnect.pm:262 network/netconnect.pm:714 standalone/drakconnect:897
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: network/netconnect.pm:284 standalone/drakconnect:463
+#: network/netconnect.pm:263 standalone/drakconnect:435 standalone/drakconnect:898
 #, c-format
 msgid "Provider phone number"
 msgstr ""
 
-#: network/netconnect.pm:285
+#: network/netconnect.pm:264
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr ""
 
-#: network/netconnect.pm:286
+#: network/netconnect.pm:265
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr ""
 
-#: network/netconnect.pm:287 standalone/drakconnect:419
+#: network/netconnect.pm:266 standalone/drakconnect:391 standalone/drakconnect:457 standalone/drakconnect:903
 #, c-format
 msgid "Dialing mode"
 msgstr ""
 
-#: network/netconnect.pm:288 standalone/drakconnect:424 standalone/drakconnect:484
+#: network/netconnect.pm:267 standalone/drakconnect:396 standalone/drakconnect:454 standalone/drakconnect:915
 #, c-format
 msgid "Connection speed"
 msgstr ""
 
-#: network/netconnect.pm:289 standalone/drakconnect:429
+#: network/netconnect.pm:268 standalone/drakconnect:401 standalone/drakconnect:916
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr ""
 
-#: network/netconnect.pm:292 network/netconnect.pm:788 standalone/drakconnect:461
+#: network/netconnect.pm:271 network/netconnect.pm:717 standalone/drakconnect:433 standalone/drakconnect:901
 #, c-format
 msgid "Account Login (user name)"
 msgstr ""
 
-#: network/netconnect.pm:293 network/netconnect.pm:789 standalone/drakconnect:462
+#: network/netconnect.pm:272 network/netconnect.pm:718 standalone/drakconnect:434 standalone/drakconnect:902 standalone/drakconnect:936
 #, c-format
 msgid "Account Password"
 msgstr ""
 
-#: network/netconnect.pm:323 network/netconnect.pm:637 network/netconnect.pm:820
-#, c-format
-msgid "Select the network interface to configure:"
-msgstr ""
-
-#: network/netconnect.pm:323 network/netconnect.pm:457 network/netconnect.pm:641 standalone/drakgw:113 standalone/drakvpn:49
+#: network/netconnect.pm:300
 #, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
+msgid "What kind is your ISDN connection?"
 msgstr ""
 
-#: network/netconnect.pm:325 network/netconnect.pm:366 network/netconnect.pm:638 network/netconnect.pm:822 network/shorewall.pm:84 standalone/drakconnect:643 standalone/drakgw:225 standalone/drakvpn:219
+#: network/netconnect.pm:301
 #, c-format
-msgid "Net Device"
+msgid "Internal ISDN card"
 msgstr ""
 
-#: network/netconnect.pm:326 network/netconnect.pm:334
+#: network/netconnect.pm:301
 #, c-format
 msgid "External ISDN modem"
 msgstr ""
 
-#: network/netconnect.pm:365 standalone/harddrake2:115
+#: network/netconnect.pm:332
 #, c-format
-msgid "Select a device !"
+msgid "Do you want to start a new configuration ?"
 msgstr ""
 
-#: network/netconnect.pm:374 network/netconnect.pm:384 network/netconnect.pm:394 network/netconnect.pm:410 network/netconnect.pm:421
+#: network/netconnect.pm:335
 #, c-format
-msgid "ISDN Configuration"
+msgid "I have detected an ISDN PCI card, but I don't know its type. Please select a PCI card on the next screen."
 msgstr ""
 
-#: network/netconnect.pm:375
+#: network/netconnect.pm:344
 #, c-format
-msgid "What kind of card do you have?"
+msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 
-#: network/netconnect.pm:385
+#: network/netconnect.pm:353
 #, c-format
 msgid ""
-"\n"
-"If you have an ISA card, the values on the next screen should be right.\n"
-"\n"
-"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.\n"
-""
-msgstr ""
-
-#: network/netconnect.pm:389
-#, c-format
-msgid "Continue"
-msgstr ""
-
-#: network/netconnect.pm:389
-#, c-format
-msgid "Abort"
-msgstr ""
-
-#: network/netconnect.pm:395
-#, c-format
-msgid "Which of the following is your ISDN card?"
+"Your modem isn't supported by the system.\n"
+"Take a look at http://www.linmodems.org"
 msgstr ""
 
-#: network/netconnect.pm:410
+#: network/netconnect.pm:364
 #, c-format
-msgid "Which protocol do you want to use?"
+msgid "Select the modem to configure:"
 msgstr ""
 
-#: network/netconnect.pm:412 standalone/drakconnect:116 standalone/drakconnect:527 standalone/drakvpn:1140
+#: network/netconnect.pm:403
 #, c-format
-msgid "Protocol"
+msgid "Please choose which serial port your modem is connected to."
 msgstr ""
 
-#: network/netconnect.pm:421
+#: network/netconnect.pm:427
 #, c-format
-msgid ""
-"Select your provider.\n"
-"If it isn't listed, choose Unlisted."
+msgid "Select your provider:"
 msgstr ""
 
-#: network/netconnect.pm:423 network/netconnect.pm:529 network/netconnect.pm:675
+#: network/netconnect.pm:429 network/netconnect.pm:599
 #, c-format
 msgid "Provider:"
 msgstr ""
 
-#: network/netconnect.pm:438
-#, c-format
-msgid ""
-"Your modem isn't supported by the system.\n"
-"Take a look at http://www.linmodems.org"
-msgstr ""
-
-#: network/netconnect.pm:450
+#: network/netconnect.pm:481 network/netconnect.pm:482 network/netconnect.pm:483 network/netconnect.pm:508 network/netconnect.pm:525 network/netconnect.pm:541
 #, c-format
-msgid "Select the modem to configure:"
-msgstr ""
-
-#: network/netconnect.pm:498
-#, c-format
-msgid "Please choose which serial port your modem is connected to."
-msgstr ""
-
-#: network/netconnect.pm:527
-#, c-format
-msgid "Select your provider:"
+msgid "Manual"
 msgstr ""
 
-#: network/netconnect.pm:556
+#: network/netconnect.pm:485
 #, c-format
 msgid "Dialup: account options"
 msgstr ""
 
-#: network/netconnect.pm:559
+#: network/netconnect.pm:488 standalone/drakconnect:905
 #, c-format
 msgid "Connection name"
 msgstr ""
 
-#: network/netconnect.pm:560
+#: network/netconnect.pm:489 standalone/drakconnect:906
 #, c-format
 msgid "Phone number"
 msgstr ""
 
-#: network/netconnect.pm:561
+#: network/netconnect.pm:490 standalone/drakconnect:907
 #, c-format
 msgid "Login ID"
 msgstr ""
 
-#: network/netconnect.pm:576 network/netconnect.pm:609
+#: network/netconnect.pm:505 network/netconnect.pm:538
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr ""
 
-#: network/netconnect.pm:579
+#: network/netconnect.pm:508
 #, c-format
 msgid "IP parameters"
 msgstr ""
 
-#: network/netconnect.pm:580 network/netconnect.pm:912 printer/printerdrake.pm:431 standalone/drakconnect:116 standalone/drakconnect:325 standalone/drakconnect:806 standalone/drakups:266
+#: network/netconnect.pm:509 network/netconnect.pm:829 printer/printerdrake.pm:431 standalone/drakconnect:112 standalone/drakconnect:301 standalone/drakconnect:756
 #, c-format
 msgid "IP address"
 msgstr ""
 
-#: network/netconnect.pm:581
+#: network/netconnect.pm:510
 #, c-format
 msgid "Subnet mask"
 msgstr ""
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:522
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr ""
 
-#: network/netconnect.pm:596
+#: network/netconnect.pm:525
 #, c-format
 msgid "DNS"
 msgstr ""
 
-#: network/netconnect.pm:597
+#: network/netconnect.pm:526 standalone/drakconnect:910
 #, c-format
 msgid "Domain name"
 msgstr ""
 
-#: network/netconnect.pm:598 network/netconnect.pm:786 standalone/drakconnect:924
+#: network/netconnect.pm:527 network/netconnect.pm:715 standalone/drakconnect:911
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr ""
 
-#: network/netconnect.pm:599 network/netconnect.pm:787 standalone/drakconnect:925
+#: network/netconnect.pm:528 network/netconnect.pm:716 standalone/drakconnect:912
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr ""
 
-#: network/netconnect.pm:600
+#: network/netconnect.pm:529
 #, c-format
 msgid "Set hostname from IP"
 msgstr ""
 
-#: network/netconnect.pm:612 standalone/drakconnect:336
+#: network/netconnect.pm:541 standalone/drakconnect:312 standalone/drakconnect:904
 #, c-format
 msgid "Gateway"
 msgstr ""
 
-#: network/netconnect.pm:613
+#: network/netconnect.pm:542
 #, c-format
 msgid "Gateway IP address"
 msgstr ""
 
-#: network/netconnect.pm:637
+#: network/netconnect.pm:567
 #, c-format
 msgid "ADSL configuration"
 msgstr ""
 
-#: network/netconnect.pm:673
+#: network/netconnect.pm:567 network/netconnect.pm:746
+#, c-format
+msgid "Select the network interface to configure:"
+msgstr ""
+
+#: network/netconnect.pm:568 network/netconnect.pm:748 network/shorewall.pm:77 standalone/drakconnect:596 standalone/drakgw:218 standalone/drakvpn:215
+#, c-format
+msgid "Net Device"
+msgstr ""
+
+#: network/netconnect.pm:597
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr ""
 
-#: network/netconnect.pm:691
+#: network/netconnect.pm:616
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -8357,32 +8344,32 @@ msgid ""
 "or skip and do it later."
 msgstr ""
 
-#: network/netconnect.pm:695 network/netconnect.pm:700
+#: network/netconnect.pm:620 network/netconnect.pm:625
 #, c-format
 msgid "Use a floppy"
 msgstr ""
 
-#: network/netconnect.pm:695 network/netconnect.pm:704
+#: network/netconnect.pm:620 network/netconnect.pm:629
 #, c-format
 msgid "Use my Windows partition"
 msgstr ""
 
-#: network/netconnect.pm:695 network/netconnect.pm:708
+#: network/netconnect.pm:620 network/netconnect.pm:633
 #, c-format
 msgid "Do it later"
 msgstr ""
 
-#: network/netconnect.pm:715
+#: network/netconnect.pm:640
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr ""
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:647
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr ""
 
-#: network/netconnect.pm:737
+#: network/netconnect.pm:662
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -8391,22 +8378,22 @@ msgid ""
 "and copy the mgmt.o in /usr/share/speedtouch"
 msgstr ""
 
-#: network/netconnect.pm:790
+#: network/netconnect.pm:719
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr ""
 
-#: network/netconnect.pm:791
+#: network/netconnect.pm:720
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
-#: network/netconnect.pm:793
+#: network/netconnect.pm:721
 #, c-format
 msgid "Encapsulation :"
 msgstr ""
 
-#: network/netconnect.pm:810
+#: network/netconnect.pm:736
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution problem.\n"
@@ -8414,38 +8401,40 @@ msgid ""
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
-#: network/netconnect.pm:837
+#: network/netconnect.pm:753
 #, c-format
-msgid ""
-"WARNING: this device has been previously configured to connect to the Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+msgid "No wireless network adapter on your system!"
+msgstr ""
+
+#: network/netconnect.pm:754 standalone/drakgw:240 standalone/drakpxe:137
+#, c-format
+msgid "No network adapter on your system!"
 msgstr ""
 
-#: network/netconnect.pm:850 network/netconnect.pm:1222
+#: network/netconnect.pm:766
 #, c-format
 msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"\n"
-""
+"WARNING: this device has been previously configured to connect to the Internet.\n"
+"Simply accept to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
 msgstr ""
 
-#: network/netconnect.pm:864
+#: network/netconnect.pm:784
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr ""
 
-#: network/netconnect.pm:865 network/netconnect.pm:899
+#: network/netconnect.pm:785 network/netconnect.pm:816
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr ""
 
-#: network/netconnect.pm:866
+#: network/netconnect.pm:786
 #, c-format
 msgid "The following protocols can be used to configure an ethernet connection. Please choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:900
+#: network/netconnect.pm:817
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -8453,102 +8442,102 @@ msgid ""
 "notation (for example, 1.2.3.4)."
 msgstr ""
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:824
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr ""
 
-#: network/netconnect.pm:908
+#: network/netconnect.pm:825
 #, c-format
 msgid "DHCP host name"
 msgstr ""
 
-#: network/netconnect.pm:913 standalone/drakconnect:330 standalone/drakconnect:807 standalone/drakgw:321
+#: network/netconnect.pm:830 standalone/drakconnect:306 standalone/drakconnect:757 standalone/drakgw:313
 #, c-format
 msgid "Netmask"
 msgstr ""
 
-#: network/netconnect.pm:915 standalone/drakconnect:412
+#: network/netconnect.pm:832 standalone/drakconnect:384
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr ""
 
-#: network/netconnect.pm:916 standalone/drakconnect:413
+#: network/netconnect.pm:833 standalone/drakconnect:385
 #, c-format
 msgid "Network Hotplugging"
 msgstr ""
 
-#: network/netconnect.pm:917 standalone/drakconnect:407
+#: network/netconnect.pm:834 standalone/drakconnect:379
 #, c-format
 msgid "Start at boot"
 msgstr ""
 
-#: network/netconnect.pm:919 standalone/drakconnect:810
+#: network/netconnect.pm:836 standalone/drakconnect:760
 #, c-format
 msgid "DHCP client"
 msgstr ""
 
-#: network/netconnect.pm:929 printer/printerdrake.pm:1383 standalone/drakconnect:608
+#: network/netconnect.pm:846 printer/printerdrake.pm:1345 standalone/drakconnect:563
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
-#: network/netconnect.pm:932
+#: network/netconnect.pm:849
 #, c-format
 msgid "Warning : IP address %s is usually reserved !"
 msgstr ""
 
-#: network/netconnect.pm:962 network/netconnect.pm:991
+#: network/netconnect.pm:879 network/netconnect.pm:908
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr ""
 
-#: network/netconnect.pm:965 standalone/drakconnect:378
+#: network/netconnect.pm:882 standalone/drakconnect:350
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: network/netconnect.pm:967 standalone/drakconnect:379
+#: network/netconnect.pm:884 standalone/drakconnect:351
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: network/netconnect.pm:968 standalone/drakconnect:380
+#: network/netconnect.pm:885 standalone/drakconnect:352
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: network/netconnect.pm:969 standalone/drakconnect:381
+#: network/netconnect.pm:886 standalone/drakconnect:353
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: network/netconnect.pm:970 standalone/drakconnect:382
+#: network/netconnect.pm:887 standalone/drakconnect:354
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:971 standalone/drakconnect:383
+#: network/netconnect.pm:888 standalone/drakconnect:355
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: network/netconnect.pm:977
+#: network/netconnect.pm:894
 #, c-format
 msgid "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:981
+#: network/netconnect.pm:898
 #, c-format
 msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:994 standalone/drakconnect:394
+#: network/netconnect.pm:911 standalone/drakconnect:366
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: network/netconnect.pm:995
+#: network/netconnect.pm:912
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that the\n"
@@ -8559,17 +8548,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:1002 standalone/drakconnect:395
+#: network/netconnect.pm:919 standalone/drakconnect:367
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: network/netconnect.pm:1003 standalone/drakconnect:396
+#: network/netconnect.pm:920 standalone/drakconnect:368
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1004
+#: network/netconnect.pm:921
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -8579,12 +8568,12 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1011 standalone/drakconnect:397
+#: network/netconnect.pm:928 standalone/drakconnect:369
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:929
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -8596,12 +8585,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1020 standalone/drakconnect:398
+#: network/netconnect.pm:937 standalone/drakconnect:370
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1021
+#: network/netconnect.pm:938
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless network\n"
@@ -8616,24 +8605,24 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1048
+#: network/netconnect.pm:965
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
 "I cannot set up this connection type."
 msgstr ""
 
-#: network/netconnect.pm:1052 standalone/drakgw:261 standalone/drakpxe:142
+#: network/netconnect.pm:969 standalone/drakgw:254 standalone/drakpxe:142
 #, c-format
 msgid "Choose the network interface"
 msgstr ""
 
-#: network/netconnect.pm:1053
+#: network/netconnect.pm:970
 #, c-format
 msgid "Please choose which network adapter you want to use to connect to Internet."
 msgstr ""
 
-#: network/netconnect.pm:1074
+#: network/netconnect.pm:991
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -8642,82 +8631,82 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one."
 msgstr ""
 
-#: network/netconnect.pm:1078
+#: network/netconnect.pm:995
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr ""
 
-#: network/netconnect.pm:1080 standalone/drakconnect:923
+#: network/netconnect.pm:997
 #, c-format
 msgid "Host name (optional)"
 msgstr ""
 
-#: network/netconnect.pm:1080
+#: network/netconnect.pm:997
 #, c-format
 msgid "Host name"
 msgstr ""
 
-#: network/netconnect.pm:1082
+#: network/netconnect.pm:998
 #, c-format
 msgid "DNS server 1"
 msgstr ""
 
-#: network/netconnect.pm:1083
+#: network/netconnect.pm:999
 #, c-format
 msgid "DNS server 2"
 msgstr ""
 
-#: network/netconnect.pm:1084
+#: network/netconnect.pm:1000
 #, c-format
 msgid "DNS server 3"
 msgstr ""
 
-#: network/netconnect.pm:1085
+#: network/netconnect.pm:1001
 #, c-format
 msgid "Search domain"
 msgstr ""
 
-#: network/netconnect.pm:1086
+#: network/netconnect.pm:1002
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1003
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr ""
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1005
 #, c-format
 msgid "Gateway device"
 msgstr ""
 
-#: network/netconnect.pm:1098
+#: network/netconnect.pm:1014
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr ""
 
-#: network/netconnect.pm:1103 standalone/drakconnect:611
+#: network/netconnect.pm:1019 standalone/drakconnect:565
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr ""
 
-#: network/netconnect.pm:1114
+#: network/netconnect.pm:1030
 #, c-format
 msgid "Enter a Zeroconf host name which will be the one that your machine will get back to other machines on the network:"
 msgstr ""
 
-#: network/netconnect.pm:1115
+#: network/netconnect.pm:1031
 #, c-format
 msgid "Zeroconf Host name"
 msgstr ""
 
-#: network/netconnect.pm:1118
+#: network/netconnect.pm:1034
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr ""
 
-#: network/netconnect.pm:1128
+#: network/netconnect.pm:1044
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -8726,32 +8715,32 @@ msgid ""
 ""
 msgstr ""
 
-#: network/netconnect.pm:1130
+#: network/netconnect.pm:1046
 #, c-format
 msgid "Internet connection"
 msgstr ""
 
-#: network/netconnect.pm:1144
+#: network/netconnect.pm:1054
 #, c-format
 msgid "Configuration is complete, do you want to apply settings ?"
 msgstr ""
 
-#: network/netconnect.pm:1154
+#: network/netconnect.pm:1070
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr ""
 
-#: network/netconnect.pm:1166
+#: network/netconnect.pm:1094
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it ?"
 msgstr ""
 
-#: network/netconnect.pm:1173 network/netconnect.pm:1238
+#: network/netconnect.pm:1100 network/netconnect.pm:1165
 #, c-format
 msgid "Network Configuration"
 msgstr ""
 
-#: network/netconnect.pm:1174
+#: network/netconnect.pm:1101
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -8759,46 +8748,54 @@ msgid ""
 "%s"
 msgstr ""
 
-#: network/netconnect.pm:1182
+#: network/netconnect.pm:1110
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr ""
 
-#: network/netconnect.pm:1190 standalone/drakconnect:955
+#: network/netconnect.pm:1118 standalone/drakconnect:950
 #, c-format
 msgid "Testing your connection..."
 msgstr ""
 
-#: network/netconnect.pm:1206
+#: network/netconnect.pm:1134
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr ""
 
-#: network/netconnect.pm:1207
+#: network/netconnect.pm:1135
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr ""
 
-#: network/netconnect.pm:1208
+#: network/netconnect.pm:1136
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 
-#: network/netconnect.pm:1225
+#: network/netconnect.pm:1150
+#, c-format
+msgid ""
+"Congratulations, the network and Internet configuration is finished.\n"
+"\n"
+""
+msgstr ""
+
+#: network/netconnect.pm:1153
 #, c-format
 msgid "After this is done, we recommend that you restart your X environment to avoid any hostname-related problems."
 msgstr ""
 
-#: network/netconnect.pm:1226
+#: network/netconnect.pm:1154
 #, c-format
 msgid ""
 "Problems occured during configuration.\n"
 "Test your connection via net_monitor or mcc. If your connection doesn't work, you might want to relaunch the configuration."
 msgstr ""
 
-#: network/netconnect.pm:1239
+#: network/netconnect.pm:1166
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already configured.\n"
@@ -8806,108 +8803,101 @@ msgid ""
 ""
 msgstr ""
 
-#: network/netconnect.pm:1327
-#, c-format
-msgid ""
-"An unexpected error has happened:\n"
-"%s"
-msgstr ""
-
-#: network/network.pm:315
+#: network/network.pm:314
 #, c-format
 msgid "Proxies configuration"
 msgstr ""
 
-#: network/network.pm:316
+#: network/network.pm:315
 #, c-format
 msgid "HTTP proxy"
 msgstr ""
 
-#: network/network.pm:317
+#: network/network.pm:316
 #, c-format
 msgid "FTP proxy"
 msgstr ""
 
-#: network/network.pm:320
+#: network/network.pm:319
 #, c-format
 msgid "Proxy should be http://..."
 msgstr ""
 
-#: network/network.pm:321
+#: network/network.pm:320
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr ""
 
-#: network/shorewall.pm:28
+#: network/shorewall.pm:26
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr ""
 
-#: network/shorewall.pm:29
+#: network/shorewall.pm:27
 #, c-format
 msgid "Warning! An existing firewalling configuration has been detected. You may need some manual fixes after installation."
 msgstr ""
 
-#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:212
+#: network/shorewall.pm:70
 #, c-format
 msgid ""
-"Please enter the name of the interface connected to the internet.\n"
-"\n"
+"Please enter the name of the interface connected to the internet.              \n"
+"                \n"
 "Examples:\n"
-"\t\tppp+ for modem or DSL connections, \n"
-"\t\teth0, or eth1 for cable connection, \n"
-"\t\tippp+ for a isdn connection.\n"
+"                ppp+ for modem or DSL connections, \n"
+"                eth0, or eth1 for cable connection, \n"
+"                ippp+ for a isdn connection.\n"
 ""
 msgstr ""
 
-#: network/tools.pm:205
+#: network/tools.pm:207
 #, c-format
 msgid "Insert floppy"
 msgstr ""
 
-#: network/tools.pm:206
+#: network/tools.pm:208
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s with %s in root directory and press %s"
 msgstr ""
 
-#: network/tools.pm:207
+#: network/tools.pm:209
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr ""
 
-#: partition_table.pm:644
+#: partition_table.pm:642
 #, c-format
 msgid "mount failed: "
 msgstr ""
 
-#: partition_table.pm:749
+#: partition_table.pm:747
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: partition_table.pm:767
+#: partition_table.pm:765
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
 "The only solution is to move your primary partitions to have the hole next to the extended partitions."
 msgstr ""
 
-#: partition_table.pm:854
+#: partition_table.pm:852
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr ""
 
-#: partition_table.pm:856
+#: partition_table.pm:854
 #, c-format
 msgid "Bad backup file"
 msgstr ""
 
-#: partition_table.pm:876
+#: partition_table.pm:874
 #, c-format
 msgid "Error writing to file %s"
 msgstr ""
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:181
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -8940,67 +8930,67 @@ msgstr ""
 msgid "maybe"
 msgstr ""
 
-#: printer/cups.pm:103
+#: printer/cups.pm:87
 #, c-format
 msgid "(on %s)"
 msgstr ""
 
-#: printer/cups.pm:103
+#: printer/cups.pm:87
 #, c-format
 msgid "(on this machine)"
 msgstr ""
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:99 standalone/printerdrake:197
 #, c-format
 msgid "Configured on other machines"
 msgstr ""
 
-#: printer/cups.pm:117
+#: printer/cups.pm:101
 #, c-format
 msgid "On CUPS server \"%s\""
 msgstr ""
 
-#: printer/cups.pm:117 printer/printerdrake.pm:3989 printer/printerdrake.pm:3998 printer/printerdrake.pm:4139 printer/printerdrake.pm:4150 printer/printerdrake.pm:4362
+#: printer/cups.pm:101 printer/printerdrake.pm:3778 printer/printerdrake.pm:3787 printer/printerdrake.pm:3925 printer/printerdrake.pm:3936 printer/printerdrake.pm:4148
 #, c-format
 msgid " (Default)"
 msgstr ""
 
-#: printer/data.pm:22
+#: printer/data.pm:21
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr ""
 
-#: printer/data.pm:23
+#: printer/data.pm:22
 #, c-format
 msgid "PDQ"
 msgstr ""
 
-#: printer/data.pm:34
+#: printer/data.pm:33
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr ""
 
-#: printer/data.pm:35
+#: printer/data.pm:34
 #, c-format
 msgid "LPD"
 msgstr ""
 
-#: printer/data.pm:56
+#: printer/data.pm:55
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr ""
 
-#: printer/data.pm:57
+#: printer/data.pm:56
 #, c-format
 msgid "LPRng"
 msgstr ""
 
-#: printer/data.pm:82
+#: printer/data.pm:81
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr ""
 
-#: printer/detect.pm:148 printer/detect.pm:226 printer/detect.pm:428 printer/detect.pm:465 printer/printerdrake.pm:686
+#: printer/detect.pm:143 printer/detect.pm:221 printer/detect.pm:423 printer/detect.pm:460 printer/printerdrake.pm:675
 #, c-format
 msgid "Unknown Model"
 msgstr ""
@@ -9020,7 +9010,7 @@ msgstr ""
 msgid "Printer on remote CUPS server"
 msgstr ""
 
-#: printer/main.pm:31 printer/printerdrake.pm:1406
+#: printer/main.pm:31 printer/printerdrake.pm:1368
 #, c-format
 msgid "Printer on remote lpd server"
 msgstr ""
@@ -9040,7 +9030,7 @@ msgstr ""
 msgid "Printer on NetWare server"
 msgstr ""
 
-#: printer/main.pm:35 printer/printerdrake.pm:1410
+#: printer/main.pm:35 printer/printerdrake.pm:1372
 #, c-format
 msgid "Enter a printer device URI"
 msgstr ""
@@ -9050,7 +9040,7 @@ msgstr ""
 msgid "Pipe job into a command"
 msgstr ""
 
-#: printer/main.pm:306 printer/main.pm:574 printer/main.pm:1544 printer/main.pm:2228 printer/main.pm:2239 printer/printerdrake.pm:1866 printer/printerdrake.pm:4396
+#: printer/main.pm:306 printer/main.pm:574 printer/main.pm:1544 printer/main.pm:2217 printer/printerdrake.pm:1777 printer/printerdrake.pm:4182
 #, c-format
 msgid "Unknown model"
 msgstr ""
@@ -9060,12 +9050,12 @@ msgstr ""
 msgid "Configured on this machine"
 msgstr ""
 
-#: printer/main.pm:337 printer/printerdrake.pm:963
+#: printer/main.pm:337 printer/printerdrake.pm:944
 #, c-format
 msgid " on parallel port #%s"
 msgstr ""
 
-#: printer/main.pm:340 printer/printerdrake.pm:965
+#: printer/main.pm:340 printer/printerdrake.pm:946
 #, c-format
 msgid ", USB printer #%s"
 msgstr ""
@@ -9135,7 +9125,7 @@ msgstr ""
 msgid "Parallel port #%s"
 msgstr ""
 
-#: printer/main.pm:391 printer/printerdrake.pm:979 printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
+#: printer/main.pm:391 printer/printerdrake.pm:960 printer/printerdrake.pm:983 printer/printerdrake.pm:1001
 #, c-format
 msgid "USB printer #%s"
 msgstr ""
@@ -9205,7 +9195,7 @@ msgstr ""
 msgid "URI: %s"
 msgstr ""
 
-#: printer/main.pm:571 printer/printerdrake.pm:732 printer/printerdrake.pm:2463
+#: printer/main.pm:571 printer/printerdrake.pm:721 printer/printerdrake.pm:2327
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr ""
@@ -9249,7 +9239,7 @@ msgstr ""
 
 #: printer/printerdrake.pm:63
 #, c-format
-msgid "Here you can choose whether the printers connected to this machine should be accessible by remote machines and by which remote machines."
+msgid "Here you can choose whether the printers connected to this machine should be accessable by remote machines and by which remote machines."
 msgstr ""
 
 #: printer/printerdrake.pm:64
@@ -9277,7 +9267,7 @@ msgstr ""
 msgid "Custom configuration"
 msgstr ""
 
-#: printer/printerdrake.pm:78 standalone/scannerdrake:561 standalone/scannerdrake:578
+#: printer/printerdrake.pm:78 standalone/scannerdrake:554 standalone/scannerdrake:571
 #, c-format
 msgid "No remote machines"
 msgstr ""
@@ -9434,7 +9424,7 @@ msgid ""
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:1629
+#: printer/printerdrake.pm:411 printer/printerdrake.pm:1578
 #, c-format
 msgid "The port number should be an integer!"
 msgstr ""
@@ -9446,12 +9436,12 @@ msgid ""
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:433 printer/printerdrake.pm:1650 standalone/drakups:233 standalone/harddrake2:64
+#: printer/printerdrake.pm:433 printer/printerdrake.pm:1599 standalone/harddrake2:64
 #, c-format
 msgid "Port"
 msgstr ""
 
-#: printer/printerdrake.pm:478 printer/printerdrake.pm:545 printer/printerdrake.pm:610 printer/printerdrake.pm:628 printer/printerdrake.pm:711 printer/printerdrake.pm:768 printer/printerdrake.pm:794 printer/printerdrake.pm:1703 printer/printerdrake.pm:1886 printer/printerdrake.pm:1902 printer/printerdrake.pm:1945 printer/printerdrake.pm:1982 printer/printerdrake.pm:2024 printer/printerdrake.pm:2061 printer/printerdrake.pm:2071 printer/printerdrake.pm:2314 printer/printerdrake.pm:2319 printer/printerdrake.pm:2458 printer/printerdrake.pm:2568 printer/printerdrake.pm:3069 printer/printerdrake.pm:3134 printer/printerdrake.pm:3177 printer/printerdrake.pm:3180 printer/printerdrake.pm:3299 printer/printerdrake.pm:3364 printer/printerdrake.pm:3436 printer/printerdrake.pm:3457 printer/printerdrake.pm:3466 printer/printerdrake.pm:3557 printer/printerdrake.pm:3655 printer/printerdrake.pm:3661 printer/printerdrake.pm:3674 printer/printerdrake.pm:3726 printer/printerdrake.pm:3766 printer/printerdrake.pm:3778 printer/printerdrake.pm:3789 printer/printerdrake.pm:3798 printer/printerdrake.pm:3811 printer/printerdrake.pm:3888 printer/printerdrake.pm:3945 printer/printerdrake.pm:4010 printer/printerdrake.pm:4270 printer/printerdrake.pm:4313 printer/printerdrake.pm:4459 printer/printerdrake.pm:4517 printer/printerdrake.pm:4546 standalone/printerdrake:65 standalone/printerdrake:85 standalone/printerdrake:515
+#: printer/printerdrake.pm:478 printer/printerdrake.pm:541 printer/printerdrake.pm:601 printer/printerdrake.pm:617 printer/printerdrake.pm:700 printer/printerdrake.pm:757 printer/printerdrake.pm:783 printer/printerdrake.pm:1796 printer/printerdrake.pm:1804 printer/printerdrake.pm:1826 printer/printerdrake.pm:1853 printer/printerdrake.pm:1888 printer/printerdrake.pm:1925 printer/printerdrake.pm:1935 printer/printerdrake.pm:2178 printer/printerdrake.pm:2183 printer/printerdrake.pm:2322 printer/printerdrake.pm:2432 printer/printerdrake.pm:2897 printer/printerdrake.pm:2962 printer/printerdrake.pm:2996 printer/printerdrake.pm:2999 printer/printerdrake.pm:3118 printer/printerdrake.pm:3180 printer/printerdrake.pm:3252 printer/printerdrake.pm:3273 printer/printerdrake.pm:3470 printer/printerdrake.pm:3476 printer/printerdrake.pm:3483 printer/printerdrake.pm:3529 printer/printerdrake.pm:3569 printer/printerdrake.pm:3581 printer/printerdrake.pm:3592 printer/printerdrake.pm:3601 printer/printerdrake.pm:3614 printer/printerdrake.pm:3684 printer/printerdrake.pm:3735 printer/printerdrake.pm:3799 printer/printerdrake.pm:4056 printer/printerdrake.pm:4099 printer/printerdrake.pm:4245 printer/printerdrake.pm:4303 printer/printerdrake.pm:4332 standalone/printerdrake:65 standalone/printerdrake:85 standalone/printerdrake:515
 #, c-format
 msgid "Printerdrake"
 msgstr ""
@@ -9461,51 +9451,44 @@ msgstr ""
 msgid "Restarting CUPS..."
 msgstr ""
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:500
 #, c-format
 msgid "Select Printer Connection"
 msgstr ""
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:501
 #, c-format
 msgid "How is the printer connected?"
 msgstr ""
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:503
 #, c-format
 msgid ""
 "\n"
 "Printers on remote CUPS servers do not need to be configured here; these printers will be automatically detected."
 msgstr ""
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
-#, c-format
-msgid ""
-"\n"
-"WARNING: No local network connection active, remote printers can neither be detected nor tested!"
-msgstr ""
-
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:511
 #, c-format
-msgid "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
+msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
 msgstr ""
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:541
 #, c-format
 msgid "Checking your system..."
 msgstr ""
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:556
 #, c-format
 msgid "and one unknown printer"
 msgstr ""
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:558
 #, c-format
 msgid "and %d unknown printers"
 msgstr ""
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:562
 #, c-format
 msgid ""
 "The following printers\n"
@@ -9514,7 +9497,7 @@ msgid ""
 "are directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:564
 #, c-format
 msgid ""
 "The following printer\n"
@@ -9523,7 +9506,7 @@ msgid ""
 "are directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:565
 #, c-format
 msgid ""
 "The following printer\n"
@@ -9532,106 +9515,106 @@ msgid ""
 "is directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:569
 #, c-format
 msgid ""
 "\n"
 "There is one unknown printer directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:570
 #, c-format
 msgid ""
 "\n"
 "There are %d unknown printers directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:573
 #, c-format
 msgid "There are no printers found which are directly connected to your machine"
 msgstr ""
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:576
 #, c-format
 msgid ""
 " (Make sure that all your printers are connected and turned on).\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:594
+#: printer/printerdrake.pm:589
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on printers in the local network?\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:595
+#: printer/printerdrake.pm:590
 #, c-format
 msgid ""
 "Do you want to enable printing on printers in the local network?\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:592
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above?\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:598
+#: printer/printerdrake.pm:593
 #, c-format
 msgid ""
 "Are you sure that you want to set up printing on this machine?\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:599
+#: printer/printerdrake.pm:594
 #, c-format
 msgid "NOTE: Depending on the printer model and the printing system up to %d MB of additional software will be installed."
 msgstr ""
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:618
 #, c-format
 msgid "Searching for new printers..."
 msgstr ""
 
-#: printer/printerdrake.pm:713
+#: printer/printerdrake.pm:702
 #, c-format
 msgid "Configuring printer ..."
 msgstr ""
 
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769 printer/printerdrake.pm:3790
+#: printer/printerdrake.pm:703 printer/printerdrake.pm:758 printer/printerdrake.pm:3593
 #, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr ""
 
-#: printer/printerdrake.pm:734
+#: printer/printerdrake.pm:723
 #, c-format
 msgid "("
 msgstr ""
 
-#: printer/printerdrake.pm:735
+#: printer/printerdrake.pm:724
 #, c-format
 msgid " on "
 msgstr ""
 
-#: printer/printerdrake.pm:736 standalone/scannerdrake:136
+#: printer/printerdrake.pm:725 standalone/scannerdrake:130
 #, c-format
 msgid ")"
 msgstr ""
 
-#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
+#: printer/printerdrake.pm:730 printer/printerdrake.pm:2334
 #, c-format
 msgid "Printer model selection"
 msgstr ""
 
-#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
+#: printer/printerdrake.pm:731 printer/printerdrake.pm:2335
 #, c-format
 msgid "Which printer model do you have?"
 msgstr ""
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:732
 #, c-format
 msgid ""
 "\n"
@@ -9639,22 +9622,22 @@ msgid ""
 "Printerdrake could not determine which model your printer %s is. Please choose the correct model from the list."
 msgstr ""
 
-#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476
+#: printer/printerdrake.pm:735 printer/printerdrake.pm:2340
 #, c-format
 msgid "If your printer is not listed, choose a compatible (see printer manual) or a similar one."
 msgstr ""
 
-#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779 printer/printerdrake.pm:3946 printer/printerdrake.pm:4271 printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
+#: printer/printerdrake.pm:784 printer/printerdrake.pm:3582 printer/printerdrake.pm:3736 printer/printerdrake.pm:4057 printer/printerdrake.pm:4100 printer/printerdrake.pm:4304
 #, c-format
 msgid "Configuring applications..."
 msgstr ""
 
-#: printer/printerdrake.pm:831 printer/printerdrake.pm:843 printer/printerdrake.pm:901 printer/printerdrake.pm:1872 printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
+#: printer/printerdrake.pm:820 printer/printerdrake.pm:832 printer/printerdrake.pm:890 printer/printerdrake.pm:1783 printer/printerdrake.pm:3816 printer/printerdrake.pm:3997
 #, c-format
 msgid "Add a new printer"
 msgstr ""
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:821
 #, c-format
 msgid ""
 "\n"
@@ -9665,7 +9648,7 @@ msgid ""
 "It asks you for all necessary information to set up the printer and gives you access to all available printer drivers, driver options, and printer connection types."
 msgstr ""
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:834
 #, c-format
 msgid ""
 "\n"
@@ -9680,7 +9663,7 @@ msgid ""
 " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:843
 #, c-format
 msgid ""
 "\n"
@@ -9693,7 +9676,7 @@ msgid ""
 " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:851
 #, c-format
 msgid ""
 "\n"
@@ -9708,7 +9691,7 @@ msgid ""
 " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:860
 #, c-format
 msgid ""
 "\n"
@@ -9721,22 +9704,22 @@ msgid ""
 " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:869
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr ""
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:872
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr ""
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:875
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:891
 #, c-format
 msgid ""
 "\n"
@@ -9747,272 +9730,257 @@ msgid ""
 "If you want to add, remove, or rename a printer, or if you want to change the default option settings (paper input tray, printout quality, ...), select \"Printer\" in the \"Hardware\" section of the %s Control Center."
 msgstr ""
 
-#: printer/printerdrake.pm:937 printer/printerdrake.pm:1152 printer/printerdrake.pm:1214 printer/printerdrake.pm:1304 printer/printerdrake.pm:1441 printer/printerdrake.pm:1516 printer/printerdrake.pm:1667 printer/printerdrake.pm:1750 printer/printerdrake.pm:1759 printer/printerdrake.pm:1768 printer/printerdrake.pm:1779 printer/printerdrake.pm:1892 printer/printerdrake.pm:1954 printer/printerdrake.pm:1988
-#, c-format
-msgid "Could not install the %s packages!"
-msgstr ""
-
-#: printer/printerdrake.pm:939
-#, c-format
-msgid "Skipping Windows/SMB server auto-detection"
-msgstr ""
-
-#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075 printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:926 printer/printerdrake.pm:1056 printer/printerdrake.pm:1272 printer/printerdrake.pm:1512
 #, c-format
 msgid "Printer auto-detection"
 msgstr ""
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:926
 #, c-format
 msgid "Detecting devices..."
 msgstr ""
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:948
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:950
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:954
 #, c-format
 msgid "Detected %s"
 msgstr ""
 
-#: printer/printerdrake.pm:977 printer/printerdrake.pm:1000 printer/printerdrake.pm:1017
+#: printer/printerdrake.pm:958 printer/printerdrake.pm:981 printer/printerdrake.pm:998
 #, c-format
 msgid "Printer on parallel port #%s"
 msgstr ""
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:962
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:964
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1043
 #, c-format
 msgid "Local Printer"
 msgstr ""
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1044
 #, c-format
 msgid "No local printer found! To manually install a printer enter a device name/file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1048
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr ""
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1057
 #, c-format
 msgid "No printer found!"
 msgstr ""
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1065
 #, c-format
 msgid "Local Printers"
 msgstr ""
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1066
 #, c-format
 msgid "Available printers"
 msgstr ""
 
-#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
+#: printer/printerdrake.pm:1070 printer/printerdrake.pm:1079
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr ""
 
-#: printer/printerdrake.pm:1091
+#: printer/printerdrake.pm:1072
 #, c-format
 msgid "If it is not the one you want to configure, enter a device name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1073
 #, c-format
 msgid "Alternatively, you can specify a device name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
+#: printer/printerdrake.pm:1074 printer/printerdrake.pm:1083
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr ""
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1076
 #, c-format
 msgid "Please choose the printer you want to set up or enter a device name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1077
 #, c-format
 msgid "Please choose the printer to which the print jobs should go or enter a device name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1081
 #, c-format
 msgid "The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr ""
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1085
 #, c-format
 msgid "Please choose the printer you want to set up. The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1086
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr ""
 
-#: printer/printerdrake.pm:1107
+#: printer/printerdrake.pm:1088
 #, c-format
 msgid "Please choose the port that your printer is connected to or enter a device name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1089
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr ""
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1091
 #, c-format
 msgid " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1095
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr ""
 
-#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216 printer/printerdrake.pm:1306 printer/printerdrake.pm:1443 printer/printerdrake.pm:1518 printer/printerdrake.pm:1669 printer/printerdrake.pm:1752 printer/printerdrake.pm:1761 printer/printerdrake.pm:1770 printer/printerdrake.pm:1781
-#, c-format
-msgid "Aborting"
-msgstr ""
-
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1164
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1165
 #, c-format
 msgid "To use a remote lpd printer, you need to supply the hostname of the printer server and the printer name on that server."
 msgstr ""
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1166
 #, c-format
 msgid "Remote host name"
 msgstr ""
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1167
 #, c-format
 msgid "Remote printer name"
 msgstr ""
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1170
 #, c-format
 msgid "Remote host name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1174
 #, c-format
 msgid "Remote printer name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799 standalone/drakTermServ:465 standalone/drakTermServ:763 standalone/drakTermServ:779 standalone/drakTermServ:1417 standalone/drakTermServ:1425 standalone/drakTermServ:1436 standalone/drakbackup:582 standalone/drakbackup:687 standalone/drakbackup:722 standalone/drakbackup:840 standalone/drakconnect:263 standalone/drakconnect:298 standalone/drakconnect:542 standalone/drakconnect:552 standalone/drakconnect:576 standalone/harddrake2:160
+#: printer/printerdrake.pm:1196 printer/printerdrake.pm:1710 standalone/drakTermServ:442 standalone/drakTermServ:725 standalone/drakTermServ:741 standalone/drakTermServ:1332 standalone/drakTermServ:1340 standalone/drakTermServ:1351 standalone/drakbackup:767 standalone/drakbackup:874 standalone/drakbackup:908 standalone/drakbackup:1027 standalone/drakbackup:1898 standalone/drakbackup:1902 standalone/drakconnect:253 standalone/drakconnect:278 standalone/drakconnect:507 standalone/drakconnect:511 standalone/drakconnect:535 standalone/harddrake2:159
 #, c-format
 msgid "Information"
 msgstr ""
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1196 printer/printerdrake.pm:1710
 #, c-format
 msgid "Detected model: %s %s"
 msgstr ""
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1272 printer/printerdrake.pm:1512
 #, c-format
 msgid "Scanning network..."
 msgstr ""
 
-#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
+#: printer/printerdrake.pm:1283 printer/printerdrake.pm:1304
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:1324 printer/printerdrake.pm:1345
+#: printer/printerdrake.pm:1286 printer/printerdrake.pm:1307
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1328
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr ""
 
-#: printer/printerdrake.pm:1367
+#: printer/printerdrake.pm:1329
 #, c-format
 msgid "To print to a SMB printer, you need to provide the SMB host name (Note! It may be different from its TCP/IP hostname!) and possibly the IP address of the print server, as well as the share name for the printer you wish to access and any applicable user name, password, and workgroup information."
 msgstr ""
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1330
 #, c-format
 msgid " If the desired printer was auto-detected, simply choose it from the list and then add user name, password, and/or workgroup if needed."
 msgstr ""
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1332
 #, c-format
 msgid "SMB server host"
 msgstr ""
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1333
 #, c-format
 msgid "SMB server IP"
 msgstr ""
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1334
 #, c-format
 msgid "Share name"
 msgstr ""
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1337
 #, c-format
 msgid "Workgroup"
 msgstr ""
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1339
 #, c-format
 msgid "Auto-detected"
 msgstr ""
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1349
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr ""
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1353
 #, c-format
 msgid "Samba share name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1359
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr ""
 
-#: printer/printerdrake.pm:1398
+#: printer/printerdrake.pm:1360
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to a fault in the architecture of the Samba client software the password is put in clear text into the command line of the Samba client used to transmit the print job to the Windows server. So it is possible for every user on this machine to display the password on the screen by issuing commands as \"ps auxwww\".\n"
@@ -10026,7 +9994,7 @@ msgid ""
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1370
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP protocol and set up printing from this machine with the \"%s\" connection type in Printerdrake.\n"
@@ -10034,7 +10002,7 @@ msgid ""
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:1411
+#: printer/printerdrake.pm:1373
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) connect to it as a client.\n"
@@ -10042,219 +10010,199 @@ msgid ""
 "Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1445
 #, c-format
 msgid "NetWare Printer Options"
 msgstr ""
 
-#: printer/printerdrake.pm:1490
+#: printer/printerdrake.pm:1446
 #, c-format
 msgid "To print on a NetWare printer, you need to provide the NetWare print server name (Note! it may be different from its TCP/IP hostname!) as well as the print queue name for the printer you wish to access and any applicable user name and password."
 msgstr ""
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1447
 #, c-format
 msgid "Printer Server"
 msgstr ""
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1448
 #, c-format
 msgid "Print Queue Name"
 msgstr ""
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1453
 #, c-format
 msgid "NCP server name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1457
 #, c-format
 msgid "NCP queue name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1523 printer/printerdrake.pm:1543
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
+#: printer/printerdrake.pm:1526 printer/printerdrake.pm:1546
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1567
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr ""
 
-#: printer/printerdrake.pm:1620
+#: printer/printerdrake.pm:1569
 #, c-format
 msgid "Choose one of the auto-detected printers from the list or enter the hostname or IP and the optional port number (default is 9100) in the input fields."
 msgstr ""
 
-#: printer/printerdrake.pm:1621
+#: printer/printerdrake.pm:1570
 #, c-format
 msgid "To print to a TCP or socket printer, you need to provide the host name or IP of the printer and optionally the port number (default is 9100). On HP JetDirect servers the port number is usually 9100, on other servers it can vary. See the manual of your hardware."
 msgstr ""
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1574
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1597
 #, c-format
 msgid "Printer host name or IP"
 msgstr ""
 
-#: printer/printerdrake.pm:1704
-#, c-format
-msgid "Refreshing Device URI list..."
-msgstr ""
-
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1645 printer/printerdrake.pm:1647
 #, c-format
 msgid "Printer Device URI"
 msgstr ""
 
-#: printer/printerdrake.pm:1708
+#: printer/printerdrake.pm:1646
 #, c-format
 msgid "You can specify directly the URI to access the printer. The URI must fulfill either the CUPS or the Foomatic specifications. Note that not all URI types are supported by all the spoolers."
 msgstr ""
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1664
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr ""
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1745
 #, c-format
 msgid "Pipe into command"
 msgstr ""
 
-#: printer/printerdrake.pm:1835
+#: printer/printerdrake.pm:1746
 #, c-format
 msgid "Here you can specify any arbitrary command line into which the job should be piped instead of being sent directly to a printer."
 msgstr ""
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1747
 #, c-format
 msgid "Command line"
 msgstr ""
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1751
 #, c-format
 msgid "A command line must be entered!"
 msgstr ""
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1784
 #, c-format
 msgid "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner, DeskJet 450, Sony IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"
 msgstr ""
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:1797
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr ""
 
-#: printer/printerdrake.pm:1894
-#, c-format
-msgid "Only printing will be possible on the %s."
-msgstr ""
-
-#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
+#: printer/printerdrake.pm:1805 printer/printerdrake.pm:1889
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr ""
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:1827
 #, c-format
 msgid "Installing SANE packages..."
 msgstr ""
 
-#: printer/printerdrake.pm:1956
-#, c-format
-msgid "Scanning on the %s will not be possible."
-msgstr ""
-
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:1854
 #, c-format
 msgid "Installing mtools packages..."
 msgstr ""
 
-#: printer/printerdrake.pm:1990
-#, c-format
-msgid "Photo memory card access on the %s will not be possible."
-msgstr ""
-
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:1869
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:1877
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:1926
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr ""
 
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315 printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:1935 printer/printerdrake.pm:2179 printer/printerdrake.pm:2323
 #, c-format
 msgid "Reading printer database..."
 msgstr ""
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2145
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr ""
 
-#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
+#: printer/printerdrake.pm:2149 printer/printerdrake.pm:3237
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr ""
 
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
+#: printer/printerdrake.pm:2155 printer/printerdrake.pm:3242
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
 "do you really want to overwrite its configuration?"
 msgstr ""
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2164
 #, c-format
 msgid "Every printer needs a name (for example \"printer\"). The Description and Location fields do not need to be filled in. They are comments for the users."
 msgstr ""
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2165
 #, c-format
 msgid "Name of printer"
 msgstr ""
 
-#: printer/printerdrake.pm:2302 standalone/drakconnect:557 standalone/harddrake2:40 standalone/printerdrake:212 standalone/printerdrake:219
+#: printer/printerdrake.pm:2166 standalone/drakconnect:516 standalone/harddrake2:40 standalone/printerdrake:212 standalone/printerdrake:219
 #, c-format
 msgid "Description"
 msgstr ""
 
-#: printer/printerdrake.pm:2303 standalone/printerdrake:212 standalone/printerdrake:219
+#: printer/printerdrake.pm:2167 standalone/printerdrake:212 standalone/printerdrake:219
 #, c-format
 msgid "Location"
 msgstr ""
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2184
 #, c-format
 msgid "Preparing printer database..."
 msgstr ""
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2302
 #, c-format
 msgid "Your printer model"
 msgstr ""
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2303
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-detection with the models listed in its printer database to find the best match. This choice can be wrong, especially when your printer is not listed at all in the database. So check whether the choice is correct and click \"The model is correct\" if so and if not, click \"Select model manually\" so that you can choose your printer model manually on the next screen.\n"
@@ -10264,17 +10212,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2308 printer/printerdrake.pm:2311
 #, c-format
 msgid "The model is correct"
 msgstr ""
 
-#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446 printer/printerdrake.pm:2449
+#: printer/printerdrake.pm:2309 printer/printerdrake.pm:2310 printer/printerdrake.pm:2313
 #, c-format
 msgid "Select model manually"
 msgstr ""
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2336
 #, c-format
 msgid ""
 "\n"
@@ -10282,124 +10230,114 @@ msgid ""
 "Please check whether Printerdrake did the auto-detection of your printer model correctly. Find the correct model in the list when a wrong model or \"Raw printer\" is highlighted."
 msgstr ""
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2355
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2386
 #, c-format
 msgid "Every PostScript printer is delivered with a PPD file which describes the printer's options and features."
 msgstr ""
 
-#: printer/printerdrake.pm:2523
+#: printer/printerdrake.pm:2387
 #, c-format
 msgid "This file is usually somewhere on the CD with the Windows and Mac drivers delivered with the printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2524
+#: printer/printerdrake.pm:2388
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr ""
 
-#: printer/printerdrake.pm:2525
+#: printer/printerdrake.pm:2389
 #, c-format
 msgid "If you have Windows installed on your machine, you can find the PPD file on your Windows partition, too."
 msgstr ""
 
-#: printer/printerdrake.pm:2526
+#: printer/printerdrake.pm:2390
 #, c-format
 msgid "Installing the printer's PPD file and using it when setting up the printer makes all options of the printer available which are provided by the printer's hardware"
 msgstr ""
 
-#: printer/printerdrake.pm:2527
+#: printer/printerdrake.pm:2391
 #, c-format
 msgid "Here you can choose the PPD file to be installed on your machine, it will then be used for the setup of your printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2393
 #, c-format
 msgid "Install PPD file from"
 msgstr ""
 
-#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538 standalone/scannerdrake:180 standalone/scannerdrake:188 standalone/scannerdrake:239 standalone/scannerdrake:246
+#: printer/printerdrake.pm:2395 printer/printerdrake.pm:2402 standalone/scannerdrake:174 standalone/scannerdrake:182 standalone/scannerdrake:233 standalone/scannerdrake:240
 #, c-format
 msgid "CD-ROM"
 msgstr ""
 
-#: printer/printerdrake.pm:2532 printer/printerdrake.pm:2540 standalone/scannerdrake:181 standalone/scannerdrake:190 standalone/scannerdrake:240 standalone/scannerdrake:248
+#: printer/printerdrake.pm:2396 printer/printerdrake.pm:2404 standalone/scannerdrake:175 standalone/scannerdrake:184 standalone/scannerdrake:234 standalone/scannerdrake:242
 #, c-format
 msgid "Floppy Disk"
 msgstr ""
 
-#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542 standalone/scannerdrake:182 standalone/scannerdrake:192 standalone/scannerdrake:241 standalone/scannerdrake:250
+#: printer/printerdrake.pm:2397 printer/printerdrake.pm:2406 standalone/scannerdrake:176 standalone/scannerdrake:186 standalone/scannerdrake:235 standalone/scannerdrake:244
 #, c-format
 msgid "Other place"
 msgstr ""
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2412
 #, c-format
 msgid "Select PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2416
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr ""
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2422
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr ""
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2433
 #, c-format
 msgid "Installing PPD file..."
 msgstr ""
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2535
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr ""
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2536
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
 "use a very special communication protocol and therefore they work only when connected to the first parallel port. When your printer is connected to another port or to a print server box please connect the printer to the first parallel port before you print a test page. Otherwise the printer will not work. Your connection type setting will be ignored by the driver."
 msgstr ""
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2560 printer/printerdrake.pm:2589
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr ""
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2561
 #, c-format
 msgid "The inkjet printer drivers provided by Lexmark only support local printers, no printers on remote machines or print server boxes. Please connect your printer to a local port or configure it on the machine where it is connected to."
 msgstr ""
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2590
 #, c-format
 msgid "To be able to print with your Lexmark inkjet and this configuration, you need the inkjet printer drivers provided by Lexmark (http://www.lexmark.com/). Click on the \"Drivers\" link. Then choose your model and afterwards \"Linux\" as operating system. The drivers come as RPM packages or shell scripts with interactive graphical installation. You do not need to do this configuration by the graphical frontends. Cancel directly after the license agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and adjust the head alignment settings with this program."
 msgstr ""
 
-#: printer/printerdrake.pm:2746
-#, c-format
-msgid "Lexmark X125 configuration"
-msgstr ""
-
-#: printer/printerdrake.pm:2747
-#, c-format
-msgid "The driver for this printer only supports printers locally connected via USB, no printers on remote machines or print server boxes. Please connect your printer to a local USB port or configure it on the machine where it is connected to."
-msgstr ""
-
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr ""
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:2706
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -10407,96 +10345,86 @@ msgid ""
 "You should make sure that the page size and the ink type/printing mode (if available) and also the hardware configuration of laser printers (memory, duplex unit, extra trays) are set correctly. Note that with a very high printout quality/resolution printing can get substantially slower."
 msgstr ""
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:2831
 #, c-format
 msgid "Printer default settings"
 msgstr ""
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:2838
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr ""
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:2842
 #, c-format
 msgid "Option %s must be a number!"
 msgstr ""
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:2846
 #, c-format
 msgid "Option %s out of range!"
 msgstr ""
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:2897
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
 "as the default printer?"
 msgstr ""
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:2912
 #, c-format
 msgid "Test pages"
 msgstr ""
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:2913
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
 "Note: the photo test page can take a rather long time to get printed and on laser printers with too low memory it can even not come out. In most cases it is enough to print the standard test page."
 msgstr ""
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:2917
 #, c-format
 msgid "No test pages"
 msgstr ""
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:2918
 #, c-format
 msgid "Print"
 msgstr ""
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Standard test page"
 msgstr ""
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:2946
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr ""
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:2949
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr ""
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:2951
 #, c-format
 msgid "Photo test page"
 msgstr ""
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:2955
 #, c-format
 msgid "Do not print any test page"
 msgstr ""
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:2963 printer/printerdrake.pm:3119
 #, c-format
 msgid "Printing test page(s)..."
 msgstr ""
 
-#: printer/printerdrake.pm:3150
-#, c-format
-msgid "Could not install the %s package!"
-msgstr ""
-
-#: printer/printerdrake.pm:3152
-#, c-format
-msgid "Skipping photo test page."
-msgstr ""
-
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:2988
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -10507,7 +10435,7 @@ msgid ""
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:2992
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -10515,38 +10443,38 @@ msgid ""
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:2999
 #, c-format
 msgid "Did it work properly?"
 msgstr ""
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3020 printer/printerdrake.pm:4183
 #, c-format
 msgid "Raw printer"
 msgstr ""
 
-#: printer/printerdrake.pm:3231
+#: printer/printerdrake.pm:3050
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or \"kprinter <file>\". The graphical tools allow you to choose the printer and to modify the option settings easily.\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3052
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the printing dialogs of many applications, but here do not supply the file name because the file to print is provided by the application.\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253 printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3055 printer/printerdrake.pm:3072 printer/printerdrake.pm:3082
 #, c-format
 msgid ""
 "\n"
 "The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". "
 msgstr ""
 
-#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
+#: printer/printerdrake.pm:3058 printer/printerdrake.pm:3098
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s%s\n"
@@ -10554,7 +10482,7 @@ msgid ""
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3243
+#: printer/printerdrake.pm:3062
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
@@ -10562,33 +10490,33 @@ msgid ""
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3248 printer/printerdrake.pm:3258
+#: printer/printerdrake.pm:3067 printer/printerdrake.pm:3077
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s <file>\".\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260 printer/printerdrake.pm:3270
+#: printer/printerdrake.pm:3069 printer/printerdrake.pm:3079 printer/printerdrake.pm:3089
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265
+#: printer/printerdrake.pm:3074 printer/printerdrake.pm:3084
 #, c-format
 msgid "To get a list of the options available for the current printer click on the \"Print option list\" button."
 msgstr ""
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3087
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s <file>\" or \"%s <file>\".\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3091
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and handling printing jobs.\n"
@@ -10596,7 +10524,7 @@ msgid ""
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3095
 #, c-format
 msgid ""
 "\n"
@@ -10604,37 +10532,37 @@ msgid ""
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3105
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3106
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3108
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3109
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296 printer/printerdrake.pm:3297 printer/printerdrake.pm:3298 printer/printerdrake.pm:4384 standalone/drakTermServ:324 standalone/drakbackup:4265 standalone/drakbug:177 standalone/drakfont:500 standalone/drakfont:591 standalone/net_monitor:106 standalone/printerdrake:508
+#: printer/printerdrake.pm:3112 printer/printerdrake.pm:3115 printer/printerdrake.pm:3116 printer/printerdrake.pm:3117 printer/printerdrake.pm:4170 standalone/drakTermServ:321 standalone/drakbackup:4587 standalone/drakbug:177 standalone/drakfont:497 standalone/drakfont:588 standalone/net_monitor:106 standalone/printerdrake:508
 #, c-format
 msgid "Close"
 msgstr ""
 
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3115
 #, c-format
 msgid "Print option list"
 msgstr ""
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3136
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the scanner when you have more than one) from the command line or with the graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, you can also scan by choosing the appropriate point in the \"File\"/\"Acquire\" menu. Call also \"man scanimage\" on the command line to get more information.\n"
@@ -10642,22 +10570,22 @@ msgid ""
 "Do not use \"scannerdrake\" for this device!"
 msgstr ""
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3159
 #, c-format
 msgid "Your printer was configured automatically to give you access to the photo card drives from your PC. Now you can access your photo cards using the graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> \"MTools File Manager\") or the command line utilities \"mtools\" (enter \"man mtools\" on the command line for more info). You find the card's file system under the drive letter \"p:\", or subsequent drive letters when you have more than one HP printer with photo card drives. In \"MtoolsFM\" you can switch between drive letters with the field at the upper-right corners of the file lists."
 msgstr ""
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
+#: printer/printerdrake.pm:3181 printer/printerdrake.pm:3570
 #, c-format
 msgid "Reading printer data..."
 msgstr ""
 
-#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412 printer/printerdrake.pm:3447
+#: printer/printerdrake.pm:3201 printer/printerdrake.pm:3228 printer/printerdrake.pm:3263
 #, c-format
 msgid "Transfer printer configuration"
 msgstr ""
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3202
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %s to %s, your current spooler. All the configuration data (printer name, description, location, connection type, and default option settings) is overtaken, but jobs will not be transferred.\n"
@@ -10665,40 +10593,40 @@ msgid ""
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3205
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the data into a free-formed command.\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3207
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP printers.\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3209
 #, c-format
 msgid ""
 "LPD and LPRng do not support IPP printers.\n"
 ""
 msgstr ""
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3211
 #, c-format
 msgid "In addition, queues not created with this program or \"foomatic-configure\" cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3212
 #, c-format
 msgid ""
 "\n"
 "Also printers configured with the PPD files provided by their manufacturers or with native CUPS drivers cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3213
 #, c-format
 msgid ""
 "\n"
@@ -10706,17 +10634,17 @@ msgid ""
 "\"Transfer\"."
 msgstr ""
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3216
 #, c-format
 msgid "Do not transfer printers"
 msgstr ""
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3217 printer/printerdrake.pm:3233
 #, c-format
 msgid "Transfer"
 msgstr ""
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3229
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -10724,97 +10652,102 @@ msgid ""
 "You can also type a new name or skip this printer."
 msgstr ""
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3250
 #, c-format
 msgid "New printer name"
 msgstr ""
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3253
 #, c-format
 msgid "Transferring %s..."
 msgstr ""
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3264
 #, c-format
 msgid "You have transferred your former default printer (\"%s\"), Should it be also the default printer under the new printing system %s?"
 msgstr ""
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3274
 #, c-format
 msgid "Refreshing printer data..."
 msgstr ""
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3282 printer/printerdrake.pm:3360 printer/printerdrake.pm:3372
+#, c-format
+msgid "Configuration of a remote printer"
+msgstr ""
+
+#: printer/printerdrake.pm:3283
 #, c-format
 msgid "Starting network..."
 msgstr ""
 
-#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512 printer/printerdrake.pm:3514
+#: printer/printerdrake.pm:3324 printer/printerdrake.pm:3328 printer/printerdrake.pm:3330
 #, c-format
 msgid "Configure the network now"
 msgstr ""
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3325
 #, c-format
 msgid "Network functionality not configured"
 msgstr ""
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3326
 #, c-format
 msgid "You are going to configure a remote printer. This needs working network access, but your network is not configured yet. If you go on without network configuration, you will not be able to use the printer which you are configuring now. How do you want to proceed?"
 msgstr ""
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3329
 #, c-format
 msgid "Go on without configuring the network"
 msgstr ""
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3362
 #, c-format
-msgid "The network configuration done during the installation cannot be started now. Please check whether the network is accessible after booting your system and correct the configuration using the %s Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the %s Control Center, section \"Hardware\"/\"Printer\""
+msgid "The network configuration done during the installation cannot be started now. Please check whether the network is accessable after booting your system and correct the configuration using the %s Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3363
 #, c-format
 msgid "The network access was not running and could not be started. Please check your configuration and your hardware. Then try to configure your remote printer again."
 msgstr ""
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3373
 #, c-format
 msgid "Restarting printing system..."
 msgstr ""
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3412
 #, c-format
 msgid "high"
 msgstr ""
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3412
 #, c-format
 msgid "paranoid"
 msgstr ""
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3413
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr ""
 
-#: printer/printerdrake.pm:3599
+#: printer/printerdrake.pm:3414
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %s security level.\n"
 "\n"
-"This printing system runs a daemon (background process) which waits for print jobs and handles them. This daemon is also accessible by remote machines through the network and so it is a possible point for attacks. Therefore only a few selected daemons are started by default in this security level.\n"
+"This printing system runs a daemon (background process) which waits for print jobs and handles them. This daemon is also accessable by remote machines through the network and so it is a possible point for attacks. Therefore only a few selected daemons are started by default in this security level.\n"
 "\n"
 "Do you really want to configure printing on this machine?"
 msgstr ""
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr ""
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3449
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine is booted.\n"
@@ -10824,224 +10757,204 @@ msgid ""
 "Do you want to have the automatic starting of the printing system turned on again?"
 msgstr ""
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3470 printer/printerdrake.pm:3685
 #, c-format
 msgid "Checking installed software..."
 msgstr ""
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3476
 #, c-format
 msgid "Removing %s ..."
 msgstr ""
 
-#: printer/printerdrake.pm:3665
-#, c-format
-msgid "Could not remove the %s printing system!"
-msgstr ""
-
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3483
 #, c-format
 msgid "Installing %s ..."
 msgstr ""
 
-#: printer/printerdrake.pm:3678
-#, c-format
-msgid "Could not install the %s printing system!"
-msgstr ""
-
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3530
 #, c-format
 msgid "Setting Default Printer..."
 msgstr ""
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3550
 #, c-format
 msgid "Select Printer Spooler"
 msgstr ""
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:3551
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr ""
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:3602
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr ""
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:3615
 #, c-format
 msgid "Installing Foomatic..."
 msgstr ""
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:3800
 #, c-format
-msgid "Could not install %s packages, %s cannot be started!"
+msgid "The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it."
 msgstr ""
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr ""
-
-#: printer/printerdrake.pm:4011
-#, c-format
-msgid "The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it. "
-msgstr ""
-
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:3827
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr ""
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:3828
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:3836
 #, c-format
 msgid "CUPS configuration"
 msgstr ""
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:3848
 #, c-format
 msgid "Change the printing system"
 msgstr ""
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:3857
 #, c-format
 msgid "Normal Mode"
 msgstr ""
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:3858
 #, c-format
 msgid "Expert Mode"
 msgstr ""
 
-#: printer/printerdrake.pm:4343 printer/printerdrake.pm:4398 printer/printerdrake.pm:4479 printer/printerdrake.pm:4489
+#: printer/printerdrake.pm:4129 printer/printerdrake.pm:4184 printer/printerdrake.pm:4265 printer/printerdrake.pm:4275
 #, c-format
 msgid "Printer options"
 msgstr ""
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4165
 #, c-format
 msgid "Modify printer configuration"
 msgstr ""
 
-#: printer/printerdrake.pm:4381
+#: printer/printerdrake.pm:4167
 #, c-format
 msgid ""
 "Printer %s\n"
 "What do you want to modify on this printer?"
 msgstr ""
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4171
 #, c-format
 msgid "Do it!"
 msgstr ""
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4176 printer/printerdrake.pm:4234
 #, c-format
 msgid "Printer connection type"
 msgstr ""
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4177 printer/printerdrake.pm:4238
 #, c-format
 msgid "Printer name, description, location"
 msgstr ""
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4179 printer/printerdrake.pm:4257
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr ""
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4180 printer/printerdrake.pm:4258
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr ""
 
-#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4186 printer/printerdrake.pm:4269
 #, c-format
 msgid "Set this printer as the default"
 msgstr ""
 
-#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
+#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4276
 #, c-format
 msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
 msgstr ""
 
-#: printer/printerdrake.pm:4403 printer/printerdrake.pm:4495
+#: printer/printerdrake.pm:4189 printer/printerdrake.pm:4281
 #, c-format
 msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
 msgstr ""
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4190 printer/printerdrake.pm:4286
 #, c-format
 msgid "Print test pages"
 msgstr ""
 
-#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
+#: printer/printerdrake.pm:4191 printer/printerdrake.pm:4288
 #, c-format
 msgid "Learn how to use this printer"
 msgstr ""
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4192 printer/printerdrake.pm:4290
 #, c-format
 msgid "Remove printer"
 msgstr ""
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4246
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr ""
 
-#: printer/printerdrake.pm:4491
+#: printer/printerdrake.pm:4277
 #, c-format
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
 msgstr ""
 
-#: printer/printerdrake.pm:4493
+#: printer/printerdrake.pm:4279
 #, c-format
 msgid "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
 msgstr ""
 
-#: printer/printerdrake.pm:4494
+#: printer/printerdrake.pm:4280
 #, c-format
 msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
 msgstr ""
 
-#: printer/printerdrake.pm:4496
+#: printer/printerdrake.pm:4282
 #, c-format
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
 msgstr ""
 
-#: printer/printerdrake.pm:4498
+#: printer/printerdrake.pm:4284
 #, c-format
 msgid "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/GIMP."
 msgstr ""
 
-#: printer/printerdrake.pm:4499
+#: printer/printerdrake.pm:4285
 #, c-format
 msgid "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
 msgstr ""
 
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4329
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr ""
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4333
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr ""
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4357
 #, c-format
 msgid "Default printer"
 msgstr ""
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4358
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr ""
@@ -11073,32 +10986,27 @@ msgstr ""
 msgid "Could not create directory /usr/share/sane/firmware!"
 msgstr ""
 
-#: scanner.pm:107
-#, c-format
-msgid "Could not create link /usr/share/sane/%s!"
-msgstr ""
-
-#: scanner.pm:114
+#: scanner.pm:102
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
 msgstr ""
 
-#: scanner.pm:121
+#: scanner.pm:109
 #, c-format
 msgid "Could not set permissions of firmware file %s!"
 msgstr ""
 
-#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69 standalone/scannerdrake:77 standalone/scannerdrake:339 standalone/scannerdrake:414 standalone/scannerdrake:458 standalone/scannerdrake:462 standalone/scannerdrake:484 standalone/scannerdrake:549
+#: scanner.pm:188 standalone/scannerdrake:59 standalone/scannerdrake:63 standalone/scannerdrake:71 standalone/scannerdrake:333 standalone/scannerdrake:407 standalone/scannerdrake:451 standalone/scannerdrake:455 standalone/scannerdrake:477 standalone/scannerdrake:542
 #, c-format
 msgid "Scannerdrake"
 msgstr ""
 
-#: scanner.pm:201 standalone/scannerdrake:915
+#: scanner.pm:189 standalone/scannerdrake:903
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
 msgstr ""
 
-#: scanner.pm:202
+#: scanner.pm:190
 #, c-format
 msgid "Your scanner(s) will not be available for non-root users."
 msgstr ""
@@ -12048,7 +11956,7 @@ msgid ""
 "about this service, sorry."
 msgstr ""
 
-#: services.pm:226 ugtk2.pm:1167
+#: services.pm:226 ugtk2.pm:1138
 #, c-format
 msgid "Info"
 msgstr ""
@@ -12075,20 +11983,20 @@ msgstr ""
 
 #: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13 share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
 #, c-format
-msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+msgid "<b>Congratulations for choosing Mandrake Linux!</b>"
 msgstr ""
 
-#: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15 share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
+#: share/advertising/dis-01.pl:15 share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
 #, c-format
 msgid "Welcome to the Open Source world!"
 msgstr ""
 
 #: share/advertising/dis-01.pl:17
 #, c-format
-msgid "Your new Mandrakelinux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."
+msgid "Your new Mandrake Linux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."
 msgstr ""
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19 share/advertising/ppp-01.pl:19
+#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:17 share/advertising/ppp-01.pl:19
 #, c-format
 msgid "We would like to thank everyone who participated in the development of this latest release."
 msgstr ""
@@ -12260,7 +12168,7 @@ msgstr ""
 
 #: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18 share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
+msgid "\t- Voting for software to put in Mandrake Linux"
 msgstr ""
 
 #: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19 share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
@@ -12293,14 +12201,14 @@ msgstr ""
 msgid "If you have Linux questions, subscribe to MandrakeExpert at <b>www.mandrakeexpert.com</b>"
 msgstr ""
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/dwd-01.pl:15
 #, c-format
-msgid "Mandrakelinux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrakelinux contributors."
+msgid "Mandrake Linux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrake Linux contributors."
 msgstr ""
 
 #: share/advertising/dwd-02.pl:13
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
+msgid "<b>Join the Mandrake Linux community!</b>"
 msgstr ""
 
 #: share/advertising/dwd-02.pl:15
@@ -12315,22 +12223,22 @@ msgstr ""
 
 #: share/advertising/dwd-03.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrake Linux?</b>"
 msgstr ""
 
 #: share/advertising/dwd-03.pl:15
 #, c-format
-msgid "Mandrakelinux is an Open Source distribution created with thousands of the choicest applications from the Free Software world. Mandrakelinux is one of the most widely used Linux distributions worldwide!"
+msgid "Mandrake Linux is an Open Source distribution created with thousands of the choicest applications from the Free Software world. Mandrake Linux is one of the most widely used Linux distributions worldwide!"
 msgstr ""
 
 #: share/advertising/dwd-03.pl:17
 #, c-format
-msgid "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications."
+msgid "Mandrake Linux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications."
 msgstr ""
 
 #: share/advertising/dwd-04.pl:13
 #, c-format
-msgid "Mandrakelinux is widely known as the most user-friendly and the easiest to install and easy to use Linux distribution."
+msgid "Mandrake Linux is widely known as the most user-friendly and the easiest to install and easy to use Linux distribution."
 msgstr ""
 
 #: share/advertising/dwd-04.pl:15
@@ -12340,7 +12248,7 @@ msgstr ""
 
 #: share/advertising/dwd-04.pl:16
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t- Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"
 msgstr ""
 
 #: share/advertising/dwd-04.pl:17
@@ -12375,7 +12283,7 @@ msgstr ""
 
 #: share/advertising/dwd-05.pl:19
 #, c-format
-msgid "<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined with the stability and easy-of-use of the world-famous Mandrakelinux distribution. A unique blend for incomparable HPC performance."
+msgid "<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined with the stability and easy-of-use of the world-famous Mandrake Linux distribution. A unique blend for incomparable HPC performance."
 msgstr ""
 
 #: share/advertising/dwd-06.pl:15
@@ -12410,17 +12318,17 @@ msgstr ""
 
 #: share/advertising/dwd-09.pl:18
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
+msgid "This is the Mandrake Linux <b>Download version</b>."
 msgstr ""
 
 #: share/advertising/dwd-09.pl:20
 #, c-format
-msgid "The free download version does not include commercial software, and therefore may not work with certain modems (such as some ADSL and RTC) and video cards (such as ATI® and NVIDIA®)."
+msgid "The free download version does not include commercial software, and therefore may not work with certain modems (such as some ADSL and RTC ones) and video cards (such as ATI® and NVIDIA® ones)."
 msgstr ""
 
 #: share/advertising/ppp-01.pl:17
 #, c-format
-msgid "Your new Mandrakelinux distribution and its many applications are the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."
+msgid "Your new Mandrake Linux distribution and its many applications are the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."
 msgstr ""
 
 #: share/advertising/ppp-02.pl:13
@@ -12435,7 +12343,7 @@ msgstr ""
 
 #: share/advertising/ppp-02.pl:17
 #, c-format
-msgid "It is the only Mandrakelinux product that includes the groupware solution."
+msgid "It is the only Mandrake Linux product that includes the groupware solution."
 msgstr ""
 
 #: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
@@ -12445,12 +12353,12 @@ msgstr ""
 
 #: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
 #, c-format
-msgid "When you log into your Mandrakelinux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others."
+msgid "When you log into your Mandrake Linux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others."
 msgstr ""
 
 #: share/advertising/ppp-04.pl:13
 #, c-format
-msgid "In the Mandrakelinux menu you will find easy-to-use applications for all tasks:"
+msgid "In the Mandrake Linux menu you will find easy-to-use applications for all tasks:"
 msgstr ""
 
 #: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
@@ -12580,7 +12488,7 @@ msgstr ""
 
 #: share/advertising/pwp-01.pl:17
 #, c-format
-msgid "Your new Mandrakelinux distribution is the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."
+msgid "Your new Mandrake Linux distribution is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."
 msgstr ""
 
 #: share/advertising/pwp-01.pl:19
@@ -12600,7 +12508,7 @@ msgstr ""
 
 #: share/advertising/pwp-04.pl:13
 #, c-format
-msgid "In the Mandrakelinux menu you will find easy-to-use applications for all of your tasks:"
+msgid "In the Mandrake Linux menu you will find easy-to-use applications for all of your tasks:"
 msgstr ""
 
 #: share/advertising/pwp-04.pl:16
@@ -12812,100 +12720,100 @@ msgstr ""
 msgid "You need to log out and back in again for changes to take effect"
 msgstr ""
 
-#: standalone/drakTermServ:77
+#: standalone/drakTermServ:71
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr ""
 
-#: standalone/drakTermServ:114 standalone/drakTermServ:121
+#: standalone/drakTermServ:101 standalone/drakTermServ:108
 #, c-format
 msgid ""
 "%s: %s requires a username...\n"
 ""
 msgstr ""
 
-#: standalone/drakTermServ:134
+#: standalone/drakTermServ:121
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, 0/1 for Local Config...\n"
 ""
 msgstr ""
 
-#: standalone/drakTermServ:141
+#: standalone/drakTermServ:128
 #, c-format
 msgid ""
 "%s: %s requires hostname...\n"
 ""
 msgstr ""
 
-#: standalone/drakTermServ:153
+#: standalone/drakTermServ:140
 #, c-format
 msgid ""
 "You must be root to read configuration file. \n"
 ""
 msgstr ""
 
-#: standalone/drakTermServ:238 standalone/drakTermServ:511 standalone/drakfont:575
+#: standalone/drakTermServ:219 standalone/drakTermServ:488 standalone/drakfont:572
 #, c-format
 msgid "OK"
 msgstr ""
 
-#: standalone/drakTermServ:249 standalone/drakTermServ:252
+#: standalone/drakTermServ:235
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr ""
 
-#: standalone/drakTermServ:267
+#: standalone/drakTermServ:240
+#, c-format
+msgid "DrakTermServ"
+msgstr ""
+
+#: standalone/drakTermServ:264
 #, c-format
 msgid "Enable Server"
 msgstr ""
 
-#: standalone/drakTermServ:273
+#: standalone/drakTermServ:270
 #, c-format
 msgid "Disable Server"
 msgstr ""
 
-#: standalone/drakTermServ:281
+#: standalone/drakTermServ:278
 #, c-format
 msgid "Start Server"
 msgstr ""
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:284
 #, c-format
 msgid "Stop Server"
 msgstr ""
 
-#: standalone/drakTermServ:295
+#: standalone/drakTermServ:292
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr ""
 
-#: standalone/drakTermServ:299
+#: standalone/drakTermServ:296
 #, c-format
 msgid "Net Boot Images"
 msgstr ""
 
-#: standalone/drakTermServ:305
+#: standalone/drakTermServ:302
 #, c-format
 msgid "Add/Del Users"
 msgstr ""
 
-#: standalone/drakTermServ:309
+#: standalone/drakTermServ:306
 #, c-format
 msgid "Add/Del Clients"
 msgstr ""
 
-#: standalone/drakTermServ:320 standalone/drakbug:54
+#: standalone/drakTermServ:317 standalone/drakbug:54
 #, c-format
 msgid "First Time Wizard"
 msgstr ""
 
-#: standalone/drakTermServ:351 standalone/drakTermServ:352
-#, c-format
-msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
-msgstr ""
-
-#: standalone/drakTermServ:358
+#: standalone/drakTermServ:342
 #, c-format
 msgid ""
 "\n"
@@ -12925,65 +12833,60 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakTermServ:403
+#: standalone/drakTermServ:387
 #, c-format
 msgid "Cancel Wizard"
 msgstr ""
 
-#: standalone/drakTermServ:415
+#: standalone/drakTermServ:399
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr ""
 
-#: standalone/drakTermServ:443
-#, c-format
-msgid "Use thin clients."
-msgstr ""
-
-#: standalone/drakTermServ:445
+#: standalone/drakTermServ:427
 #, c-format
 msgid ""
-"Please select default client type.\n"
+"Please select client type.\n"
 "    'Thin' clients run everything off the server's CPU/RAM, using the client display.\n"
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
 
-#: standalone/drakTermServ:457 standalone/drakTermServ:1071
+#: standalone/drakTermServ:433
 #, c-format
-msgid "Sync client X keyboard settings with server."
+msgid "Allow thin clients."
 msgstr ""
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:441
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr ""
 
-#: standalone/drakTermServ:465 standalone/drakTermServ:763 standalone/drakTermServ:779
+#: standalone/drakTermServ:442 standalone/drakTermServ:725 standalone/drakTermServ:741
 #, c-format
 msgid "This will take a few minutes."
 msgstr ""
 
-#: standalone/drakTermServ:469 standalone/drakTermServ:489
+#: standalone/drakTermServ:446 standalone/drakTermServ:466
 #, c-format
 msgid "Done!"
 msgstr ""
 
-#: standalone/drakTermServ:475
+#: standalone/drakTermServ:452
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 
-#: standalone/drakTermServ:495
+#: standalone/drakTermServ:472
 #, c-format
 msgid "In order to enable changes made for thin clients, the display manager must be restarted. Restart now?"
 msgstr ""
 
-#: standalone/drakTermServ:530
+#: standalone/drakTermServ:507
 #, c-format
-msgid "Terminal Server Overview"
+msgid "drakTermServ Overview"
 msgstr ""
 
-#: standalone/drakTermServ:531
+#: standalone/drakTermServ:508
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -12994,7 +12897,7 @@ msgid ""
 "        \tdhcpd.conf, you should create the etherboot images for at least one full kernel."
 msgstr ""
 
-#: standalone/drakTermServ:537
+#: standalone/drakTermServ:514
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -13009,7 +12912,7 @@ msgid ""
 "        \tA typical dhcpd.conf stanza to support a diskless client looks like:"
 msgstr ""
 
-#: standalone/drakTermServ:555
+#: standalone/drakTermServ:532
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a specific entry for\n"
@@ -13034,7 +12937,7 @@ msgid ""
 "        Note: You must stop/start the server after adding or changing clients."
 msgstr ""
 
-#: standalone/drakTermServ:575
+#: standalone/drakTermServ:552
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -13050,7 +12953,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:587
+#: standalone/drakTermServ:564
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -13059,7 +12962,7 @@ msgid ""
 "        \thelps in this respect by adding or removing system users from this file."
 msgstr ""
 
-#: standalone/drakTermServ:591
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -13068,7 +12971,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:596
+#: standalone/drakTermServ:573
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -13082,7 +12985,7 @@ msgid ""
 "        turned back off, retaining the configuration files, once the client machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:605
+#: standalone/drakTermServ:582
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -13108,7 +13011,7 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 
-#: standalone/drakTermServ:626
+#: standalone/drakTermServ:603
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -13123,62 +13026,57 @@ msgid ""
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
 
-#: standalone/drakTermServ:661
+#: standalone/drakTermServ:638
 #, c-format
 msgid "Boot Floppy"
 msgstr ""
 
-#: standalone/drakTermServ:663
+#: standalone/drakTermServ:640
 #, c-format
 msgid "Boot ISO"
 msgstr ""
 
-#: standalone/drakTermServ:665
+#: standalone/drakTermServ:642
 #, c-format
 msgid "PXE Image"
 msgstr ""
 
-#: standalone/drakTermServ:734
-#, c-format
-msgid "Default kernel version"
-msgstr ""
-
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:723
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr ""
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:730
 #, c-format
 msgid "No kernel selected!"
 msgstr ""
 
-#: standalone/drakTermServ:771
+#: standalone/drakTermServ:733
 #, c-format
 msgid "Build Single NIC -->"
 msgstr ""
 
-#: standalone/drakTermServ:775
+#: standalone/drakTermServ:737
 #, c-format
 msgid "No NIC selected!"
 msgstr ""
 
-#: standalone/drakTermServ:778
+#: standalone/drakTermServ:740
 #, c-format
 msgid "Build All Kernels -->"
 msgstr ""
 
-#: standalone/drakTermServ:786
+#: standalone/drakTermServ:747
 #, c-format
 msgid "<-- Delete"
 msgstr ""
 
-#: standalone/drakTermServ:793
+#: standalone/drakTermServ:754
 #, c-format
 msgid "Delete All NBIs"
 msgstr ""
 
-#: standalone/drakTermServ:880
+#: standalone/drakTermServ:841
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -13186,161 +13084,151 @@ msgid ""
 "Delete/re-add the user to the Terminal Server to enable login."
 msgstr ""
 
-#: standalone/drakTermServ:885
+#: standalone/drakTermServ:846
 #, c-format
 msgid "Add User -->"
 msgstr ""
 
-#: standalone/drakTermServ:891
+#: standalone/drakTermServ:852
 #, c-format
 msgid "<-- Del User"
 msgstr ""
 
-#: standalone/drakTermServ:927
+#: standalone/drakTermServ:888
 #, c-format
 msgid "type: %s"
 msgstr ""
 
-#: standalone/drakTermServ:931
+#: standalone/drakTermServ:892
 #, c-format
 msgid "local config: %s"
 msgstr ""
 
-#: standalone/drakTermServ:961
+#: standalone/drakTermServ:922
 #, c-format
 msgid ""
 "Allow local hardware\n"
 "configuration."
 msgstr ""
 
-#: standalone/drakTermServ:970
+#: standalone/drakTermServ:931
 #, c-format
 msgid "No net boot images created!"
 msgstr ""
 
-#: standalone/drakTermServ:988
+#: standalone/drakTermServ:949
 #, c-format
 msgid "Thin Client"
 msgstr ""
 
-#: standalone/drakTermServ:992
+#: standalone/drakTermServ:953
 #, c-format
 msgid "Allow Thin Clients"
 msgstr ""
 
-#: standalone/drakTermServ:993
+#: standalone/drakTermServ:954
 #, c-format
 msgid "Add Client -->"
 msgstr ""
 
-#: standalone/drakTermServ:1007
+#: standalone/drakTermServ:968
 #, c-format
 msgid "type: fat"
 msgstr ""
 
-#: standalone/drakTermServ:1008
+#: standalone/drakTermServ:969
 #, c-format
 msgid "type: thin"
 msgstr ""
 
-#: standalone/drakTermServ:1015
+#: standalone/drakTermServ:976
 #, c-format
 msgid "local config: false"
 msgstr ""
 
-#: standalone/drakTermServ:1016
+#: standalone/drakTermServ:977
 #, c-format
 msgid "local config: true"
 msgstr ""
 
-#: standalone/drakTermServ:1024
+#: standalone/drakTermServ:985
 #, c-format
 msgid "<-- Edit Client"
 msgstr ""
 
-#: standalone/drakTermServ:1050
+#: standalone/drakTermServ:1011
 #, c-format
 msgid "Disable Local Config"
 msgstr ""
 
-#: standalone/drakTermServ:1057
+#: standalone/drakTermServ:1018
 #, c-format
 msgid "Delete Client"
 msgstr ""
 
-#: standalone/drakTermServ:1066
+#: standalone/drakTermServ:1027
 #, c-format
 msgid "dhcpd Config..."
 msgstr ""
 
-#: standalone/drakTermServ:1082
+#: standalone/drakTermServ:1040
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
 "(service dm restart - at the console)"
 msgstr ""
 
-#: standalone/drakTermServ:1122
-#, c-format
-msgid "Thin clients won't work with autologin. Disable autologin?"
-msgstr ""
-
-#: standalone/drakTermServ:1138
-#, c-format
-msgid "All clients will use %s"
-msgstr ""
-
-#: standalone/drakTermServ:1168
+#: standalone/drakTermServ:1084
 #, c-format
 msgid "Subnet:"
 msgstr ""
 
-#: standalone/drakTermServ:1175
+#: standalone/drakTermServ:1091
 #, c-format
 msgid "Netmask:"
 msgstr ""
 
-#: standalone/drakTermServ:1182
+#: standalone/drakTermServ:1098
 #, c-format
 msgid "Routers:"
 msgstr ""
 
-#: standalone/drakTermServ:1189
+#: standalone/drakTermServ:1105
 #, c-format
 msgid "Subnet Mask:"
 msgstr ""
 
-#: standalone/drakTermServ:1196
+#: standalone/drakTermServ:1112
 #, c-format
 msgid "Broadcast Address:"
 msgstr ""
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1119
 #, c-format
 msgid "Domain Name:"
 msgstr ""
 
-#: standalone/drakTermServ:1211
+#: standalone/drakTermServ:1127
 #, c-format
 msgid "Name Servers:"
 msgstr ""
 
-#: standalone/drakTermServ:1222
+#: standalone/drakTermServ:1138
 #, c-format
 msgid "IP Range Start:"
 msgstr ""
 
-#: standalone/drakTermServ:1223
+#: standalone/drakTermServ:1139
 #, c-format
 msgid "IP Range End:"
 msgstr ""
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1191
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr ""
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1192
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -13348,148 +13236,148 @@ msgid ""
 "You can modify as needed."
 msgstr ""
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1195
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr ""
 
-#: standalone/drakTermServ:1292
+#: standalone/drakTermServ:1208
 #, c-format
 msgid "Write Config"
 msgstr ""
 
-#: standalone/drakTermServ:1411
+#: standalone/drakTermServ:1326
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr ""
 
-#: standalone/drakTermServ:1415
+#: standalone/drakTermServ:1330
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr ""
 
-#: standalone/drakTermServ:1417
+#: standalone/drakTermServ:1332
 #, c-format
 msgid "Floppy can be removed now"
 msgstr ""
 
-#: standalone/drakTermServ:1420
+#: standalone/drakTermServ:1335
 #, c-format
 msgid "No floppy drive available!"
 msgstr ""
 
-#: standalone/drakTermServ:1425
+#: standalone/drakTermServ:1340
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr ""
 
-#: standalone/drakTermServ:1427
+#: standalone/drakTermServ:1342
 #, c-format
 msgid "Error writing %s/%s"
 msgstr ""
 
-#: standalone/drakTermServ:1436
+#: standalone/drakTermServ:1351
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr ""
 
-#: standalone/drakTermServ:1438
+#: standalone/drakTermServ:1353
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr ""
 
-#: standalone/drakTermServ:1458
+#: standalone/drakTermServ:1372
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr ""
 
-#: standalone/drakTermServ:1619
+#: standalone/drakTermServ:1533
 #, c-format
 msgid ""
 "%s passwd bad in Terminal Server - rewriting...\n"
 ""
 msgstr ""
 
-#: standalone/drakTermServ:1637
+#: standalone/drakTermServ:1551
 #, c-format
 msgid ""
 "%s is not a user..\n"
 ""
 msgstr ""
 
-#: standalone/drakTermServ:1638
+#: standalone/drakTermServ:1552
 #, c-format
 msgid ""
 "%s is already a Terminal Server user\n"
 ""
 msgstr ""
 
-#: standalone/drakTermServ:1640
+#: standalone/drakTermServ:1554
 #, c-format
 msgid ""
 "Addition of %s to Terminal Server failed!\n"
 ""
 msgstr ""
 
-#: standalone/drakTermServ:1642
+#: standalone/drakTermServ:1556
 #, c-format
 msgid ""
 "%s added to Terminal Server\n"
 ""
 msgstr ""
 
-#: standalone/drakTermServ:1694
+#: standalone/drakTermServ:1608
 #, c-format
 msgid ""
 "Deleted %s...\n"
 ""
 msgstr ""
 
-#: standalone/drakTermServ:1696 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1610 standalone/drakTermServ:1687
 #, c-format
 msgid ""
 "%s not found...\n"
 ""
 msgstr ""
 
-#: standalone/drakTermServ:1718 standalone/drakTermServ:1719 standalone/drakTermServ:1720
+#: standalone/drakTermServ:1632 standalone/drakTermServ:1633 standalone/drakTermServ:1634
 #, c-format
 msgid ""
 "%s already in use\n"
 ""
 msgstr ""
 
-#: standalone/drakTermServ:1744
+#: standalone/drakTermServ:1658
 #, c-format
 msgid "Can't open %s!"
 msgstr ""
 
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1715
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 
-#: standalone/drakTermServ:1958
+#: standalone/drakTermServ:1872
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr ""
 
-#: standalone/drakautoinst:38
+#: standalone/drakautoinst:37
 #, c-format
 msgid "Error!"
 msgstr ""
 
-#: standalone/drakautoinst:39
+#: standalone/drakautoinst:38
 #, c-format
 msgid "I can't find needed image file `%s'."
 msgstr ""
 
-#: standalone/drakautoinst:41
+#: standalone/drakautoinst:40
 #, c-format
 msgid "Auto Install Configurator"
 msgstr ""
 
-#: standalone/drakautoinst:42
+#: standalone/drakautoinst:41
 #, c-format
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat dangerous and must be used circumspectly.\n"
@@ -13501,42 +13389,32 @@ msgid ""
 "Press ok to continue."
 msgstr ""
 
-#: standalone/drakautoinst:60
+#: standalone/drakautoinst:59
 #, c-format
 msgid "replay"
 msgstr ""
 
-#: standalone/drakautoinst:60 standalone/drakautoinst:69
+#: standalone/drakautoinst:59 standalone/drakautoinst:68
 #, c-format
 msgid "manual"
 msgstr ""
 
-#: standalone/drakautoinst:64
+#: standalone/drakautoinst:63
 #, c-format
 msgid "Automatic Steps Configuration"
 msgstr ""
 
-#: standalone/drakautoinst:65
+#: standalone/drakautoinst:64
 #, c-format
 msgid "Please choose for each step whether it will replay like your install, or it will be manual"
 msgstr ""
 
-#: standalone/drakautoinst:77 standalone/drakautoinst:78 standalone/drakautoinst:92
+#: standalone/drakautoinst:76 standalone/drakautoinst:77
 #, c-format
 msgid "Creating auto install floppy"
 msgstr ""
 
-#: standalone/drakautoinst:90
-#, c-format
-msgid "Insert another blank floppy in drive %s (for drivers disk)"
-msgstr ""
-
-#: standalone/drakautoinst:91
-#, c-format
-msgid "Creating auto install floppy (drivers disk)"
-msgstr ""
-
-#: standalone/drakautoinst:158
+#: standalone/drakautoinst:141
 #, c-format
 msgid ""
 "\n"
@@ -13545,29 +13423,29 @@ msgid ""
 "The parameters of the auto-install are available in the sections on the left"
 msgstr ""
 
-#: standalone/drakautoinst:252 standalone/drakgw:594 standalone/drakvpn:900 standalone/scannerdrake:374
+#: standalone/drakautoinst:235 standalone/drakgw:583 standalone/drakvpn:918 standalone/scannerdrake:367
 #, c-format
 msgid "Congratulations!"
 msgstr ""
 
-#: standalone/drakautoinst:253
+#: standalone/drakautoinst:236
 #, c-format
 msgid ""
 "The floppy has been successfully generated.\n"
 "You may now replay your installation."
 msgstr ""
 
-#: standalone/drakautoinst:289
+#: standalone/drakautoinst:272
 #, c-format
 msgid "Auto Install"
 msgstr ""
 
-#: standalone/drakautoinst:358
+#: standalone/drakautoinst:341
 #, c-format
 msgid "Add an item"
 msgstr ""
 
-#: standalone/drakautoinst:365
+#: standalone/drakautoinst:348
 #, c-format
 msgid "Remove the last item"
 msgstr ""
@@ -13582,111 +13460,106 @@ msgstr ""
 msgid "tape"
 msgstr ""
 
-#: standalone/drakbackup:112
+#: standalone/drakbackup:159
 #, c-format
 msgid "No devices found"
 msgstr ""
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:196
 #, c-format
 msgid "Expect is an extension to the Tcl scripting language that allows interactive sessions without user intervention."
 msgstr ""
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:197
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr ""
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:198
 #, c-format
 msgid "For a multisession CD, only the first session will erase the cdrw. Otherwise the cdrw is erased before each backup."
 msgstr ""
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:199
+#, c-format
+msgid "This uses the same syntax as the command line program 'cdrecord'. 'cdrecord -scanbus' would also show you the device number."
+msgstr ""
+
+#: standalone/drakbackup:200
 #, c-format
 msgid "This option will save files that have changed.  Exact behavior depends on whether incremental or differential mode is used."
 msgstr ""
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:201
 #, c-format
 msgid "Incremental backups only save files that have changed or are new since the last backup."
 msgstr ""
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:202
 #, c-format
 msgid "Differential backups only save files that have changed or are new since the original 'base' backup."
 msgstr ""
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:203
 #, c-format
 msgid "This should be a local user or email addresse that you want the backup results sent to. You will need to define a functioning mail server."
 msgstr ""
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:204
 #, c-format
 msgid "Files or wildcards listed in a .backupignore file at the top of a directory tree will not be backed up."
 msgstr ""
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:205
 #, c-format
 msgid "For backups to other media, files are still created on the hard drive, then moved to the other media.  Enabling this option will remove the hard drive tar files after the backup."
 msgstr ""
 
-#: standalone/drakbackup:163
+#: standalone/drakbackup:206
 #, c-format
 msgid "Some protocols, like rsync, may be configured at the server end.  Rather than using a directory path, you would use the 'module' name for the service path."
 msgstr ""
 
-#: standalone/drakbackup:164
+#: standalone/drakbackup:207
 #, c-format
 msgid "Custom allows you to specify your own day and time.  The other options use run-parts in /etc/crontab."
 msgstr ""
 
-#: standalone/drakbackup:396
-#, c-format
-msgid "No media selected for cron operation."
-msgstr ""
-
-#: standalone/drakbackup:400
-#, c-format
-msgid "No interval selected for cron operation."
-msgstr ""
-
-#: standalone/drakbackup:447
+#: standalone/drakbackup:604
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr ""
 
-#: standalone/drakbackup:532 standalone/logdrake:467
+#: standalone/drakbackup:715 standalone/logdrake:415
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr ""
 
-#: standalone/drakbackup:536 standalone/logdrake:472
+#: standalone/drakbackup:719 standalone/logdrake:420
 #, c-format
 msgid "\"%s\" is a local user, but you did not select a local smtp, so you must use a complete email address!"
 msgstr ""
 
-#: standalone/drakbackup:545
+#: standalone/drakbackup:728
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 
-#: standalone/drakbackup:547
+#: standalone/drakbackup:730
 #, c-format
 msgid ""
 "Old user list:\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:549
+#: standalone/drakbackup:732
 #, c-format
 msgid ""
 "New user list:\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:594
+#: standalone/drakbackup:779
 #, c-format
 msgid ""
 "\n"
@@ -13694,7 +13567,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:595
+#: standalone/drakbackup:780
 #, c-format
 msgid ""
 "\n"
@@ -13702,7 +13575,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:601
+#: standalone/drakbackup:786
 #, c-format
 msgid ""
 "\n"
@@ -13712,12 +13585,12 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:625 standalone/drakbackup:696 standalone/drakbackup:752
+#: standalone/drakbackup:810 standalone/drakbackup:883 standalone/drakbackup:939
 #, c-format
 msgid "Total progress"
 msgstr ""
 
-#: standalone/drakbackup:678
+#: standalone/drakbackup:865
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -13726,42 +13599,42 @@ msgid ""
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
 
-#: standalone/drakbackup:687
+#: standalone/drakbackup:874
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr ""
 
-#: standalone/drakbackup:694
+#: standalone/drakbackup:881
 #, c-format
 msgid "Cannot spawn %s."
 msgstr ""
 
-#: standalone/drakbackup:711
+#: standalone/drakbackup:898
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr ""
 
-#: standalone/drakbackup:712
+#: standalone/drakbackup:899
 #, c-format
 msgid "Bad password on %s"
 msgstr ""
 
-#: standalone/drakbackup:713
+#: standalone/drakbackup:900
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr ""
 
-#: standalone/drakbackup:714
+#: standalone/drakbackup:901
 #, c-format
 msgid "Can't find %s on %s"
 msgstr ""
 
-#: standalone/drakbackup:718
+#: standalone/drakbackup:904
 #, c-format
 msgid "%s not responding"
 msgstr ""
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:908
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -13772,84 +13645,84 @@ msgid ""
 "without being prompted for a password."
 msgstr ""
 
-#: standalone/drakbackup:766
+#: standalone/drakbackup:953
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr ""
 
-#: standalone/drakbackup:770
+#: standalone/drakbackup:957
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr ""
 
-#: standalone/drakbackup:791
+#: standalone/drakbackup:978
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr ""
 
-#: standalone/drakbackup:795
+#: standalone/drakbackup:982
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr ""
 
-#: standalone/drakbackup:799
+#: standalone/drakbackup:986
 #, c-format
 msgid "Not erasable media!"
 msgstr ""
 
-#: standalone/drakbackup:840
+#: standalone/drakbackup:1027
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr ""
 
-#: standalone/drakbackup:898
+#: standalone/drakbackup:1103
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr ""
 
-#: standalone/drakbackup:925
+#: standalone/drakbackup:1130
 #, c-format
 msgid "No tape in %s!"
 msgstr ""
 
-#: standalone/drakbackup:1025
+#: standalone/drakbackup:1232
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
 "%d MB used vs %d MB allocated."
 msgstr ""
 
-#: standalone/drakbackup:1044 standalone/drakbackup:1077
+#: standalone/drakbackup:1251 standalone/drakbackup:1307
 #, c-format
 msgid "Backup system files..."
 msgstr ""
 
-#: standalone/drakbackup:1078 standalone/drakbackup:1119
+#: standalone/drakbackup:1308 standalone/drakbackup:1372
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr ""
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1371
 #, c-format
 msgid "Backup User files..."
 msgstr ""
 
-#: standalone/drakbackup:1153
+#: standalone/drakbackup:1427
 #, c-format
 msgid "Backup Other files..."
 msgstr ""
 
-#: standalone/drakbackup:1154
+#: standalone/drakbackup:1428
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr ""
 
-#: standalone/drakbackup:1159
+#: standalone/drakbackup:1433
 #, c-format
 msgid "No changes to backup!"
 msgstr ""
 
-#: standalone/drakbackup:1177 standalone/drakbackup:1201
+#: standalone/drakbackup:1451 standalone/drakbackup:1475
 #, c-format
 msgid ""
 "\n"
@@ -13858,7 +13731,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:1186
+#: standalone/drakbackup:1460
 #, c-format
 msgid ""
 "\n"
@@ -13866,19 +13739,19 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:1187
+#: standalone/drakbackup:1461
 #, c-format
 msgid "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr ""
 
-#: standalone/drakbackup:1189
+#: standalone/drakbackup:1463
 #, c-format
 msgid ""
 "file list sent by FTP: %s\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:1206
+#: standalone/drakbackup:1480
 #, c-format
 msgid ""
 "\n"
@@ -13887,7 +13760,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:1211
+#: standalone/drakbackup:1485
 #, c-format
 msgid ""
 "\n"
@@ -13896,29 +13769,39 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:1220
+#: standalone/drakbackup:1494
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
 
-#: standalone/drakbackup:1221
+#: standalone/drakbackup:1495
 #, c-format
 msgid ""
 " Error while sending mail. \n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:1249
+#: standalone/drakbackup:1524
 #, c-format
 msgid "Can't create catalog!"
 msgstr ""
 
-#: standalone/drakbackup:1455
+#: standalone/drakbackup:1646
+#, c-format
+msgid "Can't create log file!"
+msgstr ""
+
+#: standalone/drakbackup:1663 standalone/drakbackup:1674 standalone/drakfont:584
+#, c-format
+msgid "File Selection"
+msgstr ""
+
+#: standalone/drakbackup:1702
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr ""
 
-#: standalone/drakbackup:1484
+#: standalone/drakbackup:1730
 #, c-format
 msgid ""
 "\n"
@@ -13926,513 +13809,525 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:1485
+#: standalone/drakbackup:1731
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:1486
+#: standalone/drakbackup:1732
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr ""
 
-#: standalone/drakbackup:1487 standalone/drakbackup:1551 standalone/drakbackup:1617
+#: standalone/drakbackup:1733 standalone/drakbackup:1797 standalone/drakbackup:1863
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr ""
 
-#: standalone/drakbackup:1489 standalone/drakbackup:1553 standalone/drakbackup:1619
+#: standalone/drakbackup:1735 standalone/drakbackup:1799 standalone/drakbackup:1865
 #, c-format
 msgid "Use Incremental Backups"
 msgstr ""
 
-#: standalone/drakbackup:1489 standalone/drakbackup:1553 standalone/drakbackup:1619
+#: standalone/drakbackup:1735 standalone/drakbackup:1799 standalone/drakbackup:1865
 #, c-format
 msgid "Use Differential Backups"
 msgstr ""
 
-#: standalone/drakbackup:1491
+#: standalone/drakbackup:1737
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr ""
 
-#: standalone/drakbackup:1492
+#: standalone/drakbackup:1738
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
 msgstr ""
 
-#: standalone/drakbackup:1523
+#: standalone/drakbackup:1769
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 
-#: standalone/drakbackup:1550
+#: standalone/drakbackup:1796
 #, c-format
 msgid "Do not include the browser cache"
 msgstr ""
 
-#: standalone/drakbackup:1605 standalone/drakfont:656
+#: standalone/drakbackup:1851 standalone/drakfont:650
 #, c-format
 msgid "Remove Selected"
 msgstr ""
 
-#: standalone/drakbackup:1668
+#: standalone/drakbackup:1898 standalone/drakbackup:1902
+#, c-format
+msgid "Under Devel ... please wait."
+msgstr ""
+
+#: standalone/drakbackup:1916
+#, c-format
+msgid "Windows (FAT32)"
+msgstr ""
+
+#: standalone/drakbackup:1949
 #, c-format
 msgid "Users"
 msgstr ""
 
-#: standalone/drakbackup:1688
+#: standalone/drakbackup:1968
 #, c-format
 msgid "Use network connection to backup"
 msgstr ""
 
-#: standalone/drakbackup:1690
+#: standalone/drakbackup:1970
 #, c-format
 msgid "Net Method:"
 msgstr ""
 
-#: standalone/drakbackup:1694
+#: standalone/drakbackup:1974
 #, c-format
 msgid "Use Expect for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1695
+#: standalone/drakbackup:1975
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1697
+#: standalone/drakbackup:1977
 #, c-format
 msgid "Transfer Now"
 msgstr ""
 
-#: standalone/drakbackup:1699
+#: standalone/drakbackup:1979
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr ""
 
-#: standalone/drakbackup:1702
+#: standalone/drakbackup:1982
 #, c-format
 msgid "Host name or IP."
 msgstr ""
 
-#: standalone/drakbackup:1707
+#: standalone/drakbackup:1987
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 
-#: standalone/drakbackup:1712
+#: standalone/drakbackup:1992
 #, c-format
 msgid "Login name"
 msgstr ""
 
-#: standalone/drakbackup:1719
+#: standalone/drakbackup:1999
 #, c-format
 msgid "Remember this password"
 msgstr ""
 
-#: standalone/drakbackup:1735
+#: standalone/drakbackup:2011
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr ""
 
-#: standalone/drakbackup:1833
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr ""
 
-#: standalone/drakbackup:1836
+#: standalone/drakbackup:2115
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr ""
 
-#: standalone/drakbackup:1841
+#: standalone/drakbackup:2120
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr ""
 
-#: standalone/drakbackup:1848
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Multisession CD"
 msgstr ""
 
-#: standalone/drakbackup:1850
+#: standalone/drakbackup:2129
 #, c-format
 msgid "CDRW media"
 msgstr ""
 
-#: standalone/drakbackup:1856
+#: standalone/drakbackup:2134
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr ""
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:2135
 #, c-format
 msgid " Erase Now "
 msgstr ""
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:2142
 #, c-format
 msgid "DVD+RW media"
 msgstr ""
 
-#: standalone/drakbackup:1865
+#: standalone/drakbackup:2144
 #, c-format
 msgid "DVD-R media"
 msgstr ""
 
-#: standalone/drakbackup:1867
+#: standalone/drakbackup:2146
 #, c-format
 msgid "DVDRAM device"
 msgstr ""
 
-#: standalone/drakbackup:1898
+#: standalone/drakbackup:2151
+#, c-format
+msgid ""
+"Enter your CD Writer device name\n"
+" ex: 0,1,0"
+msgstr ""
+
+#: standalone/drakbackup:2183
 #, c-format
 msgid "No CD device defined!"
 msgstr ""
 
-#: standalone/drakbackup:1945
+#: standalone/drakbackup:2232
 #, c-format
 msgid "Use tape to backup"
 msgstr ""
 
-#: standalone/drakbackup:1948
+#: standalone/drakbackup:2235
 #, c-format
 msgid "Device name to use for backup"
 msgstr ""
 
-#: standalone/drakbackup:1954
+#: standalone/drakbackup:2242
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr ""
 
-#: standalone/drakbackup:1960
+#: standalone/drakbackup:2248
 #, c-format
 msgid "Erase tape before backup"
 msgstr ""
 
-#: standalone/drakbackup:1966
+#: standalone/drakbackup:2254
 #, c-format
 msgid "Eject tape after the backup"
 msgstr ""
 
-#: standalone/drakbackup:2033
+#: standalone/drakbackup:2321
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr ""
 
-#: standalone/drakbackup:2037
-#, c-format
-msgid "Directory to save to"
-msgstr ""
-
-#: standalone/drakbackup:2042
+#: standalone/drakbackup:2330
 #, c-format
 msgid ""
 "Maximum size\n"
 " allowed for Drakbackup (MB)"
 msgstr ""
 
-#: standalone/drakbackup:2106
+#: standalone/drakbackup:2402
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr ""
 
-#: standalone/drakbackup:2111
+#: standalone/drakbackup:2407
 #, c-format
 msgid "HardDrive / NFS"
 msgstr ""
 
-#: standalone/drakbackup:2127 standalone/drakbackup:2132 standalone/drakbackup:2137
+#: standalone/drakbackup:2423 standalone/drakbackup:2428 standalone/drakbackup:2433
 #, c-format
 msgid "hourly"
 msgstr ""
 
-#: standalone/drakbackup:2128 standalone/drakbackup:2133 standalone/drakbackup:2137
+#: standalone/drakbackup:2424 standalone/drakbackup:2429 standalone/drakbackup:2433
 #, c-format
 msgid "daily"
 msgstr ""
 
-#: standalone/drakbackup:2129 standalone/drakbackup:2134 standalone/drakbackup:2137
+#: standalone/drakbackup:2425 standalone/drakbackup:2430 standalone/drakbackup:2433
 #, c-format
 msgid "weekly"
 msgstr ""
 
-#: standalone/drakbackup:2130 standalone/drakbackup:2135 standalone/drakbackup:2137
+#: standalone/drakbackup:2426 standalone/drakbackup:2431 standalone/drakbackup:2433
 #, c-format
 msgid "monthly"
 msgstr ""
 
-#: standalone/drakbackup:2131 standalone/drakbackup:2136 standalone/drakbackup:2137
+#: standalone/drakbackup:2427 standalone/drakbackup:2432 standalone/drakbackup:2433
 #, c-format
 msgid "custom"
 msgstr ""
 
-#: standalone/drakbackup:2142
+#: standalone/drakbackup:2438
 #, c-format
 msgid "January"
 msgstr ""
 
-#: standalone/drakbackup:2142
+#: standalone/drakbackup:2438
 #, c-format
 msgid "February"
 msgstr ""
 
-#: standalone/drakbackup:2142
+#: standalone/drakbackup:2438
 #, c-format
 msgid "March"
 msgstr ""
 
-#: standalone/drakbackup:2143
+#: standalone/drakbackup:2439
 #, c-format
 msgid "April"
 msgstr ""
 
-#: standalone/drakbackup:2143
+#: standalone/drakbackup:2439
 #, c-format
 msgid "May"
 msgstr ""
 
-#: standalone/drakbackup:2143
+#: standalone/drakbackup:2439
 #, c-format
 msgid "June"
 msgstr ""
 
-#: standalone/drakbackup:2143
+#: standalone/drakbackup:2439
 #, c-format
 msgid "July"
 msgstr ""
 
-#: standalone/drakbackup:2143
+#: standalone/drakbackup:2439
 #, c-format
 msgid "August"
 msgstr ""
 
-#: standalone/drakbackup:2143
+#: standalone/drakbackup:2439
 #, c-format
 msgid "September"
 msgstr ""
 
-#: standalone/drakbackup:2144
+#: standalone/drakbackup:2440
 #, c-format
 msgid "October"
 msgstr ""
 
-#: standalone/drakbackup:2144
+#: standalone/drakbackup:2440
 #, c-format
 msgid "November"
 msgstr ""
 
-#: standalone/drakbackup:2144
+#: standalone/drakbackup:2440
 #, c-format
 msgid "December"
 msgstr ""
 
-#: standalone/drakbackup:2149
+#: standalone/drakbackup:2445
 #, c-format
 msgid "Sunday"
 msgstr ""
 
-#: standalone/drakbackup:2149
+#: standalone/drakbackup:2445
 #, c-format
 msgid "Monday"
 msgstr ""
 
-#: standalone/drakbackup:2149
+#: standalone/drakbackup:2445
 #, c-format
 msgid "Tuesday"
 msgstr ""
 
-#: standalone/drakbackup:2150
+#: standalone/drakbackup:2446
 #, c-format
 msgid "Wednesday"
 msgstr ""
 
-#: standalone/drakbackup:2150
+#: standalone/drakbackup:2446
 #, c-format
 msgid "Thursday"
 msgstr ""
 
-#: standalone/drakbackup:2150
+#: standalone/drakbackup:2446
 #, c-format
 msgid "Friday"
 msgstr ""
 
-#: standalone/drakbackup:2150
+#: standalone/drakbackup:2446
 #, c-format
 msgid "Saturday"
 msgstr ""
 
-#: standalone/drakbackup:2185
+#: standalone/drakbackup:2481
 #, c-format
 msgid "Use daemon"
 msgstr ""
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2486
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr ""
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2492
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr ""
 
-#: standalone/drakbackup:2201
+#: standalone/drakbackup:2497
 #, c-format
 msgid "Minute"
 msgstr ""
 
-#: standalone/drakbackup:2205
+#: standalone/drakbackup:2501
 #, c-format
 msgid "Hour"
 msgstr ""
 
-#: standalone/drakbackup:2209
+#: standalone/drakbackup:2505
 #, c-format
 msgid "Day"
 msgstr ""
 
-#: standalone/drakbackup:2213
+#: standalone/drakbackup:2509
 #, c-format
 msgid "Month"
 msgstr ""
 
-#: standalone/drakbackup:2217
+#: standalone/drakbackup:2513
 #, c-format
 msgid "Weekday"
 msgstr ""
 
-#: standalone/drakbackup:2223
+#: standalone/drakbackup:2519
 #, c-format
 msgid "Please choose the media for backup."
 msgstr ""
 
-#: standalone/drakbackup:2230
+#: standalone/drakbackup:2526
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr ""
 
-#: standalone/drakbackup:2231
+#: standalone/drakbackup:2527
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 
-#: standalone/drakbackup:2281
+#: standalone/drakbackup:2574
 #, c-format
-msgid "Please choose the compression type"
+msgid "Use tar and bzip2 (rather than tar and gzip)"
 msgstr ""
 
-#: standalone/drakbackup:2285
+#: standalone/drakbackup:2575
 #, c-format
 msgid "Use .backupignore files"
 msgstr ""
 
-#: standalone/drakbackup:2287
+#: standalone/drakbackup:2577
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr ""
 
-#: standalone/drakbackup:2293
+#: standalone/drakbackup:2583
 #, c-format
 msgid "SMTP server for mail:"
 msgstr ""
 
-#: standalone/drakbackup:2298
+#: standalone/drakbackup:2588
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 
-#: standalone/drakbackup:2338
+#: standalone/drakbackup:2627
 #, c-format
 msgid "What"
 msgstr ""
 
-#: standalone/drakbackup:2343
+#: standalone/drakbackup:2632
 #, c-format
 msgid "Where"
 msgstr ""
 
-#: standalone/drakbackup:2348
+#: standalone/drakbackup:2637
 #, c-format
 msgid "When"
 msgstr ""
 
-#: standalone/drakbackup:2353
+#: standalone/drakbackup:2642
 #, c-format
 msgid "More Options"
 msgstr ""
 
-#: standalone/drakbackup:2366
-#, c-format
-msgid "Backup destination not configured..."
-msgstr ""
-
-#: standalone/drakbackup:2385 standalone/drakbackup:4413
+#: standalone/drakbackup:2663 standalone/drakbackup:4735
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr ""
 
-#: standalone/drakbackup:2402
+#: standalone/drakbackup:2680
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr ""
 
-#: standalone/drakbackup:2404
+#: standalone/drakbackup:2682
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr ""
 
-#: standalone/drakbackup:2412
+#: standalone/drakbackup:2692
 #, c-format
 msgid "Across Network"
 msgstr ""
 
-#: standalone/drakbackup:2420
+#: standalone/drakbackup:2702
 #, c-format
 msgid "On CD-R"
 msgstr ""
 
-#: standalone/drakbackup:2428
+#: standalone/drakbackup:2712
 #, c-format
 msgid "On Tape Device"
 msgstr ""
 
-#: standalone/drakbackup:2468
+#: standalone/drakbackup:2742
+#, c-format
+msgid "Please select media for backup..."
+msgstr ""
+
+#: standalone/drakbackup:2764
 #, c-format
 msgid "Backup Users"
 msgstr ""
 
-#: standalone/drakbackup:2469
+#: standalone/drakbackup:2765
 #, c-format
 msgid " (Default is all users)"
 msgstr ""
 
-#: standalone/drakbackup:2481
+#: standalone/drakbackup:2777
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr ""
 
-#: standalone/drakbackup:2482
+#: standalone/drakbackup:2778
 #, c-format
 msgid "Backup System"
 msgstr ""
 
-#: standalone/drakbackup:2484
+#: standalone/drakbackup:2780
 #, c-format
 msgid "Select user manually"
 msgstr ""
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2809
 #, c-format
 msgid "Please select data to backup..."
 msgstr ""
 
-#: standalone/drakbackup:2585
+#: standalone/drakbackup:2883
 #, c-format
 msgid ""
 "\n"
@@ -14440,7 +14335,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2586
+#: standalone/drakbackup:2884
 #, c-format
 msgid ""
 "\n"
@@ -14448,7 +14343,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2588
+#: standalone/drakbackup:2886
 #, c-format
 msgid ""
 "\n"
@@ -14456,7 +14351,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2590
+#: standalone/drakbackup:2888
 #, c-format
 msgid ""
 "\n"
@@ -14464,7 +14359,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2592
+#: standalone/drakbackup:2890
 #, c-format
 msgid ""
 "\n"
@@ -14472,14 +14367,14 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2593
+#: standalone/drakbackup:2891
 #, c-format
 msgid ""
 "\tLimit disk usage to %s MB\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2596
+#: standalone/drakbackup:2894
 #, c-format
 msgid ""
 "\n"
@@ -14487,51 +14382,51 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2600
+#: standalone/drakbackup:2898
 #, c-format
 msgid "NO"
 msgstr ""
 
-#: standalone/drakbackup:2601
+#: standalone/drakbackup:2899
 #, c-format
 msgid "YES"
 msgstr ""
 
-#: standalone/drakbackup:2602
+#: standalone/drakbackup:2900
 #, c-format
 msgid ""
 "\n"
 "- Burn to CD"
 msgstr ""
 
-#: standalone/drakbackup:2603
+#: standalone/drakbackup:2901
 #, c-format
 msgid "RW"
 msgstr ""
 
-#: standalone/drakbackup:2604
+#: standalone/drakbackup:2902
 #, c-format
 msgid " on device: %s"
 msgstr ""
 
-#: standalone/drakbackup:2605
+#: standalone/drakbackup:2903
 #, c-format
 msgid " (multi-session)"
 msgstr ""
 
-#: standalone/drakbackup:2606
+#: standalone/drakbackup:2904
 #, c-format
 msgid ""
 "\n"
 "- Save to Tape on device: %s"
 msgstr ""
 
-#: standalone/drakbackup:2607
+#: standalone/drakbackup:2905
 #, c-format
 msgid "\t\tErase=%s"
 msgstr ""
 
-#: standalone/drakbackup:2610
+#: standalone/drakbackup:2908
 #, c-format
 msgid ""
 "\n"
@@ -14539,7 +14434,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2611
+#: standalone/drakbackup:2909
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -14547,7 +14442,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2612
+#: standalone/drakbackup:2910
 #, c-format
 msgid ""
 "\n"
@@ -14555,56 +14450,49 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2613
+#: standalone/drakbackup:2911
 #, c-format
 msgid ""
 "\tDo not include System Files\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2615
+#: standalone/drakbackup:2914
 #, c-format
 msgid ""
 "\tBackups use tar and bzip2\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2616
+#: standalone/drakbackup:2916
 #, c-format
 msgid ""
 "\tBackups use tar and gzip\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2617
-#, c-format
-msgid ""
-"\tBackups use tar only\n"
-""
-msgstr ""
-
-#: standalone/drakbackup:2619
+#: standalone/drakbackup:2919
 #, c-format
 msgid ""
 "\tUse .backupignore files\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2620
+#: standalone/drakbackup:2920
 #, c-format
 msgid ""
 "\tSend mail to %s\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2621
+#: standalone/drakbackup:2921
 #, c-format
 msgid ""
 "\tUsing SMTP server %s\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2623
+#: standalone/drakbackup:2923
 #, c-format
 msgid ""
 "\n"
@@ -14612,63 +14500,63 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2624
+#: standalone/drakbackup:2924
 #, c-format
 msgid ""
 "\t-Hard drive.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2625
+#: standalone/drakbackup:2925
 #, c-format
 msgid ""
 "\t-CD-R.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2626
+#: standalone/drakbackup:2926
 #, c-format
 msgid ""
 "\t-Tape \n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2627
+#: standalone/drakbackup:2927
 #, c-format
 msgid ""
 "\t-Network by FTP.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2628
+#: standalone/drakbackup:2928
 #, c-format
 msgid ""
 "\t-Network by SSH.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2629
+#: standalone/drakbackup:2929
 #, c-format
 msgid ""
 "\t-Network by rsync.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2630
+#: standalone/drakbackup:2930
 #, c-format
 msgid ""
 "\t-Network by webdav.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2632
+#: standalone/drakbackup:2932
 #, c-format
 msgid ""
 "No configuration, please click Wizard or Advanced.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2637
+#: standalone/drakbackup:2937
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -14676,35 +14564,35 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2639
+#: standalone/drakbackup:2939
 #, c-format
 msgid ""
 "- Restore System Files.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2641 standalone/drakbackup:2651
+#: standalone/drakbackup:2941 standalone/drakbackup:2951
 #, c-format
 msgid ""
 "   - from date: %s %s\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2644
+#: standalone/drakbackup:2944
 #, c-format
 msgid ""
 "- Restore User Files: \n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2649
+#: standalone/drakbackup:2949
 #, c-format
 msgid ""
 "- Restore Other Files: \n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2830
+#: standalone/drakbackup:3125
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -14712,490 +14600,482 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2832
+#: standalone/drakbackup:3127
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr ""
 
-#: standalone/drakbackup:2842
+#: standalone/drakbackup:3137
 #, c-format
 msgid "Backup files are corrupted"
 msgstr ""
 
-#: standalone/drakbackup:2863
+#: standalone/drakbackup:3158
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr ""
 
-#: standalone/drakbackup:2864
+#: standalone/drakbackup:3159
 #, c-format
 msgid "          Successfuly Restored on %s       "
 msgstr ""
 
-#: standalone/drakbackup:2987
+#: standalone/drakbackup:3274
 #, c-format
 msgid "         Restore Configuration       "
 msgstr ""
 
-#: standalone/drakbackup:3015
+#: standalone/drakbackup:3302
 #, c-format
 msgid "OK to restore the other files."
 msgstr ""
 
-#: standalone/drakbackup:3031
+#: standalone/drakbackup:3320
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 
-#: standalone/drakbackup:3098
+#: standalone/drakbackup:3386
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr ""
 
-#: standalone/drakbackup:3135
+#: standalone/drakbackup:3424
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr ""
 
-#: standalone/drakbackup:3137
+#: standalone/drakbackup:3426
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr ""
 
-#: standalone/drakbackup:3141
-#, c-format
-msgid "Directory with backups"
-msgstr ""
-
-#: standalone/drakbackup:3194
+#: standalone/drakbackup:3482
 #, c-format
 msgid "Select another media to restore from"
 msgstr ""
 
-#: standalone/drakbackup:3196
+#: standalone/drakbackup:3484
 #, c-format
 msgid "Other Media"
 msgstr ""
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3489
 #, c-format
 msgid "Restore system"
 msgstr ""
 
-#: standalone/drakbackup:3202
+#: standalone/drakbackup:3490
 #, c-format
 msgid "Restore Users"
 msgstr ""
 
-#: standalone/drakbackup:3203
+#: standalone/drakbackup:3491
 #, c-format
 msgid "Restore Other"
 msgstr ""
 
-#: standalone/drakbackup:3205
-#, c-format
-msgid "Select path to restore (instead of /)"
-msgstr ""
-
-#: standalone/drakbackup:3209 standalone/drakbackup:3490
+#: standalone/drakbackup:3493
 #, c-format
-msgid "Path To Restore To"
+msgid "select path to restore (instead of /)"
 msgstr ""
 
-#: standalone/drakbackup:3212
+#: standalone/drakbackup:3497
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 
-#: standalone/drakbackup:3214
+#: standalone/drakbackup:3499
 #, c-format
 msgid "Remove user directories before restore."
 msgstr ""
 
-#: standalone/drakbackup:3298
+#: standalone/drakbackup:3579
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 
-#: standalone/drakbackup:3301
+#: standalone/drakbackup:3582
 #, c-format
 msgid "Search Backups"
 msgstr ""
 
-#: standalone/drakbackup:3320
+#: standalone/drakbackup:3601
 #, c-format
 msgid "No matches found..."
 msgstr ""
 
-#: standalone/drakbackup:3324
+#: standalone/drakbackup:3605
 #, c-format
 msgid "Restore Selected"
 msgstr ""
 
-#: standalone/drakbackup:3458
+#: standalone/drakbackup:3739
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3464
+#: standalone/drakbackup:3745
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
 
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3754
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Files"
 msgstr ""
 
-#: standalone/drakbackup:3550
+#: standalone/drakbackup:3770
+#, c-format
+msgid ""
+"Change\n"
+"Restore Path"
+msgstr ""
+
+#: standalone/drakbackup:3837
 #, c-format
 msgid "Backup files not found at %s."
 msgstr ""
 
-#: standalone/drakbackup:3563
+#: standalone/drakbackup:3850
 #, c-format
 msgid "Restore From CD"
 msgstr ""
 
-#: standalone/drakbackup:3563
+#: standalone/drakbackup:3850
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
 " in the CD drive under mount point /mnt/cdrom"
 msgstr ""
 
-#: standalone/drakbackup:3565
+#: standalone/drakbackup:3852
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3575
+#: standalone/drakbackup:3862
 #, c-format
 msgid "Restore From Tape"
 msgstr ""
 
-#: standalone/drakbackup:3575
+#: standalone/drakbackup:3862
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr ""
 
-#: standalone/drakbackup:3577
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3588
+#: standalone/drakbackup:3875
 #, c-format
 msgid "Restore Via Network"
 msgstr ""
 
-#: standalone/drakbackup:3588
+#: standalone/drakbackup:3875
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr ""
 
-#: standalone/drakbackup:3589
+#: standalone/drakbackup:3876
 #, c-format
 msgid "Host Name"
 msgstr ""
 
-#: standalone/drakbackup:3590
+#: standalone/drakbackup:3877
 #, c-format
 msgid "Host Path or Module"
 msgstr ""
 
-#: standalone/drakbackup:3597
+#: standalone/drakbackup:3884
 #, c-format
 msgid "Password required"
 msgstr ""
 
-#: standalone/drakbackup:3603
+#: standalone/drakbackup:3890
 #, c-format
 msgid "Username required"
 msgstr ""
 
-#: standalone/drakbackup:3606
+#: standalone/drakbackup:3893
 #, c-format
 msgid "Hostname required"
 msgstr ""
 
-#: standalone/drakbackup:3611
+#: standalone/drakbackup:3898
 #, c-format
 msgid "Path or Module required"
 msgstr ""
 
-#: standalone/drakbackup:3624
+#: standalone/drakbackup:3911
 #, c-format
 msgid "Files Restored..."
 msgstr ""
 
-#: standalone/drakbackup:3627
+#: standalone/drakbackup:3914
 #, c-format
 msgid "Restore Failed..."
 msgstr ""
 
-#: standalone/drakbackup:3737 standalone/drakbackup:3754
+#: standalone/drakbackup:4019 standalone/drakbackup:4035
 #, c-format
 msgid "%s not retrieved..."
 msgstr ""
 
-#: standalone/drakbackup:3880 standalone/drakbackup:3953
+#: standalone/drakbackup:4159 standalone/drakbackup:4232
 #, c-format
 msgid "Search for files to restore"
 msgstr ""
 
-#: standalone/drakbackup:3885
+#: standalone/drakbackup:4164
 #, c-format
 msgid "Restore all backups"
 msgstr ""
 
-#: standalone/drakbackup:3894
+#: standalone/drakbackup:4173
 #, c-format
 msgid "Custom Restore"
 msgstr ""
 
-#: standalone/drakbackup:3899 standalone/drakbackup:3949
+#: standalone/drakbackup:4178 standalone/drakbackup:4228
 #, c-format
 msgid "Restore From Catalog"
 msgstr ""
 
-#: standalone/drakbackup:3921
+#: standalone/drakbackup:4200
 #, c-format
 msgid ""
 "Unable to find backups to restore...\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:3922
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr ""
 
-#: standalone/drakbackup:3923
+#: standalone/drakbackup:4202
 #, c-format
 msgid " and the CD is in the drive"
 msgstr ""
 
-#: standalone/drakbackup:3925
+#: standalone/drakbackup:4204
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 
-#: standalone/drakbackup:3941
+#: standalone/drakbackup:4220
 #, c-format
 msgid "CD in place - continue."
 msgstr ""
 
-#: standalone/drakbackup:3946
+#: standalone/drakbackup:4225
 #, c-format
 msgid "Browse to new restore repository."
 msgstr ""
 
-#: standalone/drakbackup:3947
-#, c-format
-msgid "Directory To Restore From"
-msgstr ""
-
-#: standalone/drakbackup:3986
+#: standalone/drakbackup:4262
 #, c-format
 msgid "Restore Progress"
 msgstr ""
 
-#: standalone/drakbackup:4016 standalone/drakbackup:4123 standalone/logdrake:174
+#: standalone/drakbackup:4296 standalone/drakbackup:4408 standalone/logdrake:175
 #, c-format
 msgid "Save"
 msgstr ""
 
-#: standalone/drakbackup:4099
+#: standalone/drakbackup:4382
 #, c-format
 msgid "Build Backup"
 msgstr ""
 
-#: standalone/drakbackup:4147 standalone/drakbackup:4512
+#: standalone/drakbackup:4434 standalone/drakbackup:4833
 #, c-format
 msgid "Restore"
 msgstr ""
 
-#: standalone/drakbackup:4277
+#: standalone/drakbackup:4604
 #, c-format
 msgid ""
 "The following packages need to be installed:\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4626
 #, c-format
 msgid "Please select data to restore..."
 msgstr ""
 
-#: standalone/drakbackup:4344
+#: standalone/drakbackup:4666
 #, c-format
 msgid "Backup system files"
 msgstr ""
 
-#: standalone/drakbackup:4347
+#: standalone/drakbackup:4669
 #, c-format
 msgid "Backup user files"
 msgstr ""
 
-#: standalone/drakbackup:4350
+#: standalone/drakbackup:4672
 #, c-format
 msgid "Backup other files"
 msgstr ""
 
-#: standalone/drakbackup:4353 standalone/drakbackup:4389
+#: standalone/drakbackup:4675 standalone/drakbackup:4711
 #, c-format
 msgid "Total Progress"
 msgstr ""
 
-#: standalone/drakbackup:4381
+#: standalone/drakbackup:4703
 #, c-format
 msgid "Sending files by FTP"
 msgstr ""
 
-#: standalone/drakbackup:4384
+#: standalone/drakbackup:4706
 #, c-format
 msgid "Sending files..."
 msgstr ""
 
-#: standalone/drakbackup:4455
+#: standalone/drakbackup:4776
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr ""
 
-#: standalone/drakbackup:4460
+#: standalone/drakbackup:4781
 #, c-format
 msgid "View Backup Configuration."
 msgstr ""
 
-#: standalone/drakbackup:4486
+#: standalone/drakbackup:4807
 #, c-format
 msgid "Wizard Configuration"
 msgstr ""
 
-#: standalone/drakbackup:4491
+#: standalone/drakbackup:4812
 #, c-format
 msgid "Advanced Configuration"
 msgstr ""
 
-#: standalone/drakbackup:4496
+#: standalone/drakbackup:4817
 #, c-format
 msgid "View Configuration"
 msgstr ""
 
-#: standalone/drakbackup:4500
+#: standalone/drakbackup:4821
 #, c-format
 msgid "View Last Log"
 msgstr ""
 
-#: standalone/drakbackup:4505
+#: standalone/drakbackup:4826
 #, c-format
 msgid "Backup Now"
 msgstr ""
 
-#: standalone/drakbackup:4509
+#: standalone/drakbackup:4830
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
 
-#: standalone/drakbackup:4530 standalone/drakbackup:4533
+#: standalone/drakbackup:4862 standalone/drakbackup:4869
 #, c-format
 msgid "Drakbackup"
 msgstr ""
 
-#: standalone/drakboot:57
+#: standalone/drakboot:56
 #, c-format
 msgid "Graphical boot theme selection"
 msgstr ""
 
-#: standalone/drakboot:57
+#: standalone/drakboot:56
 #, c-format
 msgid "System mode"
 msgstr ""
 
-#: standalone/drakboot:67 standalone/drakfloppy:46 standalone/harddrake2:97 standalone/harddrake2:98 standalone/logdrake:71 standalone/printerdrake:150 standalone/printerdrake:151 standalone/printerdrake:152
+#: standalone/drakboot:66 standalone/drakfloppy:46 standalone/harddrake2:97 standalone/harddrake2:98 standalone/logdrake:70 standalone/printerdrake:150 standalone/printerdrake:151 standalone/printerdrake:152
 #, c-format
 msgid "/_File"
 msgstr ""
 
-#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr ""
 
-#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/harddrake2:98 standalone/logdrake:77 standalone/printerdrake:152
+#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/harddrake2:98 standalone/logdrake:76 standalone/printerdrake:152
 #, c-format
 msgid "<control>Q"
 msgstr ""
 
-#: standalone/drakboot:119
+#: standalone/drakboot:118
 #, c-format
 msgid "Install themes"
 msgstr ""
 
-#: standalone/drakboot:120
+#: standalone/drakboot:119
 #, c-format
 msgid "Create new theme"
 msgstr ""
 
-#: standalone/drakboot:134
+#: standalone/drakboot:133
 #, c-format
 msgid "Use graphical boot"
 msgstr ""
 
-#: standalone/drakboot:139
+#: standalone/drakboot:138
 #, c-format
 msgid "Your system bootloader is not in framebuffer mode. To activate graphical boot, select a graphic video mode from the bootloader configuration tool."
 msgstr ""
 
-#: standalone/drakboot:146
+#: standalone/drakboot:145
 #, c-format
 msgid "Theme"
 msgstr ""
 
-#: standalone/drakboot:149
+#: standalone/drakboot:147
 #, c-format
 msgid ""
 "Display theme\n"
 "under console"
 msgstr ""
 
-#: standalone/drakboot:158
+#: standalone/drakboot:156
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr ""
 
-#: standalone/drakboot:166
+#: standalone/drakboot:164
 #, c-format
-msgid "No, I don't want autologin"
+msgid "Yes, I want autologin with this (user, desktop)"
 msgstr ""
 
-#: standalone/drakboot:167
+#: standalone/drakboot:165
 #, c-format
-msgid "Yes, I want autologin with this (user, desktop)"
+msgid "No, I don't want autologin"
 msgstr ""
 
-#: standalone/drakboot:173
+#: standalone/drakboot:171
 #, c-format
 msgid "Default user"
 msgstr ""
 
-#: standalone/drakboot:174
+#: standalone/drakboot:172
 #, c-format
 msgid "Default desktop"
 msgstr ""
 
-#: standalone/drakboot:238
+#: standalone/drakboot:236
 #, c-format
 msgid "Installation of %s failed. The following error occured:"
 msgstr ""
@@ -15435,12 +15315,12 @@ msgstr ""
 msgid "Server:"
 msgstr ""
 
-#: standalone/drakclock:129 standalone/drakclock:141
+#: standalone/drakclock:125 standalone/drakclock:137
 #, c-format
 msgid "Reset"
 msgstr ""
 
-#: standalone/drakclock:204
+#: standalone/drakclock:200
 #, c-format
 msgid ""
 "We need to install ntp package\n"
@@ -15449,192 +15329,204 @@ msgid ""
 "Do you want to install ntp ?"
 msgstr ""
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:77
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr ""
 
-#: standalone/drakconnect:92 standalone/drakconnect:728
+#: standalone/drakconnect:88 standalone/drakconnect:678
 #, c-format
 msgid "Gateway:"
 msgstr ""
 
-#: standalone/drakconnect:92 standalone/drakconnect:728
+#: standalone/drakconnect:88 standalone/drakconnect:678
 #, c-format
 msgid "Interface:"
 msgstr ""
 
-#: standalone/drakconnect:96 standalone/net_monitor:105
+#: standalone/drakconnect:92 standalone/net_monitor:105
 #, c-format
 msgid "Wait please"
 msgstr ""
 
-#: standalone/drakconnect:116
+#: standalone/drakconnect:112
 #, c-format
 msgid "Interface"
 msgstr ""
 
-#: standalone/drakconnect:116 standalone/drakups:233
+#: standalone/drakconnect:112 standalone/drakconnect:497 standalone/drakvpn:547 standalone/drakvpn:656
+#, c-format
+msgid "Protocol"
+msgstr ""
+
+#: standalone/drakconnect:112
 #, c-format
 msgid "Driver"
 msgstr ""
 
-#: standalone/drakconnect:116
+#: standalone/drakconnect:112
 #, c-format
 msgid "State"
 msgstr ""
 
-#: standalone/drakconnect:133
+#: standalone/drakconnect:129
 #, c-format
 msgid "Hostname: "
 msgstr ""
 
-#: standalone/drakconnect:135
+#: standalone/drakconnect:131
 #, c-format
 msgid "Configure hostname..."
 msgstr ""
 
-#: standalone/drakconnect:149 standalone/drakconnect:769
+#: standalone/drakconnect:145 standalone/drakconnect:719
 #, c-format
 msgid "LAN configuration"
 msgstr ""
 
-#: standalone/drakconnect:154
+#: standalone/drakconnect:150
 #, c-format
 msgid "Configure Local Area Network..."
 msgstr ""
 
-#: standalone/drakconnect:162 standalone/drakconnect:237 standalone/drakconnect:241
+#: standalone/drakconnect:158 standalone/drakconnect:227 standalone/drakconnect:231
 #, c-format
 msgid "Apply"
 msgstr ""
 
-#: standalone/drakconnect:197
-#, c-format
-msgid "Manage connections"
-msgstr ""
-
-#: standalone/drakconnect:263 standalone/drakconnect:272 standalone/drakconnect:292 standalone/drakconnect:298 standalone/drakconnect:308 standalone/drakconnect:309 standalone/drakconnect:576
+#: standalone/drakconnect:253 standalone/drakconnect:258 standalone/drakconnect:272 standalone/drakconnect:278 standalone/drakconnect:288 standalone/drakconnect:289 standalone/drakconnect:535
 #, c-format
 msgid "TCP/IP"
 msgstr ""
 
-#: standalone/drakconnect:263 standalone/drakconnect:272 standalone/drakconnect:292 standalone/drakconnect:444 standalone/drakconnect:448 standalone/drakconnect:576
+#: standalone/drakconnect:253 standalone/drakconnect:258 standalone/drakconnect:272 standalone/drakconnect:416 standalone/drakconnect:420 standalone/drakconnect:535
 #, c-format
 msgid "Account"
 msgstr ""
 
-#: standalone/drakconnect:298 standalone/drakconnect:370 standalone/drakconnect:371 standalone/drakconnect:576
+#: standalone/drakconnect:278 standalone/drakconnect:342 standalone/drakconnect:343 standalone/drakconnect:535
 #, c-format
 msgid "Wireless"
 msgstr ""
 
-#: standalone/drakconnect:344
+#: standalone/drakconnect:320
 #, c-format
 msgid "DNS servers"
 msgstr ""
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:327
 #, c-format
 msgid "Search Domain"
 msgstr ""
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:333
 #, c-format
 msgid "static"
 msgstr ""
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:333
 #, c-format
-msgid "DHCP"
+msgid "dhcp"
 msgstr ""
 
-#: standalone/drakconnect:482
+#: standalone/drakconnect:452
 #, c-format
 msgid "Flow control"
 msgstr ""
 
-#: standalone/drakconnect:483
+#: standalone/drakconnect:453
 #, c-format
 msgid "Line termination"
 msgstr ""
 
-#: standalone/drakconnect:493
+#: standalone/drakconnect:458
+#, c-format
+msgid "Tone dialing"
+msgstr ""
+
+#: standalone/drakconnect:458
+#, c-format
+msgid "Pulse dialing"
+msgstr ""
+
+#: standalone/drakconnect:463
 #, c-format
 msgid "Use lock file"
 msgstr ""
 
-#: standalone/drakconnect:496
+#: standalone/drakconnect:466
 #, c-format
 msgid "Modem timeout"
 msgstr ""
 
-#: standalone/drakconnect:500
+#: standalone/drakconnect:470
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr ""
 
-#: standalone/drakconnect:503
+#: standalone/drakconnect:473
 #, c-format
 msgid "Busy wait"
 msgstr ""
 
-#: standalone/drakconnect:507
+#: standalone/drakconnect:477
 #, c-format
 msgid "Modem sound"
 msgstr ""
 
-#: standalone/drakconnect:508
+#: standalone/drakconnect:478
 #, c-format
 msgid "Enable"
 msgstr ""
 
-#: standalone/drakconnect:508
+#: standalone/drakconnect:478
 #, c-format
 msgid "Disable"
 msgstr ""
 
-#: standalone/drakconnect:558 standalone/harddrake2:58
+#: standalone/drakconnect:517 standalone/harddrake2:58
 #, c-format
 msgid "Media class"
 msgstr ""
 
-#: standalone/drakconnect:559 standalone/drakfloppy:140
+#: standalone/drakconnect:518 standalone/drakfloppy:140
 #, c-format
 msgid "Module name"
 msgstr ""
 
-#: standalone/drakconnect:560
+#: standalone/drakconnect:519
 #, c-format
 msgid "Mac Address"
 msgstr ""
 
-#: standalone/drakconnect:561 standalone/harddrake2:21
+#: standalone/drakconnect:520 standalone/harddrake2:21
 #, c-format
 msgid "Bus"
 msgstr ""
 
-#: standalone/drakconnect:562 standalone/harddrake2:29
+#: standalone/drakconnect:521 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr ""
 
-#: standalone/drakconnect:632 standalone/drakgw:248 standalone/drakpxe:138
+#: standalone/drakconnect:581
 #, c-format
-msgid "No ethernet network adapter has been detected on your system. Please run the hardware configuration tool."
+msgid ""
+"An unexpected error has happened:\n"
+"%s"
 msgstr ""
 
-#: standalone/drakconnect:638
+#: standalone/drakconnect:591
 #, c-format
 msgid "Remove a network interface"
 msgstr ""
 
-#: standalone/drakconnect:642
+#: standalone/drakconnect:595
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr ""
 
-#: standalone/drakconnect:656
+#: standalone/drakconnect:611
 #, c-format
 msgid ""
 "An error occured while deleting the \"%s\" network interface:\n"
@@ -15642,133 +15534,148 @@ msgid ""
 "%s"
 msgstr ""
 
-#: standalone/drakconnect:658
+#: standalone/drakconnect:613
 #, c-format
 msgid "Congratulations, the \"%s\" network interface has been succesfully deleted"
 msgstr ""
 
-#: standalone/drakconnect:675
+#: standalone/drakconnect:630
 #, c-format
 msgid "No Ip"
 msgstr ""
 
-#: standalone/drakconnect:676
+#: standalone/drakconnect:631
 #, c-format
 msgid "No Mask"
 msgstr ""
 
-#: standalone/drakconnect:677 standalone/drakconnect:840
+#: standalone/drakconnect:632 standalone/drakconnect:790
 #, c-format
 msgid "up"
 msgstr ""
 
-#: standalone/drakconnect:677 standalone/drakconnect:840
+#: standalone/drakconnect:632 standalone/drakconnect:790
 #, c-format
 msgid "down"
 msgstr ""
 
-#: standalone/drakconnect:718 standalone/net_monitor:415
+#: standalone/drakconnect:669 standalone/net_monitor:415
 #, c-format
 msgid "Connected"
 msgstr ""
 
-#: standalone/drakconnect:718 standalone/net_monitor:415
+#: standalone/drakconnect:669 standalone/net_monitor:415
 #, c-format
 msgid "Not connected"
 msgstr ""
 
-#: standalone/drakconnect:720
+#: standalone/drakconnect:670
 #, c-format
 msgid "Disconnect..."
 msgstr ""
 
-#: standalone/drakconnect:720
+#: standalone/drakconnect:670
 #, c-format
 msgid "Connect..."
 msgstr ""
 
-#: standalone/drakconnect:749
+#: standalone/drakconnect:699
 #, c-format
 msgid "Warning, another Internet connection has been detected, maybe using your network"
 msgstr ""
 
-#: standalone/drakconnect:765
+#: standalone/drakconnect:715
 #, c-format
 msgid "Deactivate now"
 msgstr ""
 
-#: standalone/drakconnect:765
+#: standalone/drakconnect:715
 #, c-format
 msgid "Activate now"
 msgstr ""
 
-#: standalone/drakconnect:773
+#: standalone/drakconnect:723
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: standalone/drakconnect:787
+#: standalone/drakconnect:737
 #, c-format
 msgid "LAN Configuration"
 msgstr ""
 
-#: standalone/drakconnect:799
+#: standalone/drakconnect:749
 #, c-format
 msgid "Adapter %s: %s"
 msgstr ""
 
-#: standalone/drakconnect:808
+#: standalone/drakconnect:758
 #, c-format
 msgid "Boot Protocol"
 msgstr ""
 
-#: standalone/drakconnect:809
+#: standalone/drakconnect:759
 #, c-format
 msgid "Started on boot"
 msgstr ""
 
-#: standalone/drakconnect:845
+#: standalone/drakconnect:795
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
 "Run the \"Add an interface\" assistant from the Mandrake Control Center"
 msgstr ""
 
-#: standalone/drakconnect:900
+#: standalone/drakconnect:850
 #, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
 "Please run \"Internet access\" in control center."
 msgstr ""
 
-#: standalone/drakconnect:908
+#: standalone/drakconnect:858
 #, c-format
 msgid "Internet connection configuration"
 msgstr ""
 
-#: standalone/drakconnect:926
+#: standalone/drakconnect:899
 #, c-format
-msgid "Third DNS server (optional)"
+msgid "Provider dns 1 (optional)"
 msgstr ""
 
-#: standalone/drakconnect:948
+#: standalone/drakconnect:900
+#, c-format
+msgid "Provider dns 2 (optional)"
+msgstr ""
+
+#: standalone/drakconnect:913
+#, c-format
+msgid "Ethernet Card"
+msgstr ""
+
+#: standalone/drakconnect:914
+#, c-format
+msgid "DHCP Client"
+msgstr ""
+
+#: standalone/drakconnect:943
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr ""
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:944
 #, c-format
 msgid "Internet access"
 msgstr ""
 
-#: standalone/drakconnect:951 standalone/net_monitor:87
+#: standalone/drakconnect:946 standalone/net_monitor:87
 #, c-format
 msgid "Connection type: "
 msgstr ""
 
-#: standalone/drakconnect:954
+#: standalone/drakconnect:949
 #, c-format
 msgid "Status:"
 msgstr ""
@@ -15903,109 +15810,109 @@ msgid ""
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 msgstr ""
 
-#: standalone/drakfont:183
+#: standalone/drakfont:181
 #, c-format
 msgid "Search installed fonts"
 msgstr ""
 
-#: standalone/drakfont:185
+#: standalone/drakfont:183
 #, c-format
 msgid "Unselect fonts installed"
 msgstr ""
 
-#: standalone/drakfont:208
+#: standalone/drakfont:206
 #, c-format
 msgid "parse all fonts"
 msgstr ""
 
-#: standalone/drakfont:210
+#: standalone/drakfont:208
 #, c-format
 msgid "No fonts found"
 msgstr ""
 
-#: standalone/drakfont:218 standalone/drakfont:258 standalone/drakfont:325 standalone/drakfont:358 standalone/drakfont:366 standalone/drakfont:392 standalone/drakfont:410 standalone/drakfont:424
+#: standalone/drakfont:216 standalone/drakfont:256 standalone/drakfont:323 standalone/drakfont:356 standalone/drakfont:364 standalone/drakfont:390 standalone/drakfont:408 standalone/drakfont:422
 #, c-format
 msgid "done"
 msgstr ""
 
-#: standalone/drakfont:223
+#: standalone/drakfont:221
 #, c-format
 msgid "Could not find any font in your mounted partitions"
 msgstr ""
 
-#: standalone/drakfont:256
+#: standalone/drakfont:254
 #, c-format
 msgid "Reselect correct fonts"
 msgstr ""
 
-#: standalone/drakfont:259
+#: standalone/drakfont:257
 #, c-format
 msgid ""
 "Could not find any font.\n"
 ""
 msgstr ""
 
-#: standalone/drakfont:269
+#: standalone/drakfont:267
 #, c-format
 msgid "Search for fonts in installed list"
 msgstr ""
 
-#: standalone/drakfont:294
+#: standalone/drakfont:292
 #, c-format
 msgid "%s fonts conversion"
 msgstr ""
 
-#: standalone/drakfont:323
+#: standalone/drakfont:321
 #, c-format
 msgid "Fonts copy"
 msgstr ""
 
-#: standalone/drakfont:326
+#: standalone/drakfont:324
 #, c-format
 msgid "True Type fonts installation"
 msgstr ""
 
-#: standalone/drakfont:333
+#: standalone/drakfont:331
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr ""
 
-#: standalone/drakfont:334
+#: standalone/drakfont:332
 #, c-format
 msgid "True Type install done"
 msgstr ""
 
-#: standalone/drakfont:340 standalone/drakfont:355
+#: standalone/drakfont:338 standalone/drakfont:353
 #, c-format
 msgid "type1inst building"
 msgstr ""
 
-#: standalone/drakfont:349
+#: standalone/drakfont:347
 #, c-format
 msgid "Ghostscript referencing"
 msgstr ""
 
-#: standalone/drakfont:359
+#: standalone/drakfont:357
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr ""
 
-#: standalone/drakfont:362
+#: standalone/drakfont:360
 #, c-format
 msgid "Restart XFS"
 msgstr ""
 
-#: standalone/drakfont:408 standalone/drakfont:418
+#: standalone/drakfont:406 standalone/drakfont:416
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr ""
 
-#: standalone/drakfont:420
+#: standalone/drakfont:418
 #, c-format
 msgid "xfs restart"
 msgstr ""
 
-#: standalone/drakfont:428
+#: standalone/drakfont:426
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and install them on your system.\n"
@@ -16013,32 +15920,32 @@ msgid ""
 "-You can install the fonts the normal way. In rare cases, bogus fonts may hang up your X Server."
 msgstr ""
 
-#: standalone/drakfont:477 standalone/drakfont:486
+#: standalone/drakfont:474
 #, c-format
 msgid "DrakFont"
 msgstr ""
 
-#: standalone/drakfont:487
+#: standalone/drakfont:484
 #, c-format
 msgid "Font List"
 msgstr ""
 
-#: standalone/drakfont:493
+#: standalone/drakfont:490
 #, c-format
 msgid "About"
 msgstr ""
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:492 standalone/drakfont:681 standalone/drakfont:719
 #, c-format
 msgid "Uninstall"
 msgstr ""
 
-#: standalone/drakfont:496
+#: standalone/drakfont:493
 #, c-format
 msgid "Import"
 msgstr ""
 
-#: standalone/drakfont:512
+#: standalone/drakfont:509
 #, c-format
 msgid ""
 "Copyright (C) 2001-2002 by MandrakeSoft \n"
@@ -16051,7 +15958,7 @@ msgid ""
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
 
-#: standalone/drakfont:521
+#: standalone/drakfont:518
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -16071,7 +15978,7 @@ msgid ""
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: standalone/drakfont:537
+#: standalone/drakfont:534
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -16090,12 +15997,12 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakfont:556
+#: standalone/drakfont:553
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr ""
 
-#: standalone/drakfont:557
+#: standalone/drakfont:554
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and install them on your system.\n"
@@ -16103,185 +16010,185 @@ msgid ""
 "You can install the fonts the normal way. In rare cases, bogus fonts may hang up your X Server."
 msgstr ""
 
-#: standalone/drakfont:567
+#: standalone/drakfont:564
 #, c-format
 msgid "Ghostscript"
 msgstr ""
 
-#: standalone/drakfont:568
+#: standalone/drakfont:565
 #, c-format
 msgid "StarOffice"
 msgstr ""
 
-#: standalone/drakfont:569
+#: standalone/drakfont:566
 #, c-format
 msgid "Abiword"
 msgstr ""
 
-#: standalone/drakfont:570
+#: standalone/drakfont:567
 #, c-format
 msgid "Generic Printers"
 msgstr ""
 
-#: standalone/drakfont:586
+#: standalone/drakfont:583
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr ""
 
-#: standalone/drakfont:587
-#, c-format
-msgid "File Selection"
-msgstr ""
-
-#: standalone/drakfont:600
+#: standalone/drakfont:597
 #, c-format
 msgid "You've not selected any font"
 msgstr ""
 
-#: standalone/drakfont:652
+#: standalone/drakfont:646
 #, c-format
 msgid "Import fonts"
 msgstr ""
 
-#: standalone/drakfont:657
+#: standalone/drakfont:651
 #, c-format
 msgid "Install fonts"
 msgstr ""
 
-#: standalone/drakfont:692
+#: standalone/drakfont:686
 #, c-format
 msgid "click here if you are sure."
 msgstr ""
 
-#: standalone/drakfont:694
+#: standalone/drakfont:688
 #, c-format
 msgid "here if no."
 msgstr ""
 
-#: standalone/drakfont:733
+#: standalone/drakfont:727
 #, c-format
 msgid "Unselected All"
 msgstr ""
 
-#: standalone/drakfont:736
+#: standalone/drakfont:730
 #, c-format
 msgid "Selected All"
 msgstr ""
 
-#: standalone/drakfont:739
+#: standalone/drakfont:733
 #, c-format
 msgid "Remove List"
 msgstr ""
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:744 standalone/drakfont:763
 #, c-format
 msgid "Importing fonts"
 msgstr ""
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:748 standalone/drakfont:768
 #, c-format
 msgid "Initial tests"
 msgstr ""
 
-#: standalone/drakfont:755
+#: standalone/drakfont:749
 #, c-format
 msgid "Copy fonts on your system"
 msgstr ""
 
-#: standalone/drakfont:756
+#: standalone/drakfont:750
 #, c-format
 msgid "Install & convert Fonts"
 msgstr ""
 
-#: standalone/drakfont:757
+#: standalone/drakfont:751
 #, c-format
 msgid "Post Install"
 msgstr ""
 
-#: standalone/drakfont:775
+#: standalone/drakfont:769
 #, c-format
 msgid "Remove fonts on your system"
 msgstr ""
 
-#: standalone/drakfont:776
+#: standalone/drakfont:770
 #, c-format
 msgid "Post Uninstall"
 msgstr ""
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:59 standalone/drakgw:190
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr ""
 
-#: standalone/drakgw:124
+#: standalone/drakgw:117 standalone/drakvpn:49
 #, c-format
-msgid "Internet Connection Sharing currently disabled"
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr ""
+
+#: standalone/drakgw:128
+#, c-format
+msgid "Internet Connection Sharing currently enabled"
 msgstr ""
 
-#: standalone/drakgw:125
+#: standalone/drakgw:129
 #, c-format
 msgid ""
-"The setup of Internet connection sharing has already been done.\n"
-"It's currently disabled.\n"
+"The setup of Internet Connection Sharing has already been done.\n"
+"It's currently enabled.\n"
 "\n"
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:129 standalone/drakvpn:125
+#: standalone/drakgw:133 standalone/drakvpn:97
 #, c-format
-msgid "enable"
+msgid "disable"
 msgstr ""
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:99 standalone/drakvpn:125
+#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:97 standalone/drakvpn:123
 #, c-format
 msgid "reconfigure"
 msgstr ""
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:99 standalone/drakvpn:125 standalone/drakvpn:374 standalone/drakvpn:733
+#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:97 standalone/drakvpn:123 standalone/drakvpn:370 standalone/drakvpn:749
 #, c-format
 msgid "dismiss"
 msgstr ""
 
 #: standalone/drakgw:136
 #, c-format
-msgid "Enabling servers..."
+msgid "Disabling servers..."
 msgstr ""
 
-#: standalone/drakgw:148
+#: standalone/drakgw:150
 #, c-format
-msgid "Internet Connection Sharing is now enabled."
+msgid "Internet Connection Sharing is now disabled."
 msgstr ""
 
-#: standalone/drakgw:151
+#: standalone/drakgw:157
 #, c-format
-msgid "Internet Connection Sharing currently enabled"
+msgid "Internet Connection Sharing currently disabled"
 msgstr ""
 
-#: standalone/drakgw:152
+#: standalone/drakgw:158
 #, c-format
 msgid ""
-"The setup of Internet Connection Sharing has already been done.\n"
-"It's currently enabled.\n"
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently disabled.\n"
 "\n"
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:156 standalone/drakvpn:99
+#: standalone/drakgw:162 standalone/drakvpn:123
 #, c-format
-msgid "disable"
+msgid "enable"
 msgstr ""
 
-#: standalone/drakgw:159
+#: standalone/drakgw:169
 #, c-format
-msgid "Disabling servers..."
+msgid "Enabling servers..."
 msgstr ""
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
-msgid "Internet Connection Sharing is now disabled."
+msgid "Internet Connection Sharing is now enabled."
 msgstr ""
 
-#: standalone/drakgw:194
+#: standalone/drakgw:191
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -16292,27 +16199,39 @@ msgid ""
 "Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN)."
 msgstr ""
 
-#: standalone/drakgw:237
+#: standalone/drakgw:211 standalone/drakvpn:208
+#, c-format
+msgid ""
+"Please enter the name of the interface connected to the internet.\n"
+"\n"
+"Examples:\n"
+"\t\tppp+ for modem or DSL connections, \n"
+"\t\teth0, or eth1 for cable connection, \n"
+"\t\tippp+ for a isdn connection.\n"
+""
+msgstr ""
+
+#: standalone/drakgw:230
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr ""
 
-#: standalone/drakgw:238
+#: standalone/drakgw:231
 #, c-format
 msgid "Interface %s"
 msgstr ""
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:241 standalone/drakpxe:138
 #, c-format
-msgid "No network adapter on your system!"
+msgid "No ethernet network adapter has been detected on your system. Please run the hardware configuration tool."
 msgstr ""
 
-#: standalone/drakgw:254
+#: standalone/drakgw:247
 #, c-format
 msgid "Network interface"
 msgstr ""
 
-#: standalone/drakgw:255
+#: standalone/drakgw:248
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -16322,17 +16241,17 @@ msgid ""
 "I am about to setup your Local Area Network with that adapter."
 msgstr ""
 
-#: standalone/drakgw:262
+#: standalone/drakgw:255
 #, c-format
 msgid "Please choose what network adapter will be connected to your Local Area Network."
 msgstr ""
 
-#: standalone/drakgw:291
+#: standalone/drakgw:283
 #, c-format
 msgid "Network interface already configured"
 msgstr ""
 
-#: standalone/drakgw:292
+#: standalone/drakgw:284
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -16342,27 +16261,27 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: standalone/drakgw:297
+#: standalone/drakgw:289
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr ""
 
-#: standalone/drakgw:297
+#: standalone/drakgw:289
 #, c-format
 msgid "No (experts only)"
 msgstr ""
 
-#: standalone/drakgw:298
+#: standalone/drakgw:290
 #, c-format
 msgid "Show current interface configuration"
 msgstr ""
 
-#: standalone/drakgw:299
+#: standalone/drakgw:291
 #, c-format
 msgid "Current interface configuration"
 msgstr ""
 
-#: standalone/drakgw:300
+#: standalone/drakgw:292
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -16373,7 +16292,7 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: standalone/drakgw:313
+#: standalone/drakgw:305
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP server; in that case please verify I correctly read the Network that you use for your local network; I will not reconfigure it and I will not touch your DHCP server configuration.\n"
@@ -16385,12 +16304,12 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakgw:320
+#: standalone/drakgw:312
 #, c-format
 msgid "Local Network adress"
 msgstr ""
 
-#: standalone/drakgw:324
+#: standalone/drakgw:316
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -16399,74 +16318,74 @@ msgid ""
 "If you don't know the meaning of an option, simply leave it as it is."
 msgstr ""
 
-#: standalone/drakgw:328
+#: standalone/drakgw:320
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr ""
 
-#: standalone/drakgw:329
+#: standalone/drakgw:321
 #, c-format
 msgid "The DNS Server IP"
 msgstr ""
 
-#: standalone/drakgw:330
+#: standalone/drakgw:322
 #, c-format
 msgid "The internal domain name"
 msgstr ""
 
-#: standalone/drakgw:331
+#: standalone/drakgw:323
 #, c-format
 msgid "The DHCP start range"
 msgstr ""
 
-#: standalone/drakgw:332
+#: standalone/drakgw:324
 #, c-format
 msgid "The DHCP end range"
 msgstr ""
 
-#: standalone/drakgw:333
+#: standalone/drakgw:325
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:334
+#: standalone/drakgw:326
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:335
+#: standalone/drakgw:327
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr ""
 
-#: standalone/drakgw:342
+#: standalone/drakgw:334
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: standalone/drakgw:352
+#: standalone/drakgw:344
 #, c-format
 msgid ""
 "Potential LAN address conflict found in current config of %s!\n"
 ""
 msgstr ""
 
-#: standalone/drakgw:362
+#: standalone/drakgw:354
 #, c-format
 msgid "Configuring..."
 msgstr ""
 
-#: standalone/drakgw:363
+#: standalone/drakgw:355
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 
-#: standalone/drakgw:399 standalone/drakpxe:231 standalone/drakvpn:276
+#: standalone/drakgw:391 standalone/drakpxe:231 standalone/drakvpn:272
 #, c-format
 msgid "Problems installing package %s"
 msgstr ""
 
-#: standalone/drakgw:595
+#: standalone/drakgw:584
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -16539,7 +16458,7 @@ msgstr ""
 msgid "Editable"
 msgstr ""
 
-#: standalone/drakperm:48 standalone/drakperm:314
+#: standalone/drakperm:48 standalone/drakperm:315
 #, c-format
 msgid "Path"
 msgstr ""
@@ -16554,7 +16473,7 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: standalone/drakperm:48 standalone/drakperm:326
+#: standalone/drakperm:48 standalone/drakperm:327
 #, c-format
 msgid "Permissions"
 msgstr ""
@@ -16608,7 +16527,7 @@ msgstr ""
 msgid "Delete selected rule"
 msgstr ""
 
-#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330 standalone/drakups:350 standalone/drakvpn:331 standalone/drakvpn:692 standalone/printerdrake:229
+#: standalone/drakperm:125 standalone/drakvpn:325 standalone/drakvpn:708 standalone/printerdrake:229
 #, c-format
 msgid "Edit"
 msgstr ""
@@ -16705,12 +16624,12 @@ msgstr ""
 msgid "When checked, owner and group won't be changed"
 msgstr ""
 
-#: standalone/drakperm:300
+#: standalone/drakperm:301
 #, c-format
 msgid "Path selection"
 msgstr ""
 
-#: standalone/drakperm:320
+#: standalone/drakperm:321
 #, c-format
 msgid "Property"
 msgstr ""
@@ -16817,7 +16736,7 @@ msgstr ""
 msgid "LOCAL"
 msgstr ""
 
-#: standalone/draksec:44 standalone/draksec:44 standalone/drakvpn:1144
+#: standalone/draksec:44 standalone/draksec:44
 #, c-format
 msgid "default"
 msgstr ""
@@ -16837,7 +16756,7 @@ msgstr ""
 msgid "yes"
 msgstr ""
 
-#: standalone/draksec:81
+#: standalone/draksec:70
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
@@ -16876,32 +16795,32 @@ msgid ""
 "maximum"
 msgstr ""
 
-#: standalone/draksec:129
+#: standalone/draksec:118
 #, c-format
 msgid "(default value: %s)"
 msgstr ""
 
-#: standalone/draksec:170
+#: standalone/draksec:159
 #, c-format
 msgid "Security Level:"
 msgstr ""
 
-#: standalone/draksec:173
+#: standalone/draksec:162
 #, c-format
 msgid "Security Alerts:"
 msgstr ""
 
-#: standalone/draksec:177
+#: standalone/draksec:166
 #, c-format
 msgid "Security Administrator:"
 msgstr ""
 
-#: standalone/draksec:179
+#: standalone/draksec:168
 #, c-format
 msgid "Basic options"
 msgstr ""
 
-#: standalone/draksec:192
+#: standalone/draksec:181
 #, c-format
 msgid ""
 "The following options can be set to customize your\n"
@@ -16909,27 +16828,27 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/draksec:194
+#: standalone/draksec:183
 #, c-format
 msgid "Network Options"
 msgstr ""
 
-#: standalone/draksec:194
+#: standalone/draksec:183
 #, c-format
 msgid "System Options"
 msgstr ""
 
-#: standalone/draksec:240
+#: standalone/draksec:229
 #, c-format
 msgid "Periodic Checks"
 msgstr ""
 
-#: standalone/draksec:258
+#: standalone/draksec:247
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr ""
 
-#: standalone/draksec:264
+#: standalone/draksec:253
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr ""
@@ -16967,324 +16886,165 @@ msgid ""
 "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
 msgstr ""
 
-#: standalone/draksplash:68
+#: standalone/draksplash:67
 #, c-format
 msgid "first step creation"
 msgstr ""
 
-#: standalone/draksplash:71
+#: standalone/draksplash:70
 #, c-format
 msgid "final resolution"
 msgstr ""
 
-#: standalone/draksplash:72
+#: standalone/draksplash:71 standalone/draksplash:165
 #, c-format
 msgid "choose image file"
 msgstr ""
 
-#: standalone/draksplash:73
+#: standalone/draksplash:72
 #, c-format
 msgid "Theme name"
 msgstr ""
 
-#: standalone/draksplash:78
+#: standalone/draksplash:77
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: standalone/draksplash:93 standalone/draksplash:158
+#: standalone/draksplash:87 standalone/draksplash:153
 #, c-format
 msgid "Configure bootsplash picture"
 msgstr ""
 
-#: standalone/draksplash:96
+#: standalone/draksplash:90
 #, c-format
 msgid ""
 "x coordinate of text box\n"
 "in number of characters"
 msgstr ""
 
-#: standalone/draksplash:97
+#: standalone/draksplash:91
 #, c-format
 msgid ""
 "y coordinate of text box\n"
 "in number of characters"
 msgstr ""
 
-#: standalone/draksplash:98
+#: standalone/draksplash:92
 #, c-format
 msgid "text width"
 msgstr ""
 
-#: standalone/draksplash:99
+#: standalone/draksplash:93
 #, c-format
 msgid "text box height"
 msgstr ""
 
-#: standalone/draksplash:100
+#: standalone/draksplash:94
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
 "of its upper left corner"
 msgstr ""
 
-#: standalone/draksplash:101
+#: standalone/draksplash:95
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
 "of its upper left corner"
 msgstr ""
 
-#: standalone/draksplash:102
+#: standalone/draksplash:96
 #, c-format
 msgid "the width of the progress bar"
 msgstr ""
 
-#: standalone/draksplash:103
+#: standalone/draksplash:97
 #, c-format
 msgid "the height of the progress bar"
 msgstr ""
 
-#: standalone/draksplash:104
+#: standalone/draksplash:98
 #, c-format
 msgid "the color of the progress bar"
 msgstr ""
 
-#: standalone/draksplash:119
+#: standalone/draksplash:113
 #, c-format
 msgid "Preview"
 msgstr ""
 
-#: standalone/draksplash:121
+#: standalone/draksplash:115
 #, c-format
 msgid "Save theme"
 msgstr ""
 
-#: standalone/draksplash:122
+#: standalone/draksplash:116
 #, c-format
 msgid "Choose color"
 msgstr ""
 
-#: standalone/draksplash:125
+#: standalone/draksplash:119
 #, c-format
 msgid "Display logo on Console"
 msgstr ""
 
-#: standalone/draksplash:126
+#: standalone/draksplash:120
 #, c-format
 msgid "Make kernel message quiet by default"
 msgstr ""
 
-#: standalone/draksplash:161 standalone/draksplash:319 standalone/draksplash:462
+#: standalone/draksplash:156 standalone/draksplash:320 standalone/draksplash:448
 #, c-format
 msgid "Notice"
 msgstr ""
 
-#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:156 standalone/draksplash:320
 #, c-format
 msgid "This theme does not yet have a bootsplash in %s !"
 msgstr ""
 
-#: standalone/draksplash:167
+#: standalone/draksplash:162
 #, c-format
 msgid "choose image"
 msgstr ""
 
-#: standalone/draksplash:209
+#: standalone/draksplash:204
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr ""
 
-#: standalone/draksplash:443
+#: standalone/draksplash:428
 #, c-format
 msgid "ProgressBar color selection"
 msgstr ""
 
-#: standalone/draksplash:462
+#: standalone/draksplash:448
 #, c-format
 msgid "You must choose an image file first!"
 msgstr ""
 
-#: standalone/draksplash:467
+#: standalone/draksplash:453
 #, c-format
 msgid "Generating preview ..."
 msgstr ""
 
-#: standalone/draksplash:512
+#: standalone/draksplash:499
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr ""
 
-#: standalone/drakups:63
-#, c-format
-msgid "Connected through a serial port or an usb cable"
-msgstr ""
-
-#: standalone/drakups:69
-#, c-format
-msgid "Add an UPS device"
-msgstr ""
-
-#: standalone/drakups:72
-#, c-format
-msgid ""
-"Welcome to the UPS configuration utility.\n"
-"\n"
-"Here, you'll be add a new UPS to your system.\n"
-""
-msgstr ""
-
-#: standalone/drakups:79
-#, c-format
-msgid ""
-"We're going to add an UPS device.\n"
-"\n"
-"Do you prefer autodetect UPS devices connected to this machine or  ?"
-msgstr ""
-
-#: standalone/drakups:82
-#, c-format
-msgid "Autodetection"
-msgstr ""
-
-#: standalone/drakups:90 standalone/harddrake2:134
-#, c-format
-msgid "Detection in progress"
-msgstr ""
-
-#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479 standalone/logdrake:485
-#, c-format
-msgid "Congratulations"
-msgstr ""
-
-#: standalone/drakups:109
-#, c-format
-msgid "The wizard successfully added the following UPS devices:"
-msgstr ""
-
-#: standalone/drakups:111
-#, c-format
-msgid "No new UPS devices was found"
-msgstr ""
-
-#: standalone/drakups:116 standalone/drakups:128
-#, c-format
-msgid "UPS driver configuration"
-msgstr ""
-
-#: standalone/drakups:116
-#, c-format
-msgid "Please select your UPS model."
-msgstr ""
-
-#: standalone/drakups:117
-#, c-format
-msgid "Manufacturer / Model:"
-msgstr ""
-
-#: standalone/drakups:128
-#, c-format
-msgid ""
-"We are configuring the \"%s\" UPS from \"%s\".\n"
-"Please fill in its name, its driver and its port."
-msgstr ""
-
-#: standalone/drakups:133
-#, c-format
-msgid "Name:"
-msgstr ""
-
-#: standalone/drakups:133
-#, c-format
-msgid "The name of your ups"
-msgstr ""
-
-#: standalone/drakups:134
-#, c-format
-msgid "The driver that manage your ups"
-msgstr ""
-
-#: standalone/drakups:135
-#, c-format
-msgid "Port:"
-msgstr ""
-
-#: standalone/drakups:137
-#, c-format
-msgid "The port on which is connected your ups"
-msgstr ""
-
-#: standalone/drakups:144
-#, c-format
-msgid "The wizard successfully configured the new \"%s\" UPS device."
-msgstr ""
-
-#: standalone/drakups:232
-#, c-format
-msgid "UPS devices"
-msgstr ""
-
-#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266 standalone/harddrake2:63
-#, c-format
-msgid "Name"
-msgstr ""
-
-#: standalone/drakups:250
-#, c-format
-msgid "UPS users"
-msgstr ""
-
-#: standalone/drakups:265
-#, c-format
-msgid "Access Control Lists"
-msgstr ""
-
-#: standalone/drakups:266
-#, c-format
-msgid "IP mask"
-msgstr ""
-
-#: standalone/drakups:277
-#, c-format
-msgid "Rules"
-msgstr ""
-
-#: standalone/drakups:278
-#, c-format
-msgid "Action"
-msgstr ""
-
-#: standalone/drakups:278 standalone/drakvpn:1144 standalone/harddrake2:57
-#, c-format
-msgid "Level"
-msgstr ""
-
-#: standalone/drakups:278
-#, c-format
-msgid "ACL name"
-msgstr ""
-
-#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
-#, c-format
-msgid "DrakUPS"
-msgstr ""
-
-#: standalone/drakups:307
-#, c-format
-msgid "Welcome to the UPS configuration tools"
-msgstr ""
-
-#: standalone/drakvpn:71
+#: standalone/drakvpn:69
 #, c-format
 msgid "DrakVPN"
 msgstr ""
 
-#: standalone/drakvpn:93
+#: standalone/drakvpn:91
 #, c-format
 msgid "The VPN connection is enabled."
 msgstr ""
 
-#: standalone/drakvpn:94
+#: standalone/drakvpn:92
 #, c-format
 msgid ""
 "The setup of a VPN connection has already been done.\n"
@@ -17294,22 +17054,22 @@ msgid ""
 "What would you like to do ?"
 msgstr ""
 
-#: standalone/drakvpn:103
+#: standalone/drakvpn:101
 #, c-format
 msgid "Disabling VPN..."
 msgstr ""
 
-#: standalone/drakvpn:112
+#: standalone/drakvpn:110
 #, c-format
 msgid "The VPN connection is now disabled."
 msgstr ""
 
-#: standalone/drakvpn:119
+#: standalone/drakvpn:117
 #, c-format
 msgid "VPN connection currently disabled"
 msgstr ""
 
-#: standalone/drakvpn:120
+#: standalone/drakvpn:118
 #, c-format
 msgid ""
 "The setup of a VPN connection has already been done.\n"
@@ -17319,28 +17079,28 @@ msgid ""
 "What would you like to do ?"
 msgstr ""
 
-#: standalone/drakvpn:133
+#: standalone/drakvpn:131
 #, c-format
 msgid "Enabling VPN..."
 msgstr ""
 
-#: standalone/drakvpn:139
+#: standalone/drakvpn:137
 #, c-format
 msgid "The VPN connection is now enabled."
 msgstr ""
 
-#: standalone/drakvpn:153 standalone/drakvpn:181
+#: standalone/drakvpn:151 standalone/drakvpn:177
 #, c-format
 msgid "Simple VPN setup."
 msgstr ""
 
-#: standalone/drakvpn:154
+#: standalone/drakvpn:152
 #, c-format
 msgid ""
 "You are about to configure your computer to use a VPN connection.\n"
 "\n"
 "With this feature, computers on your local private network and computers\n"
-"on some other remote private networks, can share resources, through\n"
+"on some other remote private networks, can share ressources, through\n"
 "their respective firewalls, over the Internet, in a secure manner. \n"
 "\n"
 "The communication over the Internet is encrypted. The local and remote\n"
@@ -17350,7 +17110,7 @@ msgid ""
 "drakconnect before going any further."
 msgstr ""
 
-#: standalone/drakvpn:182
+#: standalone/drakvpn:178
 #, c-format
 msgid ""
 "VPN connection.\n"
@@ -17366,12 +17126,12 @@ msgid ""
 "before going any further."
 msgstr ""
 
-#: standalone/drakvpn:194
+#: standalone/drakvpn:190
 #, c-format
 msgid "Kernel module."
 msgstr ""
 
-#: standalone/drakvpn:195
+#: standalone/drakvpn:191
 #, c-format
 msgid ""
 "The kernel need to have ipsec support.\n"
@@ -17381,35 +17141,28 @@ msgid ""
 "This kernel has '%s' support."
 msgstr ""
 
-#: standalone/drakvpn:290
+#: standalone/drakvpn:286 standalone/drakvpn:286
 #, c-format
-msgid "Security Policies"
+msgid "configure %s"
 msgstr ""
 
-#: standalone/drakvpn:290
-#, c-format
-msgid "IKE daemon racoon"
-msgstr ""
-
-#: standalone/drakvpn:293 standalone/drakvpn:304
+#: standalone/drakvpn:289 standalone/drakvpn:298
 #, c-format
 msgid "Configuration file"
 msgstr ""
 
-#: standalone/drakvpn:294
+#: standalone/drakvpn:290
 #, c-format
 msgid ""
-"Configuration step !\n"
+"Welcome to the configuration files step !\n"
 "\n"
-"You need to define the Security Policies and then to \n"
-"configure the automatic key exchange (IKE) daemon. \n"
-"The KAME IKE daemon we're using is called 'racoon'.\n"
+"You can now configure the sections of these files.\n"
 "\n"
-"What would you like to configure ?\n"
+"Which file would you like to configure ?\n"
 ""
 msgstr ""
 
-#: standalone/drakvpn:305
+#: standalone/drakvpn:299
 #, c-format
 msgid ""
 "Next, we will configure the %s file.\n"
@@ -17419,12 +17172,12 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:323 standalone/drakvpn:683
+#: standalone/drakvpn:317 standalone/drakvpn:699
 #, c-format
 msgid "%s entries"
 msgstr ""
 
-#: standalone/drakvpn:324
+#: standalone/drakvpn:318
 #, c-format
 msgid ""
 "The %s file contents\n"
@@ -17439,26 +17192,22 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:331 standalone/drakvpn:692
+#: standalone/drakvpn:325 standalone/drakvpn:708
 #, c-format
-msgid ""
-"_:display here is a verb\n"
-"Display"
+msgid "Display"
 msgstr ""
 
-#: standalone/drakvpn:331 standalone/drakvpn:692
+#: standalone/drakvpn:325 standalone/drakvpn:708
 #, c-format
 msgid "Commit"
 msgstr ""
 
-#: standalone/drakvpn:345 standalone/drakvpn:349 standalone/drakvpn:707 standalone/drakvpn:711
+#: standalone/drakvpn:341 standalone/drakvpn:345 standalone/drakvpn:723 standalone/drakvpn:727
 #, c-format
-msgid ""
-"_:display here is a verb\n"
-"Display configuration"
+msgid "Display configuration"
 msgstr ""
 
-#: standalone/drakvpn:350
+#: standalone/drakvpn:346
 #, c-format
 msgid ""
 "The %s file does not exist.\n"
@@ -17469,12 +17218,12 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:366
+#: standalone/drakvpn:362
 #, c-format
 msgid "ipsec.conf entries"
 msgstr ""
 
-#: standalone/drakvpn:367
+#: standalone/drakvpn:363
 #, c-format
 msgid ""
 "The %s file contains different sections.\n"
@@ -17490,27 +17239,27 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:374
+#: standalone/drakvpn:370
 #, c-format
 msgid "config setup"
 msgstr ""
 
-#: standalone/drakvpn:374
+#: standalone/drakvpn:370
 #, c-format
 msgid "conn %default"
 msgstr ""
 
-#: standalone/drakvpn:374
+#: standalone/drakvpn:370
 #, c-format
 msgid "normal conn"
 msgstr ""
 
-#: standalone/drakvpn:380 standalone/drakvpn:421 standalone/drakvpn:508
+#: standalone/drakvpn:376 standalone/drakvpn:417 standalone/drakvpn:504 standalone/drakvpn:557
 #, c-format
 msgid "Exists !"
 msgstr ""
 
-#: standalone/drakvpn:381 standalone/drakvpn:422
+#: standalone/drakvpn:377 standalone/drakvpn:418
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -17521,7 +17270,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:398
+#: standalone/drakvpn:394
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -17534,37 +17283,37 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:403
+#: standalone/drakvpn:399
 #, c-format
 msgid "interfaces"
 msgstr ""
 
-#: standalone/drakvpn:404
+#: standalone/drakvpn:400
 #, c-format
 msgid "klipsdebug"
 msgstr ""
 
-#: standalone/drakvpn:405
+#: standalone/drakvpn:401
 #, c-format
 msgid "plutodebug"
 msgstr ""
 
-#: standalone/drakvpn:406
+#: standalone/drakvpn:402
 #, c-format
 msgid "plutoload"
 msgstr ""
 
-#: standalone/drakvpn:407
+#: standalone/drakvpn:403
 #, c-format
 msgid "plutostart"
 msgstr ""
 
-#: standalone/drakvpn:408
+#: standalone/drakvpn:404
 #, c-format
 msgid "uniqueids"
 msgstr ""
 
-#: standalone/drakvpn:442
+#: standalone/drakvpn:438
 #, c-format
 msgid ""
 "This is the first section after the config\n"
@@ -17578,52 +17327,52 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:449
+#: standalone/drakvpn:445
 #, c-format
-msgid "PFS"
+msgid "pfs"
 msgstr ""
 
-#: standalone/drakvpn:450
+#: standalone/drakvpn:446
 #, c-format
 msgid "keyingtries"
 msgstr ""
 
-#: standalone/drakvpn:451
+#: standalone/drakvpn:447
 #, c-format
 msgid "compress"
 msgstr ""
 
-#: standalone/drakvpn:452
+#: standalone/drakvpn:448
 #, c-format
 msgid "disablearrivalcheck"
 msgstr ""
 
-#: standalone/drakvpn:453 standalone/drakvpn:492
+#: standalone/drakvpn:449 standalone/drakvpn:488
 #, c-format
 msgid "left"
 msgstr ""
 
-#: standalone/drakvpn:454 standalone/drakvpn:493
+#: standalone/drakvpn:450 standalone/drakvpn:489
 #, c-format
 msgid "leftcert"
 msgstr ""
 
-#: standalone/drakvpn:455 standalone/drakvpn:494
+#: standalone/drakvpn:451 standalone/drakvpn:490
 #, c-format
 msgid "leftrsasigkey"
 msgstr ""
 
-#: standalone/drakvpn:456 standalone/drakvpn:495
+#: standalone/drakvpn:452 standalone/drakvpn:491
 #, c-format
 msgid "leftsubnet"
 msgstr ""
 
-#: standalone/drakvpn:457 standalone/drakvpn:496
+#: standalone/drakvpn:453 standalone/drakvpn:492
 #, c-format
 msgid "leftnexthop"
 msgstr ""
 
-#: standalone/drakvpn:486
+#: standalone/drakvpn:482 standalone/drakvpn:537
 #, c-format
 msgid ""
 "Your %s file has several sections, or connections.\n"
@@ -17633,47 +17382,47 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:489
+#: standalone/drakvpn:485
 #, c-format
 msgid "section name"
 msgstr ""
 
-#: standalone/drakvpn:490
+#: standalone/drakvpn:486
 #, c-format
 msgid "authby"
 msgstr ""
 
-#: standalone/drakvpn:491
+#: standalone/drakvpn:487
 #, c-format
 msgid "auto"
 msgstr ""
 
-#: standalone/drakvpn:497
+#: standalone/drakvpn:493
 #, c-format
 msgid "right"
 msgstr ""
 
-#: standalone/drakvpn:498
+#: standalone/drakvpn:494
 #, c-format
 msgid "rightcert"
 msgstr ""
 
-#: standalone/drakvpn:499
+#: standalone/drakvpn:495
 #, c-format
 msgid "rightrsasigkey"
 msgstr ""
 
-#: standalone/drakvpn:500
+#: standalone/drakvpn:496
 #, c-format
 msgid "rightsubnet"
 msgstr ""
 
-#: standalone/drakvpn:501
+#: standalone/drakvpn:497
 #, c-format
 msgid "rightnexthop"
 msgstr ""
 
-#: standalone/drakvpn:509
+#: standalone/drakvpn:505 standalone/drakvpn:558
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -17684,23 +17433,62 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:541
+#: standalone/drakvpn:540 standalone/drakvpn:649
 #, c-format
-msgid ""
-"Add a Security Policy.\n"
-"\n"
-"You can now add a Security Policy.\n"
-"\n"
-"Choose continue when you are done to write the data.\n"
-""
+msgid "Secure policy"
+msgstr ""
+
+#: standalone/drakvpn:541 standalone/drakvpn:650
+#, c-format
+msgid "Source IP range"
+msgstr ""
+
+#: standalone/drakvpn:542 standalone/drakvpn:651
+#, c-format
+msgid "Destination IP range"
+msgstr ""
+
+#: standalone/drakvpn:543 standalone/drakvpn:652
+#, c-format
+msgid "Upper-layer protocol"
+msgstr ""
+
+#: standalone/drakvpn:544 standalone/drakvpn:653
+#, c-format
+msgid "Flag"
+msgstr ""
+
+#: standalone/drakvpn:545 standalone/drakvpn:654
+#, c-format
+msgid "Direction"
 msgstr ""
 
-#: standalone/drakvpn:574 standalone/drakvpn:824
+#: standalone/drakvpn:546 standalone/drakvpn:655
+#, c-format
+msgid "IPsec policy"
+msgstr ""
+
+#: standalone/drakvpn:548 standalone/drakvpn:657
+#, c-format
+msgid "Mode"
+msgstr ""
+
+#: standalone/drakvpn:549 standalone/drakvpn:658
+#, c-format
+msgid "Source/destination"
+msgstr ""
+
+#: standalone/drakvpn:550 standalone/drakvpn:659 standalone/harddrake2:57
+#, c-format
+msgid "Level"
+msgstr ""
+
+#: standalone/drakvpn:577 standalone/drakvpn:842
 #, c-format
 msgid "Edit section"
 msgstr ""
 
-#: standalone/drakvpn:575
+#: standalone/drakvpn:578
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -17710,17 +17498,17 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:578 standalone/drakvpn:658 standalone/drakvpn:829 standalone/drakvpn:875
+#: standalone/drakvpn:581 standalone/drakvpn:674 standalone/drakvpn:847 standalone/drakvpn:893
 #, c-format
 msgid "Section names"
 msgstr ""
 
-#: standalone/drakvpn:588
+#: standalone/drakvpn:591
 #, c-format
 msgid "Can't edit !"
 msgstr ""
 
-#: standalone/drakvpn:589
+#: standalone/drakvpn:592
 #, c-format
 msgid ""
 "You cannot edit this section.\n"
@@ -17728,11 +17516,11 @@ msgid ""
 "This section is mandatory for Freswan 2.X.\n"
 "One has to specify version 2.0 on the top\n"
 "of the %s file, and eventually, disable or\n"
-"enable the oportunistic encryption.\n"
+"enable the oportunistic ecryption.\n"
 ""
 msgstr ""
 
-#: standalone/drakvpn:598
+#: standalone/drakvpn:601
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -17742,7 +17530,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:609
+#: standalone/drakvpn:612
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -17752,7 +17540,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:622
+#: standalone/drakvpn:625
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -17763,33 +17551,32 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:643
+#: standalone/drakvpn:646
 #, c-format
 msgid ""
-"Edit a Security Policy.\n"
-"\n"
-"You can now add a Security Policy.\n"
+"Your %s file has several sections, or connections.\n"
 "\n"
+"You can now edit the chosen section.\n"
 "Choose continue when you are done to write the data.\n"
 ""
 msgstr ""
 
-#: standalone/drakvpn:654 standalone/drakvpn:871
+#: standalone/drakvpn:670 standalone/drakvpn:889
 #, c-format
 msgid "Remove section"
 msgstr ""
 
-#: standalone/drakvpn:655 standalone/drakvpn:872
+#: standalone/drakvpn:671 standalone/drakvpn:890
 #, c-format
 msgid ""
-"Your %s file has several sections or connections.\n"
+"Your %s file has several or sections or connections.\n"
 "\n"
 "You can choose here below the one you want to remove\n"
 "and then click on next.\n"
 ""
 msgstr ""
 
-#: standalone/drakvpn:684
+#: standalone/drakvpn:700
 #, c-format
 msgid ""
 "The racoon.conf file configuration.\n"
@@ -17803,7 +17590,7 @@ msgid ""
 "  - commit \t\t (writes the changes to the real file)"
 msgstr ""
 
-#: standalone/drakvpn:712
+#: standalone/drakvpn:728
 #, c-format
 msgid ""
 "The %s file does not exist\n"
@@ -17814,12 +17601,12 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:726
+#: standalone/drakvpn:742
 #, c-format
 msgid "racoonf.conf entries"
 msgstr ""
 
-#: standalone/drakvpn:727
+#: standalone/drakvpn:743
 #, c-format
 msgid ""
 "The 'add' sections step.\n"
@@ -17833,22 +17620,22 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:733
+#: standalone/drakvpn:749
 #, c-format
 msgid "path"
 msgstr ""
 
-#: standalone/drakvpn:733
+#: standalone/drakvpn:749 standalone/drakvpn:956
 #, c-format
 msgid "remote"
 msgstr ""
 
-#: standalone/drakvpn:733
+#: standalone/drakvpn:749
 #, c-format
 msgid "sainfo"
 msgstr ""
 
-#: standalone/drakvpn:741
+#: standalone/drakvpn:757
 #, c-format
 msgid ""
 "The 'add path' section step.\n"
@@ -17858,41 +17645,45 @@ msgid ""
 "Put your mouse over the certificate entry to obtain online help."
 msgstr ""
 
-#: standalone/drakvpn:744
+#: standalone/drakvpn:760
 #, c-format
 msgid "path type"
 msgstr ""
 
-#: standalone/drakvpn:748
+#: standalone/drakvpn:764
 #, c-format
 msgid ""
-"path include path : specifies a path to include\n"
-"a file. See File Inclusion.\n"
-"\tExample: path include '/etc/racoon'\n"
+"Path Specification\n"
+"  path include path;\n"
+"\tspecifies a path to include a file.  See File Inclusion.\n"
+"  Example: path include '/etc/racoon'\n"
 "\n"
-"path pre_shared_key file : specifies a file containing\n"
-"pre-shared key(s) for various ID(s). See Pre-shared key File.\n"
-"\tExample: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
+"  path pre_shared_key file;\n"
+"\tspecifies a file containing pre-shared key(s)\n"
+"\tfor various ID(s). See Pre-shared key File.\n"
+"  Example: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
 "\n"
-"path certificate path : racoon(8) will search this directory\n"
-"if a certificate or certificate request is received.\n"
-"\tExample: path certificate '/etc/cert' ;\n"
+"  path certificate path;\n"
+"  \tracoon(8) will search this directory if a certificate or\n"
+"\t certificate request is received.\n"
+"  Example: path certificate '/etc/cert' ;\n"
 "\n"
-"File Inclusion : include file \n"
-"other configuration files can be included.\n"
-"\tExample: include \"remote.conf\" ;\n"
+"File Inclusion\n"
+"  include file\n"
+"\tother configuration files can be included.\n"
 "\n"
-"Pre-shared key File : Pre-shared key file defines a pair\n"
-"of the identifier and the shared secret key which are used at\n"
-"Pre-shared key authentication method in phase 1."
+"Pre-shared key File\n"
+"  Pre-shared key file defines a pair of the identifier and the\n"
+"  shared secret key which are used at Pre-shared key authentication\n"
+"  method in phase 1."
 msgstr ""
 
-#: standalone/drakvpn:768 standalone/drakvpn:861
+#: standalone/drakvpn:788
 #, c-format
 msgid "real file"
 msgstr ""
 
-#: standalone/drakvpn:791
+#: standalone/drakvpn:811
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -17903,18 +17694,19 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:808
+#: standalone/drakvpn:828
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
 "on the top of your %s file.\n"
 "\n"
+"\n"
 "You can now choose the sainfo settings.\n"
 "Choose continue or previous when you are done.\n"
 ""
 msgstr ""
 
-#: standalone/drakvpn:825
+#: standalone/drakvpn:843
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -17924,7 +17716,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:836
+#: standalone/drakvpn:854
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -17936,17 +17728,18 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:845
+#: standalone/drakvpn:863
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
 "\n"
 "You can now edit the sainfo section entries.\n"
 "\n"
-"Choose continue when you are done to write the data."
+"Choose continue when you are done to write the data.\n"
+""
 msgstr ""
 
-#: standalone/drakvpn:853
+#: standalone/drakvpn:871
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -17961,503 +17754,148 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakvpn:860
+#: standalone/drakvpn:878
 #, c-format
 msgid "path_type"
 msgstr ""
 
-#: standalone/drakvpn:901
+#: standalone/drakvpn:879
+#, c-format
+msgid "real_file"
+msgstr ""
+
+#: standalone/drakvpn:919
 #, c-format
 msgid ""
 "Everything has been configured.\n"
 "\n"
-"You may now share resources through the Internet,\n"
+"You may now share ressources through the Internet,\n"
 "in a secure way, using a VPN connection.\n"
 "\n"
 "You should make sure that that the tunnels shorewall\n"
 "section is configured."
 msgstr ""
 
-#: standalone/drakvpn:921
-#, c-format
-msgid "Sainfo source address"
-msgstr ""
-
-#: standalone/drakvpn:922
-#, c-format
-msgid ""
-"sainfo (source_id destination_id | anonymous) { statements }\n"
-"defines the parameters of the IKE phase 2\n"
-"(IPsec-SA establishment).\n"
-"\n"
-"source_id and destination_id are constructed like:\n"
-"\n"
-"\taddress address [/ prefix] [[port]] ul_proto\n"
-"\n"
-"Examples : \n"
-"\n"
-"sainfo anonymous (accepts connections from anywhere)\n"
-"\tleave blank this entry if you want anonymous\n"
-"\n"
-"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
-"\t203.178.141.209 is the source address\n"
-"\n"
-"sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
-"\t172.16.1.0/24 is the source address"
-msgstr ""
-
 #: standalone/drakvpn:939
 #, c-format
-msgid "Sainfo source protocol"
+msgid "sainfo_source_address"
 msgstr ""
 
 #: standalone/drakvpn:940
 #, c-format
-msgid ""
-"sainfo (source_id destination_id | anonymous) { statements }\n"
-"defines the parameters of the IKE phase 2\n"
-"(IPsec-SA establishment).\n"
-"\n"
-"source_id and destination_id are constructed like:\n"
-"\n"
-"\taddress address [/ prefix] [[port]] ul_proto\n"
-"\n"
-"Examples : \n"
-"\n"
-"sainfo anonymous (accepts connections from anywhere)\n"
-"\tleave blank this entry if you want anonymous\n"
-"\n"
-"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
-"\tthe first 'any' allows any protocol for the source"
+msgid "sainfo_source_proto"
 msgstr ""
 
-#: standalone/drakvpn:954
+#: standalone/drakvpn:941
 #, c-format
-msgid "Sainfo destination address"
+msgid "sainfo_dest_address"
 msgstr ""
 
-#: standalone/drakvpn:955
+#: standalone/drakvpn:942
 #, c-format
-msgid ""
-"sainfo (source_id destination_id | anonymous) { statements }\n"
-"defines the parameters of the IKE phase 2\n"
-"(IPsec-SA establishment).\n"
-"\n"
-"source_id and destination_id are constructed like:\n"
-"\n"
-"\taddress address [/ prefix] [[port]] ul_proto\n"
-"\n"
-"Examples : \n"
-"\n"
-"sainfo anonymous (accepts connections from anywhere)\n"
-"\tleave blank this entry if you want anonymous\n"
-"\n"
-"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
-"\t203.178.141.218 is the destination address\n"
-"\n"
-"sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
-"\t172.16.2.0/24 is the destination address"
-msgstr ""
-
-#: standalone/drakvpn:972
-#, c-format
-msgid "Sainfo destination protocol"
-msgstr ""
-
-#: standalone/drakvpn:973
-#, c-format
-msgid ""
-"sainfo (source_id destination_id | anonymous) { statements }\n"
-"defines the parameters of the IKE phase 2\n"
-"(IPsec-SA establishment).\n"
-"\n"
-"source_id and destination_id are constructed like:\n"
-"\n"
-"\taddress address [/ prefix] [[port]] ul_proto\n"
-"\n"
-"Examples : \n"
-"\n"
-"sainfo anonymous (accepts connections from anywhere)\n"
-"\tleave blank this entry if you want anonymous\n"
-"\n"
-"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
-"\tthe last 'any' allows any protocol for the destination"
+msgid "sainfo_dest_proto"
 msgstr ""
 
-#: standalone/drakvpn:987
+#: standalone/drakvpn:943
 #, c-format
 msgid "PFS group"
 msgstr ""
 
-#: standalone/drakvpn:989
-#, c-format
-msgid ""
-"define the group of Diffie-Hellman exponentiations.\n"
-"If you do not require PFS then you can omit this directive.\n"
-"Any proposal will be accepted if you do not specify one.\n"
-"group is one of following: modp768, modp1024, modp1536.\n"
-"Or you can define 1, 2, or 5 as the DH group number."
-msgstr ""
-
-#: standalone/drakvpn:994
+#: standalone/drakvpn:945
 #, c-format
 msgid "Lifetime number"
 msgstr ""
 
-#: standalone/drakvpn:995
-#, c-format
-msgid ""
-"define a lifetime of a certain time which will be pro-\n"
-"posed in the phase 1 negotiations.  Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
-"the peer if you do not specify it(them).  They can be\n"
-"individually specified in each proposal.\n"
-"\n"
-"Examples : \n"
-"\n"
-"        lifetime time 1 min;    # sec,min,hour\n"
-"        lifetime time 1 min;    # sec,min,hour\n"
-"        lifetime time 30 sec;\n"
-"        lifetime time 30 sec;\n"
-"        lifetime time 60 sec;\n"
-"\tlifetime time 12 hour;\n"
-"\n"
-"So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
-""
-msgstr ""
-
-#: standalone/drakvpn:1011
+#: standalone/drakvpn:946
 #, c-format
 msgid "Lifetime unit"
 msgstr ""
 
-#: standalone/drakvpn:1013
-#, c-format
-msgid ""
-"define a lifetime of a certain time which will be pro-\n"
-"posed in the phase 1 negotiations.  Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
-"the peer if you do not specify it(them).  They can be\n"
-"individually specified in each proposal.\n"
-"\n"
-"Examples : \n"
-"\n"
-"        lifetime time 1 min;    # sec,min,hour\n"
-"        lifetime time 1 min;    # sec,min,hour\n"
-"        lifetime time 30 sec;\n"
-"        lifetime time 30 sec;\n"
-"        lifetime time 60 sec;\n"
-"\tlifetime time 12 hour ;\n"
-"\n"
-"So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and 'hour'.\n"
-""
-msgstr ""
-
-#: standalone/drakvpn:1029 standalone/drakvpn:1114
+#: standalone/drakvpn:947 standalone/drakvpn:968
 #, c-format
 msgid "Encryption algorithm"
 msgstr ""
 
-#: standalone/drakvpn:1031
+#: standalone/drakvpn:948
 #, c-format
 msgid "Authentication algorithm"
 msgstr ""
 
-#: standalone/drakvpn:1033
+#: standalone/drakvpn:949
 #, c-format
 msgid "Compression algorithm"
 msgstr ""
 
-#: standalone/drakvpn:1034
-#, c-format
-msgid "deflate"
-msgstr ""
-
-#: standalone/drakvpn:1041
-#, c-format
-msgid "Remote"
-msgstr ""
-
-#: standalone/drakvpn:1042
-#, c-format
-msgid ""
-"remote (address | anonymous) [[port]] { statements }\n"
-"specifies the parameters for IKE phase 1 for each remote node.\n"
-"The default port is 500.  If anonymous is specified, the state-\n"
-"ments apply to all peers which do not match any other remote\n"
-"directive.\n"
-"\n"
-"Examples : \n"
-"\n"
-"remote anonymous\n"
-"remote ::1 [8000]"
-msgstr ""
-
-#: standalone/drakvpn:1050
-#, c-format
-msgid "Exchange mode"
-msgstr ""
-
-#: standalone/drakvpn:1052
-#, c-format
-msgid ""
-"defines the exchange mode for phase 1 when racoon is the\n"
-"initiator. Also it means the acceptable exchange mode\n"
-"when racoon is responder. More than one mode can be\n"
-"specified by separating them with a comma. All of the\n"
-"modes are acceptable. The first exchange mode is what\n"
-"racoon uses when it is the initiator.\n"
-""
-msgstr ""
-
-#: standalone/drakvpn:1058
-#, c-format
-msgid "Generate policy"
-msgstr ""
-
-#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
-#, c-format
-msgid "off"
-msgstr ""
-
-#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
-#, c-format
-msgid "on"
-msgstr ""
-
-#: standalone/drakvpn:1060
-#, c-format
-msgid ""
-"This directive is for the responder.  Therefore you\n"
-"should set passive on in order that racoon(8) only\n"
-"becomes a responder.  If the responder does not have any\n"
-"policy in SPD during phase 2 negotiation, and the direc-\n"
-"tive is set on, then racoon(8) will choice the first pro-\n"
-"posal in the SA payload from the initiator, and generate\n"
-"policy entries from the proposal.  It is useful to nego-\n"
-"tiate with the client which is allocated IP address\n"
-"dynamically.  Note that inappropriate policy might be\n"
-"installed into the responder's SPD by the initiator.  So\n"
-"that other communication might fail if such policies\n"
-"installed due to some policy mismatches between the ini-\n"
-"tiator and the responder.  This directive is ignored in\n"
-"the initiator case.  The default value is off."
-msgstr ""
-
-#: standalone/drakvpn:1074
-#, c-format
-msgid "Passive"
-msgstr ""
-
-#: standalone/drakvpn:1076
-#, c-format
-msgid ""
-"If you do not want to initiate the negotiation, set this\n"
-"to on.  The default value is off.  It is useful for a\n"
-"server."
-msgstr ""
-
-#: standalone/drakvpn:1079
-#, c-format
-msgid "Certificate type"
-msgstr ""
-
-#: standalone/drakvpn:1081
-#, c-format
-msgid "My certfile"
-msgstr ""
-
-#: standalone/drakvpn:1082
-#, c-format
-msgid "Name of the certificate"
-msgstr ""
-
-#: standalone/drakvpn:1083
+#: standalone/drakvpn:957
 #, c-format
-msgid "My private key"
+msgid "exchange_mode"
 msgstr ""
 
-#: standalone/drakvpn:1084
+#: standalone/drakvpn:958
 #, c-format
-msgid "Name of the private key"
+msgid "generate_policy"
 msgstr ""
 
-#: standalone/drakvpn:1085
+#: standalone/drakvpn:959
 #, c-format
-msgid "Peers certfile"
+msgid "passive"
 msgstr ""
 
-#: standalone/drakvpn:1086
+#: standalone/drakvpn:960
 #, c-format
-msgid "Name of the peers certificate"
+msgid "certificate_type"
 msgstr ""
 
-#: standalone/drakvpn:1087
+#: standalone/drakvpn:961
 #, c-format
-msgid "Verify cert"
+msgid "my_certfile"
 msgstr ""
 
-#: standalone/drakvpn:1089
+#: standalone/drakvpn:962
 #, c-format
-msgid ""
-"If you do not want to verify the peer's certificate for\n"
-"some reason, set this to off.  The default is on."
+msgid "my_private_key"
 msgstr ""
 
-#: standalone/drakvpn:1091
+#: standalone/drakvpn:963
 #, c-format
-msgid "My identifier"
+msgid "peers_certfile"
 msgstr ""
 
-#: standalone/drakvpn:1092
+#: standalone/drakvpn:964
 #, c-format
-msgid ""
-"specifies the identifier sent to the remote host and the\n"
-"type to use in the phase 1 negotiation.  address, fqdn,\n"
-"user_fqdn, keyid and asn1dn can be used as an idtype.\n"
-"they are used like:\n"
-"\tmy_identifier address [address];\n"
-"\t\tthe type is the IP address.  This is the default\n"
-"\t\ttype if you do not specify an identifier to use.\n"
-"\tmy_identifier user_fqdn string;\n"
-"\t\tthe type is a USER_FQDN (user fully-qualified\n"
-"\t\tdomain name).\n"
-"\tmy_identifier fqdn string;\n"
-"\t\tthe type is a FQDN (fully-qualified domain name).\n"
-"\tmy_identifier keyid file;\n"
-"\t\tthe type is a KEY_ID.\n"
-"\tmy_identifier asn1dn [string];\n"
-"\t\tthe type is an ASN.1 distinguished name.  If\n"
-"\t\tstring is omitted, racoon(8) will get DN from\n"
-"\t\tSubject field in the certificate.\n"
-"\n"
-"Examples : \n"
-"\n"
-"my_identifier user_fqdn \"myemail@mydomain.com\""
+msgid "verify_cert"
 msgstr ""
 
-#: standalone/drakvpn:1112
+#: standalone/drakvpn:965
 #, c-format
-msgid "Peers identifier"
+msgid "my_identifier"
 msgstr ""
 
-#: standalone/drakvpn:1113
+#: standalone/drakvpn:966
 #, c-format
-msgid "Proposal"
+msgid "peers_identifier"
 msgstr ""
 
-#: standalone/drakvpn:1115
+#: standalone/drakvpn:967
 #, c-format
-msgid ""
-"specify the encryption algorithm used for the\n"
-"phase 1 negotiation. This directive must be defined. \n"
-"algorithm is one of following: \n"
-"\n"
-"des, 3des, blowfish, cast128 for oakley.\n"
-"\n"
-"For other transforms, this statement should not be used."
+msgid "proposal"
 msgstr ""
 
-#: standalone/drakvpn:1122
+#: standalone/drakvpn:969
 #, c-format
 msgid "Hash algorithm"
 msgstr ""
 
-#: standalone/drakvpn:1123
+#: standalone/drakvpn:970
 #, c-format
 msgid "Authentication method"
 msgstr ""
 
-#: standalone/drakvpn:1124
+#: standalone/drakvpn:971
 #, c-format
 msgid "DH group"
 msgstr ""
 
-#: standalone/drakvpn:1131
-#, c-format
-msgid "Command"
-msgstr ""
-
-#: standalone/drakvpn:1132
-#, c-format
-msgid "Source IP range"
-msgstr ""
-
-#: standalone/drakvpn:1133
-#, c-format
-msgid "Destination IP range"
-msgstr ""
-
-#: standalone/drakvpn:1134
-#, c-format
-msgid "Upper-layer protocol"
-msgstr ""
-
-#: standalone/drakvpn:1134 standalone/drakvpn:1141
-#, c-format
-msgid "any"
-msgstr ""
-
-#: standalone/drakvpn:1136
-#, c-format
-msgid "Flag"
-msgstr ""
-
-#: standalone/drakvpn:1137
-#, c-format
-msgid "Direction"
-msgstr ""
-
-#: standalone/drakvpn:1138
-#, c-format
-msgid "IPsec policy"
-msgstr ""
-
-#: standalone/drakvpn:1138
-#, c-format
-msgid "ipsec"
-msgstr ""
-
-#: standalone/drakvpn:1138
-#, c-format
-msgid "discard"
-msgstr ""
-
-#: standalone/drakvpn:1141
-#, c-format
-msgid "Mode"
-msgstr ""
-
-#: standalone/drakvpn:1141
-#, c-format
-msgid "tunnel"
-msgstr ""
-
-#: standalone/drakvpn:1141
-#, c-format
-msgid "transport"
-msgstr ""
-
-#: standalone/drakvpn:1143
-#, c-format
-msgid "Source/destination"
-msgstr ""
-
-#: standalone/drakvpn:1144
-#, c-format
-msgid "require"
-msgstr ""
-
-#: standalone/drakvpn:1144
-#, c-format
-msgid "use"
-msgstr ""
-
-#: standalone/drakvpn:1144
-#, c-format
-msgid "unique"
-msgstr ""
-
 #: standalone/drakxtv:46
 #, c-format
 msgid "USA (broadcast)"
@@ -18849,6 +18287,11 @@ msgstr ""
 
 #: standalone/harddrake2:63
 #, c-format
+msgid "Name"
+msgstr ""
+
+#: standalone/harddrake2:63
+#, c-format
 msgid "the name of the CPU"
 msgstr ""
 
@@ -18902,12 +18345,12 @@ msgstr ""
 msgid "the WP flag in the CR0 register of the cpu enforce write proctection at the memory page level, thus enabling the processor to prevent unchecked kernel accesses to user memory (aka this is a bug guard)"
 msgstr ""
 
-#: standalone/harddrake2:84 standalone/logdrake:78 standalone/printerdrake:146 standalone/printerdrake:159
+#: standalone/harddrake2:84 standalone/logdrake:77 standalone/printerdrake:146 standalone/printerdrake:159
 #, c-format
 msgid "/_Options"
 msgstr ""
 
-#: standalone/harddrake2:85 standalone/harddrake2:106 standalone/logdrake:80 standalone/printerdrake:171 standalone/printerdrake:172 standalone/printerdrake:172 standalone/printerdrake:173 standalone/printerdrake:174
+#: standalone/harddrake2:85 standalone/harddrake2:106 standalone/logdrake:79 standalone/printerdrake:171 standalone/printerdrake:172 standalone/printerdrake:172 standalone/printerdrake:173 standalone/printerdrake:174
 #, c-format
 msgid "/_Help"
 msgstr ""
@@ -18952,6 +18395,11 @@ msgstr ""
 
 #: standalone/harddrake2:115
 #, c-format
+msgid "Select a device !"
+msgstr ""
+
+#: standalone/harddrake2:115
+#, 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 ""
 
@@ -18980,57 +18428,62 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/harddrake2:141
+#: standalone/harddrake2:133
+#, c-format
+msgid "Detection in progress"
+msgstr ""
+
+#: standalone/harddrake2:140
 #, c-format
 msgid "Harddrake2 version %s"
 msgstr ""
 
-#: standalone/harddrake2:157
+#: standalone/harddrake2:156
 #, c-format
 msgid "Detected hardware"
 msgstr ""
 
-#: standalone/harddrake2:162
+#: standalone/harddrake2:161
 #, c-format
 msgid "Configure module"
 msgstr ""
 
-#: standalone/harddrake2:169
+#: standalone/harddrake2:168
 #, c-format
 msgid "Run config tool"
 msgstr ""
 
-#: standalone/harddrake2:216
+#: standalone/harddrake2:209
 #, c-format
 msgid "unknown"
 msgstr ""
 
-#: standalone/harddrake2:217
+#: standalone/harddrake2:210
 #, c-format
 msgid "Unknown"
 msgstr ""
 
-#: standalone/harddrake2:235
+#: standalone/harddrake2:228
 #, c-format
 msgid "Click on a device in the left tree in order to display its information here."
 msgstr ""
 
-#: standalone/harddrake2:286
+#: standalone/harddrake2:276
 #, c-format
 msgid "secondary"
 msgstr ""
 
-#: standalone/harddrake2:286
+#: standalone/harddrake2:276
 #, c-format
 msgid "primary"
 msgstr ""
 
-#: standalone/harddrake2:294
+#: standalone/harddrake2:284
 #, c-format
 msgid "burner"
 msgstr ""
 
-#: standalone/harddrake2:294
+#: standalone/harddrake2:284
 #, c-format
 msgid "DVD"
 msgstr ""
@@ -19050,210 +18503,210 @@ msgstr ""
 msgid "The change is done, but to be effective you must logout"
 msgstr ""
 
-#: standalone/logdrake:51
+#: standalone/logdrake:50
 #, c-format
-msgid "Mandrake Tools Logs"
+msgid "Mandrake Tools Explanation"
 msgstr ""
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, c-format
 msgid "Logdrake"
 msgstr ""
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr ""
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr ""
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "<control>N"
 msgstr ""
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_Open"
 msgstr ""
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>O"
 msgstr ""
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Save"
 msgstr ""
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>S"
 msgstr ""
 
-#: standalone/logdrake:75
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/Save _As"
 msgstr ""
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr ""
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr ""
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr ""
 
-#: standalone/logdrake:110
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr ""
 
-#: standalone/logdrake:111
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr ""
 
-#: standalone/logdrake:112
+#: standalone/logdrake:113
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr ""
 
-#: standalone/logdrake:113
+#: standalone/logdrake:114
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr ""
 
-#: standalone/logdrake:117
+#: standalone/logdrake:118
 #, c-format
 msgid "search"
 msgstr ""
 
-#: standalone/logdrake:129
+#: standalone/logdrake:130
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr ""
 
-#: standalone/logdrake:130 standalone/net_monitor:85
+#: standalone/logdrake:131 standalone/net_monitor:85
 #, c-format
 msgid "Settings"
 msgstr ""
 
-#: standalone/logdrake:135
+#: standalone/logdrake:136
 #, c-format
 msgid "Matching"
 msgstr ""
 
-#: standalone/logdrake:136
+#: standalone/logdrake:137
 #, c-format
 msgid "but not matching"
 msgstr ""
 
-#: standalone/logdrake:140
+#: standalone/logdrake:141
 #, c-format
 msgid "Choose file"
 msgstr ""
 
-#: standalone/logdrake:149
+#: standalone/logdrake:150
 #, c-format
 msgid "Calendar"
 msgstr ""
 
-#: standalone/logdrake:159
+#: standalone/logdrake:160
 #, c-format
 msgid "Content of the file"
 msgstr ""
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:164 standalone/logdrake:377
 #, c-format
 msgid "Mail alert"
 msgstr ""
 
-#: standalone/logdrake:170
+#: standalone/logdrake:171
 #, c-format
 msgid "The alert wizard had unexpectly failled:"
 msgstr ""
 
-#: standalone/logdrake:221
+#: standalone/logdrake:219
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr ""
 
-#: standalone/logdrake:406
+#: standalone/logdrake:355
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr ""
 
-#: standalone/logdrake:407
+#: standalone/logdrake:356
 #, c-format
 msgid "Domain Name Resolver"
 msgstr ""
 
-#: standalone/logdrake:408
+#: standalone/logdrake:357
 #, c-format
 msgid "Ftp Server"
 msgstr ""
 
-#: standalone/logdrake:409
+#: standalone/logdrake:358
 #, c-format
 msgid "Postfix Mail Server"
 msgstr ""
 
-#: standalone/logdrake:410
+#: standalone/logdrake:359
 #, c-format
 msgid "Samba Server"
 msgstr ""
 
-#: standalone/logdrake:411
+#: standalone/logdrake:360
 #, c-format
 msgid "SSH Server"
 msgstr ""
 
-#: standalone/logdrake:412
+#: standalone/logdrake:361
 #, c-format
 msgid "Webmin Service"
 msgstr ""
 
-#: standalone/logdrake:413
+#: standalone/logdrake:362
 #, c-format
 msgid "Xinetd Service"
 msgstr ""
 
-#: standalone/logdrake:424
+#: standalone/logdrake:372
 #, c-format
 msgid "Configure the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:425
+#: standalone/logdrake:373
 #, c-format
 msgid "Stop the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:432
+#: standalone/logdrake:380
 #, c-format
 msgid "Mail alert configuration"
 msgstr ""
 
-#: standalone/logdrake:433
+#: standalone/logdrake:381
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -19262,64 +18715,69 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/logdrake:436
+#: standalone/logdrake:384
 #, c-format
 msgid "What do you want to do?"
 msgstr ""
 
-#: standalone/logdrake:443
+#: standalone/logdrake:391
 #, c-format
 msgid "Services settings"
 msgstr ""
 
-#: standalone/logdrake:444
+#: standalone/logdrake:392
 #, c-format
 msgid "You will receive an alert if one of the selected services is no longer running"
 msgstr ""
 
-#: standalone/logdrake:451
+#: standalone/logdrake:399
 #, c-format
 msgid "Load setting"
 msgstr ""
 
-#: standalone/logdrake:452
+#: standalone/logdrake:400
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr ""
 
-#: standalone/logdrake:453
+#: standalone/logdrake:401
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr ""
 
-#: standalone/logdrake:458
+#: standalone/logdrake:406
 #, c-format
 msgid "Alert configuration"
 msgstr ""
 
-#: standalone/logdrake:459
+#: standalone/logdrake:407
 #, c-format
 msgid "Please enter your email address below "
 msgstr ""
 
-#: standalone/logdrake:460
+#: standalone/logdrake:408
 #, c-format
 msgid "and enter the name (or the IP) of the SMTP server you whish to use"
 msgstr ""
 
-#: standalone/logdrake:479
+#: standalone/logdrake:427 standalone/logdrake:433
+#, c-format
+msgid "Congratulations"
+msgstr ""
+
+#: standalone/logdrake:427
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr ""
 
-#: standalone/logdrake:485
+#: standalone/logdrake:433
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr ""
 
-#: standalone/logdrake:544
+#: standalone/logdrake:492
 #, c-format
 msgid "Save as.."
 msgstr ""
@@ -19624,204 +19082,191 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/scannerdrake:50
-#, c-format
-msgid ""
-"SANE packages need to be installed to use scanners.\n"
-"\n"
-"Do you want to install the SANE packages?"
-msgstr ""
-
-#: standalone/scannerdrake:54
-#, c-format
-msgid "Aborting Scannerdrake."
-msgstr ""
-
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:53
 #, c-format
 msgid "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:54
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr ""
 
-#: standalone/scannerdrake:66 standalone/scannerdrake:459
+#: standalone/scannerdrake:60 standalone/scannerdrake:452
 #, c-format
 msgid "Searching for configured scanners ..."
 msgstr ""
 
-#: standalone/scannerdrake:70 standalone/scannerdrake:463
+#: standalone/scannerdrake:64 standalone/scannerdrake:456
 #, c-format
 msgid "Searching for new scanners ..."
 msgstr ""
 
-#: standalone/scannerdrake:78 standalone/scannerdrake:485
+#: standalone/scannerdrake:72 standalone/scannerdrake:478
 #, c-format
 msgid "Re-generating list of configured scanners ..."
 msgstr ""
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141 standalone/scannerdrake:155
+#: standalone/scannerdrake:94 standalone/scannerdrake:135 standalone/scannerdrake:149
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr ""
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:97
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr ""
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:109
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr ""
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:124
 #, c-format
 msgid "Select a scanner model"
 msgstr ""
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:125
 #, c-format
 msgid " ("
 msgstr ""
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:126
 #, c-format
 msgid "Detected model: %s"
 msgstr ""
 
-#: standalone/scannerdrake:134
+#: standalone/scannerdrake:128
 #, c-format
 msgid ", "
 msgstr ""
 
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:129
 #, c-format
 msgid "Port: %s"
 msgstr ""
 
-#: standalone/scannerdrake:161
+#: standalone/scannerdrake:155
 #, c-format
 msgid "The %s is not known by this version of Scannerdrake."
 msgstr ""
 
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:163 standalone/scannerdrake:177
 #, c-format
 msgid "Do not install firmware file"
 msgstr ""
 
-#: standalone/scannerdrake:173 standalone/scannerdrake:225
+#: standalone/scannerdrake:167 standalone/scannerdrake:219
 #, c-format
 msgid "It is possible that your %s needs its firmware to be uploaded everytime when it is turned on."
 msgstr ""
 
-#: standalone/scannerdrake:174 standalone/scannerdrake:226
+#: standalone/scannerdrake:168 standalone/scannerdrake:220
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
 msgstr ""
 
-#: standalone/scannerdrake:175 standalone/scannerdrake:229
+#: standalone/scannerdrake:169 standalone/scannerdrake:223
 #, c-format
 msgid "To do so, you need to supply the firmware file for your scanner so that it can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:176 standalone/scannerdrake:230
+#: standalone/scannerdrake:170 standalone/scannerdrake:224
 #, c-format
 msgid "You find the file on the CD or floppy coming with the scanner, on the manufacturer's home page, or on your Windows partition."
 msgstr ""
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:172 standalone/scannerdrake:231
 #, c-format
 msgid "Install firmware file from"
 msgstr ""
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:192
 #, c-format
 msgid "Select firmware file"
 msgstr ""
 
-#: standalone/scannerdrake:201 standalone/scannerdrake:260
+#: standalone/scannerdrake:195 standalone/scannerdrake:254
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr ""
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:218
 #, c-format
 msgid "It is possible that your scanners need their firmware to be uploaded everytime when they are turned on."
 msgstr ""
 
-#: standalone/scannerdrake:228
+#: standalone/scannerdrake:222
 #, c-format
 msgid "To do so, you need to supply the firmware files for your scanners so that it can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:225
 #, c-format
 msgid "If you have already installed your scanner's firmware you can update the firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:227
 #, c-format
 msgid "Install firmware for the"
 msgstr ""
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:250
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr ""
 
-#: standalone/scannerdrake:282
+#: standalone/scannerdrake:276
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr ""
 
-#: standalone/scannerdrake:292
+#: standalone/scannerdrake:286
 #, c-format
 msgid "The %s is unsupported"
 msgstr ""
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:291
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
 "You can launch printerdrake from the %s Control Center in Hardware section."
 msgstr ""
 
-#: standalone/scannerdrake:301 standalone/scannerdrake:308 standalone/scannerdrake:338
+#: standalone/scannerdrake:295 standalone/scannerdrake:302 standalone/scannerdrake:332
 #, c-format
 msgid "Auto-detect available ports"
 msgstr ""
 
-#: standalone/scannerdrake:303 standalone/scannerdrake:349
+#: standalone/scannerdrake:297 standalone/scannerdrake:343
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr ""
 
-#: standalone/scannerdrake:304
+#: standalone/scannerdrake:298
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr ""
 
-#: standalone/scannerdrake:306 standalone/scannerdrake:351
+#: standalone/scannerdrake:300 standalone/scannerdrake:345
 #, c-format
 msgid "choose device"
 msgstr ""
 
-#: standalone/scannerdrake:340
+#: standalone/scannerdrake:334
 #, c-format
 msgid "Searching for scanners ..."
 msgstr ""
 
-#: standalone/scannerdrake:375
+#: standalone/scannerdrake:368
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
-"You may now scan documents using \"XSane\" or \"Kooka\" from Multimedia/Graphics in the applications menu."
+"You may now scan documents using \"XSane\" from Multimedia/Graphics in the applications menu."
 msgstr ""
 
-#: standalone/scannerdrake:399
+#: standalone/scannerdrake:392
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -19831,7 +19276,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/scannerdrake:400
+#: standalone/scannerdrake:393
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -19841,141 +19286,133 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/scannerdrake:403 standalone/scannerdrake:406
+#: standalone/scannerdrake:396 standalone/scannerdrake:399
 #, c-format
 msgid ""
 "There are no scanners found which are available on your system.\n"
 ""
 msgstr ""
 
-#: standalone/scannerdrake:420
+#: standalone/scannerdrake:413
 #, c-format
 msgid "Search for new scanners"
 msgstr ""
 
-#: standalone/scannerdrake:426
+#: standalone/scannerdrake:419
 #, c-format
 msgid "Add a scanner manually"
 msgstr ""
 
-#: standalone/scannerdrake:433
+#: standalone/scannerdrake:426
 #, c-format
 msgid "Install/Update firmware files"
 msgstr ""
 
-#: standalone/scannerdrake:439
+#: standalone/scannerdrake:432
 #, c-format
 msgid "Scanner sharing"
 msgstr ""
 
-#: standalone/scannerdrake:498 standalone/scannerdrake:663
+#: standalone/scannerdrake:491 standalone/scannerdrake:656
 #, c-format
 msgid "All remote machines"
 msgstr ""
 
-#: standalone/scannerdrake:510 standalone/scannerdrake:813
+#: standalone/scannerdrake:503 standalone/scannerdrake:806
 #, c-format
 msgid "This machine"
 msgstr ""
 
-#: standalone/scannerdrake:550
+#: standalone/scannerdrake:543
 #, c-format
-msgid "Here you can choose whether the scanners connected to this machine should be accessible by remote machines and by which remote machines."
+msgid "Here you can choose whether the scanners connected to this machine should be accessable by remote machines and by which remote machines."
 msgstr ""
 
-#: standalone/scannerdrake:551
+#: standalone/scannerdrake:544
 #, c-format
 msgid "You can also decide here whether scanners on remote machines should be made available on this machine."
 msgstr ""
 
-#: standalone/scannerdrake:554
+#: standalone/scannerdrake:547
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr ""
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:549
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr ""
 
-#: standalone/scannerdrake:570
+#: standalone/scannerdrake:563
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr ""
 
-#: standalone/scannerdrake:573
+#: standalone/scannerdrake:566
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr ""
 
-#: standalone/scannerdrake:600 standalone/scannerdrake:672 standalone/scannerdrake:822
+#: standalone/scannerdrake:593 standalone/scannerdrake:665 standalone/scannerdrake:815
 #, c-format
 msgid "Sharing of local scanners"
 msgstr ""
 
-#: standalone/scannerdrake:601
+#: standalone/scannerdrake:594
 #, c-format
 msgid "These are the machines on which the locally connected scanner(s) should be available:"
 msgstr ""
 
-#: standalone/scannerdrake:612 standalone/scannerdrake:762
+#: standalone/scannerdrake:605 standalone/scannerdrake:755
 #, c-format
 msgid "Add host"
 msgstr ""
 
-#: standalone/scannerdrake:618 standalone/scannerdrake:768
+#: standalone/scannerdrake:611 standalone/scannerdrake:761
 #, c-format
 msgid "Edit selected host"
 msgstr ""
 
-#: standalone/scannerdrake:627 standalone/scannerdrake:777
+#: standalone/scannerdrake:620 standalone/scannerdrake:770
 #, c-format
 msgid "Remove selected host"
 msgstr ""
 
-#: standalone/scannerdrake:651 standalone/scannerdrake:659 standalone/scannerdrake:664 standalone/scannerdrake:710 standalone/scannerdrake:801 standalone/scannerdrake:809 standalone/scannerdrake:814 standalone/scannerdrake:860
+#: standalone/scannerdrake:644 standalone/scannerdrake:652 standalone/scannerdrake:657 standalone/scannerdrake:703 standalone/scannerdrake:794 standalone/scannerdrake:802 standalone/scannerdrake:807 standalone/scannerdrake:853
 #, c-format
 msgid "Name/IP address of host:"
 msgstr ""
 
-#: standalone/scannerdrake:673 standalone/scannerdrake:823
+#: standalone/scannerdrake:666 standalone/scannerdrake:816
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr ""
 
-#: standalone/scannerdrake:684 standalone/scannerdrake:834
+#: standalone/scannerdrake:677 standalone/scannerdrake:827
 #, c-format
 msgid ""
 "You must enter a host name or an IP address.\n"
 ""
 msgstr ""
 
-#: standalone/scannerdrake:695 standalone/scannerdrake:845
+#: standalone/scannerdrake:688 standalone/scannerdrake:838
 #, c-format
 msgid ""
 "This host is already in the list, it cannot be added again.\n"
 ""
 msgstr ""
 
-#: standalone/scannerdrake:750
+#: standalone/scannerdrake:743
 #, c-format
 msgid "Usage of remote scanners"
 msgstr ""
 
-#: standalone/scannerdrake:751
+#: standalone/scannerdrake:744
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr ""
 
-#: standalone/scannerdrake:908
-#, c-format
-msgid ""
-"saned needs to be installed to share the local scanner(s).\n"
-"\n"
-"Do you want to install the saned package?"
-msgstr ""
-
-#: standalone/scannerdrake:912 standalone/scannerdrake:916
+#: standalone/scannerdrake:904
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr ""
@@ -19994,7 +19431,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/service_harddrake:98
+#: standalone/service_harddrake:94
 #, c-format
 msgid "Hardware probing in progress"
 msgstr ""
@@ -20089,22 +19526,22 @@ msgstr ""
 msgid "Exit install"
 msgstr ""
 
-#: ugtk2.pm:1075
+#: ugtk2.pm:1051
 #, c-format
 msgid "Is this correct?"
 msgstr ""
 
-#: ugtk2.pm:1203
+#: ugtk2.pm:1174
 #, c-format
 msgid "Expand Tree"
 msgstr ""
 
-#: ugtk2.pm:1204
+#: ugtk2.pm:1175
 #, c-format
 msgid "Collapse Tree"
 msgstr ""
 
-#: ugtk2.pm:1205
+#: ugtk2.pm:1176
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr ""
@@ -20121,147 +19558,3 @@ msgstr ""
 msgid "Installation failed"
 msgstr ""
 
-
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news (mutt, tin..) and to browse the Web"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "A graphical environment with user-friendly set of applications and desktop tools"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""