updated Bulgarian file

author: Pablo Saratxaga <pablo@mandriva.com> 2000-08-31 20:58:20 +0000
committer: Pablo Saratxaga <pablo@mandriva.com> 2000-08-31 20:58:20 +0000
commit: 64d4b55d1524f56b2102d21920f2c94ea06040f3 (patch)
tree: 3bd8d4b05abc3c92e4476638972b608d3606bfb8 /perl-install
parent: 6b614ee862615cbbece0dea2575a7b0daefd7648 (diff)
download: drakx-backup-do-not-use-64d4b55d1524f56b2102d21920f2c94ea06040f3.tar
drakx-backup-do-not-use-64d4b55d1524f56b2102d21920f2c94ea06040f3.tar.gz
drakx-backup-do-not-use-64d4b55d1524f56b2102d21920f2c94ea06040f3.tar.bz2
drakx-backup-do-not-use-64d4b55d1524f56b2102d21920f2c94ea06040f3.tar.xz
drakx-backup-do-not-use-64d4b55d1524f56b2102d21920f2c94ea06040f3.zip
3 files changed, 1936 insertions, 1647 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index d86f0fd36..4030501da 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: 2000-08-30 19:27+0200\n"
+"POT-Creation-Date: 2000-08-31 20:21+0200\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"
@@ -129,7 +129,7 @@ msgstr ""
 msgid "An error has occurred, try to change some parameters"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:445 ../../Xconfigurator.pm_.c:628
+#: ../../Xconfigurator.pm_.c:445 ../../Xconfigurator.pm_.c:630
 msgid "Automatic resolutions"
 msgstr ""
 
@@ -140,164 +140,164 @@ msgid ""
 "You can switch if off if you want, you'll hear a beep when it's over"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:504 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:506 ../../printerdrake.pm_.c:260
 msgid "Resolution"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:539
+#: ../../Xconfigurator.pm_.c:541
 msgid "Choose the resolution and the color depth"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:541
+#: ../../Xconfigurator.pm_.c:543
 #, c-format
 msgid "Graphic card: %s"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:542
+#: ../../Xconfigurator.pm_.c:544
 #, c-format
 msgid "XFree86 server: %s"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:553
 msgid "Show all"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:575
+#: ../../Xconfigurator.pm_.c:577
 msgid "Resolutions"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:629
+#: ../../Xconfigurator.pm_.c:631
 msgid ""
 "I can try to find the available resolutions (eg: 800x600).\n"
 "Sometimes, though, it may hang the machine.\n"
 "Do you want to try?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:634
+#: ../../Xconfigurator.pm_.c:636
 msgid ""
 "No valid modes found\n"
 "Try with another video card or monitor"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1004
+#: ../../Xconfigurator.pm_.c:1008
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1005
+#: ../../Xconfigurator.pm_.c:1009
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1006
+#: ../../Xconfigurator.pm_.c:1010
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1007
+#: ../../Xconfigurator.pm_.c:1011
 #, c-format
 msgid "Monitor: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1008
+#: ../../Xconfigurator.pm_.c:1012
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1009
+#: ../../Xconfigurator.pm_.c:1013
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1010
+#: ../../Xconfigurator.pm_.c:1014
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1011
+#: ../../Xconfigurator.pm_.c:1015
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1012
+#: ../../Xconfigurator.pm_.c:1016
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1027
+#: ../../Xconfigurator.pm_.c:1031
 msgid "Preparing X-Window configuration"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1041
+#: ../../Xconfigurator.pm_.c:1045
 msgid "Change Monitor"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1042
+#: ../../Xconfigurator.pm_.c:1046
 msgid "Change Graphic card"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1043
+#: ../../Xconfigurator.pm_.c:1047
 msgid "Change Server options"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1044
+#: ../../Xconfigurator.pm_.c:1048
 msgid "Change Resolution"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1045
+#: ../../Xconfigurator.pm_.c:1049
 msgid "Automatical resolutions search"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1049
+#: ../../Xconfigurator.pm_.c:1053
 msgid "Show information"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1050
+#: ../../Xconfigurator.pm_.c:1054
 msgid "Test again"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1051 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1055 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1055 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1059 ../../standalone/drakboot_.c:39
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1062
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Forget the changes?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1080
+#: ../../Xconfigurator.pm_.c:1084
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1096
+#: ../../Xconfigurator.pm_.c:1100
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1099
+#: ../../Xconfigurator.pm_.c:1103
 msgid "X at startup"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1100
+#: ../../Xconfigurator.pm_.c:1104
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1112
+#: ../../Xconfigurator.pm_.c:1116
 msgid "Autologin"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1113
+#: ../../Xconfigurator.pm_.c:1117
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
 "If you don't want to use this feature, click on the cancel button."
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1115
+#: ../../Xconfigurator.pm_.c:1119
 msgid "Choose the default user:"
 msgstr ""
 
@@ -482,15 +482,15 @@ msgstr ""
 msgid "Delay before booting default image"
 msgstr ""
 
-#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:688
-#: ../../install_steps_interactive.pm_.c:739 ../../netconnect.pm_.c:482
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:110
+#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:687
+#: ../../install_steps_interactive.pm_.c:738 ../../netconnect.pm_.c:481
+#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:137
 #: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr ""
 
-#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:689
-#: ../../install_steps_interactive.pm_.c:740
+#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:739
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr ""
@@ -512,14 +512,14 @@ msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:698
-#: ../../install_steps_interactive.pm_.c:753
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:697
+#: ../../install_steps_interactive.pm_.c:752
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr ""
 
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:698
-#: ../../install_steps_interactive.pm_.c:753
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:697
+#: ../../install_steps_interactive.pm_.c:752
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr ""
@@ -530,13 +530,13 @@ msgid ""
 "You can add some more or change the existing ones."
 msgstr ""
 
-#: ../../any.pm_.c:159 ../../printerdrake.pm_.c:244
+#: ../../any.pm_.c:159 ../../printerdrake.pm_.c:337
 #: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr ""
 
-#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:44
-#: ../../install_steps_interactive.pm_.c:733 ../../printerdrake.pm_.c:244
+#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:45
+#: ../../install_steps_interactive.pm_.c:732 ../../printerdrake.pm_.c:337
 #: ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr ""
@@ -594,11 +594,12 @@ msgid "Default"
 msgstr ""
 
 #: ../../any.pm_.c:213 ../../install_steps_gtk.pm_.c:580
-#: ../../install_steps_interactive.pm_.c:686 ../../interactive.pm_.c:74
+#: ../../install_steps_interactive.pm_.c:685 ../../interactive.pm_.c:74
 #: ../../interactive.pm_.c:84 ../../interactive.pm_.c:234
 #: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
 #: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:204
-#: ../../my_gtk.pm_.c:463 ../../my_gtk.pm_.c:638 ../../printerdrake.pm_.c:271
+#: ../../my_gtk.pm_.c:463 ../../my_gtk.pm_.c:638 ../../printerdrake.pm_.c:370
+#: ../../printerdrake.pm_.c:382
 msgid "Ok"
 msgstr ""
 
@@ -661,7 +662,7 @@ msgstr ""
 msgid "Start Menu"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:416
+#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:418
 msgid "Create"
 msgstr ""
 
@@ -669,7 +670,7 @@ msgstr ""
 msgid "Unmount"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:420
 msgid "Delete"
 msgstr ""
 
@@ -677,16 +678,16 @@ msgstr ""
 msgid "Format"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:592
+#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:594
 msgid "Resize"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:416
-#: ../../diskdrake.pm_.c:469
+#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:471
 msgid "Type"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:489
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:491
 msgid "Mount point"
 msgstr ""
 
@@ -711,96 +712,100 @@ msgid "Save in file"
 msgstr ""
 
 #: ../../diskdrake.pm_.c:42
-msgid "Restore from floppy"
+msgid "Wizard"
 msgstr ""
 
 #: ../../diskdrake.pm_.c:43
+msgid "Restore from floppy"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:44
 msgid "Save on floppy"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:48
 msgid "Clear all"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:48
+#: ../../diskdrake.pm_.c:49
 msgid "Format all"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:49
+#: ../../diskdrake.pm_.c:50
 msgid "Auto allocate"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:52
+#: ../../diskdrake.pm_.c:53
 msgid "All primary partitions are used"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:52
+#: ../../diskdrake.pm_.c:53
 msgid "I can't add any more partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:52
+#: ../../diskdrake.pm_.c:53
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:56
 msgid "Rescue partition table"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:57
 msgid "Undo"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:57
+#: ../../diskdrake.pm_.c:58
 msgid "Write partition table"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:58
+#: ../../diskdrake.pm_.c:59
 msgid "Reload"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:98
+#: ../../diskdrake.pm_.c:99
 msgid "loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "Ext2"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "FAT"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "HFS"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "SunOS"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "Swap"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:112
+#: ../../diskdrake.pm_.c:113
 msgid "Empty"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:112
+#: ../../diskdrake.pm_.c:113
 msgid "Other"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:118
+#: ../../diskdrake.pm_.c:119
 msgid "Filesystem types:"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:127
+#: ../../diskdrake.pm_.c:128
 msgid "Details"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:141
+#: ../../diskdrake.pm_.c:142
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -808,172 +813,172 @@ msgid ""
 "(click on it, then click on \"Resize\")"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:147
 msgid "Please make a backup of your data first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:146 ../../diskdrake.pm_.c:163
-#: ../../diskdrake.pm_.c:172 ../../diskdrake.pm_.c:521
-#: ../../diskdrake.pm_.c:543
+#: ../../diskdrake.pm_.c:147 ../../diskdrake.pm_.c:164
+#: ../../diskdrake.pm_.c:173 ../../diskdrake.pm_.c:523
+#: ../../diskdrake.pm_.c:545
 msgid "Read carefully!"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:149
+#: ../../diskdrake.pm_.c:150
 msgid ""
 "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 ""
 
-#: ../../diskdrake.pm_.c:163
+#: ../../diskdrake.pm_.c:164
 msgid "Be careful: this operation is dangerous."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:200 ../../install_steps.pm_.c:75
+#: ../../diskdrake.pm_.c:201 ../../install_steps.pm_.c:75
 #: ../../install_steps_interactive.pm_.c:42
 #: ../../install_steps_interactive.pm_.c:218 ../../standalone/diskdrake_.c:60
 #: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:685
+#: ../../diskdrake.pm_.c:226 ../../diskdrake.pm_.c:687
 msgid "Mount point: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:225 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:268
 msgid "Device: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:228
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:269
+#: ../../diskdrake.pm_.c:229 ../../diskdrake.pm_.c:271
 msgid "Type: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:230
 #, c-format
 msgid "Start: sector %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:229
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Size: %d MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:233
 #, c-format
 msgid ", %s sectors"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:235
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:236
 msgid "Formatted\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:237
 msgid "Not formatted\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:238
 msgid "Mounted\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:237
+#: ../../diskdrake.pm_.c:239
 #, c-format
 msgid "RAID md%s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:241
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:241
+#: ../../diskdrake.pm_.c:243
 #, c-format
 msgid "Level %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Chunk size %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:243
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:245
+#: ../../diskdrake.pm_.c:247
 #, c-format
 msgid "Loopback file name: %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:262
+#: ../../diskdrake.pm_.c:264
 msgid "Please click on a partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:269
 #, c-format
 msgid "Size: %d MB\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:270
+#: ../../diskdrake.pm_.c:272
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:271
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:286
 msgid "Mount"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:287
 msgid "Active"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:288
 msgid "Add to RAID"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:287
+#: ../../diskdrake.pm_.c:289
 msgid "Remove from RAID"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:288
+#: ../../diskdrake.pm_.c:290
 msgid "Modify RAID"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:289
+#: ../../diskdrake.pm_.c:291
 msgid "Use for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:296
+#: ../../diskdrake.pm_.c:298
 msgid "Choose action"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:389
+#: ../../diskdrake.pm_.c:391
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -981,7 +986,7 @@ msgid ""
 "need /boot"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:393
+#: ../../diskdrake.pm_.c:395
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -989,236 +994,236 @@ msgid ""
 "If you plan to use the LILO boot manager, be careful to add a /boot partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:399
+#: ../../diskdrake.pm_.c:401
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
 "So be careful to add a /boot partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:416 ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:418 ../../diskdrake.pm_.c:420
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:421
+#: ../../diskdrake.pm_.c:423
 msgid "Use ``Unmount'' first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:422 ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:424 ../../diskdrake.pm_.c:466
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:434
+#: ../../diskdrake.pm_.c:436
 msgid "Continue anyway?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake.pm_.c:441
 msgid "Quit without saving"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake.pm_.c:441
 msgid "Quit without writing the partition table?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:467
+#: ../../diskdrake.pm_.c:469
 msgid "Change partition type"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:468
+#: ../../diskdrake.pm_.c:470
 msgid "Which partition type do you want?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:471 ../../diskdrake.pm_.c:717
+#: ../../diskdrake.pm_.c:473 ../../diskdrake.pm_.c:719
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:487
+#: ../../diskdrake.pm_.c:489
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:488
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:493
+#: ../../diskdrake.pm_.c:495
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:514
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:514
+#: ../../diskdrake.pm_.c:516
 msgid "Formatting"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:515
+#: ../../diskdrake.pm_.c:517
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:516 ../../install_steps_interactive.pm_.c:304
+#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:294
 #, c-format
 msgid "Formatting partition %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:521
+#: ../../diskdrake.pm_.c:523
 msgid "After formatting all partitions,"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:521
+#: ../../diskdrake.pm_.c:523
 msgid "all data on these partitions will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:527
+#: ../../diskdrake.pm_.c:529
 msgid "Move"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Which disk do you want to move it to?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Sector"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:530
+#: ../../diskdrake.pm_.c:532
 msgid "Which sector do you want to move it to?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:535
 msgid "Moving"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:535
 msgid "Moving partition..."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:543
+#: ../../diskdrake.pm_.c:545
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:545
+#: ../../diskdrake.pm_.c:547
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:566 ../../install_interactive.pm_.c:68
+#: ../../diskdrake.pm_.c:568 ../../install_interactive.pm_.c:90
 msgid "Computing FAT filesystem bounds"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:566 ../../diskdrake.pm_.c:620
-#: ../../install_interactive.pm_.c:68
+#: ../../diskdrake.pm_.c:568 ../../diskdrake.pm_.c:622
+#: ../../install_interactive.pm_.c:90
 msgid "Resizing"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:587
+#: ../../diskdrake.pm_.c:589
 msgid "All data on this partition should be backed-up"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:589
+#: ../../diskdrake.pm_.c:591
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:599
+#: ../../diskdrake.pm_.c:601
 msgid "Choose the new size"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:599 ../../install_steps_graphical.pm_.c:287
+#: ../../diskdrake.pm_.c:601 ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334 ../../partition_table_raw.pm_.c:100
 msgid "MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:657
+#: ../../diskdrake.pm_.c:659
 msgid "Create a new partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:677
+#: ../../diskdrake.pm_.c:679
 msgid "Start sector: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:681 ../../diskdrake.pm_.c:756
+#: ../../diskdrake.pm_.c:683 ../../diskdrake.pm_.c:758
 msgid "Size in MB: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:684 ../../diskdrake.pm_.c:759
+#: ../../diskdrake.pm_.c:686 ../../diskdrake.pm_.c:761
 msgid "Filesystem type: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:687
+#: ../../diskdrake.pm_.c:689
 msgid "Preference: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:735
+#: ../../diskdrake.pm_.c:737
 msgid "This partition can't be used for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:745
+#: ../../diskdrake.pm_.c:747
 msgid "Loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:757
 msgid "Loopback file name: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:781
+#: ../../diskdrake.pm_.c:783
 msgid "File already used by another loopback, choose another one"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:782
+#: ../../diskdrake.pm_.c:784
 msgid "File already exists. Use it?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:804 ../../diskdrake.pm_.c:820
+#: ../../diskdrake.pm_.c:806 ../../diskdrake.pm_.c:822
 msgid "Select file"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:813
+#: ../../diskdrake.pm_.c:815
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:821
+#: ../../diskdrake.pm_.c:823
 msgid "Warning"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:822
+#: ../../diskdrake.pm_.c:824
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:833
+#: ../../diskdrake.pm_.c:835
 msgid "Trying to rescue partition table"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:846
 msgid "device"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:847
 msgid "level"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:846
+#: ../../diskdrake.pm_.c:848
 msgid "chunk size"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:860
 msgid "Choose an existing RAID to add to"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:859
+#: ../../diskdrake.pm_.c:861
 msgid "new"
 msgstr ""
 
@@ -1287,15 +1292,14 @@ msgid "Choose the layout corresponding to your keyboard from the list above"
 msgstr ""
 
 #: ../../help.pm_.c:13
+#, c-format
 msgid ""
 "Choose \"Install\" if there are no previous versions of GNU/Linux\n"
 "installed, or if you wish to use multiple distributions or versions.\n"
 "\n"
 "Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
 "Linux:\n"
-"5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
-"2000\n"
-"or 7.0 (Air).\n"
+"%s or %s.\n"
 "\n"
 "\n"
 "Select:\n"
@@ -1314,7 +1318,7 @@ msgid ""
 "DOING!\n"
 msgstr ""
 
-#: ../../help.pm_.c:35
+#: ../../help.pm_.c:34
 msgid ""
 "Select:\n"
 "\n"
@@ -1330,7 +1334,7 @@ msgid ""
 "DOING!\n"
 msgstr ""
 
-#: ../../help.pm_.c:47
+#: ../../help.pm_.c:46
 msgid ""
 "The different choices for your machine's usage (provided, hence, that you "
 "have\n"
@@ -1357,7 +1361,7 @@ msgid ""
 "    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\n"
 msgstr ""
 
-#: ../../help.pm_.c:68
+#: ../../help.pm_.c:67
 msgid ""
 "DrakX will attempt to look for PCI SCSI adapter(s). \n"
 "If DrakX finds a SCSI adapter and knows which driver to use it will\n"
@@ -1381,7 +1385,7 @@ msgid ""
 "website (if you have Internet access)."
 msgstr ""
 
-#: ../../help.pm_.c:90
+#: ../../help.pm_.c:89
 msgid ""
 "At this point, you may choose what partition(s) to use to install\n"
 "your Linux-Mandrake system if they have been already defined (from a\n"
@@ -1422,7 +1426,7 @@ msgid ""
 "- Ctrl-m  to set the mount point\n"
 msgstr ""
 
-#: ../../help.pm_.c:127
+#: ../../help.pm_.c:126
 msgid ""
 "Any partitions that have been newly defined must be formatted for\n"
 "use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -1432,7 +1436,7 @@ msgid ""
 "Typically retained are /home and /usr/local."
 msgstr ""
 
-#: ../../help.pm_.c:135
+#: ../../help.pm_.c:134
 msgid ""
 "You may now select the group of packages you wish to\n"
 "install or upgrade.\n"
@@ -1448,14 +1452,14 @@ msgid ""
 "through more than 1000 packages..."
 msgstr ""
 
-#: ../../help.pm_.c:146
+#: ../../help.pm_.c:145
 msgid ""
 "If you have all the CDs in the list above, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: ../../help.pm_.c:151
+#: ../../help.pm_.c:150
 msgid ""
 "The packages selected are now being installed. This operation\n"
 "should take a few minutes unless you have chosen to upgrade an\n"
@@ -1463,7 +1467,7 @@ msgid ""
 "upgrade starts."
 msgstr ""
 
-#: ../../help.pm_.c:157
+#: ../../help.pm_.c:156
 msgid ""
 "If DrakX failed to find your mouse, or if you want to\n"
 "check what it has done, you will be presented the list of mice\n"
@@ -1479,13 +1483,13 @@ msgid ""
 "which serial port it is connected to."
 msgstr ""
 
-#: ../../help.pm_.c:171
+#: ../../help.pm_.c:170
 msgid ""
 "Please select the correct port. For example, the COM1 port under MS Windows\n"
 "is named ttyS0 under GNU/Linux."
 msgstr ""
 
-#: ../../help.pm_.c:175
+#: ../../help.pm_.c:174
 msgid ""
 "This section is dedicated to configuring a local area\n"
 "network (LAN) or a modem.\n"
@@ -1517,7 +1521,7 @@ msgid ""
 "your modem is connected to."
 msgstr ""
 
-#: ../../help.pm_.c:205
+#: ../../help.pm_.c:204
 msgid ""
 "Enter:\n"
 "\n"
@@ -1534,19 +1538,19 @@ msgid ""
 "not sure, ask your network administrator or ISP.\n"
 msgstr ""
 
-#: ../../help.pm_.c:220
+#: ../../help.pm_.c:219
 msgid ""
 "You may now enter dialup options. If you're not sure what to enter, the\n"
 "correct information can be obtained from your ISP."
 msgstr ""
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:223
 msgid ""
 "If you will use proxies, please configure them now. If you don't know if\n"
 "you should use proxies, ask your network administrator or your ISP."
 msgstr ""
 
-#: ../../help.pm_.c:228
+#: ../../help.pm_.c:227
 msgid ""
 "You can install cryptographic package if your internet connection has been\n"
 "set up correctly. First choose a mirror where you wish to download packages "
@@ -1557,7 +1561,7 @@ msgid ""
 "to your legislation."
 msgstr ""
 
-#: ../../help.pm_.c:236
+#: ../../help.pm_.c:235
 msgid ""
 "You can now select your timezone according to where you live.\n"
 "\n"
@@ -1566,7 +1570,7 @@ msgid ""
 "in local time according to the time zone you have selected."
 msgstr ""
 
-#: ../../help.pm_.c:243
+#: ../../help.pm_.c:242
 msgid ""
 "You may now choose which services you want to see started at boot time.\n"
 "When your mouse comes over an item, a small balloon help will popup which\n"
@@ -1577,7 +1581,7 @@ msgid ""
 "want."
 msgstr ""
 
-#: ../../help.pm_.c:252
+#: ../../help.pm_.c:251
 msgid ""
 "GNU/Linux can deal with many types of printer. Each of these\n"
 "types require a different setup. Note however that the print\n"
@@ -1608,7 +1612,7 @@ msgid ""
 "for a NetWare printer, except that you need no workgroup information."
 msgstr ""
 
-#: ../../help.pm_.c:281
+#: ../../help.pm_.c:280
 msgid ""
 "You can now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
@@ -1626,19 +1630,19 @@ msgid ""
 "effort."
 msgstr ""
 
-#: ../../help.pm_.c:297
+#: ../../help.pm_.c:296
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
 msgstr ""
 
-#: ../../help.pm_.c:301
+#: ../../help.pm_.c:300
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
 msgstr ""
 
-#: ../../help.pm_.c:305
+#: ../../help.pm_.c:304
 msgid ""
 "You may now create one or more \"regular\" user account(s), as\n"
 "opposed to the \"privileged\" user account, root. You can create\n"
@@ -1662,7 +1666,7 @@ msgid ""
 "and maintenance purposes."
 msgstr ""
 
-#: ../../help.pm_.c:324
+#: ../../help.pm_.c:323
 msgid ""
 "It is strongly recommended that you answer \"Yes\" here. If you install\n"
 "Microsoft Windows at a later date it will overwrite the boot sector.\n"
@@ -1670,7 +1674,7 @@ msgid ""
 "boot into GNU/Linux any more."
 msgstr ""
 
-#: ../../help.pm_.c:330
+#: ../../help.pm_.c:329
 msgid ""
 "You need to indicate where you wish\n"
 "to place the information required to boot to GNU/Linux.\n"
@@ -1680,13 +1684,13 @@ msgid ""
 "drive (MBR)\"."
 msgstr ""
 
-#: ../../help.pm_.c:338
+#: ../../help.pm_.c:337
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
 msgstr ""
 
-#: ../../help.pm_.c:342
+#: ../../help.pm_.c:341
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
@@ -1700,7 +1704,7 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 
-#: ../../help.pm_.c:354
+#: ../../help.pm_.c:353
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1721,7 +1725,7 @@ msgid ""
 "    * <number>:  use the corresponding text mode."
 msgstr ""
 
-#: ../../help.pm_.c:373
+#: ../../help.pm_.c:372
 msgid ""
 "SILO is a bootloader for SPARC: it is able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
@@ -1735,7 +1739,7 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 
-#: ../../help.pm_.c:385
+#: ../../help.pm_.c:384
 msgid ""
 "SILO main options are:\n"
 "  - Bootloader installation: Indicate where you want to place the\n"
@@ -1750,7 +1754,7 @@ msgid ""
 "omitted or is set to zero."
 msgstr ""
 
-#: ../../help.pm_.c:398
+#: ../../help.pm_.c:397
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
 "core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -1765,19 +1769,19 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 
-#: ../../help.pm_.c:411
+#: ../../help.pm_.c:410
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
 msgstr ""
 
-#: ../../help.pm_.c:415
+#: ../../help.pm_.c:414
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
 msgstr ""
 
-#: ../../help.pm_.c:419
+#: ../../help.pm_.c:418
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
@@ -1811,7 +1815,7 @@ msgid ""
 "    select this option (Note: NumLock may or may not work under X)."
 msgstr ""
 
-#: ../../help.pm_.c:444
+#: ../../help.pm_.c:443
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -1840,7 +1844,7 @@ msgstr ""
 msgid "Choose your keyboard"
 msgstr ""
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:374
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:364
 msgid "Miscellaneous"
 msgstr ""
 
@@ -1880,8 +1884,8 @@ msgstr ""
 msgid "Configure printer"
 msgstr ""
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:686
-#: ../../install_steps_interactive.pm_.c:687
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:686
 msgid "Set root password"
 msgstr ""
 
@@ -1909,66 +1913,84 @@ msgstr ""
 msgid "Exit install"
 msgstr ""
 
-#: ../../install_any.pm_.c:568
+#: ../../install_any.pm_.c:570
 msgid "Error reading file $f"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:34
+#: ../../install_interactive.pm_.c:30
+msgid ""
+"You must have a root partition.\n"
+"For this, create a partition (or click on an existing one).\n"
+"Then choose action ``Mount point'' and set it to `/'"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:35 ../../install_steps_graphical.pm_.c:259
+msgid "You must have a swap partition"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:36 ../../install_steps_graphical.pm_.c:261
+msgid ""
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:56
 msgid "Use free space"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:36
+#: ../../install_interactive.pm_.c:58
 msgid "Not enough free space to allocate new partitions"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:42
+#: ../../install_interactive.pm_.c:64
 msgid "Use existing partition"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:44
+#: ../../install_interactive.pm_.c:66
 msgid "There is no existing partition to use"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:51
+#: ../../install_interactive.pm_.c:73
 msgid "Use the FAT partition for loopback"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:54
+#: ../../install_interactive.pm_.c:76
 msgid "Which partition do you want to use to put Linux4Win?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:55
+#: ../../install_interactive.pm_.c:77
 msgid "Choose the sizes"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:56
+#: ../../install_interactive.pm_.c:78
 msgid "Root partition size in MB: "
 msgstr ""
 
-#: ../../install_interactive.pm_.c:57
+#: ../../install_interactive.pm_.c:79
 msgid "Swap partition size in MB: "
 msgstr ""
 
-#: ../../install_interactive.pm_.c:65
+#: ../../install_interactive.pm_.c:87
 msgid "Use the free space on the FAT partition"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:67
+#: ../../install_interactive.pm_.c:89
 msgid "Which partition do you want to resize?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:92
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
 "the following error occured: %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:73
+#: ../../install_interactive.pm_.c:95
 msgid "Your windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:74
+#: ../../install_interactive.pm_.c:96
 msgid ""
 "WARNING!\n"
 "\n"
@@ -1979,92 +2001,86 @@ msgid ""
 "When sure, press Ok."
 msgstr ""
 
-#: ../../install_interactive.pm_.c:83
+#: ../../install_interactive.pm_.c:105
 msgid "Which size do you want to keep for windows on"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:84
+#: ../../install_interactive.pm_.c:106
 #, c-format
 msgid "partition %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:112
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:127
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:133
 msgid "Remove Windows(TM)"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:133
 msgid "Take over the hard drive"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:135
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:115
+#: ../../install_interactive.pm_.c:137
 #, c-format
 msgid "All existing partitions and their data will be lost on drive %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:145
 msgid "Use diskdrake"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:132
-msgid ""
-"You must have a root partition.\n"
-"For this, create a partition (or click on an existing one).\n"
-"Then choose action ``Mount point'' and set it to `/'"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:137 ../../install_steps_graphical.pm_.c:259
-msgid "You must have a swap partition"
+#: ../../install_interactive.pm_.c:149
+msgid "Use fdisk"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:138 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:152
+#, c-format
 msgid ""
-"You don't have a swap partition\n"
-"\n"
-"Continue anyway?"
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:146
-msgid "Use fdisk"
+#: ../../install_interactive.pm_.c:178
+msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:149
+#: ../../install_interactive.pm_.c:182
 #, c-format
-msgid ""
-"You can now partition %s.\n"
-"When you are done, don't forget to save using `w'"
+msgid "Partitioning failed: %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:167
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../install_interactive.pm_.c:192
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:168
+#: ../../install_interactive.pm_.c:193
 #, c-format
 msgid "(module %s)"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:178
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../install_interactive.pm_.c:204
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:186
+#: ../../install_interactive.pm_.c:212
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -2076,20 +2092,20 @@ msgid ""
 "not cause any damage."
 msgstr ""
 
-#: ../../install_interactive.pm_.c:191
+#: ../../install_interactive.pm_.c:217
 msgid "Autoprobe"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:191
+#: ../../install_interactive.pm_.c:217
 msgid "Specify options"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:195
+#: ../../install_interactive.pm_.c:221
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr ""
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:227
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -2097,60 +2113,60 @@ msgid ""
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:204
+#: ../../install_interactive.pm_.c:230
 msgid "Module options:"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:214
+#: ../../install_interactive.pm_.c:240
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
 "Do you want to try again with other parameters?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:225
+#: ../../install_interactive.pm_.c:251
 msgid "Configuring PCMCIA cards..."
 msgstr ""
 
-#: ../../install_interactive.pm_.c:225
+#: ../../install_interactive.pm_.c:251
 msgid "PCMCIA"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:247
+#: ../../install_interactive.pm_.c:273
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:248
+#: ../../install_interactive.pm_.c:274
 msgid "Do you have another one?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:249
+#: ../../install_interactive.pm_.c:275
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:251 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:85 ../../netconnect.pm_.c:404
-#: ../../netconnect.pm_.c:570 ../../printerdrake.pm_.c:124
+#: ../../install_interactive.pm_.c:277 ../../interactive.pm_.c:79
+#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:85 ../../netconnect.pm_.c:403
+#: ../../netconnect.pm_.c:576 ../../printerdrake.pm_.c:217
 msgid "No"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:251 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:83 ../../netconnect.pm_.c:402
-#: ../../netconnect.pm_.c:568
+#: ../../install_interactive.pm_.c:277 ../../interactive.pm_.c:79
+#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:83 ../../netconnect.pm_.c:401
+#: ../../netconnect.pm_.c:574
 msgid "Yes"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:252
+#: ../../install_interactive.pm_.c:278
 msgid "See hardware info"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:267
+#: ../../install_interactive.pm_.c:293
 msgid "Bringing up the network"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:272
+#: ../../install_interactive.pm_.c:298
 msgid "Bringing down the network"
 msgstr ""
 
@@ -2173,12 +2189,12 @@ msgid ""
 "Mandrake/RPMS/*.rpm\"\n"
 msgstr ""
 
-#: ../../install_steps.pm_.c:411
+#: ../../install_steps.pm_.c:413
 #, c-format
 msgid "Welcome to %s"
 msgstr ""
 
-#: ../../install_steps.pm_.c:644
+#: ../../install_steps.pm_.c:646
 msgid "No floppy drive available"
 msgstr ""
 
@@ -2222,7 +2238,7 @@ msgid "Install"
 msgstr ""
 
 #: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:439
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:434
 msgid "Installing"
 msgstr ""
 
@@ -2239,7 +2255,7 @@ msgid "Total time "
 msgstr ""
 
 #: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:457
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:434
 msgid "Preparing installation"
 msgstr ""
 
@@ -2258,7 +2274,7 @@ msgid "There was an error ordering packages:"
 msgstr ""
 
 #: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../install_steps_interactive.pm_.c:943
 msgid "Use existing configuration for X11?"
 msgstr ""
 
@@ -2377,10 +2393,11 @@ msgstr ""
 msgid "Estimating"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:454 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:233 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:205 ../../my_gtk.pm_.c:463
+#: ../../install_steps_gtk.pm_.c:454 ../../install_steps_interactive.pm_.c:663
+#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:233
+#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:205
+#: ../../my_gtk.pm_.c:463
 msgid "Cancel"
 msgstr ""
 
@@ -2469,7 +2486,7 @@ msgid "Upgrade"
 msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:138
-msgid "Normal"
+msgid "Workstation"
 msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:139
@@ -2534,134 +2551,125 @@ msgstr ""
 msgid "What is the root partition (/) of your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:250
-msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:253
-#, c-format
-msgid "Partitioning failed: %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:251
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:287
+#: ../../install_steps_interactive.pm_.c:277
 msgid "Choose the partitions you want to format"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:291
+#: ../../install_steps_interactive.pm_.c:281
 msgid "Check bad blocks?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:299
+#: ../../install_steps_interactive.pm_.c:289
 msgid "Formatting partitions"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:303
+#: ../../install_steps_interactive.pm_.c:293
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:296
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:312
+#: ../../install_steps_interactive.pm_.c:302
 msgid "Looking for available packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:318
+#: ../../install_steps_interactive.pm_.c:308
 msgid "Finding packages to upgrade"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:335
+#: ../../install_steps_interactive.pm_.c:325
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:350
+#: ../../install_steps_interactive.pm_.c:340
 #, c-format
 msgid "Complete (%dMB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:350
+#: ../../install_steps_interactive.pm_.c:340
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:350
+#: ../../install_steps_interactive.pm_.c:340
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:373
+#: ../../install_steps_interactive.pm_.c:363
 msgid "Package Group Selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:376
+#: ../../install_steps_interactive.pm_.c:366
 msgid "Individual package selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:422
+#: ../../install_steps_interactive.pm_.c:412
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:425
+#: ../../install_steps_interactive.pm_.c:415
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:453
+#: ../../install_steps_interactive.pm_.c:443
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:462
+#: ../../install_steps_interactive.pm_.c:452
 msgid "Post-install configuration"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:472
+#: ../../install_steps_interactive.pm_.c:462
 msgid "Keep the current IP configuration"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:473
+#: ../../install_steps_interactive.pm_.c:463
 msgid "Reconfigure network now"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:474
+#: ../../install_steps_interactive.pm_.c:464
 msgid "Do not set up networking"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:477
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:472
 msgid "Network Configuration"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:478
+#: ../../install_steps_interactive.pm_.c:468
 msgid "Local networking has already been configured. Do you want to:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:483
+#: ../../install_steps_interactive.pm_.c:473
 msgid "Do you want to configure a local network for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:489
+#: ../../install_steps_interactive.pm_.c:479
 msgid "no network card found"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:561
+#: ../../install_steps_interactive.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:551
 msgid "Configuring network"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:508
+#: ../../install_steps_interactive.pm_.c:498
 msgid ""
 "Please enter your host name if you know it.\n"
 "Some DHCP servers require the hostname to work.\n"
@@ -2669,45 +2677,45 @@ msgid ""
 "such as ``mybox.mylab.myco.com''."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:512
-#: ../../install_steps_interactive.pm_.c:566
+#: ../../install_steps_interactive.pm_.c:502
+#: ../../install_steps_interactive.pm_.c:556
 msgid "Host name:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:532
+#: ../../install_steps_interactive.pm_.c:521
+#: ../../install_steps_interactive.pm_.c:522
 #, c-format
 msgid "Configuring network device %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:533
+#: ../../install_steps_interactive.pm_.c:523
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
 "notation (for example, 1.2.3.4)."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:526
 msgid "Automatic IP"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:526
 msgid "IP address:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:526
 msgid "Netmask:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:537
+#: ../../install_steps_interactive.pm_.c:527
 msgid "(bootp/dhcp)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:543 ../../printerdrake.pm_.c:89
+#: ../../install_steps_interactive.pm_.c:533 ../../printerdrake.pm_.c:107
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:562
+#: ../../install_steps_interactive.pm_.c:552
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -2715,19 +2723,19 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:566
+#: ../../install_steps_interactive.pm_.c:556
 msgid "DNS server:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:566
+#: ../../install_steps_interactive.pm_.c:556
 msgid "Gateway device:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:566
+#: ../../install_steps_interactive.pm_.c:556
 msgid "Gateway:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:582
+#: ../../install_steps_interactive.pm_.c:572
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2766,88 +2774,92 @@ msgid ""
 "USA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:613
+#: ../../install_steps_interactive.pm_.c:603
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:621
+#: ../../install_steps_interactive.pm_.c:611
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:625
+#: ../../install_steps_interactive.pm_.c:615
 msgid "Please choose the packages you want to install."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:638
+#: ../../install_steps_interactive.pm_.c:628
 msgid "Which is your timezone?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:639
+#: ../../install_steps_interactive.pm_.c:629
 msgid "Is your hardware clock set to GMT?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:662
+msgid "What printing system do you want to use?"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:685
 msgid "No password"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_interactive.pm_.c:690
 msgid "Use shadow file"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_interactive.pm_.c:690
 msgid "shadow"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:692
+#: ../../install_steps_interactive.pm_.c:691
 msgid "MD5"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:692
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Use MD5 passwords"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:694
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Use NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:694
+#: ../../install_steps_interactive.pm_.c:693
 msgid "yellow pages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:699
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:706
 msgid "Authentification NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:707
 msgid "NIS Domain"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:707
 msgid "NIS Server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:732
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:732
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:733
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:733
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -2855,48 +2867,48 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:736
+#: ../../install_steps_interactive.pm_.c:735
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:737 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:736 ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:136 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:742
+#: ../../install_steps_interactive.pm_.c:741
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:744
+#: ../../install_steps_interactive.pm_.c:743
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:754
+#: ../../install_steps_interactive.pm_.c:753
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:754
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:756
+#: ../../install_steps_interactive.pm_.c:755
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:757
+#: ../../install_steps_interactive.pm_.c:756
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:781
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -2914,19 +2926,19 @@ msgid ""
 "drive and press \"Ok\"."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:798
+#: ../../install_steps_interactive.pm_.c:797
 msgid "First floppy drive"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:798
 msgid "Second floppy drive"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:800
+#: ../../install_steps_interactive.pm_.c:799
 msgid "Skip"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:805
+#: ../../install_steps_interactive.pm_.c:804
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -2940,131 +2952,131 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:814
+#: ../../install_steps_interactive.pm_.c:813
 msgid "Sorry, no floppy drive available"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:817
+#: ../../install_steps_interactive.pm_.c:816
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:822
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:825
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:833
+#: ../../install_steps_interactive.pm_.c:832
 msgid "Preparing bootloader"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:841
+#: ../../install_steps_interactive.pm_.c:840
 msgid "Do you want to use aboot?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:844
+#: ../../install_steps_interactive.pm_.c:843
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:853
+#: ../../install_steps_interactive.pm_.c:852
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:868
+#: ../../install_steps_interactive.pm_.c:867
 msgid "Proxies configuration"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:868
 msgid "HTTP proxy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:870
+#: ../../install_steps_interactive.pm_.c:869
 msgid "FTP proxy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:876
+#: ../../install_steps_interactive.pm_.c:875
 msgid "Proxy should be http://..."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:877
+#: ../../install_steps_interactive.pm_.c:876
 msgid "Proxy should be ftp://..."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:887 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:886 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:888 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:887 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:889 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:888 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:890 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:889 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:891 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:890 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:892 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:891 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Miscellaneous questions"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:905
 msgid "(may cause data corruption)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:905
 msgid "Use hard drive optimisations?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:907 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:906 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:908
+#: ../../install_steps_interactive.pm_.c:907
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:909
 msgid "Removable media automounting"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:912
+#: ../../install_steps_interactive.pm_.c:911
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:914
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:917
+#: ../../install_steps_interactive.pm_.c:916
 msgid "Enable num lock at startup"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:920
+#: ../../install_steps_interactive.pm_.c:919
 msgid "Give the ram size in MB"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:922
+#: ../../install_steps_interactive.pm_.c:921
 msgid "Can't use supermount in high security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:924
+#: ../../install_steps_interactive.pm_.c:923
 msgid ""
 "beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
 "If you want to be root, you have to login as a user and then use \"su\".\n"
@@ -3073,13 +3085,13 @@ msgid ""
 "You have been warned."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:929
+#: ../../install_steps_interactive.pm_.c:928
 msgid ""
 "Be carefull, having numlock enabled causes a lot of keystrokes to\n"
 "give digits instead of normal letters (eg: pressing `p' gives `6')"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:950
+#: ../../install_steps_interactive.pm_.c:949
 msgid ""
 "DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
 "By default, the 4.0 server is used unless your card is not supported.\n"
@@ -3087,16 +3099,16 @@ msgid ""
 "Do you want to keep XFree 3.3?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:981
+#: ../../install_steps_interactive.pm_.c:980
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:982
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:997
+#: ../../install_steps_interactive.pm_.c:996
 msgid "Creating auto install floppy"
 msgstr ""
 
@@ -3579,7 +3591,7 @@ msgstr ""
 msgid "Card IO_1"
 msgstr ""
 
-#: ../../netconnect.pm_.c:151 ../../netconnect.pm_.c:479
+#: ../../netconnect.pm_.c:151 ../../netconnect.pm_.c:478
 msgid "Connection name"
 msgstr ""
 
@@ -3671,163 +3683,178 @@ msgstr ""
 msgid "Which is your ISDN card ?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:280
+#: ../../netconnect.pm_.c:279
 msgid "I have found an ISDN Card:\n"
 msgstr ""
 
-#: ../../netconnect.pm_.c:288
+#: ../../netconnect.pm_.c:287
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
 msgstr ""
 
-#: ../../netconnect.pm_.c:295
+#: ../../netconnect.pm_.c:294
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 
-#: ../../netconnect.pm_.c:407
+#: ../../netconnect.pm_.c:406
 msgid "ISDN configuration"
 msgstr ""
 
-#: ../../netconnect.pm_.c:408
+#: ../../netconnect.pm_.c:407
 msgid "Do you want to start your connection at boot?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:462
+#: ../../netconnect.pm_.c:461
 msgid "Try to find a modem?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:472
+#: ../../netconnect.pm_.c:471
 msgid "Please choose which serial port your modem is connected to."
 msgstr ""
 
-#: ../../netconnect.pm_.c:478
+#: ../../netconnect.pm_.c:477
 msgid "Dialup options"
 msgstr ""
 
-#: ../../netconnect.pm_.c:480
+#: ../../netconnect.pm_.c:479
 msgid "Phone number"
 msgstr ""
 
-#: ../../netconnect.pm_.c:481
+#: ../../netconnect.pm_.c:480
 msgid "Login ID"
 msgstr ""
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "Authentication"
 msgstr ""
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "CHAP"
 msgstr ""
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "PAP"
 msgstr ""
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "Script-based"
 msgstr ""
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "Terminal-based"
 msgstr ""
 
-#: ../../netconnect.pm_.c:484
+#: ../../netconnect.pm_.c:483
 msgid "Domain name"
 msgstr ""
 
-#: ../../netconnect.pm_.c:486
+#: ../../netconnect.pm_.c:485
 msgid "First DNS Server"
 msgstr ""
 
-#: ../../netconnect.pm_.c:487
+#: ../../netconnect.pm_.c:486
 msgid "Second DNS Server"
 msgstr ""
 
-#: ../../netconnect.pm_.c:497
+#: ../../netconnect.pm_.c:498
 msgid "Connect to internet"
 msgstr ""
 
-#: ../../netconnect.pm_.c:499
+#: ../../netconnect.pm_.c:500
 msgid "Disconnect from internet"
 msgstr ""
 
-#: ../../netconnect.pm_.c:501
+#: ../../netconnect.pm_.c:502
 msgid "Configure internet connexion"
 msgstr ""
 
-#: ../../netconnect.pm_.c:504
+#: ../../netconnect.pm_.c:505
 msgid "Internet connection & configuration"
 msgstr ""
 
-#: ../../netconnect.pm_.c:505
+#: ../../netconnect.pm_.c:506
 msgid "What do you wish to do?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:520
+#: ../../netconnect.pm_.c:521
 msgid "Connect to internet with a normal modem"
 msgstr ""
 
-#: ../../netconnect.pm_.c:522
+#: ../../netconnect.pm_.c:523
 msgid "Connect to internet using ISDN"
 msgstr ""
 
-#: ../../netconnect.pm_.c:524
+#: ../../netconnect.pm_.c:525
 msgid "Connect to internet using DSL (or ADSL)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:526
+#: ../../netconnect.pm_.c:527
 msgid "Connect to internet using Cable"
 msgstr ""
 
-#: ../../netconnect.pm_.c:528
+#: ../../netconnect.pm_.c:529
 msgid "Do not connect to internet"
 msgstr ""
 
-#: ../../netconnect.pm_.c:531 ../../netconnect.pm_.c:554
-#: ../../netconnect.pm_.c:573 ../../netconnect.pm_.c:591
-#: ../../netconnect.pm_.c:602
+#: ../../netconnect.pm_.c:532 ../../netconnect.pm_.c:555
+#: ../../netconnect.pm_.c:579 ../../netconnect.pm_.c:595
+#: ../../netconnect.pm_.c:606 ../../netconnect.pm_.c:632
 msgid "Connect to the Internet"
 msgstr ""
 
-#: ../../netconnect.pm_.c:532
+#: ../../netconnect.pm_.c:533
 msgid "How do you want to connect to the Internet?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:549
+#: ../../netconnect.pm_.c:550
 msgid "Internal ISDN card"
 msgstr ""
 
-#: ../../netconnect.pm_.c:551
+#: ../../netconnect.pm_.c:552
 msgid "External modem"
 msgstr ""
 
-#: ../../netconnect.pm_.c:555
+#: ../../netconnect.pm_.c:556
 msgid "What kind is your ISDN connection?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:574
+#: ../../netconnect.pm_.c:580
 msgid "Have you been provided with a hostname?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:586
+#: ../../netconnect.pm_.c:590
 msgid "France"
 msgstr ""
 
-#: ../../netconnect.pm_.c:588
+#: ../../netconnect.pm_.c:592
 msgid "Other countries"
 msgstr ""
 
-#: ../../netconnect.pm_.c:592
+#: ../../netconnect.pm_.c:596
 msgid "On which country are you located ?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:603
+#: ../../netconnect.pm_.c:607
 msgid ""
 "If your adsl modem is an alcatel one, choose pptp alcatel. Otherwise, pppoe."
 msgstr ""
 
+#: ../../netconnect.pm_.c:627
+msgid "using pppoe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:629
+msgid "using dhcp"
+msgstr ""
+
+#: ../../netconnect.pm_.c:633
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"However, it exists some connexion that use dhcp. Dhcp usually doesn't "
+"require login/password, so it may be a hint to know what your connexion is."
+msgstr ""
+
 #: ../../partition_table.pm_.c:542
 msgid "Extended partition not supported on this platform"
 msgstr ""
@@ -3907,22 +3934,30 @@ msgstr ""
 msgid "Show more"
 msgstr ""
 
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr ""
 
-#: ../../printer.pm_.c:245
+#: ../../printer.pm_.c:20
 msgid "Remote lpd"
 msgstr ""
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:21
 msgid "SMB/Windows 95/98/NT"
 msgstr ""
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:22
 msgid "NetWare"
 msgstr ""
 
+#: ../../printer.pm_.c:23
+msgid "URI for Local printer"
+msgstr ""
+
+#: ../../printer.pm_.c:24
+msgid "URI for Network printer"
+msgstr ""
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr ""
@@ -3936,44 +3971,58 @@ msgstr ""
 msgid "A printer, model \"%s\", has been detected on "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:45
 msgid "Local Printer Device"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:46
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:48
 msgid "Printer Device"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:67
+msgid "Local Printer Device (URI)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:68
+msgid ""
+"What URI device is your printer connected to\n"
+"(note that parallel:/dev/lp0 is equivalent to LPT1:)?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:70 ../../printerdrake.pm_.c:154
+msgid "Printer Device URI"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:78
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:79
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
 "on that server which jobs should be placed in."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:82
 msgid "Remote hostname"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:83
 msgid "Remote queue"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:93
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:94
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -3982,27 +4031,27 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:99
 msgid "SMB server host"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:100
 msgid "SMB server IP"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:101
 msgid "Share name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:104
 msgid "Workgroup"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:129
 msgid "NetWare Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:130
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4010,139 +4059,180 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:134
 msgid "Printer Server"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:135
 msgid "Print Queue Name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:146
+msgid "Network Printer Options (URI)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:147
+msgid ""
+"Choose the right Device URI for a network printer or a local file. "
+"Examples:\n"
+"   file:/path/to/filename.prn\n"
+"   http://hostname:631/ipp/port1\n"
+"   ipp://hostname/ipp/port1\n"
+"   lpq://hostname/queue\n"
+"   socket://hostname\n"
+"   socket://hostname:9100"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:175 ../../printerdrake.pm_.c:224
+msgid "What type of printer do you have?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:184 ../../printerdrake.pm_.c:291
+msgid "Do you want to test printing?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:187 ../../printerdrake.pm_.c:302
+msgid "Printing test page(s)..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:194 ../../printerdrake.pm_.c:310
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:198 ../../printerdrake.pm_.c:314
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Does it work properly?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:214
 msgid "Yes, print ASCII test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:215
 msgid "Yes, print PostScript test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:216
 msgid "Yes, print both test pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:223
 msgid "Configure Printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:256
 msgid "Printer options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:257
 msgid "Paper Size"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:258
 msgid "Eject page after job?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:263
 msgid "Uniprint driver options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:264
 msgid "Color depth options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:266
 msgid "Print text as PostScript?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:267
 msgid "Reverse page order"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:269
 msgid "Fix stair-stepping text?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:272
 msgid "Number of pages per output pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:273
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:274
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:277
 msgid "Extra GhostScript options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:280
 msgid "Extra Text options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
+#: ../../printerdrake.pm_.c:330
+msgid "Printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:209
-msgid "Printing test page(s)..."
+#: ../../printerdrake.pm_.c:331
+msgid "Would you like to configure a printer?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:217
-#, c-format
+#: ../../printerdrake.pm_.c:335
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
+"Here are the following print queues.\n"
+"You can add some more or change the existing ones."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:221
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Does it work properly?"
+#: ../../printerdrake.pm_.c:363 ../../printerdrake.pm_.c:370
+#: ../../printerdrake.pm_.c:382
+msgid "Select Printer Connection"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:237
-msgid "Printer"
+#: ../../printerdrake.pm_.c:364
+msgid "How is the printer connected?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:238
-msgid "Would you like to configure a printer?"
+#: ../../printerdrake.pm_.c:370 ../../printerdrake.pm_.c:382
+msgid "Remove queue"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:242
+#: ../../printerdrake.pm_.c:371
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"Every printer managed by CUPS need a name (for example lp).\n"
+"Other parameter like the description of the printer or its location\n"
+"can be defined. What name should be used for this printer and\n"
+"how is the printer connected?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:265 ../../printerdrake.pm_.c:271
-msgid "Select Printer Connection"
+#: ../../printerdrake.pm_.c:375
+msgid "Name of printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:266
-msgid "How is the printer connected?"
+#: ../../printerdrake.pm_.c:376
+msgid "Description"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:271
-msgid "Remove queue"
+#: ../../printerdrake.pm_.c:377
+msgid "Location"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:378 ../../printerdrake.pm_.c:388
+msgid "Printer Connection"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:383
 msgid ""
 "Every print queue (which print jobs are directed to) needs a\n"
 "name (often lp) and a spool directory associated with it. What\n"
@@ -4150,18 +4240,14 @@ msgid ""
 "connected?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:275
+#: ../../printerdrake.pm_.c:386
 msgid "Name of queue"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:387
 msgid "Spool directory"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:277
-msgid "Printer Connection"
-msgstr ""
-
 #: ../../raid.pm_.c:36
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 82253054a..96f28e686 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-08-30 19:27+0200\n"
+"POT-Creation-Date: 2000-08-31 20:21+0200\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -142,7 +142,7 @@ msgstr "Er dette den riktige innstillingen?"
 msgid "An error has occurred, try to change some parameters"
 msgstr "En feil oppsto, pr�v � endre noen parametere"
 
-#: ../../Xconfigurator.pm_.c:445 ../../Xconfigurator.pm_.c:628
+#: ../../Xconfigurator.pm_.c:445 ../../Xconfigurator.pm_.c:630
 msgid "Automatic resolutions"
 msgstr "Automatiske oppl�sninger"
 
@@ -156,33 +156,33 @@ msgstr ""
 "Skjermen din vil blinke...\n"
 "Du kan sl� av hvis du vil, du vil h�re et bipp n�r det er ferdig"
 
-#: ../../Xconfigurator.pm_.c:504 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:506 ../../printerdrake.pm_.c:260
 msgid "Resolution"
 msgstr "Oppl�sning"
 
-#: ../../Xconfigurator.pm_.c:539
+#: ../../Xconfigurator.pm_.c:541
 msgid "Choose the resolution and the color depth"
 msgstr "Velg oppl�sning og fargedybde"
 
-#: ../../Xconfigurator.pm_.c:541
+#: ../../Xconfigurator.pm_.c:543
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafikk-kort: %s"
 
-#: ../../Xconfigurator.pm_.c:542
+#: ../../Xconfigurator.pm_.c:544
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86-tjener: %s"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:553
 msgid "Show all"
 msgstr "Vis alle"
 
-#: ../../Xconfigurator.pm_.c:575
+#: ../../Xconfigurator.pm_.c:577
 msgid "Resolutions"
 msgstr "Oppl�sninger"
 
-#: ../../Xconfigurator.pm_.c:629
+#: ../../Xconfigurator.pm_.c:631
 msgid ""
 "I can try to find the available resolutions (eg: 800x600).\n"
 "Sometimes, though, it may hang the machine.\n"
@@ -192,7 +192,7 @@ msgstr ""
 "Noen ganger kan dette for�rsake at maskinen stopper opp.\n"
 "�nsker du � pr�ve?"
 
-#: ../../Xconfigurator.pm_.c:634
+#: ../../Xconfigurator.pm_.c:636
 msgid ""
 "No valid modes found\n"
 "Try with another video card or monitor"
@@ -200,109 +200,109 @@ msgstr ""
 "Ingen gyldige modus funnet\n"
 "Pr�v med et annet skjermkort eller monitor"
 
-#: ../../Xconfigurator.pm_.c:1004
+#: ../../Xconfigurator.pm_.c:1008
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastatur-oppsett: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1005
+#: ../../Xconfigurator.pm_.c:1009
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Type mus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1006
+#: ../../Xconfigurator.pm_.c:1010
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Enhet mus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1007
+#: ../../Xconfigurator.pm_.c:1011
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1008
+#: ../../Xconfigurator.pm_.c:1012
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HorizSync: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1009
+#: ../../Xconfigurator.pm_.c:1013
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertRefresh: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1010
+#: ../../Xconfigurator.pm_.c:1014
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafikk-kort: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1011
+#: ../../Xconfigurator.pm_.c:1015
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Minne grafikk: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1012
+#: ../../Xconfigurator.pm_.c:1016
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86-tjener: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1027
+#: ../../Xconfigurator.pm_.c:1031
 msgid "Preparing X-Window configuration"
 msgstr "Forbereder X-Window konfigurasjon"
 
-#: ../../Xconfigurator.pm_.c:1041
+#: ../../Xconfigurator.pm_.c:1045
 msgid "Change Monitor"
 msgstr "Endre monitor"
 
-#: ../../Xconfigurator.pm_.c:1042
+#: ../../Xconfigurator.pm_.c:1046
 msgid "Change Graphic card"
 msgstr "Endre grafikk-kort"
 
-#: ../../Xconfigurator.pm_.c:1043
+#: ../../Xconfigurator.pm_.c:1047
 msgid "Change Server options"
 msgstr "Endre opsjoner for tjener"
 
-#: ../../Xconfigurator.pm_.c:1044
+#: ../../Xconfigurator.pm_.c:1048
 msgid "Change Resolution"
 msgstr "Endre oppl�sning"
 
-#: ../../Xconfigurator.pm_.c:1045
+#: ../../Xconfigurator.pm_.c:1049
 msgid "Automatical resolutions search"
 msgstr "Automatisk oppl�sningss�k"
 
-#: ../../Xconfigurator.pm_.c:1049
+#: ../../Xconfigurator.pm_.c:1053
 msgid "Show information"
 msgstr "Vis informasjon"
 
-#: ../../Xconfigurator.pm_.c:1050
+#: ../../Xconfigurator.pm_.c:1054
 msgid "Test again"
 msgstr "Test igjen"
 
-#: ../../Xconfigurator.pm_.c:1051 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1055 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../../Xconfigurator.pm_.c:1055 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1059 ../../standalone/drakboot_.c:39
 msgid "What do you want to do?"
 msgstr "Hva �nsker du � gj�re?"
 
-#: ../../Xconfigurator.pm_.c:1062
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Forget the changes?"
 msgstr "Glem endringene?"
 
-#: ../../Xconfigurator.pm_.c:1080
+#: ../../Xconfigurator.pm_.c:1084
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Vennligst logg inn i %s p� nytt for � aktivere endringene"
 
-#: ../../Xconfigurator.pm_.c:1096
+#: ../../Xconfigurator.pm_.c:1100
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Vennligst logg ut og bruk s� Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1099
+#: ../../Xconfigurator.pm_.c:1103
 msgid "X at startup"
 msgstr "X ved oppstart"
 
-#: ../../Xconfigurator.pm_.c:1100
+#: ../../Xconfigurator.pm_.c:1104
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -310,11 +310,11 @@ msgstr ""
 "Jeg kan sette opp maskinen din til � automatisk starte X ved oppstart.\n"
 "Vil du at X skal starte n�r du starter maskinen p� nytt?"
 
-#: ../../Xconfigurator.pm_.c:1112
+#: ../../Xconfigurator.pm_.c:1116
 msgid "Autologin"
 msgstr "Autoinnlogg"
 
-#: ../../Xconfigurator.pm_.c:1113
+#: ../../Xconfigurator.pm_.c:1117
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
 "If you don't want to use this feature, click on the cancel button."
@@ -322,7 +322,7 @@ msgstr ""
 "Jeg kan sette opp maskinen din til � automatisk logge p� en bruker.\n"
 "�nsker du � bruke denne funksjonen?"
 
-#: ../../Xconfigurator.pm_.c:1115
+#: ../../Xconfigurator.pm_.c:1119
 msgid "Choose the default user:"
 msgstr "Velg standard bruker :"
 
@@ -507,15 +507,15 @@ msgstr "Skjermmodus"
 msgid "Delay before booting default image"
 msgstr "Forsinkelse f�r oppstart av standard bilde"
 
-#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:688
-#: ../../install_steps_interactive.pm_.c:739 ../../netconnect.pm_.c:482
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:110
+#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:687
+#: ../../install_steps_interactive.pm_.c:738 ../../netconnect.pm_.c:481
+#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:137
 #: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Passord"
 
-#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:689
-#: ../../install_steps_interactive.pm_.c:740
+#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:739
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Passord (igjen)"
@@ -538,14 +538,14 @@ msgid ""
 msgstr ""
 "Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
 
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:698
-#: ../../install_steps_interactive.pm_.c:753
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:697
+#: ../../install_steps_interactive.pm_.c:752
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Vennligst pr�v igjen"
 
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:698
-#: ../../install_steps_interactive.pm_.c:753
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:697
+#: ../../install_steps_interactive.pm_.c:752
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Passordene stemmer ikke overens"
@@ -558,13 +558,13 @@ msgstr ""
 "Her er de forskjellige oppf�ringene.\n"
 "Du kan legge til flere eller endre de eksisterende."
 
-#: ../../any.pm_.c:159 ../../printerdrake.pm_.c:244
+#: ../../any.pm_.c:159 ../../printerdrake.pm_.c:337
 #: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Legg til"
 
-#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:44
-#: ../../install_steps_interactive.pm_.c:733 ../../printerdrake.pm_.c:244
+#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:45
+#: ../../install_steps_interactive.pm_.c:732 ../../printerdrake.pm_.c:337
 #: ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Ferdig"
@@ -622,11 +622,12 @@ msgid "Default"
 msgstr "Standard"
 
 #: ../../any.pm_.c:213 ../../install_steps_gtk.pm_.c:580
-#: ../../install_steps_interactive.pm_.c:686 ../../interactive.pm_.c:74
+#: ../../install_steps_interactive.pm_.c:685 ../../interactive.pm_.c:74
 #: ../../interactive.pm_.c:84 ../../interactive.pm_.c:234
 #: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
 #: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:204
-#: ../../my_gtk.pm_.c:463 ../../my_gtk.pm_.c:638 ../../printerdrake.pm_.c:271
+#: ../../my_gtk.pm_.c:463 ../../my_gtk.pm_.c:638 ../../printerdrake.pm_.c:370
+#: ../../printerdrake.pm_.c:382
 msgid "Ok"
 msgstr "Ok"
 
@@ -741,7 +742,7 @@ msgstr "Skrivebord"
 msgid "Start Menu"
 msgstr "Startmeny"
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:416
+#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:418
 msgid "Create"
 msgstr "Opprett"
 
@@ -749,7 +750,7 @@ msgstr "Opprett"
 msgid "Unmount"
 msgstr "Demonter"
 
-#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:420
 msgid "Delete"
 msgstr "Slett"
 
@@ -757,16 +758,16 @@ msgstr "Slett"
 msgid "Format"
 msgstr "Formater"
 
-#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:592
+#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:594
 msgid "Resize"
 msgstr "Endre st�rrelse"
 
-#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:416
-#: ../../diskdrake.pm_.c:469
+#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:471
 msgid "Type"
 msgstr "Type"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:489
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:491
 msgid "Mount point"
 msgstr "Monteringspunkt"
 
@@ -791,34 +792,38 @@ msgid "Save in file"
 msgstr "Lagre i fil"
 
 #: ../../diskdrake.pm_.c:42
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:43
 msgid "Restore from floppy"
 msgstr "Gjenopprett fra diskett"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:44
 msgid "Save on floppy"
 msgstr "Lagre p� diskett"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:48
 msgid "Clear all"
 msgstr "Fjern alle"
 
-#: ../../diskdrake.pm_.c:48
+#: ../../diskdrake.pm_.c:49
 msgid "Format all"
 msgstr "Formater alle"
 
-#: ../../diskdrake.pm_.c:49
+#: ../../diskdrake.pm_.c:50
 msgid "Auto allocate"
 msgstr "Automatisk allokering"
 
-#: ../../diskdrake.pm_.c:52
+#: ../../diskdrake.pm_.c:53
 msgid "All primary partitions are used"
 msgstr "Alle prim�re partisjoner er i bruk"
 
-#: ../../diskdrake.pm_.c:52
+#: ../../diskdrake.pm_.c:53
 msgid "I can't add any more partition"
 msgstr "Jeg kan ikke legge til flere partisjoner"
 
-#: ../../diskdrake.pm_.c:52
+#: ../../diskdrake.pm_.c:53
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -826,63 +831,63 @@ msgstr ""
 "For � ha flere partisjoner vennligst slett en for � kunne opprette en "
 "utvidet partisjon"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:56
 msgid "Rescue partition table"
 msgstr "Redd partisjonstabell"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:57
 msgid "Undo"
 msgstr "Angre"
 
-#: ../../diskdrake.pm_.c:57
+#: ../../diskdrake.pm_.c:58
 msgid "Write partition table"
 msgstr "Skriv partisjonstabell"
 
-#: ../../diskdrake.pm_.c:58
+#: ../../diskdrake.pm_.c:59
 msgid "Reload"
 msgstr "Last igjen"
 
-#: ../../diskdrake.pm_.c:98
+#: ../../diskdrake.pm_.c:99
 msgid "loopback"
 msgstr "loopback"
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "Swap"
 msgstr "Veksel"
 
-#: ../../diskdrake.pm_.c:112
+#: ../../diskdrake.pm_.c:113
 msgid "Empty"
 msgstr "Tom"
 
-#: ../../diskdrake.pm_.c:112
+#: ../../diskdrake.pm_.c:113
 msgid "Other"
 msgstr "Andre"
 
-#: ../../diskdrake.pm_.c:118
+#: ../../diskdrake.pm_.c:119
 msgid "Filesystem types:"
 msgstr "Filsystemtyper:"
 
-#: ../../diskdrake.pm_.c:127
+#: ../../diskdrake.pm_.c:128
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../../diskdrake.pm_.c:141
+#: ../../diskdrake.pm_.c:142
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -894,17 +899,17 @@ msgstr ""
 "Jeg forsl�r at du f�rst endrer st�rrelsen p� denne partisjonen\n"
 "(klikk p� den, klikk s� p� \"Endre st�rrelse\")"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:147
 msgid "Please make a backup of your data first"
 msgstr "Vennligst ta sikkerhetskopi av din data f�rst"
 
-#: ../../diskdrake.pm_.c:146 ../../diskdrake.pm_.c:163
-#: ../../diskdrake.pm_.c:172 ../../diskdrake.pm_.c:521
-#: ../../diskdrake.pm_.c:543
+#: ../../diskdrake.pm_.c:147 ../../diskdrake.pm_.c:164
+#: ../../diskdrake.pm_.c:173 ../../diskdrake.pm_.c:523
+#: ../../diskdrake.pm_.c:545
 msgid "Read carefully!"
 msgstr "Les n�ye!"
 
-#: ../../diskdrake.pm_.c:149
+#: ../../diskdrake.pm_.c:150
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -914,78 +919,78 @@ msgstr ""
 "sektorer er nok)\n"
 "ved begynnelsen av disken"
 
-#: ../../diskdrake.pm_.c:163
+#: ../../diskdrake.pm_.c:164
 msgid "Be careful: this operation is dangerous."
 msgstr "V�r forsiktig: denne operasjonen er farlig."
 
 # #: ../install_steps_interactive.pm_.c:37
-#: ../../diskdrake.pm_.c:200 ../../install_steps.pm_.c:75
+#: ../../diskdrake.pm_.c:201 ../../install_steps.pm_.c:75
 #: ../../install_steps_interactive.pm_.c:42
 #: ../../install_steps_interactive.pm_.c:218 ../../standalone/diskdrake_.c:60
 #: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Feil"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:685
+#: ../../diskdrake.pm_.c:226 ../../diskdrake.pm_.c:687
 msgid "Mount point: "
 msgstr "Monteringspunkt: "
 
-#: ../../diskdrake.pm_.c:225 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:268
 msgid "Device: "
 msgstr "Enhet: "
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:228
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS diskbokstav: %s (bare en gjetning)\n"
 
-#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:269
+#: ../../diskdrake.pm_.c:229 ../../diskdrake.pm_.c:271
 msgid "Type: "
 msgstr "Type: "
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:230
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Start: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:229
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Size: %d MB"
 msgstr "St�rrelse: %d MB"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:233
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektorer"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:235
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Sylinder %d til sylinder %d\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:236
 msgid "Formatted\n"
 msgstr "Formatert\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:237
 msgid "Not formatted\n"
 msgstr "Ikke formatert\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:238
 msgid "Mounted\n"
 msgstr "Montert\n"
 
-#: ../../diskdrake.pm_.c:237
+#: ../../diskdrake.pm_.c:239
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Loopback-fil(s): %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:241
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -993,79 +998,79 @@ msgstr ""
 "Partisjon startet opp som standard\n"
 "    (for MS-DOS oppstart, ikke for lilo)\n"
 
-#: ../../diskdrake.pm_.c:241
+#: ../../diskdrake.pm_.c:243
 #, c-format
 msgid "Level %s\n"
 msgstr "Niv� %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Skivest�rrelse %s\n"
 
-#: ../../diskdrake.pm_.c:243
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-disker %s\n"
 
-#: ../../diskdrake.pm_.c:245
+#: ../../diskdrake.pm_.c:247
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Loopback filnavn: %s"
 
-#: ../../diskdrake.pm_.c:262
+#: ../../diskdrake.pm_.c:264
 msgid "Please click on a partition"
 msgstr "Vennligst klikk p� en partisjon"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:269
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "St�rrelse: %d MB\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometri: %s sylindere, %s hoder, %s sektorer\n"
 
-#: ../../diskdrake.pm_.c:270
+#: ../../diskdrake.pm_.c:272
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Type partisjonstabell: %s\n"
 
-#: ../../diskdrake.pm_.c:271
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "p� buss %d id %d\n"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:286
 msgid "Mount"
 msgstr "Monter"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:287
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:288
 msgid "Add to RAID"
 msgstr "Legg til RAID"
 
-#: ../../diskdrake.pm_.c:287
+#: ../../diskdrake.pm_.c:289
 msgid "Remove from RAID"
 msgstr "Fjern fra RAID"
 
-#: ../../diskdrake.pm_.c:288
+#: ../../diskdrake.pm_.c:290
 msgid "Modify RAID"
 msgstr "Modifiser RAID"
 
-#: ../../diskdrake.pm_.c:289
+#: ../../diskdrake.pm_.c:291
 msgid "Use for loopback"
 msgstr "Bruk for loopback"
 
-#: ../../diskdrake.pm_.c:296
+#: ../../diskdrake.pm_.c:298
 msgid "Choose action"
 msgstr "Velg handling"
 
-#: ../../diskdrake.pm_.c:389
+#: ../../diskdrake.pm_.c:391
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1077,7 +1082,7 @@ msgstr ""
 "Enten bruker du LILO og denne ikke virker, eller du bruker ikke LILO og du "
 "trenger ikke /boot"
 
-#: ../../diskdrake.pm_.c:393
+#: ../../diskdrake.pm_.c:395
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -1090,7 +1095,7 @@ msgstr ""
 "Hvis du skal bruke oppstartsh�ndtereren LILO, v�r n�ye med � legge til en\n"
 "/boot partisjon"
 
-#: ../../diskdrake.pm_.c:399
+#: ../../diskdrake.pm_.c:401
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
@@ -1100,16 +1105,16 @@ msgstr ""
 "Ingen oppstartslaster kan h�ndtere dette uten en /boot partisjon.\n"
 "S� v�r n�ye med � legge til en /boot partisjon"
 
-#: ../../diskdrake.pm_.c:416 ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:418 ../../diskdrake.pm_.c:420
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Bruk ``%s'' istedet"
 
-#: ../../diskdrake.pm_.c:421
+#: ../../diskdrake.pm_.c:423
 msgid "Use ``Unmount'' first"
 msgstr "Bruk ``Demonter'' f�rst"
 
-#: ../../diskdrake.pm_.c:422 ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:424 ../../diskdrake.pm_.c:466
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -1118,41 +1123,41 @@ msgstr ""
 "g�\n"
 "tapt"
 
-#: ../../diskdrake.pm_.c:434
+#: ../../diskdrake.pm_.c:436
 msgid "Continue anyway?"
 msgstr "Fortsette likevel?"
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake.pm_.c:441
 msgid "Quit without saving"
 msgstr "Avslutt uten � lagre"
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake.pm_.c:441
 msgid "Quit without writing the partition table?"
 msgstr "Avslutt uten � skrive partisjonstabellen?"
 
-#: ../../diskdrake.pm_.c:467
+#: ../../diskdrake.pm_.c:469
 msgid "Change partition type"
 msgstr "Endre partisjonstype"
 
-#: ../../diskdrake.pm_.c:468
+#: ../../diskdrake.pm_.c:470
 msgid "Which partition type do you want?"
 msgstr "Hvilken partisjonstype �nsker du?"
 
-#: ../../diskdrake.pm_.c:471 ../../diskdrake.pm_.c:717
+#: ../../diskdrake.pm_.c:473 ../../diskdrake.pm_.c:719
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr "Du kan ikke bruke ReiserFS for partisjoner mindre enn 32MB"
 
-#: ../../diskdrake.pm_.c:487
+#: ../../diskdrake.pm_.c:489
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Hvor vil du montere loopback-filen %s?"
 
-#: ../../diskdrake.pm_.c:488
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Hvor vil du montere %s enheten?"
 
-#: ../../diskdrake.pm_.c:493
+#: ../../diskdrake.pm_.c:495
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1160,142 +1165,142 @@ msgstr ""
 "Kan ikke fjerne monteringspunkt da denne partisjonen blir brukt til\n"
 "loopback. Fjern loopback f�rst"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:514
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "Etter formatering av partisjon %s vil alle data p� denne partisjonen\n"
 "g� tapt"
 
-#: ../../diskdrake.pm_.c:514
+#: ../../diskdrake.pm_.c:516
 msgid "Formatting"
 msgstr "Formatering"
 
-#: ../../diskdrake.pm_.c:515
+#: ../../diskdrake.pm_.c:517
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formaterer loopback-fil %s"
 
-#: ../../diskdrake.pm_.c:516 ../../install_steps_interactive.pm_.c:304
+#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:294
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formaterer partisjon %s"
 
-#: ../../diskdrake.pm_.c:521
+#: ../../diskdrake.pm_.c:523
 msgid "After formatting all partitions,"
 msgstr "Etter formatering av alle partisjonene,"
 
-#: ../../diskdrake.pm_.c:521
+#: ../../diskdrake.pm_.c:523
 msgid "all data on these partitions will be lost"
 msgstr "alle data p� disse partisjonene vil g� tapt"
 
-#: ../../diskdrake.pm_.c:527
+#: ../../diskdrake.pm_.c:529
 msgid "Move"
 msgstr "Flytt"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Which disk do you want to move it to?"
 msgstr "Hvilken disk vil du flytte til?"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../../diskdrake.pm_.c:530
+#: ../../diskdrake.pm_.c:532
 msgid "Which sector do you want to move it to?"
 msgstr "Hvilken sektor vil du flytte til?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:535
 msgid "Moving"
 msgstr "Flytter"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:535
 msgid "Moving partition..."
 msgstr "Flytter partisjon..."
 
-#: ../../diskdrake.pm_.c:543
+#: ../../diskdrake.pm_.c:545
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Partisjonstabellen p� disk %s blir n� skrevet til disk!"
 
-#: ../../diskdrake.pm_.c:545
+#: ../../diskdrake.pm_.c:547
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Du m� starte maskinen p� nytt for at modifiseringene skal tre i kraft"
 
-#: ../../diskdrake.pm_.c:566 ../../install_interactive.pm_.c:68
+#: ../../diskdrake.pm_.c:568 ../../install_interactive.pm_.c:90
 msgid "Computing FAT filesystem bounds"
 msgstr "Beregner fat filsystemgrense"
 
-#: ../../diskdrake.pm_.c:566 ../../diskdrake.pm_.c:620
-#: ../../install_interactive.pm_.c:68
+#: ../../diskdrake.pm_.c:568 ../../diskdrake.pm_.c:622
+#: ../../install_interactive.pm_.c:90
 msgid "Resizing"
 msgstr "Endrer st�rrelse"
 
-#: ../../diskdrake.pm_.c:587
+#: ../../diskdrake.pm_.c:589
 msgid "All data on this partition should be backed-up"
 msgstr "Alle data p� denne partisjonen burde sikkerhetskopieres"
 
-#: ../../diskdrake.pm_.c:589
+#: ../../diskdrake.pm_.c:591
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "Etter endring av st�rrelse for partisjon %s, vil alle data p� denne\n"
 "partisjonen vil g� tapt"
 
-#: ../../diskdrake.pm_.c:599
+#: ../../diskdrake.pm_.c:601
 msgid "Choose the new size"
 msgstr "Velg den nye st�rrelsen"
 
-#: ../../diskdrake.pm_.c:599 ../../install_steps_graphical.pm_.c:287
+#: ../../diskdrake.pm_.c:601 ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334 ../../partition_table_raw.pm_.c:100
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:657
+#: ../../diskdrake.pm_.c:659
 msgid "Create a new partition"
 msgstr "Opprette en ny partisjon"
 
-#: ../../diskdrake.pm_.c:677
+#: ../../diskdrake.pm_.c:679
 msgid "Start sector: "
 msgstr "Start sektor: "
 
-#: ../../diskdrake.pm_.c:681 ../../diskdrake.pm_.c:756
+#: ../../diskdrake.pm_.c:683 ../../diskdrake.pm_.c:758
 msgid "Size in MB: "
 msgstr "St�rrelse i MB: "
 
-#: ../../diskdrake.pm_.c:684 ../../diskdrake.pm_.c:759
+#: ../../diskdrake.pm_.c:686 ../../diskdrake.pm_.c:761
 msgid "Filesystem type: "
 msgstr "Filsystemtype: "
 
-#: ../../diskdrake.pm_.c:687
+#: ../../diskdrake.pm_.c:689
 msgid "Preference: "
 msgstr "Valg: "
 
-#: ../../diskdrake.pm_.c:735
+#: ../../diskdrake.pm_.c:737
 msgid "This partition can't be used for loopback"
 msgstr "Denne partisjonen kan ikke brukes for loopback"
 
-#: ../../diskdrake.pm_.c:745
+#: ../../diskdrake.pm_.c:747
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:757
 msgid "Loopback file name: "
 msgstr "Loopback filnavn: "
 
-#: ../../diskdrake.pm_.c:781
+#: ../../diskdrake.pm_.c:783
 msgid "File already used by another loopback, choose another one"
 msgstr "Filen blir allerede brukt av en annen loopback, velg en annen"
 
-#: ../../diskdrake.pm_.c:782
+#: ../../diskdrake.pm_.c:784
 msgid "File already exists. Use it?"
 msgstr "Filen eksisterer allerede. Bruke denne?"
 
-#: ../../diskdrake.pm_.c:804 ../../diskdrake.pm_.c:820
+#: ../../diskdrake.pm_.c:806 ../../diskdrake.pm_.c:822
 msgid "Select file"
 msgstr "Velg fil"
 
-#: ../../diskdrake.pm_.c:813
+#: ../../diskdrake.pm_.c:815
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1303,11 +1308,11 @@ msgstr ""
 "Sikkerhetskopien av partisjonstabellen har ikke samme st�rrelse\n"
 "Fortsette for det?"
 
-#: ../../diskdrake.pm_.c:821
+#: ../../diskdrake.pm_.c:823
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../../diskdrake.pm_.c:822
+#: ../../diskdrake.pm_.c:824
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1315,27 +1320,27 @@ msgstr ""
 "Sett inn en diskett i stasjonen\n"
 "Alle data p� denne disketten vil g� tapt"
 
-#: ../../diskdrake.pm_.c:833
+#: ../../diskdrake.pm_.c:835
 msgid "Trying to rescue partition table"
 msgstr "Pr�ver � redde partisjonstabell"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:846
 msgid "device"
 msgstr "enhet"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:847
 msgid "level"
 msgstr "niv�"
 
-#: ../../diskdrake.pm_.c:846
+#: ../../diskdrake.pm_.c:848
 msgid "chunk size"
 msgstr "skivest�rrelse"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:860
 msgid "Choose an existing RAID to add to"
 msgstr "Velg en eksisterende RAID for � legge til"
 
-#: ../../diskdrake.pm_.c:859
+#: ../../diskdrake.pm_.c:861
 msgid "new"
 msgstr "ny"
 
@@ -1408,15 +1413,14 @@ msgid "Choose the layout corresponding to your keyboard from the list above"
 msgstr "Velg oppsettet som stemmer med tastaturet ditt fra listen ovenfor"
 
 #: ../../help.pm_.c:13
+#, c-format
 msgid ""
 "Choose \"Install\" if there are no previous versions of GNU/Linux\n"
 "installed, or if you wish to use multiple distributions or versions.\n"
 "\n"
 "Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
 "Linux:\n"
-"5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
-"2000\n"
-"or 7.0 (Air).\n"
+"%s or %s.\n"
 "\n"
 "\n"
 "Select:\n"
@@ -1440,9 +1444,7 @@ msgstr ""
 "\n"
 "Velg \"Oppdater\" hvis du �nsker � oppdatere en tidligere versjon av "
 "Mandrake Linux:\n"
-"5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
-"2000\n"
-"eller 7.0 (Air).\n"
+"%s eller %s.\n"
 "\n"
 "\n"
 "Velg:\n"
@@ -1457,7 +1459,7 @@ msgstr ""
 "    installasjonsklassen vil du kunne velge bruk for systemet ditt.\n"
 "    Men v�r s� snill, IKKE VELG DETTE HVIS DU IKKE VET HVA DU GJ�R!\n"
 
-#: ../../help.pm_.c:35
+#: ../../help.pm_.c:34
 msgid ""
 "Select:\n"
 "\n"
@@ -1482,7 +1484,7 @@ msgstr ""
 "    installasjonsklasse, vil du kunne velge bruk for systemet ditt.\n"
 "    Men v�r s� snill, IKKE VELG DETTE HVIS DU IKKE VET HVA DU GJ�R!\n"
 
-#: ../../help.pm_.c:47
+#: ../../help.pm_.c:46
 msgid ""
 "The different choices for your machine's usage (provided, hence, that you "
 "have\n"
@@ -1529,7 +1531,7 @@ msgstr ""
 "    utskrift), en autentifikasjonstjener (NIS), en databasetjener osv. Som\n"
 "    s�, ikke forvent at noe spesielt (KDE, GNOME...) vil bli installert.\n"
 
-#: ../../help.pm_.c:68
+#: ../../help.pm_.c:67
 msgid ""
 "DrakX will attempt to look for PCI SCSI adapter(s). \n"
 "If DrakX finds a SCSI adapter and knows which driver to use it will\n"
@@ -1573,7 +1575,7 @@ msgstr ""
 "fr maskinvaredokumentasjonen, eller fra produsentens\n"
 "websted (hvis du har Internett-tilgang)."
 
-#: ../../help.pm_.c:90
+#: ../../help.pm_.c:89
 msgid ""
 "At this point, you may choose what partition(s) to use to install\n"
 "your Linux-Mandrake system if they have been already defined (from a\n"
@@ -1652,7 +1654,7 @@ msgstr ""
 "\n"
 "- Ctrl-m for � sette monteringspunktet\n"
 
-#: ../../help.pm_.c:127
+#: ../../help.pm_.c:126
 msgid ""
 "Any partitions that have been newly defined must be formatted for\n"
 "use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -1668,7 +1670,7 @@ msgstr ""
 "eksisterende partisjoner, is�r hvis de inneholder filer eller data som du\n"
 "�nsker � beholde. Typiske � beholde er: /home og /usr/local."
 
-#: ../../help.pm_.c:135
+#: ../../help.pm_.c:134
 msgid ""
 "You may now select the group of packages you wish to\n"
 "install or upgrade.\n"
@@ -1695,7 +1697,7 @@ msgstr ""
 "\"Individuelt pakkevalg\"; i s� tilfelle m� du lete gjennom mer enn 1000\n"
 "pakker..."
 
-#: ../../help.pm_.c:146
+#: ../../help.pm_.c:145
 msgid ""
 "If you have all the CDs in the list above, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -1705,7 +1707,7 @@ msgstr ""
 "Hvis du ikke har noen av disse CDene, klikk Avbryt.\n"
 "Hvis bare noen av CDene mangler, fjern disse, klikk s� Ok."
 
-#: ../../help.pm_.c:151
+#: ../../help.pm_.c:150
 msgid ""
 "The packages selected are now being installed. This operation\n"
 "should take a few minutes unless you have chosen to upgrade an\n"
@@ -1717,7 +1719,7 @@ msgstr ""
 "eksisterende system. I s� tilfelle kan det ta lengre tid ogs� f�r\n"
 "oppgraderingen starter."
 
-#: ../../help.pm_.c:157
+#: ../../help.pm_.c:156
 msgid ""
 "If DrakX failed to find your mouse, or if you want to\n"
 "check what it has done, you will be presented the list of mice\n"
@@ -1745,7 +1747,7 @@ msgstr ""
 "Hvis du har en seriell mus, m� du ogs� fortelle DrakX hvilken\n"
 "serie-port den er koblet til."
 
-#: ../../help.pm_.c:171
+#: ../../help.pm_.c:170
 msgid ""
 "Please select the correct port. For example, the COM1 port under MS Windows\n"
 "is named ttyS0 under GNU/Linux."
@@ -1753,7 +1755,7 @@ msgstr ""
 "Vennligst velg den riktige porten. F.eks., COM1 porten i MS Windows blir\n"
 "kalt ttyS0 i GNU/Linux."
 
-#: ../../help.pm_.c:175
+#: ../../help.pm_.c:174
 msgid ""
 "This section is dedicated to configuring a local area\n"
 "network (LAN) or a modem.\n"
@@ -1811,7 +1813,7 @@ msgstr ""
 "mislykkes m� du velge den riktige serieporten hvor modemet ditt er\n"
 "tilkoblet."
 
-#: ../../help.pm_.c:205
+#: ../../help.pm_.c:204
 msgid ""
 "Enter:\n"
 "\n"
@@ -1842,7 +1844,7 @@ msgstr ""
 "velg denne opsjonen. Hvis valgt, trengs ingen verdi i \"IP-adresse\". Hvis\n"
 "du ikke er sikker, sp�r nettverksadministratoren eller ISP'en din.\n"
 
-#: ../../help.pm_.c:220
+#: ../../help.pm_.c:219
 msgid ""
 "You may now enter dialup options. If you're not sure what to enter, the\n"
 "correct information can be obtained from your ISP."
@@ -1851,7 +1853,7 @@ msgstr ""
 "skal\n"
 "entre, s� kan korrekt informasjon f�es fra din ISP."
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:223
 msgid ""
 "If you will use proxies, please configure them now. If you don't know if\n"
 "you should use proxies, ask your network administrator or your ISP."
@@ -1859,7 +1861,7 @@ msgstr ""
 "Hvis du skal bruke proxier, vennligst konfigurer disse n�. Hvis du ikke vet\n"
 "om du skal bruke proxier, sp�r nettverksadministratoren din eller din ISP."
 
-#: ../../help.pm_.c:228
+#: ../../help.pm_.c:227
 msgid ""
 "You can install cryptographic package if your internet connection has been\n"
 "set up correctly. First choose a mirror where you wish to download packages "
@@ -1876,7 +1878,7 @@ msgstr ""
 "\n"
 "Mer at du m� velge speil og kryptografisk pakke ihht. lovgivning i ditt land."
 
-#: ../../help.pm_.c:236
+#: ../../help.pm_.c:235
 msgid ""
 "You can now select your timezone according to where you live.\n"
 "\n"
@@ -1890,7 +1892,7 @@ msgstr ""
 "Linux h�ndterer tid i GMT eller \"Greenwich Mean Time\" og oversetter denne\n"
 "til lokal tid ihht. den tidssonen du har valgt."
 
-#: ../../help.pm_.c:243
+#: ../../help.pm_.c:242
 msgid ""
 "You may now choose which services you want to see started at boot time.\n"
 "When your mouse comes over an item, a small balloon help will popup which\n"
@@ -1908,7 +1910,7 @@ msgstr ""
 "V�r spesielt forsiktig i dette trinnet hvis du skal bruke maskinen din som\n"
 "tjener: du vil antageligvis ikke starte noen tjenester som du ikke trenger."
 
-#: ../../help.pm_.c:252
+#: ../../help.pm_.c:251
 msgid ""
 "GNU/Linux can deal with many types of printer. Each of these\n"
 "types require a different setup. Note however that the print\n"
@@ -1966,7 +1968,7 @@ msgstr ""
 "en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n"
 "informasjon."
 
-#: ../../help.pm_.c:281
+#: ../../help.pm_.c:280
 msgid ""
 "You can now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
@@ -1997,7 +1999,7 @@ msgstr ""
 "bli skrevet ned. Ikke lag passordet for langt eller for komplisert:\n"
 "du m� kunne klare � huske det."
 
-#: ../../help.pm_.c:297
+#: ../../help.pm_.c:296
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -2005,7 +2007,7 @@ msgstr ""
 "For et mere sikkert system, burde du velge \"Bruk skyggefil\" og\n"
 "\"Bruk MD5 passord\"."
 
-#: ../../help.pm_.c:301
+#: ../../help.pm_.c:300
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -2013,7 +2015,7 @@ msgstr ""
 "Hvis nettverket ditt bruker NIS, velg \"Bruk NIS\". Hvis du ikke vet dette,\n"
 "sp�r nettverksadministratoren din."
 
-#: ../../help.pm_.c:305
+#: ../../help.pm_.c:304
 msgid ""
 "You may now create one or more \"regular\" user account(s), as\n"
 "opposed to the \"privileged\" user account, root. You can create\n"
@@ -2056,7 +2058,7 @@ msgstr ""
 "du vil ha opprettet her, og bare logge inn som root for administrasjon-\n"
 "og vedlikeholdsform�l."
 
-#: ../../help.pm_.c:324
+#: ../../help.pm_.c:323
 msgid ""
 "It is strongly recommended that you answer \"Yes\" here. If you install\n"
 "Microsoft Windows at a later date it will overwrite the boot sector.\n"
@@ -2069,7 +2071,7 @@ msgstr ""
 "Hvis du ikke har opprettet en oppstartsdiskett som foresl�tt, vil du ikke\n"
 "kunne starte GNU/Linux mer."
 
-#: ../../help.pm_.c:330
+#: ../../help.pm_.c:329
 msgid ""
 "You need to indicate where you wish\n"
 "to place the information required to boot to GNU/Linux.\n"
@@ -2085,7 +2087,7 @@ msgstr ""
 "Med mindre du vet akkurat hva du gj�r, velg \"F�rste sektor av\n"
 "disken (MBR)\"."
 
-#: ../../help.pm_.c:338
+#: ../../help.pm_.c:337
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -2093,7 +2095,7 @@ msgstr ""
 "Hvis du ikke spesifikt vet en annen m�te, s� er det vanlige valget\n"
 "\"/dev/hda\" (prim�r IDE-disk) eller \"/dev/sda\" (f�rste SCSI-disk)."
 
-#: ../../help.pm_.c:342
+#: ../../help.pm_.c:341
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
@@ -2117,7 +2119,7 @@ msgstr ""
 "andre kan du fjerne linjene for disse. Men i s� tilfelle trenger du\n"
 "en oppstartsdiskett for � starte disse!"
 
-#: ../../help.pm_.c:354
+#: ../../help.pm_.c:353
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -2155,7 +2157,7 @@ msgstr ""
 "    * normal: velg normal 80x25 tekstmodus.\n"
 "    * <nummer>:  bruk tilsvarende tekstmodus."
 
-#: ../../help.pm_.c:373
+#: ../../help.pm_.c:372
 msgid ""
 "SILO is a bootloader for SPARC: it is able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
@@ -2179,7 +2181,7 @@ msgstr ""
 "andre kan du fjerne linjene for disse. Men i s� tilfelle trenger du\n"
 "en oppstartsdiskett for � starte disse!"
 
-#: ../../help.pm_.c:385
+#: ../../help.pm_.c:384
 msgid ""
 "SILO main options are:\n"
 "  - Bootloader installation: Indicate where you want to place the\n"
@@ -2205,7 +2207,7 @@ msgstr ""
 "� ha sl�tt p� tastaturet. Oppstartslasteren venter ikke hvis\n"
 "\"forsinkelse\" er utelatt eller er satt til null."
 
-#: ../../help.pm_.c:398
+#: ../../help.pm_.c:397
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
 "core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -2231,7 +2233,7 @@ msgstr ""
 "passer deg. Hvis de ikke gj�r det, kan du g� tilbake og endre\n"
 "disse s� mange ganger som det m�tte beh�ves."
 
-#: ../../help.pm_.c:411
+#: ../../help.pm_.c:410
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2239,7 +2241,7 @@ msgstr ""
 "Hvis noe er galt i X konfigurasjonen, bruk disse opsjonene til �\n"
 "konfigurere X Window systemet riktig."
 
-#: ../../help.pm_.c:415
+#: ../../help.pm_.c:414
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2247,7 +2249,7 @@ msgstr ""
 "Hvis du velger � bruke grafisk login, velg \"Ja\". Ellers, velg\n"
 "\"Nei\"."
 
-#: ../../help.pm_.c:419
+#: ../../help.pm_.c:418
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
@@ -2310,7 +2312,7 @@ msgstr ""
 "    oppstart, velg denne opsjonen (Merk: NumLock vil kanskje/kanskje ikke    "
 " virke under X)."
 
-#: ../../help.pm_.c:444
+#: ../../help.pm_.c:443
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2344,7 +2346,7 @@ msgstr "Konfigurer mus"
 msgid "Choose your keyboard"
 msgstr "Velg tastatur"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:374
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:364
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
@@ -2384,8 +2386,8 @@ msgstr "Konfigurer tjenester"
 msgid "Configure printer"
 msgstr "Konfigurer skriver"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:686
-#: ../../install_steps_interactive.pm_.c:687
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:686
 msgid "Set root password"
 msgstr "Sett root-passord"
 
@@ -2413,55 +2415,79 @@ msgstr "Diskett autoinstallering"
 msgid "Exit install"
 msgstr "Avslutt installering"
 
-#: ../../install_any.pm_.c:568
+#: ../../install_any.pm_.c:570
 msgid "Error reading file $f"
 msgstr "Feil ved lesing av fil $f"
 
-#: ../../install_interactive.pm_.c:34
+#: ../../install_interactive.pm_.c:30
+msgid ""
+"You must have a root partition.\n"
+"For this, create a partition (or click on an existing one).\n"
+"Then choose action ``Mount point'' and set it to `/'"
+msgstr ""
+"Du m� ha en root-partisjon.\n"
+"Opprett en partisjon for dette (eller klikk p� en eksisterende).\n"
+"Velg s� ``Monteringspunkt'' og  sett dette til `/'"
+
+#: ../../install_interactive.pm_.c:35 ../../install_steps_graphical.pm_.c:259
+msgid "You must have a swap partition"
+msgstr "Du m� ha en vekslingspartisjon"
+
+#: ../../install_interactive.pm_.c:36 ../../install_steps_graphical.pm_.c:261
+msgid ""
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+"Du har ingen vekselpartisjon\n"
+"\n"
+"Fortsette likevel?"
+
+#: ../../install_interactive.pm_.c:56
 msgid "Use free space"
 msgstr "Bruk ledig plass"
 
-#: ../../install_interactive.pm_.c:36
+#: ../../install_interactive.pm_.c:58
 msgid "Not enough free space to allocate new partitions"
 msgstr "Ikke nok plass til � allokere en ny partisjon"
 
-#: ../../install_interactive.pm_.c:42
+#: ../../install_interactive.pm_.c:64
 msgid "Use existing partition"
 msgstr "Bruk eksisterende partisjon"
 
-#: ../../install_interactive.pm_.c:44
+#: ../../install_interactive.pm_.c:66
 msgid "There is no existing partition to use"
 msgstr "Det finnes ingen eksisterende partisjon som kan brukes"
 
-#: ../../install_interactive.pm_.c:51
+#: ../../install_interactive.pm_.c:73
 msgid "Use the FAT partition for loopback"
 msgstr "Bruk FAT partisjonen for loopback"
 
-#: ../../install_interactive.pm_.c:54
+#: ../../install_interactive.pm_.c:76
 msgid "Which partition do you want to use to put Linux4Win?"
 msgstr "Hvilken partisjon vil du bruke til � plassere Linux4Win?"
 
-#: ../../install_interactive.pm_.c:55
+#: ../../install_interactive.pm_.c:77
 msgid "Choose the sizes"
 msgstr "Velg st�rrelsene"
 
-#: ../../install_interactive.pm_.c:56
+#: ../../install_interactive.pm_.c:78
 msgid "Root partition size in MB: "
 msgstr "Root-partisjonsst�rrelse i MB: "
 
-#: ../../install_interactive.pm_.c:57
+#: ../../install_interactive.pm_.c:79
 msgid "Swap partition size in MB: "
 msgstr "Veksel-partisjonsst�rrelse i MB: "
 
-#: ../../install_interactive.pm_.c:65
+#: ../../install_interactive.pm_.c:87
 msgid "Use the free space on the FAT partition"
 msgstr "Bruk den ledige plassen p� FAT partisjonen"
 
-#: ../../install_interactive.pm_.c:67
+#: ../../install_interactive.pm_.c:89
 msgid "Which partition do you want to resize?"
 msgstr "Hvilken partisjonstype �nsker du � forandre st�rrelse p�?"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:92
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -2470,12 +2496,12 @@ msgstr ""
 "St�rrelsesendreren for FAT greide ikke � h�ndtere din partisjon, \n"
 "f�lgende feil oppsto: %s"
 
-#: ../../install_interactive.pm_.c:73
+#: ../../install_interactive.pm_.c:95
 msgid "Your windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Windows-partisjonen din er for fragmentert, vennligst kj�r ``defrag'' f�rst"
 
-#: ../../install_interactive.pm_.c:74
+#: ../../install_interactive.pm_.c:96
 msgid ""
 "WARNING!\n"
 "\n"
@@ -2495,21 +2521,21 @@ msgstr ""
 "dine data.\n"
 "N�r du er sikker, trykk Ok."
 
-#: ../../install_interactive.pm_.c:83
+#: ../../install_interactive.pm_.c:105
 msgid "Which size do you want to keep for windows on"
 msgstr "Hvilken st�rrelse �nsker du � beholde vinduer p�?"
 
-#: ../../install_interactive.pm_.c:84
+#: ../../install_interactive.pm_.c:106
 #, c-format
 msgid "partition %s"
 msgstr "partisjon %s"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:112
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Krymping/forst�rring av FAT feilet: %s"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:127
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -2517,56 +2543,32 @@ msgstr ""
 "Det finnes ingen FAT partisjon � forandre st�rrelsen p� eller � brukes som "
 "loopback (ikke nok plass igjen)"
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:133
 msgid "Remove Windows(TM)"
 msgstr "Fjern Windows(TM)"
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:133
 msgid "Take over the hard drive"
 msgstr "Ta over harddisken"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:135
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "Du har mer enn en harddisk, hvilken �nsker du � installere linux p�?"
 
-#: ../../install_interactive.pm_.c:115
+#: ../../install_interactive.pm_.c:137
 #, c-format
 msgid "All existing partitions and their data will be lost on drive %s"
 msgstr "Alle eksisterende partisjoner og deres data vil v�re tapt p� disk %s"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:145
 msgid "Use diskdrake"
 msgstr "Bruk diskdrake"
 
-#: ../../install_interactive.pm_.c:132
-msgid ""
-"You must have a root partition.\n"
-"For this, create a partition (or click on an existing one).\n"
-"Then choose action ``Mount point'' and set it to `/'"
-msgstr ""
-"Du m� ha en root-partisjon.\n"
-"Opprett en partisjon for dette (eller klikk p� en eksisterende).\n"
-"Velg s� ``Monteringspunkt'' og  sett dette til `/'"
-
-#: ../../install_interactive.pm_.c:137 ../../install_steps_graphical.pm_.c:259
-msgid "You must have a swap partition"
-msgstr "Du m� ha en vekslingspartisjon"
-
-#: ../../install_interactive.pm_.c:138 ../../install_steps_graphical.pm_.c:261
-msgid ""
-"You don't have a swap partition\n"
-"\n"
-"Continue anyway?"
-msgstr ""
-"Du har ingen vekselpartisjon\n"
-"\n"
-"Fortsette likevel?"
-
-#: ../../install_interactive.pm_.c:146
+#: ../../install_interactive.pm_.c:149
 msgid "Use fdisk"
 msgstr "Bruk fdisk"
 
-#: ../../install_interactive.pm_.c:149
+#: ../../install_interactive.pm_.c:152
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -2575,22 +2577,34 @@ msgstr ""
 "Du kan n� partisjonere %s.\n"
 "N�r du er ferdig ikke glem � lagre med `w'"
 
-#: ../../install_interactive.pm_.c:167
+#: ../../install_interactive.pm_.c:178
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "DrakX partisjonsveiviseren fant disse l�sningene:"
+
+#: ../../install_interactive.pm_.c:182
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Partisjonering feilet: %s"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../install_interactive.pm_.c:192
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Installerer driver for %s kort %s"
 
-#: ../../install_interactive.pm_.c:168
+#: ../../install_interactive.pm_.c:193
 #, c-format
 msgid "(module %s)"
 msgstr "(modul %s)"
 
-#: ../../install_interactive.pm_.c:178
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../install_interactive.pm_.c:204
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Hvilken %s driver skal jeg pr�ve?"
 
-#: ../../install_interactive.pm_.c:186
+#: ../../install_interactive.pm_.c:212
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -2609,20 +2623,20 @@ msgstr ""
 "burde\n"
 "ikke for�rsake noen skader."
 
-#: ../../install_interactive.pm_.c:191
+#: ../../install_interactive.pm_.c:217
 msgid "Autoprobe"
 msgstr "Automatisk sondering"
 
-#: ../../install_interactive.pm_.c:191
+#: ../../install_interactive.pm_.c:217
 msgid "Specify options"
 msgstr "Spesifiser opsjoner"
 
-#: ../../install_interactive.pm_.c:195
+#: ../../install_interactive.pm_.c:221
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Du kan n� gi dens opsjoner til modul %s."
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:227
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -2633,11 +2647,11 @@ msgstr ""
 "Opsjonene er i format ``name=value name2=value2 ...''.\n"
 "F.eks., ``io=0x300 irq=7''"
 
-#: ../../install_interactive.pm_.c:204
+#: ../../install_interactive.pm_.c:230
 msgid "Module options:"
 msgstr "Modulopsjoner:"
 
-#: ../../install_interactive.pm_.c:214
+#: ../../install_interactive.pm_.c:240
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -2646,49 +2660,49 @@ msgstr ""
 "Lasting av modul %s feilet.\n"
 "�nsker du � pr�ve igjen med andre parametere?"
 
-#: ../../install_interactive.pm_.c:225
+#: ../../install_interactive.pm_.c:251
 msgid "Configuring PCMCIA cards..."
 msgstr "Konfigurerer PCMCIA kort..."
 
-#: ../../install_interactive.pm_.c:225
+#: ../../install_interactive.pm_.c:251
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_interactive.pm_.c:247
+#: ../../install_interactive.pm_.c:273
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Fant %s %s grensesnitt"
 
-#: ../../install_interactive.pm_.c:248
+#: ../../install_interactive.pm_.c:274
 msgid "Do you have another one?"
 msgstr "Har du enda ett?"
 
-#: ../../install_interactive.pm_.c:249
+#: ../../install_interactive.pm_.c:275
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Har du noen %s grensesnitt?"
 
-#: ../../install_interactive.pm_.c:251 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:85 ../../netconnect.pm_.c:404
-#: ../../netconnect.pm_.c:570 ../../printerdrake.pm_.c:124
+#: ../../install_interactive.pm_.c:277 ../../interactive.pm_.c:79
+#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:85 ../../netconnect.pm_.c:403
+#: ../../netconnect.pm_.c:576 ../../printerdrake.pm_.c:217
 msgid "No"
 msgstr "Nei"
 
-#: ../../install_interactive.pm_.c:251 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:83 ../../netconnect.pm_.c:402
-#: ../../netconnect.pm_.c:568
+#: ../../install_interactive.pm_.c:277 ../../interactive.pm_.c:79
+#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:83 ../../netconnect.pm_.c:401
+#: ../../netconnect.pm_.c:574
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../install_interactive.pm_.c:252
+#: ../../install_interactive.pm_.c:278
 msgid "See hardware info"
 msgstr "Se maskinvareinfo"
 
-#: ../../install_interactive.pm_.c:267
+#: ../../install_interactive.pm_.c:293
 msgid "Bringing up the network"
 msgstr "Henter opp nettverket"
 
-#: ../../install_interactive.pm_.c:272
+#: ../../install_interactive.pm_.c:298
 msgid "Bringing down the network"
 msgstr "Tar ned nettverket"
 
@@ -2718,12 +2732,12 @@ msgstr ""
 "Sjekk cd-platen p� en installert maskin med \"rpm -qpl "
 "Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:411
+#: ../../install_steps.pm_.c:413
 #, c-format
 msgid "Welcome to %s"
 msgstr "Velkommen til %s"
 
-#: ../../install_steps.pm_.c:644
+#: ../../install_steps.pm_.c:646
 msgid "No floppy drive available"
 msgstr "Ingen diskettstasjon tilgjengelig"
 
@@ -2767,7 +2781,7 @@ msgid "Install"
 msgstr "Installer"
 
 #: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:439
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:434
 msgid "Installing"
 msgstr "Installerer"
 
@@ -2784,7 +2798,7 @@ msgid "Total time "
 msgstr "Total tid "
 
 #: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:457
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:434
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
@@ -2803,7 +2817,7 @@ msgid "There was an error ordering packages:"
 msgstr "Det var en feil ved endring av pakkenes rekkef�lge:"
 
 #: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../install_steps_interactive.pm_.c:943
 msgid "Use existing configuration for X11?"
 msgstr "Bruke eksisterende konfigurasjon for X11?"
 
@@ -2941,10 +2955,11 @@ msgstr "Du kan ikke velge/fjerne denne pakken"
 msgid "Estimating"
 msgstr "Beregner"
 
-#: ../../install_steps_gtk.pm_.c:454 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:233 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:205 ../../my_gtk.pm_.c:463
+#: ../../install_steps_gtk.pm_.c:454 ../../install_steps_interactive.pm_.c:663
+#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:233
+#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:205
+#: ../../my_gtk.pm_.c:463
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -3040,8 +3055,9 @@ msgid "Upgrade"
 msgstr "Oppgrader"
 
 #: ../../install_steps_interactive.pm_.c:138
-msgid "Normal"
-msgstr "Normal"
+#, fuzzy
+msgid "Workstation"
+msgstr "Informasjon"
 
 #: ../../install_steps_interactive.pm_.c:139
 msgid "Development"
@@ -3110,52 +3126,43 @@ msgstr "Root-partisjon"
 msgid "What is the root partition (/) of your system?"
 msgstr "Hva er root-partisjonen (/) p� systemet ditt?"
 
-#: ../../install_steps_interactive.pm_.c:250
-msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "DrakX partisjonsveiviseren fant disse l�sningene:"
-
-#: ../../install_steps_interactive.pm_.c:253
-#, c-format
-msgid "Partitioning failed: %s"
-msgstr "Partisjonering feilet: %s"
-
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:251
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "Du m� starte maskinen p� nytt for at modifiseringene av partisjonstabellen\n"
 "skal tre i kraft"
 
-#: ../../install_steps_interactive.pm_.c:287
+#: ../../install_steps_interactive.pm_.c:277
 msgid "Choose the partitions you want to format"
 msgstr "Velg de partisjonene du �nsker � formatere"
 
-#: ../../install_steps_interactive.pm_.c:291
+#: ../../install_steps_interactive.pm_.c:281
 msgid "Check bad blocks?"
 msgstr "Sjekke d�rlige blokker?"
 
-#: ../../install_steps_interactive.pm_.c:299
+#: ../../install_steps_interactive.pm_.c:289
 msgid "Formatting partitions"
 msgstr "Formaterer partisjoner"
 
-#: ../../install_steps_interactive.pm_.c:303
+#: ../../install_steps_interactive.pm_.c:293
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Oppretter og formaterer fil %s"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:296
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "Ikke nok vekslingsplass til � fullf�re installasjonen, vennligst legg til mer"
 
-#: ../../install_steps_interactive.pm_.c:312
+#: ../../install_steps_interactive.pm_.c:302
 msgid "Looking for available packages"
 msgstr "Ser etter tilgjengelige pakker"
 
-#: ../../install_steps_interactive.pm_.c:318
+#: ../../install_steps_interactive.pm_.c:308
 msgid "Finding packages to upgrade"
 msgstr "Finner pakker � oppgradere"
 
-#: ../../install_steps_interactive.pm_.c:335
+#: ../../install_steps_interactive.pm_.c:325
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
@@ -3163,30 +3170,30 @@ msgstr ""
 "Systemet ditt har ikke nok plass for installasjon eller oppgradering (%d > "
 "%d)"
 
-#: ../../install_steps_interactive.pm_.c:350
+#: ../../install_steps_interactive.pm_.c:340
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Ferdig (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:350
+#: ../../install_steps_interactive.pm_.c:340
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimum (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:350
+#: ../../install_steps_interactive.pm_.c:340
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Anbefalt (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:373
+#: ../../install_steps_interactive.pm_.c:363
 msgid "Package Group Selection"
 msgstr "Valg pakkegruppe"
 
-#: ../../install_steps_interactive.pm_.c:376
+#: ../../install_steps_interactive.pm_.c:366
 msgid "Individual package selection"
 msgstr "Individuelt pakkevalg"
 
-#: ../../install_steps_interactive.pm_.c:422
+#: ../../install_steps_interactive.pm_.c:412
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -3196,12 +3203,12 @@ msgstr ""
 "Hvis du ikke har noen av CDene, klikk Avbryt.\n"
 "Hvis bare noen av CDene mangler, fjern disse, klikk s� Ok."
 
-#: ../../install_steps_interactive.pm_.c:425
+#: ../../install_steps_interactive.pm_.c:415
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROM merket \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:453
+#: ../../install_steps_interactive.pm_.c:443
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -3209,45 +3216,45 @@ msgstr ""
 "Installerer pakke %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:462
+#: ../../install_steps_interactive.pm_.c:452
 msgid "Post-install configuration"
 msgstr "Konfigurasjon postinstallering"
 
-#: ../../install_steps_interactive.pm_.c:472
+#: ../../install_steps_interactive.pm_.c:462
 msgid "Keep the current IP configuration"
 msgstr "Behold n�v�rende IP-konfigurasjon"
 
-#: ../../install_steps_interactive.pm_.c:473
+#: ../../install_steps_interactive.pm_.c:463
 msgid "Reconfigure network now"
 msgstr "Rekonfigurer nettverket n�"
 
-#: ../../install_steps_interactive.pm_.c:474
+#: ../../install_steps_interactive.pm_.c:464
 msgid "Do not set up networking"
 msgstr "Ikke sett opp nettverk"
 
-#: ../../install_steps_interactive.pm_.c:477
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:472
 msgid "Network Configuration"
 msgstr "Nettverkskonfigurasjon"
 
-#: ../../install_steps_interactive.pm_.c:478
+#: ../../install_steps_interactive.pm_.c:468
 msgid "Local networking has already been configured. Do you want to:"
 msgstr "Lokalt nettverk har allerede blitt konfigurert. Vil du:"
 
-#: ../../install_steps_interactive.pm_.c:483
+#: ../../install_steps_interactive.pm_.c:473
 msgid "Do you want to configure a local network for your system?"
 msgstr "Vil du konfigurere lokalt LAN-nettverk for systemet ditt?"
 
-#: ../../install_steps_interactive.pm_.c:489
+#: ../../install_steps_interactive.pm_.c:479
 msgid "no network card found"
 msgstr "ingen nettverkskort funnet"
 
-#: ../../install_steps_interactive.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:561
+#: ../../install_steps_interactive.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:551
 msgid "Configuring network"
 msgstr "Konfigurerer nettverk"
 
-#: ../../install_steps_interactive.pm_.c:508
+#: ../../install_steps_interactive.pm_.c:498
 msgid ""
 "Please enter your host name if you know it.\n"
 "Some DHCP servers require the hostname to work.\n"
@@ -3259,18 +3266,18 @@ msgstr ""
 "Vertsnavnet ditt b�r v�re et full-kvalifisert vertsnavn,\n"
 "som ``minboks.mittlab.mittfirma.no''."
 
-#: ../../install_steps_interactive.pm_.c:512
-#: ../../install_steps_interactive.pm_.c:566
+#: ../../install_steps_interactive.pm_.c:502
+#: ../../install_steps_interactive.pm_.c:556
 msgid "Host name:"
 msgstr "Vertsnavn:"
 
-#: ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:532
+#: ../../install_steps_interactive.pm_.c:521
+#: ../../install_steps_interactive.pm_.c:522
 #, c-format
 msgid "Configuring network device %s"
 msgstr "Konfigurerer nettverksenhet %s"
 
-#: ../../install_steps_interactive.pm_.c:533
+#: ../../install_steps_interactive.pm_.c:523
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -3280,27 +3287,27 @@ msgstr ""
 "Hvert element b�r entres som en IP-adresse i punkt-desimal\n"
 "notasjon (f.eks, 1.2.3.4)."
 
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:526
 msgid "Automatic IP"
 msgstr "Automatisk IP"
 
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:526
 msgid "IP address:"
 msgstr "IP-adresse:"
 
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:526
 msgid "Netmask:"
 msgstr "Nettmaske:"
 
-#: ../../install_steps_interactive.pm_.c:537
+#: ../../install_steps_interactive.pm_.c:527
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../install_steps_interactive.pm_.c:543 ../../printerdrake.pm_.c:89
+#: ../../install_steps_interactive.pm_.c:533 ../../printerdrake.pm_.c:107
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adresse b�r v�re i format 1.2.3.4"
 
-#: ../../install_steps_interactive.pm_.c:562
+#: ../../install_steps_interactive.pm_.c:552
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -3312,19 +3319,19 @@ msgstr ""
 "s� som ``minboks.mittlab.mittfirma.no''.\n"
 "Du kan ogs� entre IP-adressen til gateway'en hvis du har en"
 
-#: ../../install_steps_interactive.pm_.c:566
+#: ../../install_steps_interactive.pm_.c:556
 msgid "DNS server:"
 msgstr "DNS-tjener:"
 
-#: ../../install_steps_interactive.pm_.c:566
+#: ../../install_steps_interactive.pm_.c:556
 msgid "Gateway device:"
 msgstr "Gateway-enhet:"
 
-#: ../../install_steps_interactive.pm_.c:566
+#: ../../install_steps_interactive.pm_.c:556
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../../install_steps_interactive.pm_.c:582
+#: ../../install_steps_interactive.pm_.c:572
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3398,88 +3405,93 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:613
+#: ../../install_steps_interactive.pm_.c:603
 msgid "Choose a mirror from which to get the packages"
 msgstr "Velg et speil som pakkene kan hentes fra"
 
-#: ../../install_steps_interactive.pm_.c:621
+#: ../../install_steps_interactive.pm_.c:611
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Kontakter speilet for � f� en liste over tilgjengelige pakker"
 
-#: ../../install_steps_interactive.pm_.c:625
+#: ../../install_steps_interactive.pm_.c:615
 msgid "Please choose the packages you want to install."
 msgstr "Vennligst velg pakkene du �nsker � installere."
 
-#: ../../install_steps_interactive.pm_.c:638
+#: ../../install_steps_interactive.pm_.c:628
 msgid "Which is your timezone?"
 msgstr "Hva er din tidsone?"
 
-#: ../../install_steps_interactive.pm_.c:639
+#: ../../install_steps_interactive.pm_.c:629
 msgid "Is your hardware clock set to GMT?"
 msgstr "Er maskinvareklokken din satt til GMT?"
 
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:662
+#, fuzzy
+msgid "What printing system do you want to use?"
+msgstr "Hvilken partisjonstype �nsker du � forandre st�rrelse p�?"
+
+#: ../../install_steps_interactive.pm_.c:685
 msgid "No password"
 msgstr "Intet passord"
 
-#: ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_interactive.pm_.c:690
 msgid "Use shadow file"
 msgstr "Bruk skyggefil"
 
-#: ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_interactive.pm_.c:690
 msgid "shadow"
 msgstr "skygge"
 
-#: ../../install_steps_interactive.pm_.c:692
+#: ../../install_steps_interactive.pm_.c:691
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:692
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Use MD5 passwords"
 msgstr "Bruk MD5 passord"
 
-#: ../../install_steps_interactive.pm_.c:694
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Use NIS"
 msgstr "Bruk NIS"
 
-#: ../../install_steps_interactive.pm_.c:694
+#: ../../install_steps_interactive.pm_.c:693
 msgid "yellow pages"
 msgstr "gule sider"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:699
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "Dette passordet er for enkelt (m� v�re minst %d tegn langt)"
 
-#: ../../install_steps_interactive.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:706
 msgid "Authentification NIS"
 msgstr "Autentifikasjon NIS"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:707
 msgid "NIS Domain"
 msgstr "NIS-domene"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:707
 msgid "NIS Server"
 msgstr "NIS-tjener"
 
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:732
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Godta bruker"
 
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:732
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:733
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(allerede lagt til %s)"
 
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:733
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3489,48 +3501,48 @@ msgstr ""
 "Entre en bruker\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:736
+#: ../../install_steps_interactive.pm_.c:735
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Virkelig navn"
 
-#: ../../install_steps_interactive.pm_.c:737 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:736 ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:136 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Brukernavn"
 
-#: ../../install_steps_interactive.pm_.c:742
+#: ../../install_steps_interactive.pm_.c:741
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Skall"
 
-#: ../../install_steps_interactive.pm_.c:744
+#: ../../install_steps_interactive.pm_.c:743
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../../install_steps_interactive.pm_.c:754
+#: ../../install_steps_interactive.pm_.c:753
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Dette passordet er for enkelt"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:754
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Vennligst oppgi et brukernavn"
 
-#: ../../install_steps_interactive.pm_.c:756
+#: ../../install_steps_interactive.pm_.c:755
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Brukernavnet kan kun inneholde sm� bokstaver, tall, `-' og `_'"
 
-#: ../../install_steps_interactive.pm_.c:757
+#: ../../install_steps_interactive.pm_.c:756
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Denne brukeren er allerede lagt til"
 
-#: ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:781
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -3561,19 +3573,19 @@ msgstr ""
 "en diskett\n"
 "i den f�rste stasjonen og trykk \"Ok\"."
 
-#: ../../install_steps_interactive.pm_.c:798
+#: ../../install_steps_interactive.pm_.c:797
 msgid "First floppy drive"
 msgstr "F�rste diskettstasjon"
 
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:798
 msgid "Second floppy drive"
 msgstr "Andre diskettstasjon"
 
-#: ../../install_steps_interactive.pm_.c:800
+#: ../../install_steps_interactive.pm_.c:799
 msgid "Skip"
 msgstr "Dropp"
 
-#: ../../install_steps_interactive.pm_.c:805
+#: ../../install_steps_interactive.pm_.c:804
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -3598,32 +3610,32 @@ msgstr ""
 "etter systemsvikt. �nsker du � opprette en oppstartsdiskett for systemet "
 "ditt?"
 
-#: ../../install_steps_interactive.pm_.c:814
+#: ../../install_steps_interactive.pm_.c:813
 msgid "Sorry, no floppy drive available"
 msgstr "Beklager, ingen diskettstasjon tilgjengelig"
 
-#: ../../install_steps_interactive.pm_.c:817
+#: ../../install_steps_interactive.pm_.c:816
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Velg diskettstasjonen du �nsker � bruke for � lage oppstartsdisketten"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:822
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Sett inn en diskett i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:825
 msgid "Creating bootdisk"
 msgstr "Oppretter oppstartdiskett"
 
-#: ../../install_steps_interactive.pm_.c:833
+#: ../../install_steps_interactive.pm_.c:832
 msgid "Preparing bootloader"
 msgstr "Klargj�r oppstartslaster"
 
-#: ../../install_steps_interactive.pm_.c:841
+#: ../../install_steps_interactive.pm_.c:840
 msgid "Do you want to use aboot?"
 msgstr "�nsker du � bruke aboot?"
 
-#: ../../install_steps_interactive.pm_.c:844
+#: ../../install_steps_interactive.pm_.c:843
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3631,100 +3643,100 @@ msgstr ""
 "Feil ved installasjon av aboot, \n"
 "pr�ve � installere selv om det �delegger den f�rste partisjonen?"
 
-#: ../../install_steps_interactive.pm_.c:853
+#: ../../install_steps_interactive.pm_.c:852
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Installasjon av oppstartslaster mislykket. F�lgende feil oppsto:"
 
-#: ../../install_steps_interactive.pm_.c:868
+#: ../../install_steps_interactive.pm_.c:867
 msgid "Proxies configuration"
 msgstr "Konfigurasjon proxy"
 
-#: ../../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:868
 msgid "HTTP proxy"
 msgstr "HTTP-proxy"
 
-#: ../../install_steps_interactive.pm_.c:870
+#: ../../install_steps_interactive.pm_.c:869
 msgid "FTP proxy"
 msgstr "FTP-proxy"
 
-#: ../../install_steps_interactive.pm_.c:876
+#: ../../install_steps_interactive.pm_.c:875
 msgid "Proxy should be http://..."
 msgstr "Proxy burde v�re http://..."
 
-#: ../../install_steps_interactive.pm_.c:877
+#: ../../install_steps_interactive.pm_.c:876
 msgid "Proxy should be ftp://..."
 msgstr "Proxy burde v�re ftp://..."
 
-#: ../../install_steps_interactive.pm_.c:887 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:886 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Velkommen til Crackers"
 
-#: ../../install_steps_interactive.pm_.c:888 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:887 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "D�rlig"
 
-#: ../../install_steps_interactive.pm_.c:889 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:888 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Lav"
 
-#: ../../install_steps_interactive.pm_.c:890 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:889 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Medium"
 
-#: ../../install_steps_interactive.pm_.c:891 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:890 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "H�y"
 
-#: ../../install_steps_interactive.pm_.c:892 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:891 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoid"
 
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Miscellaneous questions"
 msgstr "Forskjellige sp�rsm�l"
 
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:905
 msgid "(may cause data corruption)"
 msgstr "(kan for�rsake korrupsjon av data)"
 
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:905
 msgid "Use hard drive optimisations?"
 msgstr "Bruk harddisk-optimisering?"
 
-#: ../../install_steps_interactive.pm_.c:907 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:906 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Velg sikkerhetsniv�"
 
-#: ../../install_steps_interactive.pm_.c:908
+#: ../../install_steps_interactive.pm_.c:907
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Presiser RAM-st�rrelse hvis det trengs (funnet %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:909
 msgid "Removable media automounting"
 msgstr "Fjernbart media automontering"
 
-#: ../../install_steps_interactive.pm_.c:912
+#: ../../install_steps_interactive.pm_.c:911
 msgid "Clean /tmp at each boot"
 msgstr "T�m /tmp ved hver oppstart"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:914
 msgid "Enable multi profiles"
 msgstr "Sl� p� multiprofiler"
 
-#: ../../install_steps_interactive.pm_.c:917
+#: ../../install_steps_interactive.pm_.c:916
 msgid "Enable num lock at startup"
 msgstr "Sl� p� num lock ved oppstart"
 
-#: ../../install_steps_interactive.pm_.c:920
+#: ../../install_steps_interactive.pm_.c:919
 msgid "Give the ram size in MB"
 msgstr "Oppgi ram-st�rrelsen i MB"
 
-#: ../../install_steps_interactive.pm_.c:922
+#: ../../install_steps_interactive.pm_.c:921
 msgid "Can't use supermount in high security level"
 msgstr "Kan ikke bruke supermount i h�yt sikkerhetsniv�"
 
-#: ../../install_steps_interactive.pm_.c:924
+#: ../../install_steps_interactive.pm_.c:923
 msgid ""
 "beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
 "If you want to be root, you have to login as a user and then use \"su\".\n"
@@ -3738,7 +3750,7 @@ msgstr ""
 "Mere generelt, ikke forvent � bruke maskinen din til annet enn en tjener.\n"
 "Du har blitt advart."
 
-#: ../../install_steps_interactive.pm_.c:929
+#: ../../install_steps_interactive.pm_.c:928
 msgid ""
 "Be carefull, having numlock enabled causes a lot of keystrokes to\n"
 "give digits instead of normal letters (eg: pressing `p' gives `6')"
@@ -3746,7 +3758,7 @@ msgstr ""
 "V�r forsiktig, � ha numlock sl�tt p� for�rsaker at mange av tastene\n"
 "gir tall istedenfor vanlige bokstaver (f.eks: `p' gir `6')"
 
-#: ../../install_steps_interactive.pm_.c:950
+#: ../../install_steps_interactive.pm_.c:949
 msgid ""
 "DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
 "By default, the 4.0 server is used unless your card is not supported.\n"
@@ -3758,17 +3770,17 @@ msgstr ""
 "\n"
 "�nsker du � beholde XFree 3.3?"
 
-#: ../../install_steps_interactive.pm_.c:981
+#: ../../install_steps_interactive.pm_.c:980
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 "�nsker du � generere en auto installeringsdiskett for linux replikasjon?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:982
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sett inn en tom diskett i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:997
+#: ../../install_steps_interactive.pm_.c:996
 msgid "Creating auto install floppy"
 msgstr "Oppretter diskett for autoinstallasjon"
 
@@ -4254,7 +4266,7 @@ msgstr "Kort IO_0"
 msgid "Card IO_1"
 msgstr "Kort IO_1"
 
-#: ../../netconnect.pm_.c:151 ../../netconnect.pm_.c:479
+#: ../../netconnect.pm_.c:151 ../../netconnect.pm_.c:478
 msgid "Connection name"
 msgstr "Navn tilknytning"
 
@@ -4350,11 +4362,11 @@ msgstr ""
 msgid "Which is your ISDN card ?"
 msgstr "Hvilket er ditt ISDN-kort?"
 
-#: ../../netconnect.pm_.c:280
+#: ../../netconnect.pm_.c:279
 msgid "I have found an ISDN Card:\n"
 msgstr "Jeg har funnet et ISDN-kort:\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../netconnect.pm_.c:287
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -4362,153 +4374,168 @@ msgstr ""
 "Jeg har oppdaget et ISDN PCI-kort, men jeg vet ikke hviklet type. Vennligst "
 "velg et PCI-kort i neste skjermbilde."
 
-#: ../../netconnect.pm_.c:295
+#: ../../netconnect.pm_.c:294
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "Ingen ISDN PCI-kort funnet. Vennligst velg et i neste skjermbilde."
 
-#: ../../netconnect.pm_.c:407
+#: ../../netconnect.pm_.c:406
 msgid "ISDN configuration"
 msgstr "ISDN-konfigurasjon"
 
-#: ../../netconnect.pm_.c:408
+#: ../../netconnect.pm_.c:407
 msgid "Do you want to start your connection at boot?"
 msgstr "�nsker du � starte tilkoblingen din ved oppstart?"
 
-#: ../../netconnect.pm_.c:462
+#: ../../netconnect.pm_.c:461
 msgid "Try to find a modem?"
 msgstr "Pr�ve � finne et modem?"
 
-#: ../../netconnect.pm_.c:472
+#: ../../netconnect.pm_.c:471
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
 
-#: ../../netconnect.pm_.c:478
+#: ../../netconnect.pm_.c:477
 msgid "Dialup options"
 msgstr "Opsjoner oppringt"
 
-#: ../../netconnect.pm_.c:480
+#: ../../netconnect.pm_.c:479
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: ../../netconnect.pm_.c:481
+#: ../../netconnect.pm_.c:480
 msgid "Login ID"
 msgstr "Login ID"
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "Authentication"
 msgstr "Autentifikasjon"
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "Script-based"
 msgstr "Scriptbasert"
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "Terminal-based"
 msgstr "Terminalbasert"
 
-#: ../../netconnect.pm_.c:484
+#: ../../netconnect.pm_.c:483
 msgid "Domain name"
 msgstr "Domenenavn"
 
-#: ../../netconnect.pm_.c:486
+#: ../../netconnect.pm_.c:485
 msgid "First DNS Server"
 msgstr "F�rste DNS-tjener"
 
-#: ../../netconnect.pm_.c:487
+#: ../../netconnect.pm_.c:486
 msgid "Second DNS Server"
 msgstr "Andre DNS-tjener"
 
-#: ../../netconnect.pm_.c:497
+#: ../../netconnect.pm_.c:498
 msgid "Connect to internet"
 msgstr "Koble opp mot Internett"
 
-#: ../../netconnect.pm_.c:499
+#: ../../netconnect.pm_.c:500
 msgid "Disconnect from internet"
 msgstr "Koble ned fra Internett"
 
-#: ../../netconnect.pm_.c:501
+#: ../../netconnect.pm_.c:502
 msgid "Configure internet connexion"
 msgstr "Konfigurer Internett-tilkobling"
 
-#: ../../netconnect.pm_.c:504
+#: ../../netconnect.pm_.c:505
 msgid "Internet connection & configuration"
 msgstr "Internett tilkobling & konfigurasjon"
 
-#: ../../netconnect.pm_.c:505
+#: ../../netconnect.pm_.c:506
 msgid "What do you wish to do?"
 msgstr "Hva �nsker du � gj�re?"
 
-#: ../../netconnect.pm_.c:520
+#: ../../netconnect.pm_.c:521
 msgid "Connect to internet with a normal modem"
 msgstr "Koble opp mot Internett med vanlig modem"
 
-#: ../../netconnect.pm_.c:522
+#: ../../netconnect.pm_.c:523
 msgid "Connect to internet using ISDN"
 msgstr "Koble opp mot Internett med ISDN"
 
-#: ../../netconnect.pm_.c:524
+#: ../../netconnect.pm_.c:525
 msgid "Connect to internet using DSL (or ADSL)"
 msgstr "Koble opp mot Internett med DSL (eller ADSL)"
 
-#: ../../netconnect.pm_.c:526
+#: ../../netconnect.pm_.c:527
 msgid "Connect to internet using Cable"
 msgstr "Koble opp mot Internett med kabel"
 
-#: ../../netconnect.pm_.c:528
+#: ../../netconnect.pm_.c:529
 msgid "Do not connect to internet"
 msgstr "Ikke koble opp mot Internett"
 
-#: ../../netconnect.pm_.c:531 ../../netconnect.pm_.c:554
-#: ../../netconnect.pm_.c:573 ../../netconnect.pm_.c:591
-#: ../../netconnect.pm_.c:602
+#: ../../netconnect.pm_.c:532 ../../netconnect.pm_.c:555
+#: ../../netconnect.pm_.c:579 ../../netconnect.pm_.c:595
+#: ../../netconnect.pm_.c:606 ../../netconnect.pm_.c:632
 msgid "Connect to the Internet"
 msgstr "Koble opp mot Internett"
 
-#: ../../netconnect.pm_.c:532
+#: ../../netconnect.pm_.c:533
 msgid "How do you want to connect to the Internet?"
 msgstr "Hvordan vil du koble opp mot Internett?"
 
-#: ../../netconnect.pm_.c:549
+#: ../../netconnect.pm_.c:550
 msgid "Internal ISDN card"
 msgstr "Internt ISDN-kort"
 
-#: ../../netconnect.pm_.c:551
+#: ../../netconnect.pm_.c:552
 msgid "External modem"
 msgstr "Eksternt modem"
 
-#: ../../netconnect.pm_.c:555
+#: ../../netconnect.pm_.c:556
 msgid "What kind is your ISDN connection?"
 msgstr "Hva slags type er ISDN-tilknytningen din?"
 
-#: ../../netconnect.pm_.c:574
+#: ../../netconnect.pm_.c:580
 msgid "Have you been provided with a hostname?"
 msgstr "Har du et vertsnavn?"
 
-#: ../../netconnect.pm_.c:586
+#: ../../netconnect.pm_.c:590
 msgid "France"
 msgstr "Frankrike"
 
-#: ../../netconnect.pm_.c:588
+#: ../../netconnect.pm_.c:592
 msgid "Other countries"
 msgstr "Andre land"
 
-#: ../../netconnect.pm_.c:592
+#: ../../netconnect.pm_.c:596
 msgid "On which country are you located ?"
 msgstr "I hvilket land er du ?"
 
-#: ../../netconnect.pm_.c:603
+#: ../../netconnect.pm_.c:607
 msgid ""
 "If your adsl modem is an alcatel one, choose pptp alcatel. Otherwise, pppoe."
 msgstr "Hvis adsl modemet ditt er alcatel, velg pptp alcatel. ellers, pppoe."
 
+#: ../../netconnect.pm_.c:627
+msgid "using pppoe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:629
+msgid "using dhcp"
+msgstr ""
+
+#: ../../netconnect.pm_.c:633
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"However, it exists some connexion that use dhcp. Dhcp usually doesn't "
+"require login/password, so it may be a hint to know what your connexion is."
+msgstr ""
+
 #: ../../partition_table.pm_.c:542
 msgid "Extended partition not supported on this platform"
 msgstr "Utvidet partisjon ikke st�ttet p� denne plattformen"
@@ -4591,22 +4618,32 @@ msgstr "Vis mindre"
 msgid "Show more"
 msgstr "Vis mere"
 
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "Lokal skriver"
 
-#: ../../printer.pm_.c:245
+#: ../../printer.pm_.c:20
 msgid "Remote lpd"
 msgstr "Fjern-lpd"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:21
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:22
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "URI for Local printer"
+msgstr "Lokal skriver"
+
+#: ../../printer.pm_.c:24
+#, fuzzy
+msgid "URI for Network printer"
+msgstr "Nettverksgrensesnitt"
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Finner enheter..."
@@ -4620,11 +4657,11 @@ msgstr "Test porter"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "En skriver, modell \"%s\", ble funnet p� "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:45
 msgid "Local Printer Device"
 msgstr "Lokal skriverenhet"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:46
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4632,15 +4669,34 @@ msgstr ""
 "Hvilken enhet er skriveren din koblet til \n"
 "(merk at /dev/lp0 er det samme som LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:48
 msgid "Printer Device"
 msgstr "Skriverenhet"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:67
+#, fuzzy
+msgid "Local Printer Device (URI)"
+msgstr "Lokal skriverenhet"
+
+#: ../../printerdrake.pm_.c:68
+#, fuzzy
+msgid ""
+"What URI device is your printer connected to\n"
+"(note that parallel:/dev/lp0 is equivalent to LPT1:)?"
+msgstr ""
+"Hvilken enhet er skriveren din koblet til \n"
+"(merk at /dev/lp0 er det samme som LPT1:)?\n"
+
+#: ../../printerdrake.pm_.c:70 ../../printerdrake.pm_.c:154
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "Skriverenhet"
+
+#: ../../printerdrake.pm_.c:78
 msgid "Remote lpd Printer Options"
 msgstr "Opsjoner for fjern-lpd skriver"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:79
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4650,19 +4706,19 @@ msgstr ""
 "til skrivertjeneren og k�navnet til den tjeneren som\n"
 "jobbene skal plasseres i."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:82
 msgid "Remote hostname"
 msgstr "Fjern-vertnavn"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:83
 msgid "Remote queue"
 msgstr "Fjern-k�"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:93
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opsjoner for SMB (Windows 9x/NT) skriver"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:94
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4676,27 +4732,27 @@ msgstr ""
 "navnet til skriveren du �nsker tilgang til og anvendelige brukernavn,\n"
 "passord og arbeidsgruppeinformasjon."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:99
 msgid "SMB server host"
 msgstr "SMB-tjener vert"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:100
 msgid "SMB server IP"
 msgstr "SMB-tjener IP"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:101
 msgid "Share name"
 msgstr "Navn deling"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:104
 msgid "Workgroup"
 msgstr "Arbeidsgruppe"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:129
 msgid "NetWare Printer Options"
 msgstr "NetWare skriveropsjoner"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:130
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4708,130 +4764,147 @@ msgstr ""
 "vertsnavn!) s� vel som navnet p� skriverk�en til skriveren du �nsker\n"
 "adgang til og anvendelige brukernavn og passord."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:134
 msgid "Printer Server"
 msgstr "Skrivertjener"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:135
 msgid "Print Queue Name"
 msgstr "Skriverk�-navn"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:146
+#, fuzzy
+msgid "Network Printer Options (URI)"
+msgstr "NetWare skriveropsjoner"
+
+#: ../../printerdrake.pm_.c:147
+msgid ""
+"Choose the right Device URI for a network printer or a local file. "
+"Examples:\n"
+"   file:/path/to/filename.prn\n"
+"   http://hostname:631/ipp/port1\n"
+"   ipp://hostname/ipp/port1\n"
+"   lpq://hostname/queue\n"
+"   socket://hostname\n"
+"   socket://hostname:9100"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:175 ../../printerdrake.pm_.c:224
+msgid "What type of printer do you have?"
+msgstr "Hva slags type skriver har du?"
+
+#: ../../printerdrake.pm_.c:184 ../../printerdrake.pm_.c:291
+msgid "Do you want to test printing?"
+msgstr "Vil du teste utskrift?"
+
+#: ../../printerdrake.pm_.c:187 ../../printerdrake.pm_.c:302
+msgid "Printing test page(s)..."
+msgstr "Skriver ut testside(r)..."
+
+#: ../../printerdrake.pm_.c:194 ../../printerdrake.pm_.c:310
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"Testsiden(e) har blitt sendt til skriver-daemonen.\n"
+"Det kan ta litt tid f�r skriveren starter.\n"
+"Utskriftstatus:\n"
+"%s\n"
+"\n"
+"Virker det ordentlig?"
+
+#: ../../printerdrake.pm_.c:198 ../../printerdrake.pm_.c:314
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Does it work properly?"
+msgstr ""
+"Testsiden(e) har blitt sendt til skriver-daemonen.\n"
+"Det kan ta litt tid f�r skriveren starter.\n"
+"Virker det ordentlig?"
+
+#: ../../printerdrake.pm_.c:214
 msgid "Yes, print ASCII test page"
 msgstr "Ja, skriv ASCII testside"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:215
 msgid "Yes, print PostScript test page"
 msgstr "Ja, skriv PostScript testside"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:216
 msgid "Yes, print both test pages"
 msgstr "Ja, skriv begge testsidene"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:223
 msgid "Configure Printer"
 msgstr "Konfigurer skriver"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "Hva slags type skriver har du?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:256
 msgid "Printer options"
 msgstr "Opsjoner for skriver"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:257
 msgid "Paper Size"
 msgstr "Papirst�rrelse"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:258
 msgid "Eject page after job?"
 msgstr "Kj�r ut side etter jobb?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:263
 msgid "Uniprint driver options"
 msgstr "Opsjoner uniprint-driver"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:264
 msgid "Color depth options"
 msgstr "Opsjoner fargedybde"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:266
 msgid "Print text as PostScript?"
 msgstr "Skrive ut tekst som PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:267
 msgid "Reverse page order"
 msgstr "Reversere siderekkef�lge"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:269
 msgid "Fix stair-stepping text?"
 msgstr "Fikse trappestegs-tekst?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:272
 msgid "Number of pages per output pages"
 msgstr "Nummer av sider pr. sider ut"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:273
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "H�yre/venstre marginer i punkter (1/72 av inch)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:274
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "Topp/bunn marginer i punkter (1/72 av inch)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:277
 msgid "Extra GhostScript options"
 msgstr "Ekstra GhostScript opsjoner"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:280
 msgid "Extra Text options"
 msgstr "Ekstra tekstopsjoner"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "Vil du teste utskrift?"
-
-#: ../../printerdrake.pm_.c:209
-msgid "Printing test page(s)..."
-msgstr "Skriver ut testside(r)..."
-
-#: ../../printerdrake.pm_.c:217
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"Testsiden(e) har blitt sendt til skriver-daemonen.\n"
-"Det kan ta litt tid f�r skriveren starter.\n"
-"Utskriftstatus:\n"
-"%s\n"
-"\n"
-"Virker det ordentlig?"
-
-#: ../../printerdrake.pm_.c:221
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Does it work properly?"
-msgstr ""
-"Testsiden(e) har blitt sendt til skriver-daemonen.\n"
-"Det kan ta litt tid f�r skriveren starter.\n"
-"Virker det ordentlig?"
-
-#: ../../printerdrake.pm_.c:237
+#: ../../printerdrake.pm_.c:330
 msgid "Printer"
 msgstr "Skriver"
 
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:331
 msgid "Would you like to configure a printer?"
 msgstr "�nsker du � konfigurere en skriver?"
 
-#: ../../printerdrake.pm_.c:242
+#: ../../printerdrake.pm_.c:335
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4839,19 +4912,51 @@ msgstr ""
 "Her er f�lgende skriverk�.\n"
 "Du kan legge til flere eller endre de eksisterende."
 
-#: ../../printerdrake.pm_.c:265 ../../printerdrake.pm_.c:271
+#: ../../printerdrake.pm_.c:363 ../../printerdrake.pm_.c:370
+#: ../../printerdrake.pm_.c:382
 msgid "Select Printer Connection"
 msgstr "Velg skrivertilkobling"
 
-#: ../../printerdrake.pm_.c:266
+#: ../../printerdrake.pm_.c:364
 msgid "How is the printer connected?"
 msgstr "Hvordan er skriveren tilkoblet?"
 
-#: ../../printerdrake.pm_.c:271
+#: ../../printerdrake.pm_.c:370 ../../printerdrake.pm_.c:382
 msgid "Remove queue"
 msgstr "Fjern k�"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:371
+#, fuzzy
+msgid ""
+"Every printer managed by CUPS need a name (for example lp).\n"
+"Other parameter like the description of the printer or its location\n"
+"can be defined. What name should be used for this printer and\n"
+"how is the printer connected?"
+msgstr ""
+"Hver skriverk� (som skrivejobber sendes til) trenger et navn\n"
+"(ofte lp) og en spolingskatalog direkte assosiert med denne. Hvilket\n"
+"navn og katalog skal brukes for denne k�en og hvordan er skriveren tilkoblet?"
+
+#: ../../printerdrake.pm_.c:375
+#, fuzzy
+msgid "Name of printer"
+msgstr "Lokal skriver"
+
+#: ../../printerdrake.pm_.c:376
+#, fuzzy
+msgid "Description"
+msgstr "Spesifiser opsjoner"
+
+#: ../../printerdrake.pm_.c:377
+#, fuzzy
+msgid "Location"
+msgstr "Informasjon"
+
+#: ../../printerdrake.pm_.c:378 ../../printerdrake.pm_.c:388
+msgid "Printer Connection"
+msgstr "Skrivertilkobling"
+
+#: ../../printerdrake.pm_.c:383
 msgid ""
 "Every print queue (which print jobs are directed to) needs a\n"
 "name (often lp) and a spool directory associated with it. What\n"
@@ -4862,18 +4967,14 @@ msgstr ""
 "(ofte lp) og en spolingskatalog direkte assosiert med denne. Hvilket\n"
 "navn og katalog skal brukes for denne k�en og hvordan er skriveren tilkoblet?"
 
-#: ../../printerdrake.pm_.c:275
+#: ../../printerdrake.pm_.c:386
 msgid "Name of queue"
 msgstr "K�ens navn"
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:387
 msgid "Spool directory"
 msgstr "Spolingskatalog"
 
-#: ../../printerdrake.pm_.c:277
-msgid "Printer Connection"
-msgstr "Skrivertilkobling"
-
 #: ../../raid.pm_.c:36
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
@@ -5582,6 +5683,9 @@ msgstr "Finner tillatelser"
 msgid "Finding leaves takes some time"
 msgstr "Finne tillatelser vil ta litt tid"
 
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
 #~ msgid "Install/Upgrade"
 #~ msgstr "Installer/Oppgrader"
 
@@ -5629,9 +5733,6 @@ msgstr "Finne tillatelser vil ta litt tid"
 #~ msgid "Searching root partition."
 #~ msgstr "S�ker root-partisjon."
 
-#~ msgid "Information"
-#~ msgstr "Informasjon"
-
 #~ msgid "%s: This is not a root partition, please select another one."
 #~ msgstr "%s: Dette er ikke en root-partisjon, vennligst velg en annen."
 
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index 4aa6bab72..37bca29a5 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-08-30 19:27+0200\n"
+"POT-Creation-Date: 2000-08-31 20:21+0200\n"
 "PO-Revision-Date: 1999-08-09 16:39+0200\n"
 "Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
 "Language-Team: Serbian (cyrillic)\n"
@@ -138,7 +138,7 @@ msgstr "�� �� �� ��� �������� ���e����?"
 msgid "An error has occurred, try to change some parameters"
 msgstr "��, �������� �� ������, �������� �� ��������e ���������"
 
-#: ../../Xconfigurator.pm_.c:445 ../../Xconfigurator.pm_.c:628
+#: ../../Xconfigurator.pm_.c:445 ../../Xconfigurator.pm_.c:630
 msgid "Automatic resolutions"
 msgstr "���������� ���������� ����������"
 
@@ -152,33 +152,33 @@ msgstr ""
 "��� ����� �� ��������...\n"
 "������ ������� ������� ��� ������, ���� �� ���� ������� ������� ��������"
 
-#: ../../Xconfigurator.pm_.c:504 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:506 ../../printerdrake.pm_.c:260
 msgid "Resolution"
 msgstr "����������"
 
-#: ../../Xconfigurator.pm_.c:539
+#: ../../Xconfigurator.pm_.c:541
 msgid "Choose the resolution and the color depth"
 msgstr "��������� ���������� � ���� ���� ��� ����a��"
 
-#: ../../Xconfigurator.pm_.c:541
+#: ../../Xconfigurator.pm_.c:543
 #, c-format
 msgid "Graphic card: %s"
 msgstr "�������� �������: %s"
 
-#: ../../Xconfigurator.pm_.c:542
+#: ../../Xconfigurator.pm_.c:544
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 ������: %s"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:553
 msgid "Show all"
 msgstr "������� ���"
 
-#: ../../Xconfigurator.pm_.c:575
+#: ../../Xconfigurator.pm_.c:577
 msgid "Resolutions"
 msgstr "����������"
 
-#: ../../Xconfigurator.pm_.c:629
+#: ../../Xconfigurator.pm_.c:631
 msgid ""
 "I can try to find the available resolutions (eg: 800x600).\n"
 "Sometimes, though, it may hang the machine.\n"
@@ -188,7 +188,7 @@ msgstr ""
 "����, �� ���� ������� �� ��������� ��������.\n"
 "�� �� ������ ��������?"
 
-#: ../../Xconfigurator.pm_.c:634
+#: ../../Xconfigurator.pm_.c:636
 msgid ""
 "No valid modes found\n"
 "Try with another video card or monitor"
@@ -196,109 +196,109 @@ msgstr ""
 "���� �������� ������������ ���\n"
 "��������� �� ������ ��������� �������� ��� ���������"
 
-#: ../../Xconfigurator.pm_.c:1004
+#: ../../Xconfigurator.pm_.c:1008
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "��� ���������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1005
+#: ../../Xconfigurator.pm_.c:1009
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "��� ����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1006
+#: ../../Xconfigurator.pm_.c:1010
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "��� �� ��������� �� ������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1007
+#: ../../Xconfigurator.pm_.c:1011
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "�������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1008
+#: ../../Xconfigurator.pm_.c:1012
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "������� - �����������a �����������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1009
+#: ../../Xconfigurator.pm_.c:1013
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "������� - ���������� ����������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1010
+#: ../../Xconfigurator.pm_.c:1014
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1011
+#: ../../Xconfigurator.pm_.c:1015
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "�������� �� ��������� �������: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1012
+#: ../../Xconfigurator.pm_.c:1016
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 ������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1027
+#: ../../Xconfigurator.pm_.c:1031
 msgid "Preparing X-Window configuration"
 msgstr "������� ������������� �� X-Window ������"
 
-#: ../../Xconfigurator.pm_.c:1041
+#: ../../Xconfigurator.pm_.c:1045
 msgid "Change Monitor"
 msgstr "������� ��������"
 
-#: ../../Xconfigurator.pm_.c:1042
+#: ../../Xconfigurator.pm_.c:1046
 msgid "Change Graphic card"
 msgstr "������� �������� �������"
 
-#: ../../Xconfigurator.pm_.c:1043
+#: ../../Xconfigurator.pm_.c:1047
 msgid "Change Server options"
 msgstr "������� ������ ������"
 
-#: ../../Xconfigurator.pm_.c:1044
+#: ../../Xconfigurator.pm_.c:1048
 msgid "Change Resolution"
 msgstr "������� ����������"
 
-#: ../../Xconfigurator.pm_.c:1045
+#: ../../Xconfigurator.pm_.c:1049
 msgid "Automatical resolutions search"
 msgstr "���������� ������� ����������"
 
-#: ../../Xconfigurator.pm_.c:1049
+#: ../../Xconfigurator.pm_.c:1053
 msgid "Show information"
 msgstr "������� �����������"
 
-#: ../../Xconfigurator.pm_.c:1050
+#: ../../Xconfigurator.pm_.c:1054
 msgid "Test again"
 msgstr "�������� ������"
 
-#: ../../Xconfigurator.pm_.c:1051 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1055 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "����"
 
-#: ../../Xconfigurator.pm_.c:1055 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1059 ../../standalone/drakboot_.c:39
 msgid "What do you want to do?"
 msgstr "��� ������ �� �������?"
 
-#: ../../Xconfigurator.pm_.c:1062
+#: ../../Xconfigurator.pm_.c:1066
 msgid "Forget the changes?"
 msgstr "�� ������� �������?"
 
-#: ../../Xconfigurator.pm_.c:1080
+#: ../../Xconfigurator.pm_.c:1084
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "�����, ������ ������� %s ���� ���������� �������"
 
-#: ../../Xconfigurator.pm_.c:1096
+#: ../../Xconfigurator.pm_.c:1100
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "����� ��� ��������� �� � ����������� (Ctrl-Alt-BackSpace) �������"
 
-#: ../../Xconfigurator.pm_.c:1099
+#: ../../Xconfigurator.pm_.c:1103
 msgid "X at startup"
 msgstr "X �������� �� ������"
 
-#: ../../Xconfigurator.pm_.c:1100
+#: ../../Xconfigurator.pm_.c:1104
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -306,11 +306,11 @@ msgstr ""
 "Ja ���� ������� ��� ������� �� ���������� ������ X �������� ��� ��������.\n"
 "�� �� ������ X �������� ��� �������� ?"
 
-#: ../../Xconfigurator.pm_.c:1112
+#: ../../Xconfigurator.pm_.c:1116
 msgid "Autologin"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1113
+#: ../../Xconfigurator.pm_.c:1117
 #, fuzzy
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
@@ -319,7 +319,7 @@ msgstr ""
 "Ja ���� ������� ��� ������� �� ���������� ������ X �������� ��� ��������.\n"
 "�� �� ������ X �������� ��� �������� ?"
 
-#: ../../Xconfigurator.pm_.c:1115
+#: ../../Xconfigurator.pm_.c:1119
 #, fuzzy
 msgid "Choose the default user:"
 msgstr "��������� ���� ��������"
@@ -505,15 +505,15 @@ msgstr "����� ���"
 msgid "Delay before booting default image"
 msgstr "����� ��� �������� default image-�"
 
-#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:688
-#: ../../install_steps_interactive.pm_.c:739 ../../netconnect.pm_.c:482
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:110
+#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:687
+#: ../../install_steps_interactive.pm_.c:738 ../../netconnect.pm_.c:481
+#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:137
 #: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "�������"
 
-#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:689
-#: ../../install_steps_interactive.pm_.c:740
+#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:739
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "������� (��������)"
@@ -536,14 +536,14 @@ msgid ""
 msgstr ""
 "������``���������� �������� ������ - ������'' �� ������������� ��� �������"
 
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:698
-#: ../../install_steps_interactive.pm_.c:753
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:697
+#: ../../install_steps_interactive.pm_.c:752
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "�������� ������"
 
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:698
-#: ../../install_steps_interactive.pm_.c:753
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:697
+#: ../../install_steps_interactive.pm_.c:752
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "������������� �������"
@@ -556,13 +556,13 @@ msgstr ""
 "��� �� ��������� ������.\n"
 "������ ������ ���� ��� �������� �����."
 
-#: ../../any.pm_.c:159 ../../printerdrake.pm_.c:244
+#: ../../any.pm_.c:159 ../../printerdrake.pm_.c:337
 #: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "�����"
 
-#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:44
-#: ../../install_steps_interactive.pm_.c:733 ../../printerdrake.pm_.c:244
+#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:45
+#: ../../install_steps_interactive.pm_.c:732 ../../printerdrake.pm_.c:337
 #: ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "�������"
@@ -620,11 +620,12 @@ msgid "Default"
 msgstr "�������������"
 
 #: ../../any.pm_.c:213 ../../install_steps_gtk.pm_.c:580
-#: ../../install_steps_interactive.pm_.c:686 ../../interactive.pm_.c:74
+#: ../../install_steps_interactive.pm_.c:685 ../../interactive.pm_.c:74
 #: ../../interactive.pm_.c:84 ../../interactive.pm_.c:234
 #: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
 #: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:204
-#: ../../my_gtk.pm_.c:463 ../../my_gtk.pm_.c:638 ../../printerdrake.pm_.c:271
+#: ../../my_gtk.pm_.c:463 ../../my_gtk.pm_.c:638 ../../printerdrake.pm_.c:370
+#: ../../printerdrake.pm_.c:382
 msgid "Ok"
 msgstr "� ����"
 
@@ -733,7 +734,7 @@ msgstr "�������"
 msgid "Start Menu"
 msgstr "����� ���� "
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:416
+#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:418
 msgid "Create"
 msgstr "�������"
 
@@ -741,7 +742,7 @@ msgstr "�������"
 msgid "Unmount"
 msgstr "����������"
 
-#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:420
 msgid "Delete"
 msgstr "������"
 
@@ -749,16 +750,16 @@ msgstr "������"
 msgid "Format"
 msgstr "�����������"
 
-#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:592
+#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:594
 msgid "Resize"
 msgstr "������� ��������"
 
-#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:416
-#: ../../diskdrake.pm_.c:469
+#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:471
 msgid "Type"
 msgstr "���"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:489
+#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:491
 msgid "Mount point"
 msgstr "����� ���������"
 
@@ -783,34 +784,38 @@ msgid "Save in file"
 msgstr "����� � ����"
 
 #: ../../diskdrake.pm_.c:42
+msgid "Wizard"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:43
 msgid "Restore from floppy"
 msgstr "������� (restore) �� �������"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:44
 msgid "Save on floppy"
 msgstr "����� �� �������"
 
-#: ../../diskdrake.pm_.c:47
+#: ../../diskdrake.pm_.c:48
 msgid "Clear all"
 msgstr "������ ���"
 
-#: ../../diskdrake.pm_.c:48
+#: ../../diskdrake.pm_.c:49
 msgid "Format all"
 msgstr "���������� ���"
 
-#: ../../diskdrake.pm_.c:49
+#: ../../diskdrake.pm_.c:50
 msgid "Auto allocate"
 msgstr "���� �����������"
 
-#: ../../diskdrake.pm_.c:52
+#: ../../diskdrake.pm_.c:53
 msgid "All primary partitions are used"
 msgstr "��� �������� ��������� �� �������"
 
-#: ../../diskdrake.pm_.c:52
+#: ../../diskdrake.pm_.c:53
 msgid "I can't add any more partition"
 msgstr "�� ���� ������ ���� �� ����� ���������"
 
-#: ../../diskdrake.pm_.c:52
+#: ../../diskdrake.pm_.c:53
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -818,63 +823,63 @@ msgstr ""
 "�� �� ��������� �������� ��� (extended) ��������� ��������� ����� �� "
 "����������"
 
-#: ../../diskdrake.pm_.c:55
+#: ../../diskdrake.pm_.c:56
 msgid "Rescue partition table"
 msgstr "�����  ������ ���������"
 
-#: ../../diskdrake.pm_.c:56
+#: ../../diskdrake.pm_.c:57
 msgid "Undo"
 msgstr "������� �����"
 
-#: ../../diskdrake.pm_.c:57
+#: ../../diskdrake.pm_.c:58
 msgid "Write partition table"
 msgstr "����� ������ ���������"
 
-#: ../../diskdrake.pm_.c:58
+#: ../../diskdrake.pm_.c:59
 msgid "Reload"
 msgstr "������ �����"
 
-#: ../../diskdrake.pm_.c:98
+#: ../../diskdrake.pm_.c:99
 msgid "loopback"
 msgstr "��������"
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:111
+#: ../../diskdrake.pm_.c:112
 msgid "Swap"
 msgstr "Swap"
 
-#: ../../diskdrake.pm_.c:112
+#: ../../diskdrake.pm_.c:113
 msgid "Empty"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:112
+#: ../../diskdrake.pm_.c:113
 msgid "Other"
 msgstr "�����"
 
-#: ../../diskdrake.pm_.c:118
+#: ../../diskdrake.pm_.c:119
 msgid "Filesystem types:"
 msgstr "����� ���� �������:"
 
-#: ../../diskdrake.pm_.c:127
+#: ../../diskdrake.pm_.c:128
 msgid "Details"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:141
+#: ../../diskdrake.pm_.c:142
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -886,17 +891,17 @@ msgstr ""
 "��������� �� ���� �������� ������� (resize) �� ��������� (�������� �� ��,\n"
 "� ����� �� \"������� ��������\")"
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:147
 msgid "Please make a backup of your data first"
 msgstr "����� ���, ���� ��������� ������ ����� ��������"
 
-#: ../../diskdrake.pm_.c:146 ../../diskdrake.pm_.c:163
-#: ../../diskdrake.pm_.c:172 ../../diskdrake.pm_.c:521
-#: ../../diskdrake.pm_.c:543
+#: ../../diskdrake.pm_.c:147 ../../diskdrake.pm_.c:164
+#: ../../diskdrake.pm_.c:173 ../../diskdrake.pm_.c:523
+#: ../../diskdrake.pm_.c:545
 msgid "Read carefully!"
 msgstr "������� ���Ǹ°� !"
 
-#: ../../diskdrake.pm_.c:149
+#: ../../diskdrake.pm_.c:150
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -906,77 +911,77 @@ msgstr ""
 "��������� ������� \n"
 "�����)"
 
-#: ../../diskdrake.pm_.c:163
+#: ../../diskdrake.pm_.c:164
 msgid "Be careful: this operation is dangerous."
 msgstr "�������,��� ��������� j� ������."
 
-#: ../../diskdrake.pm_.c:200 ../../install_steps.pm_.c:75
+#: ../../diskdrake.pm_.c:201 ../../install_steps.pm_.c:75
 #: ../../install_steps_interactive.pm_.c:42
 #: ../../install_steps_interactive.pm_.c:218 ../../standalone/diskdrake_.c:60
 #: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:685
+#: ../../diskdrake.pm_.c:226 ../../diskdrake.pm_.c:687
 msgid "Mount point: "
 msgstr "����� ���������: "
 
-#: ../../diskdrake.pm_.c:225 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:268
 msgid "Device: "
 msgstr "������: "
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:228
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "������ DOS ���������: %s (���� ������������)\n"
 
-#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:269
+#: ../../diskdrake.pm_.c:229 ../../diskdrake.pm_.c:271
 msgid "Type: "
 msgstr "�����: "
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:230
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "�������: ������ %s\n"
 
-#: ../../diskdrake.pm_.c:229
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Size: %d MB"
 msgstr "��������: %d MB"
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:233
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s �������"
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:235
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "�������� %d �� �������� %d\n"
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:236
 msgid "Formatted\n"
 msgstr "�����������\n"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:237
 msgid "Not formatted\n"
 msgstr "���� �����������\n"
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:238
 msgid "Mounted\n"
 msgstr "���������\n"
 
-#: ../../diskdrake.pm_.c:237
+#: ../../diskdrake.pm_.c:239
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr "Loopback ��j�(���): %s\n"
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:241
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -984,79 +989,79 @@ msgstr ""
 "Boot ��������� �� default-�\n"
 "   (�� �������� MS-DOS�, �� �� lilo)\n"
 
-#: ../../diskdrake.pm_.c:241
+#: ../../diskdrake.pm_.c:243
 #, c-format
 msgid "Level %s\n"
 msgstr "���� %s\n"
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:244
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Chunk-�� %s\n"
 
-#: ../../diskdrake.pm_.c:243
+#: ../../diskdrake.pm_.c:245
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-������� %s\n"
 
-#: ../../diskdrake.pm_.c:245
+#: ../../diskdrake.pm_.c:247
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "��e Loopback ��j�a: %s"
 
-#: ../../diskdrake.pm_.c:262
+#: ../../diskdrake.pm_.c:264
 msgid "Please click on a partition"
 msgstr "�������� �� ���������"
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:269
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "��������: %d MB\n"
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:270
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "����������: %s ���������, %s �����, %s �������\n"
 
-#: ../../diskdrake.pm_.c:270
+#: ../../diskdrake.pm_.c:272
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "��� �����e ��������� : %s\n"
 
-#: ../../diskdrake.pm_.c:271
+#: ../../diskdrake.pm_.c:273
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "�� ���� %d ID %d\n"
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:286
 msgid "Mount"
 msgstr "��������"
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:287
 msgid "Active"
 msgstr "���������"
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:288
 msgid "Add to RAID"
 msgstr "����� �� RAID"
 
-#: ../../diskdrake.pm_.c:287
+#: ../../diskdrake.pm_.c:289
 msgid "Remove from RAID"
 msgstr "������ �� RAID-�"
 
-#: ../../diskdrake.pm_.c:288
+#: ../../diskdrake.pm_.c:290
 msgid "Modify RAID"
 msgstr "������� RAID"
 
-#: ../../diskdrake.pm_.c:289
+#: ../../diskdrake.pm_.c:291
 msgid "Use for loopback"
 msgstr "������� �� loopback"
 
-#: ../../diskdrake.pm_.c:296
+#: ../../diskdrake.pm_.c:298
 msgid "Choose action"
 msgstr "��������� ������"
 
-#: ../../diskdrake.pm_.c:389
+#: ../../diskdrake.pm_.c:391
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1066,7 +1071,7 @@ msgstr ""
 "���� ������ �������� /boot �� ���� �� ���� ����� (�� �������� > 1024).\n"
 "��� ��������� LILO ���� �� ����, ��� �� �� ��������� �� ��� �� ����� /boot"
 
-#: ../../diskdrake.pm_.c:393
+#: ../../diskdrake.pm_.c:395
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -1078,7 +1083,7 @@ msgstr ""
 "������� ��������� �� ���������� LILO boot ��������, ������\n"
 "������ /boot ���������."
 
-#: ../../diskdrake.pm_.c:399
+#: ../../diskdrake.pm_.c:401
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
@@ -1088,16 +1093,16 @@ msgstr ""
 "��j���� ������� �� ���� �� ���� �� ��� ��� /boot �������je.\n"
 "���� ������ �a ������ /boot �������j�"
 
-#: ../../diskdrake.pm_.c:416 ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:418 ../../diskdrake.pm_.c:420
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "������ ���� �������� ``%s''"
 
-#: ../../diskdrake.pm_.c:421
+#: ../../diskdrake.pm_.c:423
 msgid "Use ``Unmount'' first"
 msgstr "���� ������� ``����������''"
 
-#: ../../diskdrake.pm_.c:422 ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:424 ../../diskdrake.pm_.c:466
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -1105,41 +1110,41 @@ msgstr ""
 "����� ������� ���� �������je %s, ��� ������ �� ���� ��������� �� ���� "
 "���������"
 
-#: ../../diskdrake.pm_.c:434
+#: ../../diskdrake.pm_.c:436
 msgid "Continue anyway?"
 msgstr "�������� ��������� ?"
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake.pm_.c:441
 msgid "Quit without saving"
 msgstr "���� ��� ������� �������"
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake.pm_.c:441
 msgid "Quit without writing the partition table?"
 msgstr "���� ��� ������� ������� � ������ ���������?"
 
-#: ../../diskdrake.pm_.c:467
+#: ../../diskdrake.pm_.c:469
 msgid "Change partition type"
 msgstr "������� ���� ���������"
 
-#: ../../diskdrake.pm_.c:468
+#: ../../diskdrake.pm_.c:470
 msgid "Which partition type do you want?"
 msgstr "���� ��� ��������� ������?"
 
-#: ../../diskdrake.pm_.c:471 ../../diskdrake.pm_.c:717
+#: ../../diskdrake.pm_.c:473 ../../diskdrake.pm_.c:719
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr "�e ������ ��������� ReiserFS �� �������j� ���� �� 32MB"
 
-#: ../../diskdrake.pm_.c:487
+#: ../../diskdrake.pm_.c:489
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "��� ����� �� ��������� loopback ��j�  %s?"
 
-#: ../../diskdrake.pm_.c:488
+#: ../../diskdrake.pm_.c:490
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "��� ����� �� ��������� %s ������ ?"
 
-#: ../../diskdrake.pm_.c:493
+#: ../../diskdrake.pm_.c:495
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1147,139 +1152,139 @@ msgstr ""
 "��������a�e ��j� ������,j�� �� �������j� �������� �� loop back.\n"
 "���� �������� loopback"
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:514
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "����� ��������a�a �������je %s,��� ������ �� ���� ��������� �� ���� ���������"
 
-#: ../../diskdrake.pm_.c:514
+#: ../../diskdrake.pm_.c:516
 msgid "Formatting"
 msgstr "�����������"
 
-#: ../../diskdrake.pm_.c:515
+#: ../../diskdrake.pm_.c:517
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "����������� loopback ��j�a %s"
 
-#: ../../diskdrake.pm_.c:516 ../../install_steps_interactive.pm_.c:304
+#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:294
 #, c-format
 msgid "Formatting partition %s"
 msgstr "����������� ��������� %s"
 
-#: ../../diskdrake.pm_.c:521
+#: ../../diskdrake.pm_.c:523
 msgid "After formatting all partitions,"
 msgstr "����� ����������� ���� ���������,"
 
-#: ../../diskdrake.pm_.c:521
+#: ../../diskdrake.pm_.c:523
 msgid "all data on these partitions will be lost"
 msgstr "��� ������ �� ���� �� ���� ��������"
 
-#: ../../diskdrake.pm_.c:527
+#: ../../diskdrake.pm_.c:529
 msgid "Move"
 msgstr "��������"
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:530
 msgid "Which disk do you want to move it to?"
 msgstr "���� ���� ������ �� ����������?"
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:531
 msgid "Sector"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:530
+#: ../../diskdrake.pm_.c:532
 msgid "Which sector do you want to move it to?"
 msgstr "��� �����e �� ����������� �������?"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:535
 msgid "Moving"
 msgstr "����������"
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:535
 msgid "Moving partition..."
 msgstr "���������� ���������..."
 
-#: ../../diskdrake.pm_.c:543
+#: ../../diskdrake.pm_.c:545
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "������ ��������� �� ������ %s �� ���� �������� �� ����!"
 
-#: ../../diskdrake.pm_.c:545
+#: ../../diskdrake.pm_.c:547
 msgid "You'll need to reboot before the modification can take place"
 msgstr "������ ������������ ������� �� �� �� ������ ��������"
 
-#: ../../diskdrake.pm_.c:566 ../../install_interactive.pm_.c:68
+#: ../../diskdrake.pm_.c:568 ../../install_interactive.pm_.c:90
 msgid "Computing FAT filesystem bounds"
 msgstr "������������ ������� FAT ����-�������"
 
-#: ../../diskdrake.pm_.c:566 ../../diskdrake.pm_.c:620
-#: ../../install_interactive.pm_.c:68
+#: ../../diskdrake.pm_.c:568 ../../diskdrake.pm_.c:622
+#: ../../install_interactive.pm_.c:90
 msgid "Resizing"
 msgstr "������� �������� (resizing)"
 
-#: ../../diskdrake.pm_.c:587
+#: ../../diskdrake.pm_.c:589
 msgid "All data on this partition should be backed-up"
 msgstr "C�� ������ �� ���� ��������� �� ������� ���� �a������"
 
-#: ../../diskdrake.pm_.c:589
+#: ../../diskdrake.pm_.c:591
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "����� ������� �������e %s �������j� ��� ������  �� ���� ���������"
 
-#: ../../diskdrake.pm_.c:599
+#: ../../diskdrake.pm_.c:601
 msgid "Choose the new size"
 msgstr "��������� ���� ��������"
 
-#: ../../diskdrake.pm_.c:599 ../../install_steps_graphical.pm_.c:287
+#: ../../diskdrake.pm_.c:601 ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334 ../../partition_table_raw.pm_.c:100
 msgid "MB"
 msgstr "MB"
 
-#: ../../diskdrake.pm_.c:657
+#: ../../diskdrake.pm_.c:659
 msgid "Create a new partition"
 msgstr "������� ���� ���������"
 
-#: ../../diskdrake.pm_.c:677
+#: ../../diskdrake.pm_.c:679
 msgid "Start sector: "
 msgstr "������� ������: "
 
-#: ../../diskdrake.pm_.c:681 ../../diskdrake.pm_.c:756
+#: ../../diskdrake.pm_.c:683 ../../diskdrake.pm_.c:758
 msgid "Size in MB: "
 msgstr "�������� � MB:"
 
-#: ../../diskdrake.pm_.c:684 ../../diskdrake.pm_.c:759
+#: ../../diskdrake.pm_.c:686 ../../diskdrake.pm_.c:761
 msgid "Filesystem type: "
 msgstr "����� ����-�������:"
 
-#: ../../diskdrake.pm_.c:687
+#: ../../diskdrake.pm_.c:689
 msgid "Preference: "
 msgstr "��������������: "
 
-#: ../../diskdrake.pm_.c:735
+#: ../../diskdrake.pm_.c:737
 msgid "This partition can't be used for loopback"
 msgstr "��� ��������� �� ���� ���� ��������� �� loopback "
 
-#: ../../diskdrake.pm_.c:745
+#: ../../diskdrake.pm_.c:747
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:757
 msgid "Loopback file name: "
 msgstr "��� Loopback ��j�a: "
 
-#: ../../diskdrake.pm_.c:781
+#: ../../diskdrake.pm_.c:783
 msgid "File already used by another loopback, choose another one"
 msgstr "��j� �� ��� ������� �� ������ ������ loopback-�,��������� �����"
 
-#: ../../diskdrake.pm_.c:782
+#: ../../diskdrake.pm_.c:784
 msgid "File already exists. Use it?"
 msgstr "��j� ��� �������.�� �� �� �� �������� ?"
 
-#: ../../diskdrake.pm_.c:804 ../../diskdrake.pm_.c:820
+#: ../../diskdrake.pm_.c:806 ../../diskdrake.pm_.c:822
 msgid "Select file"
 msgstr "��������� ����"
 
-#: ../../diskdrake.pm_.c:813
+#: ../../diskdrake.pm_.c:815
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1287,11 +1292,11 @@ msgstr ""
 "����a���a(��������) ������ ��������� ���� ���� ��������\n"
 "������ �� ��������� ?"
 
-#: ../../diskdrake.pm_.c:821
+#: ../../diskdrake.pm_.c:823
 msgid "Warning"
 msgstr "���������"
 
-#: ../../diskdrake.pm_.c:822
+#: ../../diskdrake.pm_.c:824
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1299,27 +1304,27 @@ msgstr ""
 "������� ������� � ������\n"
 "��� ������ �� ������� �� ���� ��������� !"
 
-#: ../../diskdrake.pm_.c:833
+#: ../../diskdrake.pm_.c:835
 msgid "Trying to rescue partition table"
 msgstr "��������� ������ ���������"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:846
 msgid "device"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:847
 msgid "level"
 msgstr "����"
 
-#: ../../diskdrake.pm_.c:846
+#: ../../diskdrake.pm_.c:848
 msgid "chunk size"
 msgstr "chunk ��������"
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:860
 msgid "Choose an existing RAID to add to"
 msgstr "������� ��������� RAID �� ��������"
 
-#: ../../diskdrake.pm_.c:859
+#: ../../diskdrake.pm_.c:861
 msgid "new"
 msgstr "����"
 
@@ -1392,16 +1397,14 @@ msgid "Choose the layout corresponding to your keyboard from the list above"
 msgstr "��������� ��� ������������ �� ���������� �� ���� ���������"
 
 #: ../../help.pm_.c:13
-#, fuzzy
+#, c-format
 msgid ""
 "Choose \"Install\" if there are no previous versions of GNU/Linux\n"
 "installed, or if you wish to use multiple distributions or versions.\n"
 "\n"
 "Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
 "Linux:\n"
-"5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
-"2000\n"
-"or 7.0 (Air).\n"
+"%s or %s.\n"
 "\n"
 "\n"
 "Select:\n"
@@ -1422,9 +1425,9 @@ msgstr ""
 "��������� \"�����������\" ��� ������ ��� ���������� Linux, ��� ������\n"
 "�� ��������� ���� ������������ ��� �������.\n"
 "\n"
-"��������� \"���������\" ��� ������ �� ��e���������� ������ �������\n"
-"Mandrake-� ������: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000 ��� Air (7.0).\n"
+"��������� \"���������\" ��� ������ �� ��e���������� ������\n"
+"������� Mandrake-� ������:\n"
+"%s ��� %s.\n"
 "\n"
 "\n"
 "���������:\n"
@@ -1445,7 +1448,7 @@ msgstr ""
 "��������� ������� ��� \"�����������\".\n"
 "    ��� ����� ���, ����Jµ ����¸ ��� ��ƸJ� ú����� �� ���µ ��a �����E !\n"
 
-#: ../../help.pm_.c:35
+#: ../../help.pm_.c:34
 msgid ""
 "Select:\n"
 "\n"
@@ -1473,7 +1476,7 @@ msgstr ""
 "�������� ����������� ���� �� ��� ����� ��� �� ���. ���� ���� ��������\n"
 "��������� ������� ��� \"�����������\".\n"
 
-#: ../../help.pm_.c:47
+#: ../../help.pm_.c:46
 msgid ""
 "The different choices for your machine's usage (provided, hence, that you "
 "have\n"
@@ -1522,7 +1525,7 @@ msgstr ""
 "�������aserver ���. ��� \n"
 "    �����, �� �e�� ��a�� ���������� ������  (KDE, GNOME...) .\n"
 
-#: ../../help.pm_.c:68
+#: ../../help.pm_.c:67
 msgid ""
 "DrakX will attempt to look for PCI SCSI adapter(s). \n"
 "If DrakX finds a SCSI adapter and knows which driver to use it will\n"
@@ -1569,7 +1572,7 @@ msgstr ""
 "�����������j� � ��������, ��� �� ��������a����� \n"
 "��� ��j�a (������� ����� ������� ���������)."
 
-#: ../../help.pm_.c:90
+#: ../../help.pm_.c:89
 msgid ""
 "At this point, you may choose what partition(s) to use to install\n"
 "your Linux-Mandrake system if they have been already defined (from a\n"
@@ -1645,7 +1648,7 @@ msgstr ""
 "\n"
 "- Ctrl-m  �� ���e���a�� �a��� ������a�a \n"
 
-#: ../../help.pm_.c:127
+#: ../../help.pm_.c:126
 msgid ""
 "Any partitions that have been newly defined must be formatted for\n"
 "use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -1661,7 +1664,7 @@ msgstr ""
 "������� ������ �� �������� ������� �� ����. ��� �� ������ ������\n"
 "� /home � /usr/local ���������������."
 
-#: ../../help.pm_.c:135
+#: ../../help.pm_.c:134
 msgid ""
 "You may now select the group of packages you wish to\n"
 "install or upgrade.\n"
@@ -1688,7 +1691,7 @@ msgstr ""
 "������ �������� ����jy \"Individual package selection\";\n"
 "� ��� �����j� ���a���� ������ ���e�� ���� �� 1000 �����a..."
 
-#: ../../help.pm_.c:146
+#: ../../help.pm_.c:145
 msgid ""
 "If you have all the CDs in the list above, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -1698,7 +1701,7 @@ msgstr ""
 "������� ������ ��j���� CD, �������� �a Cancel.\n"
 "��� ��� �������j�  ���� CD-���, ���������j��� �� , � ���� �������� ��  Ok."
 
-#: ../../help.pm_.c:151
+#: ../../help.pm_.c:150
 msgid ""
 "The packages selected are now being installed. This operation\n"
 "should take a few minutes unless you have chosen to upgrade an\n"
@@ -1709,7 +1712,7 @@ msgstr ""
 "�������� ������ ������� ����� �������� ���������\n"
 "�� ��������� ������.� ��� ������� �������� �� ����� ���� �������."
 
-#: ../../help.pm_.c:157
+#: ../../help.pm_.c:156
 msgid ""
 "If DrakX failed to find your mouse, or if you want to\n"
 "check what it has done, you will be presented the list of mice\n"
@@ -1736,7 +1739,7 @@ msgstr ""
 "� ������� �� ����� �������� ���, �������� �������� � DrakX-� �� ����\n"
 "�������� ���� �� ���������."
 
-#: ../../help.pm_.c:171
+#: ../../help.pm_.c:170
 msgid ""
 "Please select the correct port. For example, the COM1 port under MS Windows\n"
 "is named ttyS0 under GNU/Linux."
@@ -1744,7 +1747,7 @@ msgstr ""
 "�����, ��������� ������������ ����. �� ������, COM1 ���� ���  MS Windows-��\n"
 "� ������� ��� ������ ttyS0"
 
-#: ../../help.pm_.c:175
+#: ../../help.pm_.c:174
 msgid ""
 "This section is dedicated to configuring a local area\n"
 "network (LAN) or a modem.\n"
@@ -1798,7 +1801,7 @@ msgstr ""
 "�������������. DrakX �� ������� �����, ������� �� �� �������, ������\n"
 "�������� �������� ���� �� ���� �� ������� �����."
 
-#: ../../help.pm_.c:205
+#: ../../help.pm_.c:204
 msgid ""
 "Enter:\n"
 "\n"
@@ -1829,7 +1832,7 @@ msgstr ""
 "\"IP ������\". ������� ����� �������, ������������� ������ �������������� "
 "��� ISP. \n"
 
-#: ../../help.pm_.c:220
+#: ../../help.pm_.c:219
 msgid ""
 "You may now enter dialup options. If you're not sure what to enter, the\n"
 "correct information can be obtained from your ISP."
@@ -1837,7 +1840,7 @@ msgstr ""
 "���� ������� dialup ������. ������� ����� ������� ��� �� �������,\n"
 "�������� ����������� ���� ������� ��� ����� ISP."
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:223
 msgid ""
 "If you will use proxies, please configure them now. If you don't know if\n"
 "you should use proxies, ask your network administrator or your ISP."
@@ -1845,7 +1848,7 @@ msgstr ""
 "������� ��������� ��������, ������������� �� ����. ������� �� �����\n"
 "�� �� ���� �� ���������, ����������� ������ �������������� ��� ISP."
 
-#: ../../help.pm_.c:228
+#: ../../help.pm_.c:227
 msgid ""
 "You can install cryptographic package if your internet connection has been\n"
 "set up correctly. First choose a mirror where you wish to download packages "
@@ -1860,7 +1863,7 @@ msgstr ""
 "� ����� ���� �������� ������ ���� ���� �����������.\n"
 "������ �������� mirror � ������ ����� ������ ������ � ��������."
 
-#: ../../help.pm_.c:236
+#: ../../help.pm_.c:235
 msgid ""
 "You can now select your timezone according to where you live.\n"
 "\n"
@@ -1874,7 +1877,7 @@ msgstr ""
 "Linux ���� ����� � GMT ��� \"Greeenwich Mean Time\" � ������� �� �\n"
 "������� ����� ��������� � ����� �������� ��������� ����."
 
-#: ../../help.pm_.c:243
+#: ../../help.pm_.c:242
 msgid ""
 "You may now choose which services you want to see started at boot time.\n"
 "When your mouse comes over an item, a small balloon help will popup which\n"
@@ -1895,7 +1898,7 @@ msgstr ""
 "������: ��������� �� �� ������ �� �� ������j��e ���� ��j� ������ ��j� \n"
 "�� �����e."
 
-#: ../../help.pm_.c:252
+#: ../../help.pm_.c:251
 msgid ""
 "GNU/Linux can deal with many types of printer. Each of these\n"
 "types require a different setup. Note however that the print\n"
@@ -1952,7 +1955,7 @@ msgstr ""
 "�� ��� �������� �� �� ���������� ��������, � ������� ��� ��������. ����\n"
 "�������� �� �������� � �� NetWare ��������, ������ ����� ����� �����."
 
-#: ../../help.pm_.c:281
+#: ../../help.pm_.c:280
 msgid ""
 "You can now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
@@ -1983,7 +1986,7 @@ msgstr ""
 "*������* �� �� ��������� �� �����. �� ������� ������� ������� �����\n"
 "� �������������, ��� �� ������ �������� ��� ����� ������."
 
-#: ../../help.pm_.c:297
+#: ../../help.pm_.c:296
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1991,7 +1994,7 @@ msgstr ""
 "�� �� ��������� ���� ��������� �������, ��������� \"������� shadow ����\" �\n"
 "\"Use MD5 passwords\"."
 
-#: ../../help.pm_.c:301
+#: ../../help.pm_.c:300
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1999,7 +2002,7 @@ msgstr ""
 "������� ��� ������� ������� NIS, ��������� \"������� NIS\". ������� �����\n"
 "������� ������������� ����� ��������������."
 
-#: ../../help.pm_.c:305
+#: ../../help.pm_.c:304
 msgid ""
 "You may now create one or more \"regular\" user account(s), as\n"
 "opposed to the \"privileged\" user account, root. You can create\n"
@@ -2038,7 +2041,7 @@ msgstr ""
 "���� �������� ����, � root ����� ��������� ���� ��� �������������� ���\n"
 "��������� �������."
 
-#: ../../help.pm_.c:324
+#: ../../help.pm_.c:323
 msgid ""
 "It is strongly recommended that you answer \"Yes\" here. If you install\n"
 "Microsoft Windows at a later date it will overwrite the boot sector.\n"
@@ -2049,7 +2052,7 @@ msgstr ""
 "�� �������� ������� �� �� ��� ������� ���� boot ������.\n"
 "������� ����� ��������� ������� �������, ������ ���� ���� ������ Linux."
 
-#: ../../help.pm_.c:330
+#: ../../help.pm_.c:329
 msgid ""
 "You need to indicate where you wish\n"
 "to place the information required to boot to GNU/Linux.\n"
@@ -2065,7 +2068,7 @@ msgstr ""
 "������� ������� ����� ��� ������,��������� \"���� ������\n"
 "����� (MBR)\"."
 
-#: ../../help.pm_.c:338
+#: ../../help.pm_.c:337
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -2073,7 +2076,7 @@ msgstr ""
 "������� ���� ��������� ��������, ��������� ����� �� \"/dev/hda\"\n"
 "(������ ���� �� ��������� ������) ��� \"/dev/sda\" (first SCSI disk)."
 
-#: ../../help.pm_.c:342
+#: ../../help.pm_.c:341
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
@@ -2100,7 +2103,7 @@ msgstr ""
 "� ��� �����j�, ����� �� ��������� ��������j��e ����je �� �� ������e. ���\n"
 "���a ������ ����� boot ������� �� �� �� �������� !"
 
-#: ../../help.pm_.c:354
+#: ../../help.pm_.c:353
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -2138,7 +2141,7 @@ msgstr ""
 "    * ������: ������� �������� 80x25 ����� ���.\n"
 "    * <������>: ������� �������������� ����� ���."
 
-#: ../../help.pm_.c:373
+#: ../../help.pm_.c:372
 msgid ""
 "SILO is a bootloader for SPARC: it is able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
@@ -2164,7 +2167,7 @@ msgstr ""
 "� ��� �����j�, ����� �� ��������� ��������j��e ����je �� �� ������e. ���\n"
 "���a ������ ����� boot ������� �� �� �� �������� !"
 
-#: ../../help.pm_.c:385
+#: ../../help.pm_.c:384
 msgid ""
 "SILO main options are:\n"
 "  - Bootloader installation: Indicate where you want to place the\n"
@@ -2190,7 +2193,7 @@ msgstr ""
 "�������j� �������e. ������� �� ���� ������� j�  \"delay\" \n"
 "������ ��� ���e���� �� 0 - ���a ."
 
-#: ../../help.pm_.c:398
+#: ../../help.pm_.c:397
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
 "core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -2217,7 +2220,7 @@ msgstr ""
 "��� �������� ���� ����. ��� �� �� �������, ������� �� ����� �����\n"
 "� ��������� ���������� ������ ��� ���� �� ��������."
 
-#: ../../help.pm_.c:411
+#: ../../help.pm_.c:410
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2225,7 +2228,7 @@ msgstr ""
 "������� �� ����� �������� � X �������������, ��������� ��� ������\n"
 "�� �� �������� ��������� X Window ������."
 
-#: ../../help.pm_.c:415
+#: ../../help.pm_.c:414
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2233,7 +2236,7 @@ msgstr ""
 "������� ���� ������ �������� � ��������� ����, ��������� \"��\".\n"
 "� ��������� ��������� \"��\"."
 
-#: ../../help.pm_.c:419
+#: ../../help.pm_.c:418
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
@@ -2298,7 +2301,7 @@ msgstr ""
 "��������� ��� boot-���, ��������� ��� ������ (��������: Num Lock ����� ���� "
 "���� ������ ��� X-���, �� ������ !)."
 
-#: ../../help.pm_.c:444
+#: ../../help.pm_.c:443
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2332,7 +2335,7 @@ msgstr "���������� ����"
 msgid "Choose your keyboard"
 msgstr "������� ���������"
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:374
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:364
 msgid "Miscellaneous"
 msgstr "����� ������"
 
@@ -2372,8 +2375,8 @@ msgstr "������ �������"
 msgid "Configure printer"
 msgstr "������ �������"
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:686
-#: ../../install_steps_interactive.pm_.c:687
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:686
 msgid "Set root password"
 msgstr "����� root �������"
 
@@ -2401,71 +2404,95 @@ msgstr "���� �����������a ������a "
 msgid "Exit install"
 msgstr "����� �� �����������"
 
-#: ../../install_any.pm_.c:568
+#: ../../install_any.pm_.c:570
 msgid "Error reading file $f"
 msgstr "������ ��� �������� ����� $f"
 
-#: ../../install_interactive.pm_.c:34
+#: ../../install_interactive.pm_.c:30
+msgid ""
+"You must have a root partition.\n"
+"For this, create a partition (or click on an existing one).\n"
+"Then choose action ``Mount point'' and set it to `/'"
+msgstr ""
+"������ �����  root �������j�.\n"
+"�� ���, ��������� ��������� (��� �������� �� ���������).\n"
+"����� ��������� \"����� ���������\" � �������� �� `/'"
+
+#: ../../install_interactive.pm_.c:35 ../../install_steps_graphical.pm_.c:259
+msgid "You must have a swap partition"
+msgstr "������ ����� swap ���������"
+
+#: ../../install_interactive.pm_.c:36 ../../install_steps_graphical.pm_.c:261
+msgid ""
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+"��, ���� swap ���������\n"
+"\n"
+"�������� ��������� ���� ?"
+
+#: ../../install_interactive.pm_.c:56
 #, fuzzy
 msgid "Use free space"
 msgstr "������� �� loopback"
 
-#: ../../install_interactive.pm_.c:36
+#: ../../install_interactive.pm_.c:58
 msgid "Not enough free space to allocate new partitions"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:42
+#: ../../install_interactive.pm_.c:64
 #, fuzzy
 msgid "Use existing partition"
 msgstr "����������� ���������"
 
-#: ../../install_interactive.pm_.c:44
+#: ../../install_interactive.pm_.c:66
 #, fuzzy
 msgid "There is no existing partition to use"
 msgstr "��������� ������ ���������"
 
-#: ../../install_interactive.pm_.c:51
+#: ../../install_interactive.pm_.c:73
 #, fuzzy
 msgid "Use the FAT partition for loopback"
 msgstr "������� �� loopback"
 
-#: ../../install_interactive.pm_.c:54
+#: ../../install_interactive.pm_.c:76
 msgid "Which partition do you want to use to put Linux4Win?"
 msgstr "���� ��������� ������ �� �������� �� Linux4Win?"
 
-#: ../../install_interactive.pm_.c:55
+#: ../../install_interactive.pm_.c:77
 msgid "Choose the sizes"
 msgstr "���������  ��������"
 
-#: ../../install_interactive.pm_.c:56
+#: ../../install_interactive.pm_.c:78
 msgid "Root partition size in MB: "
 msgstr "�������� Root �������j� � MB:"
 
-#: ../../install_interactive.pm_.c:57
+#: ../../install_interactive.pm_.c:79
 msgid "Swap partition size in MB: "
 msgstr "�������� Swap �������j� � MB:"
 
-#: ../../install_interactive.pm_.c:65
+#: ../../install_interactive.pm_.c:87
 msgid "Use the free space on the FAT partition"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:67
+#: ../../install_interactive.pm_.c:89
 #, fuzzy
 msgid "Which partition do you want to resize?"
 msgstr "���� ��� ��������� ������?"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:92
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
 "the following error occured: %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:73
+#: ../../install_interactive.pm_.c:95
 msgid "Your windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:74
+#: ../../install_interactive.pm_.c:96
 #, fuzzy
 msgid ""
 "WARNING!\n"
@@ -2485,77 +2512,53 @@ msgstr ""
 "��������.\n"
 "��� ��� �������, ���������� \"� ����\"."
 
-#: ../../install_interactive.pm_.c:83
+#: ../../install_interactive.pm_.c:105
 #, fuzzy
 msgid "Which size do you want to keep for windows on"
 msgstr "��� �����e �� ����������� �������?"
 
-#: ../../install_interactive.pm_.c:84
+#: ../../install_interactive.pm_.c:106
 #, fuzzy, c-format
 msgid "partition %s"
 msgstr "���������"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:112
 #, fuzzy, c-format
 msgid "FAT resizing failed: %s"
 msgstr "���������� ������ �������� ��������"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:127
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:133
 msgid "Remove Windows(TM)"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:133
 msgid "Take over the hard drive"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:135
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:115
+#: ../../install_interactive.pm_.c:137
 #, fuzzy, c-format
 msgid "All existing partitions and their data will be lost on drive %s"
 msgstr "����� ������� �������e %s �������j� ��� ������  �� ���� ���������"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:145
 msgid "Use diskdrake"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:132
-msgid ""
-"You must have a root partition.\n"
-"For this, create a partition (or click on an existing one).\n"
-"Then choose action ``Mount point'' and set it to `/'"
-msgstr ""
-"������ �����  root �������j�.\n"
-"�� ���, ��������� ��������� (��� �������� �� ���������).\n"
-"����� ��������� \"����� ���������\" � �������� �� `/'"
-
-#: ../../install_interactive.pm_.c:137 ../../install_steps_graphical.pm_.c:259
-msgid "You must have a swap partition"
-msgstr "������ ����� swap ���������"
-
-#: ../../install_interactive.pm_.c:138 ../../install_steps_graphical.pm_.c:261
-msgid ""
-"You don't have a swap partition\n"
-"\n"
-"Continue anyway?"
-msgstr ""
-"��, ���� swap ���������\n"
-"\n"
-"�������� ��������� ���� ?"
-
-#: ../../install_interactive.pm_.c:146
+#: ../../install_interactive.pm_.c:149
 msgid "Use fdisk"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:149
+#: ../../install_interactive.pm_.c:152
 #, fuzzy, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -2564,22 +2567,34 @@ msgstr ""
 "���a ������ �������������� �a� %s ���� ���� ������\n"
 "�a�a ��������,�� ���������� �� ��������� ������e�� `w'"
 
-#: ../../install_interactive.pm_.c:167
+#: ../../install_interactive.pm_.c:178
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:182
+#, fuzzy, c-format
+msgid "Partitioning failed: %s"
+msgstr "��� �����e ��������� : %s\n"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../install_interactive.pm_.c:192
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "���������� ������� �� %s ������� %s"
 
-#: ../../install_interactive.pm_.c:168
+#: ../../install_interactive.pm_.c:193
 #, c-format
 msgid "(module %s)"
 msgstr "(����� %s)"
 
-#: ../../install_interactive.pm_.c:178
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../install_interactive.pm_.c:204
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "���� %s ������� �� ������?"
 
-#: ../../install_interactive.pm_.c:186
+#: ../../install_interactive.pm_.c:212
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -2595,20 +2610,20 @@ msgstr ""
 "���� �� ������� ������� ������� �� ����, ��� �� �� ������� ��� ������?\n"
 "������ �� �� �� ����� ��������� ��� �������, ��� ���� ������ ������� �����."
 
-#: ../../install_interactive.pm_.c:191
+#: ../../install_interactive.pm_.c:217
 msgid "Autoprobe"
 msgstr "���������� �����"
 
-#: ../../install_interactive.pm_.c:191
+#: ../../install_interactive.pm_.c:217
 msgid "Specify options"
 msgstr "�������� ������"
 
-#: ../../install_interactive.pm_.c:195
+#: ../../install_interactive.pm_.c:221
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "������ ������� ������ ������ �� ����� %s."
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:227
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -2619,11 +2634,11 @@ msgstr ""
 "������ �� � ������� ``���=�������� ���2=��������2 ...''.\n"
 "�� ������, ``io=0x300 irq=7''"
 
-#: ../../install_interactive.pm_.c:204
+#: ../../install_interactive.pm_.c:230
 msgid "Module options:"
 msgstr "������ ������:"
 
-#: ../../install_interactive.pm_.c:214
+#: ../../install_interactive.pm_.c:240
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -2632,49 +2647,49 @@ msgstr ""
 "�������� ������ %s ��������.\n"
 "�� �� ������ �������� ������ �� ������ ����������� ?"
 
-#: ../../install_interactive.pm_.c:225
+#: ../../install_interactive.pm_.c:251
 msgid "Configuring PCMCIA cards..."
 msgstr "������������ PCMCIA �������..."
 
-#: ../../install_interactive.pm_.c:225
+#: ../../install_interactive.pm_.c:251
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_interactive.pm_.c:247
+#: ../../install_interactive.pm_.c:273
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "���������  %s %s ���������a"
 
-#: ../../install_interactive.pm_.c:248
+#: ../../install_interactive.pm_.c:274
 msgid "Do you have another one?"
 msgstr "�� �� ����� ��� �����?"
 
-#: ../../install_interactive.pm_.c:249
+#: ../../install_interactive.pm_.c:275
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "����� �� ��� %s ����������?"
 
-#: ../../install_interactive.pm_.c:251 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:85 ../../netconnect.pm_.c:404
-#: ../../netconnect.pm_.c:570 ../../printerdrake.pm_.c:124
+#: ../../install_interactive.pm_.c:277 ../../interactive.pm_.c:79
+#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:85 ../../netconnect.pm_.c:403
+#: ../../netconnect.pm_.c:576 ../../printerdrake.pm_.c:217
 msgid "No"
 msgstr "��"
 
-#: ../../install_interactive.pm_.c:251 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:83 ../../netconnect.pm_.c:402
-#: ../../netconnect.pm_.c:568
+#: ../../install_interactive.pm_.c:277 ../../interactive.pm_.c:79
+#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:83 ../../netconnect.pm_.c:401
+#: ../../netconnect.pm_.c:574
 msgid "Yes"
 msgstr "��"
 
-#: ../../install_interactive.pm_.c:252
+#: ../../install_interactive.pm_.c:278
 msgid "See hardware info"
 msgstr "�������� ����������� � ��������"
 
-#: ../../install_interactive.pm_.c:267
+#: ../../install_interactive.pm_.c:293
 msgid "Bringing up the network"
 msgstr "���������  �����"
 
-#: ../../install_interactive.pm_.c:272
+#: ../../install_interactive.pm_.c:298
 msgid "Bringing down the network"
 msgstr "�������� �� ����e"
 
@@ -2703,12 +2718,12 @@ msgstr ""
 "��������e cdrom �� ������������ ����j����� ������e�e \"rpm -qpl "
 "Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:411
+#: ../../install_steps.pm_.c:413
 #, c-format
 msgid "Welcome to %s"
 msgstr "�������� �  %s"
 
-#: ../../install_steps.pm_.c:644
+#: ../../install_steps.pm_.c:646
 msgid "No floppy drive available"
 msgstr "������������� �������� ������"
 
@@ -2752,7 +2767,7 @@ msgid "Install"
 msgstr "����������"
 
 #: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:439
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:434
 msgid "Installing"
 msgstr "����������"
 
@@ -2769,7 +2784,7 @@ msgid "Total time "
 msgstr "������ �����"
 
 #: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:457
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:434
 msgid "Preparing installation"
 msgstr "��������� �����������"
 
@@ -2788,7 +2803,7 @@ msgid "There was an error ordering packages:"
 msgstr "������ � ����� ������:"
 
 #: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../install_steps_interactive.pm_.c:943
 msgid "Use existing configuration for X11?"
 msgstr "�� �� �� �������� ��������� ������������� �� X11 ?"
 
@@ -2920,10 +2935,11 @@ msgstr "�� ������ �����������/������������� ���j �����"
 msgid "Estimating"
 msgstr "����������"
 
-#: ../../install_steps_gtk.pm_.c:454 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:233 ../../interactive_newt.pm_.c:49
-#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:205 ../../my_gtk.pm_.c:463
+#: ../../install_steps_gtk.pm_.c:454 ../../install_steps_interactive.pm_.c:663
+#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:233
+#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:205
+#: ../../my_gtk.pm_.c:463
 msgid "Cancel"
 msgstr "��������"
 
@@ -3021,8 +3037,9 @@ msgid "Upgrade"
 msgstr "���������"
 
 #: ../../install_steps_interactive.pm_.c:138
-msgid "Normal"
-msgstr "�������a"
+#, fuzzy
+msgid "Workstation"
+msgstr "�����������"
 
 #: ../../install_steps_interactive.pm_.c:139
 msgid "Development"
@@ -3090,78 +3107,69 @@ msgstr "Root ���������"
 msgid "What is the root partition (/) of your system?"
 msgstr "�� ����� ��������� �� root ��������� (/) ����� �������?"
 
-#: ../../install_steps_interactive.pm_.c:250
-msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:253
-#, fuzzy, c-format
-msgid "Partitioning failed: %s"
-msgstr "��� �����e ��������� : %s\n"
-
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:251
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "����� �� ���������� ������ �� ������� ������ � ������ ���������"
 
-#: ../../install_steps_interactive.pm_.c:287
+#: ../../install_steps_interactive.pm_.c:277
 msgid "Choose the partitions you want to format"
 msgstr "������� ��������� �� �����������"
 
-#: ../../install_steps_interactive.pm_.c:291
+#: ../../install_steps_interactive.pm_.c:281
 msgid "Check bad blocks?"
 msgstr "������� ���� ������� ?"
 
-#: ../../install_steps_interactive.pm_.c:299
+#: ../../install_steps_interactive.pm_.c:289
 msgid "Formatting partitions"
 msgstr "����������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:303
+#: ../../install_steps_interactive.pm_.c:293
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "�����a�� � ��������a�� ��j�a %s"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:296
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "���� ������� swap-� �� ������ �����������, ������� ��� swap-�"
 
-#: ../../install_steps_interactive.pm_.c:312
+#: ../../install_steps_interactive.pm_.c:302
 msgid "Looking for available packages"
 msgstr "������ ������"
 
-#: ../../install_steps_interactive.pm_.c:318
+#: ../../install_steps_interactive.pm_.c:308
 msgid "Finding packages to upgrade"
 msgstr "������ ������ �� ���������..."
 
-#: ../../install_steps_interactive.pm_.c:335
+#: ../../install_steps_interactive.pm_.c:325
 #, fuzzy, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr "�a� ������ ���� ���� ����� �� ���������j� ��� a�����a�e"
 
-#: ../../install_steps_interactive.pm_.c:350
+#: ../../install_steps_interactive.pm_.c:340
 #, fuzzy, c-format
 msgid "Complete (%dMB)"
 msgstr "�������a"
 
-#: ../../install_steps_interactive.pm_.c:350
+#: ../../install_steps_interactive.pm_.c:340
 #, fuzzy, c-format
 msgid "Minimum (%dMB)"
 msgstr "(%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:350
+#: ../../install_steps_interactive.pm_.c:340
 #, fuzzy, c-format
 msgid "Recommended (%dMB)"
 msgstr "�����������"
 
-#: ../../install_steps_interactive.pm_.c:373
+#: ../../install_steps_interactive.pm_.c:363
 msgid "Package Group Selection"
 msgstr "������ ����� ������"
 
-#: ../../install_steps_interactive.pm_.c:376
+#: ../../install_steps_interactive.pm_.c:366
 msgid "Individual package selection"
 msgstr "��j����a��� ���a�� �����a"
 
-#: ../../install_steps_interactive.pm_.c:422
+#: ../../install_steps_interactive.pm_.c:412
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -3172,12 +3180,12 @@ msgstr ""
 "��� ��� �������j�  ���� ���� CD-��� , ���������j�e �x, � ���� �������� ��  "
 "Ok."
 
-#: ../../install_steps_interactive.pm_.c:425
+#: ../../install_steps_interactive.pm_.c:415
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom ���a��� ��� \"%s"
 
-#: ../../install_steps_interactive.pm_.c:453
+#: ../../install_steps_interactive.pm_.c:443
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -3185,46 +3193,46 @@ msgstr ""
 "���������� ������ %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:462
+#: ../../install_steps_interactive.pm_.c:452
 msgid "Post-install configuration"
 msgstr "���������������� ������������a"
 
-#: ../../install_steps_interactive.pm_.c:472
+#: ../../install_steps_interactive.pm_.c:462
 msgid "Keep the current IP configuration"
 msgstr "������� ������ IP ���������"
 
-#: ../../install_steps_interactive.pm_.c:473
+#: ../../install_steps_interactive.pm_.c:463
 msgid "Reconfigure network now"
 msgstr "������������� �����"
 
-#: ../../install_steps_interactive.pm_.c:474
+#: ../../install_steps_interactive.pm_.c:464
 #, fuzzy
 msgid "Do not set up networking"
 msgstr "������ �����"
 
-#: ../../install_steps_interactive.pm_.c:477
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:472
 msgid "Network Configuration"
 msgstr "������ ����������"
 
-#: ../../install_steps_interactive.pm_.c:478
+#: ../../install_steps_interactive.pm_.c:468
 msgid "Local networking has already been configured. Do you want to:"
 msgstr "������� ����� �� ��� ��������. �� �� ������ ��:"
 
-#: ../../install_steps_interactive.pm_.c:483
+#: ../../install_steps_interactive.pm_.c:473
 msgid "Do you want to configure a local network for your system?"
 msgstr "�� �� ������ �� �������� ������� ����� �� ��� ������?"
 
-#: ../../install_steps_interactive.pm_.c:489
+#: ../../install_steps_interactive.pm_.c:479
 msgid "no network card found"
 msgstr "���� ��������� ������ �������"
 
-#: ../../install_steps_interactive.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:561
+#: ../../install_steps_interactive.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:551
 msgid "Configuring network"
 msgstr "���������� �����"
 
-#: ../../install_steps_interactive.pm_.c:508
+#: ../../install_steps_interactive.pm_.c:498
 #, fuzzy
 msgid ""
 "Please enter your host name if you know it.\n"
@@ -3237,18 +3245,18 @@ msgstr ""
 "��� �� ��.  ``mybox.mylab.myco.com''.\n"
 "��� ������ �������� 'nameserver'-�, �������� �� ���� ������."
 
-#: ../../install_steps_interactive.pm_.c:512
-#: ../../install_steps_interactive.pm_.c:566
+#: ../../install_steps_interactive.pm_.c:502
+#: ../../install_steps_interactive.pm_.c:556
 msgid "Host name:"
 msgstr "��� �����:"
 
-#: ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:532
+#: ../../install_steps_interactive.pm_.c:521
+#: ../../install_steps_interactive.pm_.c:522
 #, c-format
 msgid "Configuring network device %s"
 msgstr "���������� ������� ������� %s"
 
-#: ../../install_steps_interactive.pm_.c:533
+#: ../../install_steps_interactive.pm_.c:523
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -3258,27 +3266,27 @@ msgstr ""
 "����� ������ ����� �� ���� tavka ����� �� ���� ����� ���\n"
 "IP ������ (�� ������, 123.45.67.89)."
 
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:526
 msgid "Automatic IP"
 msgstr "���������� IP"
 
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:526
 msgid "IP address:"
 msgstr "IP ������:"
 
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:526
 msgid "Netmask:"
 msgstr "������ �����:"
 
-#: ../../install_steps_interactive.pm_.c:537
+#: ../../install_steps_interactive.pm_.c:527
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../install_steps_interactive.pm_.c:543 ../../printerdrake.pm_.c:89
+#: ../../install_steps_interactive.pm_.c:533 ../../printerdrake.pm_.c:107
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP ������ ����� �� ���� � ������� 1.2.3.4"
 
-#: ../../install_steps_interactive.pm_.c:562
+#: ../../install_steps_interactive.pm_.c:552
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -3290,19 +3298,19 @@ msgstr ""
 "��� �� ��.  ``mybox.mylab.myco.com''.\n"
 "��� ������ �������� 'nameserver'-�, �������� �� ���� ������."
 
-#: ../../install_steps_interactive.pm_.c:566
+#: ../../install_steps_interactive.pm_.c:556
 msgid "DNS server:"
 msgstr "DNS ������:"
 
-#: ../../install_steps_interactive.pm_.c:566
+#: ../../install_steps_interactive.pm_.c:556
 msgid "Gateway device:"
 msgstr "Gateway ������:"
 
-#: ../../install_steps_interactive.pm_.c:566
+#: ../../install_steps_interactive.pm_.c:556
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../../install_steps_interactive.pm_.c:582
+#: ../../install_steps_interactive.pm_.c:572
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3358,89 +3366,94 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:613
+#: ../../install_steps_interactive.pm_.c:603
 msgid "Choose a mirror from which to get the packages"
 msgstr "��������� mirror �� ��� ���� ������� ������"
 
-#: ../../install_steps_interactive.pm_.c:621
+#: ../../install_steps_interactive.pm_.c:611
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "������������� mirror �� ����� ������� ������"
 
-#: ../../install_steps_interactive.pm_.c:625
+#: ../../install_steps_interactive.pm_.c:615
 msgid "Please choose the packages you want to install."
 msgstr "��������� ������ �� �����������"
 
-#: ../../install_steps_interactive.pm_.c:638
+#: ../../install_steps_interactive.pm_.c:628
 #, fuzzy
 msgid "Which is your timezone?"
 msgstr "�� k�j� �������� �� �� �������� ������ ?"
 
-#: ../../install_steps_interactive.pm_.c:639
+#: ../../install_steps_interactive.pm_.c:629
 msgid "Is your hardware clock set to GMT?"
 msgstr "�� �� �� ��� ��������� (BIOS) �������� ������� �� GMT ?"
 
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:662
+#, fuzzy
+msgid "What printing system do you want to use?"
+msgstr "���� ��� ��������� ������?"
+
+#: ../../install_steps_interactive.pm_.c:685
 msgid "No password"
 msgstr "���� �������"
 
-#: ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_interactive.pm_.c:690
 msgid "Use shadow file"
 msgstr "������� shadow ����"
 
-#: ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_interactive.pm_.c:690
 msgid "shadow"
 msgstr "����a"
 
-#: ../../install_steps_interactive.pm_.c:692
+#: ../../install_steps_interactive.pm_.c:691
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:692
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Use MD5 passwords"
 msgstr "�������  MD5 �������"
 
-#: ../../install_steps_interactive.pm_.c:694
+#: ../../install_steps_interactive.pm_.c:693
 msgid "Use NIS"
 msgstr "������� NIS"
 
-#: ../../install_steps_interactive.pm_.c:694
+#: ../../install_steps_interactive.pm_.c:693
 msgid "yellow pages"
 msgstr "���� ��������"
 
-#: ../../install_steps_interactive.pm_.c:700
+#: ../../install_steps_interactive.pm_.c:699
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "��� ������� j� �����e j���������a (����� �a ��� ��� %d �������)"
 
-#: ../../install_steps_interactive.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:706
 msgid "Authentification NIS"
 msgstr "��������������� NIS"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:707
 msgid "NIS Domain"
 msgstr "NIS �����"
 
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:707
 msgid "NIS Server"
 msgstr "NIS ������"
 
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:732
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "�������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:732
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "����� ���������"
 
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:733
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s ��� �������)"
 
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:733
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3450,48 +3463,48 @@ msgstr ""
 "����� ���������\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:736
+#: ../../install_steps_interactive.pm_.c:735
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "����� ���"
 
-#: ../../install_steps_interactive.pm_.c:737 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
+#: ../../install_steps_interactive.pm_.c:736 ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:136 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "���������� ���"
 
-#: ../../install_steps_interactive.pm_.c:742
+#: ../../install_steps_interactive.pm_.c:741
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:744
+#: ../../install_steps_interactive.pm_.c:743
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "����a"
 
-#: ../../install_steps_interactive.pm_.c:754
+#: ../../install_steps_interactive.pm_.c:753
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "��� ������� �� ������� ������"
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:754
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "�������� ���������� ���"
 
-#: ../../install_steps_interactive.pm_.c:756
+#: ../../install_steps_interactive.pm_.c:755
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "���������� ��� ���� �������� ���� ���� �����, �������, `-' � `_'"
 
-#: ../../install_steps_interactive.pm_.c:757
+#: ../../install_steps_interactive.pm_.c:756
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "��� ���������� ��� ��� �������"
 
-#: ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:781
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -3517,19 +3530,19 @@ msgstr ""
 "������� ������ �� �������� ������� ������� �� ��� ������������� ������� � "
 "����� � ���������� \"��\"."
 
-#: ../../install_steps_interactive.pm_.c:798
+#: ../../install_steps_interactive.pm_.c:797
 msgid "First floppy drive"
 msgstr "���� ����� ��e��j "
 
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:798
 msgid "Second floppy drive"
 msgstr "����� ����� ��e��j"
 
-#: ../../install_steps_interactive.pm_.c:800
+#: ../../install_steps_interactive.pm_.c:799
 msgid "Skip"
 msgstr "��������"
 
-#: ../../install_steps_interactive.pm_.c:805
+#: ../../install_steps_interactive.pm_.c:804
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -3550,34 +3563,34 @@ msgstr ""
 "'������ �� ���������', ��� �������� �������� � ������� ���� ��������.\n"
 "�� �� ����� �� �������� ������� ������� �� ��� ������?"
 
-#: ../../install_steps_interactive.pm_.c:814
+#: ../../install_steps_interactive.pm_.c:813
 msgid "Sorry, no floppy drive available"
 msgstr "�� ������, ���� ������e"
 
-#: ../../install_steps_interactive.pm_.c:817
+#: ../../install_steps_interactive.pm_.c:816
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 "���������� �������� ������ ���� ���� ���������  �� �������� ������ �������"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:822
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "������� ������ ������� � ������ %s"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:825
 msgid "Creating bootdisk"
 msgstr "������� ������� ����..."
 
-#: ../../install_steps_interactive.pm_.c:833
+#: ../../install_steps_interactive.pm_.c:832
 msgid "Preparing bootloader"
 msgstr "��������� �������..."
 
-#: ../../install_steps_interactive.pm_.c:841
+#: ../../install_steps_interactive.pm_.c:840
 #, fuzzy
 msgid "Do you want to use aboot?"
 msgstr "�� �� ������ �� ��������� SILO ?"
 
-#: ../../install_steps_interactive.pm_.c:844
+#: ../../install_steps_interactive.pm_.c:843
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3585,102 +3598,102 @@ msgstr ""
 "��e��� ��� ���������j� aboot-a, \n"
 "�� �� �a ������ �� ���������� ��� ��� �� ���� �����e�� ���� �������je?"
 
-#: ../../install_steps_interactive.pm_.c:853
+#: ../../install_steps_interactive.pm_.c:852
 #, fuzzy
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "����������� LILO-� ��������. ������ ��:"
 
-#: ../../install_steps_interactive.pm_.c:868
+#: ../../install_steps_interactive.pm_.c:867
 #, fuzzy
 msgid "Proxies configuration"
 msgstr "���������������� ������������a"
 
-#: ../../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:868
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: ../../install_steps_interactive.pm_.c:870
+#: ../../install_steps_interactive.pm_.c:869
 msgid "FTP proxy"
 msgstr "FTP proxy"
 
-#: ../../install_steps_interactive.pm_.c:876
+#: ../../install_steps_interactive.pm_.c:875
 msgid "Proxy should be http://..."
 msgstr "Proxy ����� �� ���� http://..."
 
-#: ../../install_steps_interactive.pm_.c:877
+#: ../../install_steps_interactive.pm_.c:876
 msgid "Proxy should be ftp://..."
 msgstr "Proxy ����� �� ���� ftp://..."
 
-#: ../../install_steps_interactive.pm_.c:887 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:886 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "�������� ��� ������a"
 
-#: ../../install_steps_interactive.pm_.c:888 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:887 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "�����"
 
-#: ../../install_steps_interactive.pm_.c:889 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:888 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "����"
 
-#: ../../install_steps_interactive.pm_.c:890 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:889 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:891 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:890 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:892 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:891 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "����������"
 
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:904
 msgid "Miscellaneous questions"
 msgstr "����a ������"
 
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:905
 msgid "(may cause data corruption)"
 msgstr "(���� ���������� ������)"
 
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:905
 msgid "Use hard drive optimisations?"
 msgstr "��������� ���� ���� ������������ ?"
 
-#: ../../install_steps_interactive.pm_.c:907 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:906 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "��������� ���������� ����"
 
-#: ../../install_steps_interactive.pm_.c:908
+#: ../../install_steps_interactive.pm_.c:907
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "�������� �������� RAM ��� �� �������� (����������� �� %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:909
 msgid "Removable media automounting"
 msgstr "������������� ���������� ������"
 
-#: ../../install_steps_interactive.pm_.c:912
+#: ../../install_steps_interactive.pm_.c:911
 msgid "Clean /tmp at each boot"
 msgstr "������ /tmp ��� ������ �����a��"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:914
 msgid "Enable multi profiles"
 msgstr "������� �����-������� "
 
-#: ../../install_steps_interactive.pm_.c:917
+#: ../../install_steps_interactive.pm_.c:916
 msgid "Enable num lock at startup"
 msgstr "��������� Num Lock ������ ��� ��������"
 
-#: ../../install_steps_interactive.pm_.c:920
+#: ../../install_steps_interactive.pm_.c:919
 msgid "Give the ram size in MB"
 msgstr "������� �������� RAM-� � Mb"
 
-#: ../../install_steps_interactive.pm_.c:922
+#: ../../install_steps_interactive.pm_.c:921
 msgid "Can't use supermount in high security level"
 msgstr "��j� ������ ���������� supermount ���  '������' ����������� �����"
 
-#: ../../install_steps_interactive.pm_.c:924
+#: ../../install_steps_interactive.pm_.c:923
 msgid ""
 "beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
 "If you want to be root, you have to login as a user and then use \"su\".\n"
@@ -3696,13 +3709,13 @@ msgstr ""
 "���������.\n"
 "��������� ��e."
 
-#: ../../install_steps_interactive.pm_.c:929
+#: ../../install_steps_interactive.pm_.c:928
 msgid ""
 "Be carefull, having numlock enabled causes a lot of keystrokes to\n"
 "give digits instead of normal letters (eg: pressing `p' gives `6')"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:950
+#: ../../install_steps_interactive.pm_.c:949
 #, fuzzy
 msgid ""
 "DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
@@ -3717,17 +3730,17 @@ msgstr ""
 "\n"
 "�� �� ������ �� ������� XFree 4.0?"
 
-#: ../../install_steps_interactive.pm_.c:981
+#: ../../install_steps_interactive.pm_.c:980
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 "�a �� ������ �� �������� ���������������� ����� �� ���������j� ������� ?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:982
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "������� ������ ������� � ������ %s"
 
-#: ../../install_steps_interactive.pm_.c:997
+#: ../../install_steps_interactive.pm_.c:996
 msgid "Creating auto install floppy"
 msgstr "������� ���� ������������ �����"
 
@@ -4218,7 +4231,7 @@ msgstr ""
 msgid "Card IO_1"
 msgstr ""
 
-#: ../../netconnect.pm_.c:151 ../../netconnect.pm_.c:479
+#: ../../netconnect.pm_.c:151 ../../netconnect.pm_.c:478
 msgid "Connection name"
 msgstr "��� ���������"
 
@@ -4322,174 +4335,189 @@ msgstr ""
 msgid "Which is your ISDN card ?"
 msgstr "���� �� ���� ��������� ���� ?"
 
-#: ../../netconnect.pm_.c:280
+#: ../../netconnect.pm_.c:279
 msgid "I have found an ISDN Card:\n"
 msgstr ""
 
-#: ../../netconnect.pm_.c:288
+#: ../../netconnect.pm_.c:287
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
 msgstr ""
 
-#: ../../netconnect.pm_.c:295
+#: ../../netconnect.pm_.c:294
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 
-#: ../../netconnect.pm_.c:407
+#: ../../netconnect.pm_.c:406
 #, fuzzy
 msgid "ISDN configuration"
 msgstr "������������a"
 
-#: ../../netconnect.pm_.c:408
+#: ../../netconnect.pm_.c:407
 #, fuzzy
 msgid "Do you want to start your connection at boot?"
 msgstr "�� �� ������ �� ��������� aboot ?"
 
-#: ../../netconnect.pm_.c:462
+#: ../../netconnect.pm_.c:461
 msgid "Try to find a modem?"
 msgstr "�� �������� ����� ?"
 
-#: ../../netconnect.pm_.c:472
+#: ../../netconnect.pm_.c:471
 msgid "Please choose which serial port your modem is connected to."
 msgstr "��������� �������� ����  �� ���� �� ����� �������."
 
-#: ../../netconnect.pm_.c:478
+#: ../../netconnect.pm_.c:477
 msgid "Dialup options"
 msgstr "Dialup ������"
 
-#: ../../netconnect.pm_.c:480
+#: ../../netconnect.pm_.c:479
 #, fuzzy
 msgid "Phone number"
 msgstr "���� ��������"
 
-#: ../../netconnect.pm_.c:481
+#: ../../netconnect.pm_.c:480
 msgid "Login ID"
 msgstr "ID �� ��������"
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "Authentication"
 msgstr "���������������"
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "Script-based"
 msgstr "�������� �� �������"
 
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:482
 msgid "Terminal-based"
 msgstr "�������� �� ���������"
 
-#: ../../netconnect.pm_.c:484
+#: ../../netconnect.pm_.c:483
 msgid "Domain name"
 msgstr "��� ������"
 
-#: ../../netconnect.pm_.c:486
+#: ../../netconnect.pm_.c:485
 msgid "First DNS Server"
 msgstr "���� DNS ������"
 
-#: ../../netconnect.pm_.c:487
+#: ../../netconnect.pm_.c:486
 msgid "Second DNS Server"
 msgstr "����� DNS ������"
 
-#: ../../netconnect.pm_.c:497
+#: ../../netconnect.pm_.c:498
 #, fuzzy
 msgid "Connect to internet"
 msgstr "��� ���������"
 
-#: ../../netconnect.pm_.c:499
+#: ../../netconnect.pm_.c:500
 msgid "Disconnect from internet"
 msgstr ""
 
-#: ../../netconnect.pm_.c:501
+#: ../../netconnect.pm_.c:502
 #, fuzzy
 msgid "Configure internet connexion"
 msgstr "������ �����"
 
-#: ../../netconnect.pm_.c:504
+#: ../../netconnect.pm_.c:505
 #, fuzzy
 msgid "Internet connection & configuration"
 msgstr "�������j� ��������"
 
-#: ../../netconnect.pm_.c:505
+#: ../../netconnect.pm_.c:506
 #, fuzzy
 msgid "What do you wish to do?"
 msgstr "��� ������ �� �������?"
 
-#: ../../netconnect.pm_.c:520
+#: ../../netconnect.pm_.c:521
 msgid "Connect to internet with a normal modem"
 msgstr ""
 
-#: ../../netconnect.pm_.c:522
+#: ../../netconnect.pm_.c:523
 msgid "Connect to internet using ISDN"
 msgstr ""
 
-#: ../../netconnect.pm_.c:524
+#: ../../netconnect.pm_.c:525
 msgid "Connect to internet using DSL (or ADSL)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:526
+#: ../../netconnect.pm_.c:527
 msgid "Connect to internet using Cable"
 msgstr ""
 
-#: ../../netconnect.pm_.c:528
+#: ../../netconnect.pm_.c:529
 #, fuzzy
 msgid "Do not connect to internet"
 msgstr "����� ���������� �����"
 
-#: ../../netconnect.pm_.c:531 ../../netconnect.pm_.c:554
-#: ../../netconnect.pm_.c:573 ../../netconnect.pm_.c:591
-#: ../../netconnect.pm_.c:602
+#: ../../netconnect.pm_.c:532 ../../netconnect.pm_.c:555
+#: ../../netconnect.pm_.c:579 ../../netconnect.pm_.c:595
+#: ../../netconnect.pm_.c:606 ../../netconnect.pm_.c:632
 msgid "Connect to the Internet"
 msgstr ""
 
-#: ../../netconnect.pm_.c:532
+#: ../../netconnect.pm_.c:533
 #, fuzzy
 msgid "How do you want to connect to the Internet?"
 msgstr "���� ���� ������ �� ����������?"
 
-#: ../../netconnect.pm_.c:549
+#: ../../netconnect.pm_.c:550
 msgid "Internal ISDN card"
 msgstr ""
 
-#: ../../netconnect.pm_.c:551
+#: ../../netconnect.pm_.c:552
 msgid "External modem"
 msgstr ""
 
-#: ../../netconnect.pm_.c:555
+#: ../../netconnect.pm_.c:556
 #, fuzzy
 msgid "What kind is your ISDN connection?"
 msgstr "�� ���� �������� ���� �� ��� ��� ���������?"
 
-#: ../../netconnect.pm_.c:574
+#: ../../netconnect.pm_.c:580
 msgid "Have you been provided with a hostname?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:586
+#: ../../netconnect.pm_.c:590
 #, fuzzy
 msgid "France"
 msgstr "��������"
 
-#: ../../netconnect.pm_.c:588
+#: ../../netconnect.pm_.c:592
 msgid "Other countries"
 msgstr ""
 
-#: ../../netconnect.pm_.c:592
+#: ../../netconnect.pm_.c:596
 msgid "On which country are you located ?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:603
+#: ../../netconnect.pm_.c:607
 msgid ""
 "If your adsl modem is an alcatel one, choose pptp alcatel. Otherwise, pppoe."
 msgstr ""
 
+#: ../../netconnect.pm_.c:627
+msgid "using pppoe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:629
+msgid "using dhcp"
+msgstr ""
+
+#: ../../netconnect.pm_.c:633
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"However, it exists some connexion that use dhcp. Dhcp usually doesn't "
+"require login/password, so it may be a hint to know what your connexion is."
+msgstr ""
+
 #: ../../partition_table.pm_.c:542
 msgid "Extended partition not supported on this platform"
 msgstr "Extended �������j� ��j� �������� �� ���j ���������"
@@ -4572,22 +4600,31 @@ msgstr "������� �a�e"
 msgid "Show more"
 msgstr "������� ���e"
 
-#: ../../printer.pm_.c:244
+#: ../../printer.pm_.c:19
 msgid "Local printer"
 msgstr "�������  �������"
 
-#: ../../printer.pm_.c:245
+#: ../../printer.pm_.c:20
 msgid "Remote lpd"
 msgstr "������� lpd"
 
-#: ../../printer.pm_.c:246
+#: ../../printer.pm_.c:21
 msgid "SMB/Windows 95/98/NT"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:247
+#: ../../printer.pm_.c:22
 msgid "NetWare"
 msgstr "NetWare"
 
+#: ../../printer.pm_.c:23
+#, fuzzy
+msgid "URI for Local printer"
+msgstr "�������  �������"
+
+#: ../../printer.pm_.c:24
+msgid "URI for Network printer"
+msgstr ""
+
 #: ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "�������j��  ��e��j..."
@@ -4601,11 +4638,11 @@ msgstr "��������� �������"
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "�������, ����� \"%s\", �� ���������� �� "
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:45
 msgid "Local Printer Device"
 msgstr "������� ������ �� �������"
 
-#: ../../printerdrake.pm_.c:45
+#: ../../printerdrake.pm_.c:46
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -4613,15 +4650,34 @@ msgstr ""
 "�� ���� ��e��j �� ��� ������� ������� \n"
 "(/dev/lp0 �������� LPT1: � DOS-�)?\n"
 
-#: ../../printerdrake.pm_.c:47
+#: ../../printerdrake.pm_.c:48
 msgid "Printer Device"
 msgstr "��e��j �� �������:"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:67
+#, fuzzy
+msgid "Local Printer Device (URI)"
+msgstr "������� ������ �� �������"
+
+#: ../../printerdrake.pm_.c:68
+#, fuzzy
+msgid ""
+"What URI device is your printer connected to\n"
+"(note that parallel:/dev/lp0 is equivalent to LPT1:)?"
+msgstr ""
+"�� ���� ��e��j �� ��� ������� ������� \n"
+"(/dev/lp0 �������� LPT1: � DOS-�)?\n"
+
+#: ../../printerdrake.pm_.c:70 ../../printerdrake.pm_.c:154
+#, fuzzy
+msgid "Printer Device URI"
+msgstr "��e��j �� �������:"
+
+#: ../../printerdrake.pm_.c:78
 msgid "Remote lpd Printer Options"
 msgstr "������ �� ������� lpd"
 
-#: ../../printerdrake.pm_.c:63
+#: ../../printerdrake.pm_.c:79
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -4632,19 +4688,19 @@ msgstr ""
 "� ��� ���� ������� �� ������ �� ��� ������� � ���� �� �� ��������\n"
 "��� ��� �� ������ �� �������."
 
-#: ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:82
 msgid "Remote hostname"
 msgstr "��� �������� host-a:"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:83
 msgid "Remote queue"
 msgstr "������� ���:"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:93
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT)  ������ ��������"
 
-#: ../../printerdrake.pm_.c:76
+#: ../../printerdrake.pm_.c:94
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -4657,27 +4713,27 @@ msgstr ""
 "IP ������ ����������� �������; ������ ��� �������� ���� ����������,\n"
 "��� � �������� ���������� ����� � �������."
 
-#: ../../printerdrake.pm_.c:81
+#: ../../printerdrake.pm_.c:99
 msgid "SMB server host"
 msgstr "SMB ������  host:"
 
-#: ../../printerdrake.pm_.c:82
+#: ../../printerdrake.pm_.c:100
 msgid "SMB server IP"
 msgstr "SMB ������ IP:"
 
-#: ../../printerdrake.pm_.c:83
+#: ../../printerdrake.pm_.c:101
 msgid "Share name"
 msgstr "������ (��j�������)  ��e :"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printerdrake.pm_.c:104
 msgid "Workgroup"
 msgstr "����� �����(Workgroup):"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printerdrake.pm_.c:129
 msgid "NetWare Printer Options"
 msgstr "NetWare ������ ��������"
 
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:130
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -4689,130 +4745,147 @@ msgstr ""
 "��  ��� '����' �������� ���� ����������,\n"
 "��� � �������� ���������� ����� � �������."
 
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:134
 msgid "Printer Server"
 msgstr "������ ��������:"
 
-#: ../../printerdrake.pm_.c:108
+#: ../../printerdrake.pm_.c:135
 msgid "Print Queue Name"
 msgstr "Print Queue ���:"
 
-#: ../../printerdrake.pm_.c:121
+#: ../../printerdrake.pm_.c:146
+#, fuzzy
+msgid "Network Printer Options (URI)"
+msgstr "NetWare ������ ��������"
+
+#: ../../printerdrake.pm_.c:147
+msgid ""
+"Choose the right Device URI for a network printer or a local file. "
+"Examples:\n"
+"   file:/path/to/filename.prn\n"
+"   http://hostname:631/ipp/port1\n"
+"   ipp://hostname/ipp/port1\n"
+"   lpq://hostname/queue\n"
+"   socket://hostname\n"
+"   socket://hostname:9100"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:175 ../../printerdrake.pm_.c:224
+msgid "What type of printer do you have?"
+msgstr "���� ����� �������� �����?"
+
+#: ../../printerdrake.pm_.c:184 ../../printerdrake.pm_.c:291
+msgid "Do you want to test printing?"
+msgstr "�� �� ������ �� ��������� �������?"
+
+#: ../../printerdrake.pm_.c:187 ../../printerdrake.pm_.c:302
+msgid "Printing test page(s)..."
+msgstr "������� ���� �����(���)�..."
+
+#: ../../printerdrake.pm_.c:194 ../../printerdrake.pm_.c:310
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
+msgstr ""
+"���� �����(���)� �� ������� ������� ������.\n"
+"�� ���� ������� �� ����� �������� ������ ��������.\n"
+"������ ��������:\n"
+"%s\n"
+"\n"
+"�� �� ���� OK ?"
+
+#: ../../printerdrake.pm_.c:198 ../../printerdrake.pm_.c:314
+msgid ""
+"Test page(s) have been sent to the printer daemon.\n"
+"This may take a little time before printer start.\n"
+"Does it work properly?"
+msgstr ""
+"���� �����(���)� �� ������� ������� ������.\n"
+"�� ���� ������� �� ����� �������� ������ ��������.\n"
+"�� �� ���� OK ?"
+
+#: ../../printerdrake.pm_.c:214
 msgid "Yes, print ASCII test page"
 msgstr "��, �������� ASCII ���� ��������"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:215
 msgid "Yes, print PostScript test page"
 msgstr "��, �������� PostScript ���� ��������"
 
-#: ../../printerdrake.pm_.c:123
+#: ../../printerdrake.pm_.c:216
 msgid "Yes, print both test pages"
 msgstr "��, �������� ��� ���� ��������"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:223
 msgid "Configure Printer"
 msgstr "���������� ��������"
 
-#: ../../printerdrake.pm_.c:131
-msgid "What type of printer do you have?"
-msgstr "���� ����� �������� �����?"
-
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:256
 msgid "Printer options"
 msgstr "������ ��������"
 
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:257
 msgid "Paper Size"
 msgstr "�������� ������"
 
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:258
 msgid "Eject page after job?"
 msgstr "������ ����� ����� ������ ?"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:263
 msgid "Uniprint driver options"
 msgstr "Uniprint  ������� -������"
 
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:264
 msgid "Color depth options"
 msgstr "����j� - ���� ����"
 
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:266
 msgid "Print text as PostScript?"
 msgstr "������j ����� ��� PostScript?"
 
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:267
 msgid "Reverse page order"
 msgstr "������ �������� �������a"
 
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:269
 msgid "Fix stair-stepping text?"
 msgstr "���������  '����a� ���������' � ������?"
 
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:272
 msgid "Number of pages per output pages"
 msgstr "���j �������� �� �������� ���������a"
 
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:273
 msgid "Right/Left margins in points (1/72 of inch)"
 msgstr "�����/���� ������� � �a����a (1/72 ��� ���a)"
 
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:274
 msgid "Top/Bottom margins in points (1/72 of inch)"
 msgstr "���/��� ������� � �a����a (1/72 ��� ���a)"
 
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:277
 msgid "Extra GhostScript options"
 msgstr "������� GhostScript ����je"
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:280
 msgid "Extra Text options"
 msgstr "������e ����� ����je"
 
-#: ../../printerdrake.pm_.c:198
-msgid "Do you want to test printing?"
-msgstr "�� �� ������ �� ��������� �������?"
-
-#: ../../printerdrake.pm_.c:209
-msgid "Printing test page(s)..."
-msgstr "������� ���� �����(���)�..."
-
-#: ../../printerdrake.pm_.c:217
-#, c-format
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
-"Does it work properly?"
-msgstr ""
-"���� �����(���)� �� ������� ������� ������.\n"
-"�� ���� ������� �� ����� �������� ������ ��������.\n"
-"������ ��������:\n"
-"%s\n"
-"\n"
-"�� �� ���� OK ?"
-
-#: ../../printerdrake.pm_.c:221
-msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Does it work properly?"
-msgstr ""
-"���� �����(���)� �� ������� ������� ������.\n"
-"�� ���� ������� �� ����� �������� ������ ��������.\n"
-"�� �� ���� OK ?"
-
-#: ../../printerdrake.pm_.c:237
+#: ../../printerdrake.pm_.c:330
 msgid "Printer"
 msgstr "�������"
 
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:331
 msgid "Would you like to configure a printer?"
 msgstr "�� �� ����� �� �������� �������?"
 
-#: ../../printerdrake.pm_.c:242
+#: ../../printerdrake.pm_.c:335
 msgid ""
 "Here are the following print queues.\n"
 "You can add some more or change the existing ones."
@@ -4820,19 +4893,52 @@ msgstr ""
 "��� �� ��������� ������.\n"
 "������ ������ ���� ��� �������� �����."
 
-#: ../../printerdrake.pm_.c:265 ../../printerdrake.pm_.c:271
+#: ../../printerdrake.pm_.c:363 ../../printerdrake.pm_.c:370
+#: ../../printerdrake.pm_.c:382
 msgid "Select Printer Connection"
 msgstr "����� ����������� ��������"
 
-#: ../../printerdrake.pm_.c:266
+#: ../../printerdrake.pm_.c:364
 msgid "How is the printer connected?"
 msgstr "���� �� ������� �������?"
 
-#: ../../printerdrake.pm_.c:271
+#: ../../printerdrake.pm_.c:370 ../../printerdrake.pm_.c:382
 msgid "Remove queue"
 msgstr "������  queue"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:371
+#, fuzzy
+msgid ""
+"Every printer managed by CUPS need a name (for example lp).\n"
+"Other parameter like the description of the printer or its location\n"
+"can be defined. What name should be used for this printer and\n"
+"how is the printer connected?"
+msgstr ""
+"����� '���' �� ������ (� ���� �� ����� ������� �� ��������) �������\n"
+"��� (������ lp) � 'spool' ������������ ���� �� �� ���. ���� ��� � "
+"������������\n"
+"�� �������� �� ���� ��� �� ������ � ���� j�  ������� �������?"
+
+#: ../../printerdrake.pm_.c:375
+#, fuzzy
+msgid "Name of printer"
+msgstr "�������  �������"
+
+#: ../../printerdrake.pm_.c:376
+#, fuzzy
+msgid "Description"
+msgstr "�������� ������"
+
+#: ../../printerdrake.pm_.c:377
+#, fuzzy
+msgid "Location"
+msgstr "�����������"
+
+#: ../../printerdrake.pm_.c:378 ../../printerdrake.pm_.c:388
+msgid "Printer Connection"
+msgstr "�������j� ��������"
+
+#: ../../printerdrake.pm_.c:383
 msgid ""
 "Every print queue (which print jobs are directed to) needs a\n"
 "name (often lp) and a spool directory associated with it. What\n"
@@ -4844,18 +4950,14 @@ msgstr ""
 "������������\n"
 "�� �������� �� ���� ��� �� ������ � ���� j�  ������� �������?"
 
-#: ../../printerdrake.pm_.c:275
+#: ../../printerdrake.pm_.c:386
 msgid "Name of queue"
 msgstr "��� queue-a "
 
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:387
 msgid "Spool directory"
 msgstr "'Spool ������������"
 
-#: ../../printerdrake.pm_.c:277
-msgid "Printer Connection"
-msgstr "�������j� ��������"
-
 #: ../../raid.pm_.c:36
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
@@ -5547,6 +5649,9 @@ msgstr "����a�� ��������e"
 msgid "Finding leaves takes some time"
 msgstr "����a�� ���������� ��a�� ���� ������a"
 
+#~ msgid "Normal"
+#~ msgstr "�������a"
+
 #~ msgid "Install/Upgrade"
 #~ msgstr "�����������/���������"
 
@@ -5585,9 +5690,6 @@ msgstr "����a�� ���������� ��a�� ���� ������a"
 #~ msgid "Searching root partition."
 #~ msgstr "������ root ���������."
 
-#~ msgid "Information"
-#~ msgstr "�����������"
-
 #~ msgid "%s: This is not a root partition, please select another one."
 #~ msgstr "%s: ��� ���� root ���������, ��������� ���� �����."
author	Pablo Saratxaga <pablo@mandriva.com>	2000-08-31 20:58:20 +0000
committer	Pablo Saratxaga <pablo@mandriva.com>	2000-08-31 20:58:20 +0000
commit	64d4b55d1524f56b2102d21920f2c94ea06040f3 (patch)
tree	3bd8d4b05abc3c92e4476638972b608d3606bfb8 /perl-install
parent	6b614ee862615cbbece0dea2575a7b0daefd7648 (diff)
download	drakx-backup-do-not-use-64d4b55d1524f56b2102d21920f2c94ea06040f3.tar drakx-backup-do-not-use-64d4b55d1524f56b2102d21920f2c94ea06040f3.tar.gz drakx-backup-do-not-use-64d4b55d1524f56b2102d21920f2c94ea06040f3.tar.bz2 drakx-backup-do-not-use-64d4b55d1524f56b2102d21920f2c94ea06040f3.tar.xz drakx-backup-do-not-use-64d4b55d1524f56b2102d21920f2c94ea06040f3.zip