no_comment

24 files changed, 547 insertions, 449 deletions

diff --git a/Makefile b/Makefile
index 576a0fac9..939a35ee9 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,6 @@ dirs:
 	for i in $(DIRS); do make -C $$i; done
 
 $(BOOT_IMG): modules dirs
-	make dirs
 	./make_boot_img $@ $(@:gi_%.img=%)
 
 tar: clean
diff --git a/docs/TODO b/docs/TODO
index 88ccff7a3..fe6e0e892 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,4 +1,6 @@
-bug: if u choose mouse usb != found mouse, it fails at X config
+move security question before isntallation of packages
+
+verify kernel-smp is put in lilo by default, works on torturebox :-/
 
 i18n
 
@@ -19,12 +21,8 @@ X configuration and bootloader in kickstart
 auto_partitions
 suggested partition tables must be better foreach installClass
 
-(pix)options in mkfs, progress bar when formatting
-
 (pix)Tree -> CTree, ``all'' branch with all packages
 
-install postfix in place of sendmail for security levels 4&5
-
 update the list of modules (in update_kernel)
 
 install ssh
@@ -43,6 +41,8 @@ smaller zsh (or ash in initrd)
 
 initrd in bzip2
 
+(pix)options in mkfs, progress bar when formatting
+
 aha152x needs "insmod aha152x.o aha152x=0x140,11,7"
 
 try detect_devices::floppies (and how are scsi floppies handled?)
@@ -107,3 +107,5 @@ compress hdlist?
 
 (done,pix)text install
 
+(done,pix) if u choose mouse usb != found mouse, it fails at X config
+
diff --git a/make_boot_img b/make_boot_img
index 560c4c688..8ec17c7f1 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -78,6 +78,7 @@ label linux
 ");
     _ "cp -f $instdir/installinit/ks.cfg $mnt 2>/dev/null" if $ks;
     _ "sync";
+    _ "df $mnt";
 }
 
 sub msg_boot_img {
@@ -116,6 +117,7 @@ label rescue
 ");
     _ "cp -f $instdir/installinit/ks.cfg $mnt 2>/dev/null";
     _ "sync";
+    _ "df $mnt";
 }
 
 
diff --git a/perl-install/Makefile b/perl-install/Makefile
index c8c7e0a30..f17a8c8e9 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -2,7 +2,7 @@ VERSION     = 2.2.10-BOOT
 SUDO        = sudo
 SO_FILES    = c/blib/arch/auto/c/c.so                                                                 
 PMS         = *.pm Newt/*.pm c/stuff.pm resize_fat/*.pm pci_probing/*.pm commands install2 g_auto_install
-PMS	   .= $(patsubst %, standalone/%,diskdrake XFdrake rpmdrake)
+PMS	   += $(patsubst %, standalone/%,diskdrake XFdrake rpmdrake mousedrake)
 REP4PMS     = /usr/bin/perl-install
 ROOTDEST    = /export
 DEST        = $(ROOTDEST)/Mandrake/mdkinst
@@ -31,8 +31,8 @@ clean:
 
 tar-drakxtools: clean
 	cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/ddcprobe drakxtools	
-	cd ../drakxtools ; rm -f install* ForMakefile.pm pkgs.pm ftp.pm t.pm ; mv Makefile.drakxtools Makefile ; mv -f standalone/* .
-	cd .. ; tar cfy drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile MonitorsDB Newt c ddcprobe po pci_probing resize_fat diskdrake diskdrake.rc XFdrake *.pm)
+	cd ../drakxtools ; rm -rf install* ForMakefile.pm pkgs.pm ftp.pm t.pm standalone/CVS ; mv Makefile.drakxtools Makefile ; mv -f standalone/* .
+	cd .. ; tar cfy drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile MonitorsDB Newt c ddcprobe po pci_probing resize_fat diskdrake diskdrake.rc XFdrake mousedrake *.pm)
 	cd .. ; rm -rf drakxtools
 
 $(DIRS):
@@ -63,7 +63,7 @@ install_pms: $(DIRS)
 	cp -f po/*.po* $(DESTREP4PMS)/po ||:
 	chmod a+x $(DESTREP4PMS)/install2
 	chmod a+x $(DESTREP4PMS)/commands
-	chmod a+x $(DESTREP4PMS)/XFdrake
+	chmod a+x $(DESTREP4PMS)/standalone/*
 	chmod a+x $(DESTREP4PMS)/g_auto_install
 
 get_needed_files: $(DIRS)
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 5e4eff121..51d0f21a7 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -16,7 +16,8 @@ $(DIRS):
 
 install:
 	install -d $(BINDEST) $(ETCDEST) $(SBINDEST) $(LIBDEST) $(X11DEST) $(DIRS:%=$(LIBDEST)/%)
-	install diskdrake XFdrake ddcprobe/ddcxinfos $(SBINDEST)
+	install diskdrake XFdrake mousedrake $(SBINDEST)
+	install -s ddcprobe/ddcxinfos $(SBINDEST)
 
 	for i in *.pm ; do perl -pe '$$_ = "\n" if /\s*use\s+(diagnostics|vars|strict)/' $$i > $(LIBDEST)/$$i ; done
 	install -m 644 MonitorsDB $(X11DEST)
@@ -27,4 +28,4 @@ install:
 	install -m 644 $(patsubst %,pci_probing/%.pm,main pcitable pci_class) $(LIBDEST)/pci_probing
 	install -m 644 $(patsubst %,resize_fat/%.pm,main any boot_sector c_rewritten dir_entry directory fat info_sector io) $(LIBDEST)/resize_fat
 	cp -rf auto $(LIBDEST)
-
+	find $(LIBDEST) -name "*.so" | xargs strip
diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index 9f2ae364c..af03b4019 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -76,13 +76,13 @@ sub getinfoFromXF86Config {
 	    $o->{monitor}{model} ||= $1 if /^\s*ModelName\s+"(.*?)"/;
 	    $o->{monitor}{modelines} .= $_ if /^\s*Mode[lL]ine\s+/;
 	} elsif (my $s = /^Section "Screen"/ .. /^EndSection/) {
-	    $driver = undef if $s == 1;
+	    undef $driver if $s == 1;
 	    $driver = $1 if /^\s*Driver\s+"(.*?)"/;
 	    #- print "($driver eq $Xconfigurator::serversdriver{$o->{card}{server}})";
 	    if ($driver eq $Xconfigurator::serversdriver{$o->{card}{server}}) { #- take into account the right screen section for the server.
 		$o->{card}{default_depth} ||= $1 if /^\s*DefaultColorDepth\s+(\d+)/;
 		if (my $i = /^\s*Subsection\s+"Display"/ .. /^\s*EndSubsection/) {
-		    $depth = undef if $i == 1;
+		    undef $depth if $i == 1;
 		    $depth = $1 if /^\s*Depth\s+(\d*)/;
 		    if (/^\s*Modes\s+(.*)/) {
 			my $a = 0;
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index b7ce31282..ea988b777 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -153,18 +153,18 @@ sub cardConfiguration(;$$$) {
     readCardsDB("$prefix/usr/X11R6/lib/X11/Cards");
 
     add2hash($card, $cards{$card->{type}}) if $card->{type}; #- try to get info from given type
-    $card->{type} = undef unless $card->{server}; #- bad type as we can't find the server
+    undef $card->{type} unless $card->{server}; #- bad type as we can't find the server
     add2hash($card, cardConfigurationAuto()) unless $card->{server} || $noauto;
     $card->{server} = 'FBDev' unless !$allowFB || $card->{server} || $card->{type} || $noauto;
     $card->{type} = $in->ask_from_list('', _("Select a graphic card"), ['Unlisted', keys %cards]) unless $card->{type} || $card->{server};
-    $card->{type} = undef, $card->{server} = $in->ask_from_list('', _("Choose a X server"), $allowFB ? \@allservers : \@allbutfbservers ) if $card->{type} eq "Unlisted";
+    undef $card->{type}, $card->{server} = $in->ask_from_list('', _("Choose a X server"), $allowFB ? \@allservers : \@allbutfbservers ) if $card->{type} eq "Unlisted";
 
     add2hash($card, $cards{$card->{type}}) if $card->{type};
     add2hash($card, { vendor => "Unknown", board => "Unknown" });
 
     $card->{prog} = "/usr/X11R6/bin/XF86_$card->{server}";
 
-    -x "$prefix$card->{prog}" or !defined $install or &$install($card->{server});
+    -x "$prefix$card->{prog}" or $install && &$install($card->{server});
     -x "$prefix$card->{prog}" or die "server $card->{server} is not available (should be in $prefix$card->{prog})";
 
     symlinkf "../..$card->{prog}", "$prefix/etc/X11/X" unless $::testing;
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 609a2b720..1f56fa6cf 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -186,7 +186,7 @@ $o = $::o = {
 
 
 
-    base => [ qw(basesystem sed initscripts console-tools mkbootdisk utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash ash setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which perl-base) ],
+    base => [ qw(basesystem sed initscripts console-tools mkbootdisk utempter ldconfig chkconfig ntsysv setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep gzip hdparm info initscripts isapnptools kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash ash setserial shadow-utils sh-utils stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which perl-base) ],
 #-GOLD    base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash ash setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which cpio perl) ],
 
 #- for the list of fields available for user and superuser, see @etc_pass_fields in install_steps.pm
@@ -335,6 +335,7 @@ sub choosePackages {
     $o->selectPackagesToUpgrade($o) if $o->{isUpgrade} && $_[1] == 1;
     unless ($o->{isUpgrade}) {
 	$o->choosePackages($o->{packages}, $o->{compss}, $o->{compssUsers}, $_[1] == 1);
+	pkgs::unselect($o->{packages}, $o->{packages}{kdesu}) if $o->{packages}{kdesu} && $o->{security} > 3;
 	$o->{packages}{$_}{selected} = 1 foreach @{$o->{base}}; #- already done by selectPackagesToUpgrade.
     }
 }
@@ -486,6 +487,7 @@ sub main {
 	    simple_themes => sub { $o->{simple_themes} = 1 },
 	    alawindows => sub { $o->{security} = 0; $o->{partitioning}{clearall} = 1; $o->{bootloader}{crushMbr} = 1 },
 	    g_auto_install => sub { $::testing = $::g_auto_install = 1; $o->{partitioning}{auto_allocate} = 1 },
+	    nomouseprobe => sub { $o->{nomouseprobe} = $v },
 	}}{lc $n}; &$f if $f;
     } %cmdline;    
 
@@ -525,7 +527,7 @@ sub main {
 	eval { $o = $::o = install_any::loadO($o, "floppy") };
 	if ($@) {
 	    log::l("error using auto_install, continuing");
-	    $::auto_install = undef;
+	    undef $::auto_install;
 	}
     }
     unless ($::auto_install) {
@@ -539,7 +541,7 @@ sub main {
     mkdir $o->{prefix}, 0755;
 
     #- needed very early for install_steps_gtk
-    eval { $o->{mouse} ||= mouse::detect() };
+    eval { $o->{mouse} ||= mouse::detect() } unless $o->{nomouseprobe};
 
     $::o = $o = $::auto_install ?
       install_steps_auto_install->new($o) :
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index f982ac38d..040d36baf 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -391,7 +391,7 @@ sub g_auto_install(;$) {
     my @fields = qw(mntpoint type size);
     $o->{partitions} = [ map { my %l; @l{@fields} = @$_{@fields}; \%l } grep { $_->{mntpoint} } @{$::o->{fstab}} ];
     
-    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse netc timezone superuser intf keyboard mkbootdisk base users installClass partitioning isUpgrade X manualFstab); #- TODO modules bootloader 
+    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse netc timezone superuser intf keyboard mkbootdisk base users installClass partitioning isUpgrade X manualFstab nomouseprobe); #- TODO modules bootloader 
 
 #-    local $o->{partitioning}{clearall} = 1;
 
@@ -459,6 +459,10 @@ sub install_urpmi {
 	print OUT foreach <$fd>;
     }
     {
+	local *F = getFile("depslist");
+	output("$prefix/etc/urpmi/depslist", <F>);
+    }
+    {
 	local *LIST;
 	open LIST, ">$prefix/etc/urpmi/list.$name" or log::l("failed to write list.$name"), return;
 
@@ -472,7 +476,6 @@ sub install_urpmi {
 	$dir .= "/Mandrake/RPMS with ../base/hdlist" if $method =~ /ftp|http/;
 	eval { output "$prefix/etc/urpmi/urpmi.cfg", "$name $dir\n" };
     }
-    run_program::rooted($prefix, "urpmi.update");
 }
 
 1;
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index fda1686cb..79d2b1743 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -278,7 +278,7 @@ sub chooseSizeToInstall {
     my $availableSpace = int(install_any::getAvailableSpace($o) / sqr(1024));
     my $default = pkgs::correctSize((sum map { $_->{size} } grep { $_->{selected} } values %$packages) / sqr(1024) || $availableSpace * 0.7);
     my $w = my_gtk->new('');
-    my $adj = create_adjustment($default, 100, $availableSpace);
+    my $adj = create_adjustment($default, 75, $availableSpace);
     my $spin = gtkset_usize(new Gtk::SpinButton($adj, 0, 0), 100, 0);
 
     gtkadd($w->{window},
@@ -337,7 +337,7 @@ sub choosePackagesTree {
 	my ($p, $name, $parent) = @_;
 	my $w = create_treeitem($name);
 	$items{++$itemsNB} = [ $w, $p ];
-	$parent->{packages_item}{$itemsNB} = undef if $parent;
+	undef $parent->{packages_item}{$itemsNB} if $parent;
 	$w->show;
 	$w->set_sensitive(!$p->{base} && !$p->{installed});
 	$w->signal_connect(focus_in_event => sub {
@@ -552,9 +552,6 @@ _("There was an error ordering packages:"), $1, _("Go on anyway?") ], 1) and ret
     $w->destroy;
 }
 
-
-
-
 #------------------------------------------------------------------------------
 sub load_rc($) {
     if (my ($f) = grep { -r $_ } map { "$_/$_[0].rc" } (".", "/usr/share", dirname(__FILE__))) {
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index f6b5a9f9e..55c11b2f3 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -145,6 +145,8 @@ sub selectMouse {
 			  _("Which serial port is your mouse connected to?"),
 			  [ mouse::serial_ports_names() ])) if $o->{mouse}{device} eq "ttyS";
 
+    $o->setup_thiskind('serial_usb', !$::expert, 0) if $o->{mouse}{device} eq "usbmouse";
+
     $o->SUPER::selectMouse;
 }
 #------------------------------------------------------------------------------
@@ -263,6 +265,12 @@ sub installPackages {
     $o->SUPER::installPackages($packages);
 }
 
+sub afterInstallPackages($) {
+    my ($o) = @_;
+    my $w = $o->wait_message('', _("Post install stuff"));
+    $o->SUPER::afterInstallPackages($o);
+}
+
 #------------------------------------------------------------------------------
 sub configureNetwork($) {
     my ($o, $first_time) = @_;
@@ -601,7 +609,7 @@ _("Color depth options") => { val => \$o->{printer}{BITSPERPIXEL}, type => 'list
 	    local *F; open F, "chroot $o->{prefix} /usr/bin/lpq |";
 	    my @lpq_output = grep { !/^no entries/ && !(/^Rank\s+Owner/ .. /^\s*$/) } <F>;
 
-	    $w = undef; #- erase wait message window.
+	    undef $w; #- erase wait message window.
 	    if (@lpq_output) {
 		$action = $o->ask_yesorno('', _("Is this correct? Printing status:\n%s", "@lpq_output"), 1) ? 'done' : 'change';
 	    } else {
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 45f3cea66..a71f27197 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -38,6 +38,17 @@ sub new($) {
     bless {}, ref $type || $type;
 }
 
+sub vnew {
+    if (c::Xtest($ENV{DISPLAY} ||= ":0")) {
+	require 'interactive_gtk.pm';
+	interactive_gtk->new;
+    } else {
+	undef *log::l;
+	*log::l = sub {}; # otherwise, it will bother us :(
+	require 'interactive_newt.pm';
+	interactive_newt->new;
+    }
+}
 
 #-######################################################################################
 #- Interactive functions
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 7aec4b070..089b09e7f 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -150,7 +150,7 @@ sub ask_from_entries_refW {
 	    $widget->signal_connect(changed => $changed_callback);
 	    my $go_to_next = sub {
 		if ($ind == $#$l) {
-		    $w->{ok}->grab_focus();
+		    @$l == 1 ? $w->{ok}->clicked : $w->{ok}->grab_focus();
 		} else {
 		    widget($widgets[$ind+1],$val->[$ind+1])->grab_focus();
 		}
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index c9e2031f5..a2a0c228c 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -2,7 +2,7 @@ package modules;
 
 use diagnostics;
 use strict;
-use vars qw(%loaded);
+use vars qw(%loaded %drivers);
 
 use common qw(:common :file);
 use pci_probing::main;
@@ -17,7 +17,7 @@ my $scsi = 0;
 my %deps = ();
 
 my @drivers_by_category = (
-[ \&detect_devices::hasEthernet, 'net', 'ethernet', {
+[ 'net', {
   "3c509" => "3com 3c509",
   "3c501" => "3com 3c501",
   "3c503" => "3com 3c503",
@@ -29,6 +29,7 @@ my @drivers_by_category = (
   "3c90x" => "3Com 3c90x (Cyclone/Hurricane/Tornado)",
   "at1700" => "Allied Telesis AT1700",
   "ac3200" => "Ansel Communication AC3200",
+  "acenic" => "AceNIC Gigabit Ethernet",
   "pcnet32" => "AMD PC/Net 32",
   "apricot" => "Apricot 82596",
   "atp" => "ATP",
@@ -60,30 +61,37 @@ my @drivers_by_category = (
   "es3210" => "Racal-Interlan ES3210",
   "rcpci45" => "RedCreek PCI45 LAN",
   "epic100" => "SMC 83c170 EPIC/100",
+  "sktr" => "Syskonnect Token ring adaptor",
   "smc9194" => "SMC 9000 series",
   "smc-ultra" => "SMC Ultra",
   "smc-ultra32" => "SMC Ultra 32",
+  "sunhme" => "Sun Happy Meal",
+  "tr" => "IBM TR Auto LANstreamer",
   "via-rhine" => "VIA Rhine",
   "wd" => "WD8003, WD8013 and compatible",
+  "yellowfin" => "Symbios Yellowfin G-NIC",
 }],
-[ \&detect_devices::hasSCSI, 'scsi', undef, {
+[ 'scsi', {
   "aha152x" => "Adaptec 152x",
   "aha1542" => "Adaptec 1542",
   "aha1740" => "Adaptec 1740",
   "aic7xxx" => "Adaptec 2740, 2840, 2940",
   "advansys" => "AdvanSys Adapters",
+  "dpt" => "Distributed Tech SmartCache/Raid I-IV Controller",
   "in2000" => "Always IN2000",
   "AM53C974" => "AMD SCSI",
   "megaraid" => "AMI MegaRAID",
   "BusLogic" => "BusLogic Adapters",
   "cpqarray" => "Compaq Smart-2/P RAID Controller",
   "dtc" => "DTC 3180/3280",
+  "eata" => "EATA SCSI PM2x24/PM3224",
   "eata_dma" => "EATA DMA Adapters",
   "eata_pio" => "EATA PIO Adapters",
   "seagate" => "Future Domain TMC-885, TMC-950",
   "fdomain" => "Future Domain TMC-16x0",
   "gdth" => "ICP Disk Array Controller",
   "initio" => "Initio",
+  "ips" => "IBM ServeRAID controller",
   "ppa" => "Iomega PPA3 (parallel port Zip)",
   "g_NCR5380" => "NCR 5380",
   "NCR53c406a" => "NCR 53c406a",
@@ -94,12 +102,13 @@ my @drivers_by_category = (
   "qlogicfas" => "Qlogic FAS",
   "qlogicisp" => "Qlogic ISP",
   "seagate" => "Seagate ST01/02",
+  "sym53c8xx" => "Symbios 53c8xx",
   "t128" => "Trantor T128/T128F/T228",
   "u14-34f" => "UltraStor 14F/34F",
   "ultrastor" => "UltraStor 14F/24F/34F",
   "wd7000" => "Western Digital wd7000",
 }],
-[ undef, 'cdrom', 'none', {
+[ 'cdrom', {
   "sbpcd" => "SoundBlaster/Panasonic",
   "aztcd" => "Aztech CD",
   "bpcd" => "Backpack CDROM",
@@ -111,23 +120,37 @@ my @drivers_by_category = (
   "sjcd" => "Sanyo",
   "cdu31a" => "Sony CDU-31A",
   "sonycd535" => "Sony CDU-5xx",
-}]
+}],
+[ 'sound', {
+  "alsa" => "ALSA sound module, many sound cards",
+  "cmpci" => "C-Media Electronics CMI8338A CMI8338B CMI8738",
+  "es1370" => "Ensoniq ES1370 [AudioPCI]",
+  "es1371" => "Ensoniq ES1371 [AudioPCI-97]",
+  "esssolo1" => "ESS Technology ES1969 Solo-1 Audiodrive",
+  "maestro" => "Maestro",
+  "nm256" => "Neomagic MagicMedia 256AV",
+  "via82cxxx" => "VIA VT82C686_5",
+  "sonicvibes" => "S3 SonicVibes",
+}],
 );
 
-my @drivers_fields = qw(text detect type minor);
-my %drivers = (
-  "plip" => [ "PLIP (parallel port)", \&detect_devices::hasPlip, 'net', 'plip' ],
-  "ibmtr" => [ "Token Ring", \&detect_devices::hasTokenRing, 'net', 'tr' ],
-  "DAC960" => [ "Mylex DAC960", undef, 'scsi', undef ],
-  "pcmcia_core" => [ "PCMCIA core support", undef, 'pcmcia', undef ],
-  "ds" => [ "PCMCIA card support", undef, 'pcmcia', undef ],
-  "i82365" => [ "PCMCIA i82365 controller", undef, 'pcmcia', undef ],
-  "tcic" => [ "PCMCIA tcic controller", undef, 'pcmcia', undef ],
-  "isofs" => [ "iso9660", undef, 'fs', undef ],
-  "nfs" => [ "Network File System (nfs)", undef, 'fs', undef ],
-  "smbfs" => [ "Windows SMB", undef, 'fs', undef ],
-  "loop" => [ "Loopback device", undef, 'other', undef ],
-  "lp" => [ "Parallel Printer", undef, 'other', undef ],
+my @drivers_fields = qw(text type);
+%drivers = (
+  "plip" => [ "PLIP (parallel port)", 'net' ],
+  "ibmtr" => [ "Token Ring", 'net' ],
+  "DAC960" => [ "Mylex DAC960", 'scsi' ],
+  "pcmcia_core" => [ "PCMCIA core support", 'pcmcia' ],
+  "ds" => [ "PCMCIA card support", 'pcmcia' ],
+  "i82365" => [ "PCMCIA i82365 controller", 'pcmcia' ],
+  "tcic" => [ "PCMCIA tcic controller", 'pcmcia' ],
+  "isofs" => [ "iso9660", 'fs' ],
+  "nfs" => [ "Network File System (nfs)", 'fs' ],
+  "smbfs" => [ "Windows SMB", 'fs' ],
+  "loop" => [ "Loopback device", 'other' ],
+  "lp" => [ "Parallel Printer", 'other' ],
+  "usb-uhci", [ "USB (uhci)", 'serial_usb' ],
+  "usb-ohci", [ "USB (ohci)", 'serial_usb' ],
+  "usb-ohci-hcd", [ "USB (ohci-hcd)", 'serial_usb' ],
 );
 foreach (@drivers_by_category) {
     my @l = @$_;
@@ -142,7 +165,6 @@ while (my ($k, $v) = each %drivers) {
 
 1;
 
-sub drivers { %drivers }
 sub text_of_type($) {
     my ($type) = @_;
 
@@ -176,7 +198,7 @@ sub load {
     push @{$loaded{$type}}, $name;
 
     if ($type) {
-	$conf{$type}{alias} = $name if $type eq 'usbmouse';
+	$conf{usbmouse}{alias} = $name if $type =~ /serial_usb/i;
 	$conf{'scsi_hostadapter' . ($scsi++ || '')}{alias} = $name if $type eq 'scsi';
     }
     $conf{$name}{options} = join " ", @options if @options;
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 1e1827a25..f535ffcc2 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -117,8 +117,8 @@ sub detect() {
     #- @l{qw(FULLNAME nbuttons MOUSETYPE XMOUSETYPE device)} = split("\n", `mouseconfig --nointeractive 2>/dev/null`) and return \%l;
     #- modules::unload("serial");
 
-    if (my ($c) = pci_probing::main::probe("SERIAL_USB")) {
-	eval { modules::load($c->[1], 'usbmouse') };
+    if (my ($c) = pci_probing::main::probe("serial_usb")) {
+	eval { modules::load($c->[1], "serial_usb") };
 	sleep(1);
 	do { modules::unload("serial"); return name2mouse("USB Mouse") } if !$@ && detect_devices::tryOpen("usbmouse");
 	modules::unload($c->[1]);
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index dcd11e130..af7ae44e0 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -328,7 +328,7 @@ sub _create_window($$) {
 
     $w->signal_connect("map_event" => sub { c::XSetInputFocus($w->window->XWINDOW); }) if $my_gtk::force_focus || $o->{force_focus};
     $w->signal_connect("expose_event" => sub { c::XSetInputFocus($w->window->XWINDOW); }) if $my_gtk::force_focus || $o->{force_focus};
-    $w->signal_connect("delete_event" => sub { $o->{retval} = undef; Gtk->main_quit });
+    $w->signal_connect("delete_event" => sub { undef $o->{retval}; Gtk->main_quit });
     $w->set_uposition(@{$my_gtk::force_position || $o->{force_position}}) if $my_gtk::force_position || $o->{force_position};
 
     $w->signal_connect("key_press_event" => sub {
@@ -445,7 +445,7 @@ sub _ask_from_entry($$@) {
     my $entry = new Gtk::Entry;
     my $f = sub { $o->{retval} = $entry->get_text; Gtk->main_quit };
     $o->{ok_clicked} = $f;
-    $o->{cancel_clicked} = sub { $o->{retval} = undef; Gtk->main_quit };
+    $o->{cancel_clicked} = sub { undef $o->{retval}; Gtk->main_quit };
 
     gtkadd($o->{window},
 	  gtkpack($o->create_box_with_title(@msgs),
@@ -469,7 +469,9 @@ sub _ask_from_list {
 	$list->moveto($_[0], 0, 0.5, 0);
     };
 
-    $list->signal_connect(button_release_event => $leave) if ref $title && !@okcancel;
+    $list->signal_connect(button_press_event => 
+			  ref $title && !@okcancel ? $leave : sub { &$leave if $_[1]{type} =~ /^2/ }
+			 );
     $list->signal_connect(select_row => sub {
 	my ($w, $row, undef, $e) = @_;
 	$curr = $row;
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 05d30b916..7bc22ada5 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -333,7 +333,7 @@ sub read($;$) {
       read_one($hd, 0) || return 0;
 
     $hd->{primary} = $pt;
-    $hd->{extended} = undef;
+    undef $hd->{extended};
     $clearall and return $hd->{isDirty} = $hd->{needKernelReread} = 1;
     verifyPrimary($pt);
 
diff --git a/perl-install/raid.pm b/perl-install/raid.pm
index a9a493f7a..8bce51b15 100644
--- a/perl-install/raid.pm
+++ b/perl-install/raid.pm
@@ -44,7 +44,7 @@ sub delete($$) {
     $nb = nb($nb);
 
     delete $_->{raid} foreach @{$raid->[$nb]{disks}};
-    $raid->[$nb] = undef;
+    undef $raid->[$nb];
 }
 
 sub changeNb($$$) {
diff --git a/perl-install/resize_fat/directory.pm b/perl-install/resize_fat/directory.pm
index 22d2a1fae..cdce4be88 100644
--- a/perl-install/resize_fat/directory.pm
+++ b/perl-install/resize_fat/directory.pm
@@ -67,7 +67,7 @@ sub traverse_all($$) {
 	resize_fat::io::read_file($fs, $fs->{fat32_root_dir_cluster}) :
 	resize_fat::io::read($fs, $fs->{root_dir_offset}, $fs->{root_dir_size});
     traverse($directory, $traverse_all);
-    $traverse_all = undef; #- circular reference is no good for perl's poor GC :(
+    undef $traverse_all; #- circular reference is no good for perl's poor GC :(
 }
 
 
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 34ae83131..d891ece34 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -127,8 +127,8 @@ freetype-devel                                 1     0     0
 fribidi                                        1     0     0
 ftp                                           55     0    49
 fvwm                                          40     0    36
-fvwm2                                         90     0    36
-fvwm2-icons                                   90     0    36
+fvwm2                                         30     0    36
+fvwm2-icons                                   30     0    36
 fwhois                                        40     0    36
 gaddr                                         45     0    40
 gated                                          1    99     0
@@ -235,6 +235,7 @@ ibtk                                          15     0    13
 ical                                          30     0    27
 iceconf                                       60     0    54
 icewm                                         40     0    80
+icewm-light                                   90     0    90
 icewm-themes                                  60     0    54
 ImageMagick                                   42     0    60
 ImageMagick-devel                              1     0    60
@@ -379,7 +380,7 @@ libxml                                         0     0    71
 libxml-devel                                   3     0    71
 linuxconf                                     82     0    96
 linuxconf-devel                                1     0    70
-linux_logo                                     1     0     0
+linux_logo                                    92    92    92
 locales                                       96    96    96
 locales-ar                                    22    22	  22
 locales-bg				      22    22	  22
@@ -533,7 +534,7 @@ pmake                                         22     0    75
 pmake-customs                                 21     0    72
 popt                                          26     0    80
 portmap                                       22    99    19
-postfix                                       35     0    31
+postfix                                       35    90    31
 postgresql                                    26    99    23
 postgresql-clients                            26     0    23
 postgresql-devel                              26    99    23
@@ -585,8 +586,8 @@ samba                                         34    99    30
 sane                                          59     0    53
 sane-devel                                     3     0     2
 screen                                        22     0    19
-sendmail                                      41    99    36
-sendmail-cf                                   41    99    36
+sendmail                                      41    90    36
+sendmail-cf                                   41    90    36
 sendmail-doc                                  41     0    36
 setserial                                     62     0    55
 setuptool                                     90     0    90
@@ -596,6 +597,7 @@ sharutils                                     43    99    38
 slang                                         31     0    75
 slang-devel                                    7     0    70
 sliplogin                                     19     0    17
+slocate                                       99    99    99
 slrn                                          56     0    50
 sndconfig                                     90     0    90
 sox                                           56    99    80
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 943ec64ac..08e7769f6 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: 1999-11-19 14:17+0100\n"
+"POT-Creation-Date: 1999-11-22 02:57+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,27 +14,27 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../Xconfigurator.pm_.c:158
+#: ../Xconfigurator.pm_.c:159
 msgid "Select a graphic card"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:159
+#: ../Xconfigurator.pm_.c:160
 msgid "Choose a X server"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:178
+#: ../Xconfigurator.pm_.c:179
 msgid "Select the memory size of your graphic card"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:200
+#: ../Xconfigurator.pm_.c:201
 msgid "Choose options for server"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:218
+#: ../Xconfigurator.pm_.c:219
 msgid "Choose a monitor"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:221
+#: ../Xconfigurator.pm_.c:222
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -48,184 +48,184 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:228
+#: ../Xconfigurator.pm_.c:229
 msgid "Horizontal refresh rate"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:228
+#: ../Xconfigurator.pm_.c:229
 msgid "Vertical refresh rate"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:269
+#: ../Xconfigurator.pm_.c:270
 msgid "Monitor not configured"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:272
+#: ../Xconfigurator.pm_.c:273
 msgid "Graphic card not configured yet"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:275
+#: ../Xconfigurator.pm_.c:276
 msgid "Resolutions not chosen yet"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:284
+#: ../Xconfigurator.pm_.c:285
 msgid "Do you want to test the configuration?"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:284
+#: ../Xconfigurator.pm_.c:285
 msgid "Test configuration"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:316
+#: ../Xconfigurator.pm_.c:317
 msgid "An error occurred:"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:318
+#: ../Xconfigurator.pm_.c:319
 msgid ""
 "\n"
 "try changing some parameters"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:339
+#: ../Xconfigurator.pm_.c:340
 #, c-format
 msgid "(leaving in %d seconds)"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:343 ../install_steps_interactive.pm_.c:599
+#: ../Xconfigurator.pm_.c:344 ../install_steps_interactive.pm_.c:616
 #: ../my_gtk.pm_.c:438
 msgid "Is this correct?"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:351
+#: ../Xconfigurator.pm_.c:352
 msgid "An error occurred, try changing some parameters"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:359 ../Xconfigurator.pm_.c:524
+#: ../Xconfigurator.pm_.c:360 ../Xconfigurator.pm_.c:525
 msgid "Automatic resolutions"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:360
+#: ../Xconfigurator.pm_.c:361
 msgid ""
 "To find the available resolutions I will try different ones.\n"
 "Your screen will blink...\n"
 "You can switch if off if you want, you'll hear a beep when it's over"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:411 ../install_steps_interactive.pm_.c:564
+#: ../Xconfigurator.pm_.c:412 ../install_steps_interactive.pm_.c:571
 msgid "Resolution"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:446
+#: ../Xconfigurator.pm_.c:447
 msgid "Choose resolution and color depth"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:454
+#: ../Xconfigurator.pm_.c:455
 msgid "Show all"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:525
+#: ../Xconfigurator.pm_.c:526
 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:530
+#: ../Xconfigurator.pm_.c:531
 msgid ""
 "No valid modes found\n"
 "Try with another video card or monitor"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:721
+#: ../Xconfigurator.pm_.c:722
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:722
+#: ../Xconfigurator.pm_.c:723
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:723
+#: ../Xconfigurator.pm_.c:724
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:724
+#: ../Xconfigurator.pm_.c:725
 #, c-format
 msgid "Monitor: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:725
+#: ../Xconfigurator.pm_.c:726
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:726
+#: ../Xconfigurator.pm_.c:727
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:727
+#: ../Xconfigurator.pm_.c:728
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:728
+#: ../Xconfigurator.pm_.c:729
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:729
+#: ../Xconfigurator.pm_.c:730
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:743
+#: ../Xconfigurator.pm_.c:744
 msgid "Preparing X-Window configuration"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:757
+#: ../Xconfigurator.pm_.c:758
 msgid "Change Monitor"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:758
+#: ../Xconfigurator.pm_.c:759
 msgid "Change Graphic card"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:759
+#: ../Xconfigurator.pm_.c:760
 msgid "Change Server options"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:760
+#: ../Xconfigurator.pm_.c:761
 msgid "Change Resolution"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:761
+#: ../Xconfigurator.pm_.c:762
 msgid "Automatical resolutions search"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:765
+#: ../Xconfigurator.pm_.c:766
 msgid "Show information"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:766
+#: ../Xconfigurator.pm_.c:767
 msgid "Test again"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:767
+#: ../Xconfigurator.pm_.c:768
 msgid "Quit"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:770
+#: ../Xconfigurator.pm_.c:771
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:777
+#: ../Xconfigurator.pm_.c:778
 msgid "X at startup"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:778
+#: ../Xconfigurator.pm_.c:779
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -251,79 +251,79 @@ msgstr ""
 msgid "4 billion colors (32 bits)"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:101
+#: ../Xconfigurator_consts.pm_.c:93
 msgid "256 kB"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:102
+#: ../Xconfigurator_consts.pm_.c:94
 msgid "512 kB"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:103
+#: ../Xconfigurator_consts.pm_.c:95
 msgid "1 MB"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:104
+#: ../Xconfigurator_consts.pm_.c:96
 msgid "2 MB"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:105
+#: ../Xconfigurator_consts.pm_.c:97
 msgid "4 MB"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:106
+#: ../Xconfigurator_consts.pm_.c:98
 msgid "8 MB"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:107
+#: ../Xconfigurator_consts.pm_.c:99
 msgid "16 MB or more"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:111 ../Xconfigurator_consts.pm_.c:112
+#: ../Xconfigurator_consts.pm_.c:103 ../Xconfigurator_consts.pm_.c:104
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:113
+#: ../Xconfigurator_consts.pm_.c:105
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:114
+#: ../Xconfigurator_consts.pm_.c:106
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:115
+#: ../Xconfigurator_consts.pm_.c:107
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:116
+#: ../Xconfigurator_consts.pm_.c:108
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:117
+#: ../Xconfigurator_consts.pm_.c:109
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:118
+#: ../Xconfigurator_consts.pm_.c:110
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:119
+#: ../Xconfigurator_consts.pm_.c:111
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:120
+#: ../Xconfigurator_consts.pm_.c:112
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:121
+#: ../Xconfigurator_consts.pm_.c:113
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:122
+#: ../Xconfigurator_consts.pm_.c:114
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr ""
 
-#: ../Xconfigurator_consts.pm_.c:123
+#: ../Xconfigurator_consts.pm_.c:115
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr ""
 
@@ -387,8 +387,8 @@ msgstr ""
 msgid "Save on floppy"
 msgstr ""
 
-#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:656
-#: ../install_steps_interactive.pm_.c:774
+#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:674
+#: ../install_steps_interactive.pm_.c:792
 msgid "Done"
 msgstr ""
 
@@ -484,7 +484,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: ../diskdrake.pm_.c:177 ../diskdrake.pm_.c:562
+#: ../diskdrake.pm_.c:177 ../diskdrake.pm_.c:565
 msgid "Mount point: "
 msgstr ""
 
@@ -643,7 +643,7 @@ msgstr ""
 msgid "Formatting"
 msgstr ""
 
-#: ../diskdrake.pm_.c:410 ../install_steps_interactive.pm_.c:216
+#: ../diskdrake.pm_.c:410 ../install_steps_interactive.pm_.c:217
 #, c-format
 msgid "Formatting partition %s"
 msgstr ""
@@ -701,73 +701,72 @@ msgstr ""
 msgid "Choose the new size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:491 ../install_steps_graphical.pm_.c:287
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:287
-#: ../install_steps_gtk.pm_.c:334
+#: ../diskdrake.pm_.c:491 ../install_steps_gtk.pm_.c:287
+#: ../install_steps_gtk.pm_.c:334 ../unused/install_steps_graphical.pm_.c:314
 msgid "MB"
 msgstr ""
 
-#: ../diskdrake.pm_.c:539
+#: ../diskdrake.pm_.c:542
 msgid "Create a new partition"
 msgstr ""
 
-#: ../diskdrake.pm_.c:555
+#: ../diskdrake.pm_.c:558
 msgid "Start sector: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:558
+#: ../diskdrake.pm_.c:561
 msgid "Size in MB: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:561
+#: ../diskdrake.pm_.c:564
 msgid "Filesystem type: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:563
+#: ../diskdrake.pm_.c:566
 msgid "Preference: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:607 ../diskdrake.pm_.c:623
+#: ../diskdrake.pm_.c:610 ../diskdrake.pm_.c:626
 msgid "Select file"
 msgstr ""
 
-#: ../diskdrake.pm_.c:616
+#: ../diskdrake.pm_.c:619
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:624
+#: ../diskdrake.pm_.c:627
 msgid "Warning"
 msgstr ""
 
-#: ../diskdrake.pm_.c:625
+#: ../diskdrake.pm_.c:628
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:639
+#: ../diskdrake.pm_.c:642
 msgid "Trying to rescue partition table"
 msgstr ""
 
-#: ../diskdrake.pm_.c:650
+#: ../diskdrake.pm_.c:653
 msgid "device"
 msgstr ""
 
-#: ../diskdrake.pm_.c:651
+#: ../diskdrake.pm_.c:654
 msgid "level"
 msgstr ""
 
-#: ../diskdrake.pm_.c:652
+#: ../diskdrake.pm_.c:655
 msgid "chunk size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:664
+#: ../diskdrake.pm_.c:667
 msgid "Choose an existing RAID to add to"
 msgstr ""
 
-#: ../diskdrake.pm_.c:665
+#: ../diskdrake.pm_.c:668
 msgid "new"
 msgstr ""
 
@@ -1330,8 +1329,8 @@ msgstr ""
 msgid "Configure printer"
 msgstr ""
 
-#: ../install2.pm_.c:56 ../install_steps_interactive.pm_.c:614
-#: ../install_steps_interactive.pm_.c:615
+#: ../install2.pm_.c:56 ../install_steps_interactive.pm_.c:632
+#: ../install_steps_interactive.pm_.c:633
 msgid "Set root password"
 msgstr ""
 
@@ -1371,11 +1370,11 @@ msgstr ""
 msgid "server"
 msgstr ""
 
-#: ../install2.pm_.c:311
+#: ../install2.pm_.c:304
 msgid "Partitioning failed: no root filesystem"
 msgstr ""
 
-#: ../install2.pm_.c:325
+#: ../install2.pm_.c:318
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 
@@ -1412,11 +1411,11 @@ msgstr ""
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
-#: ../install_any.pm_.c:422
+#: ../install_any.pm_.c:425
 msgid "Error reading file $f"
 msgstr ""
 
-#: ../install_any.pm_.c:428
+#: ../install_any.pm_.c:431
 #, c-format
 msgid "Bad kickstart file %s (failed %s)"
 msgstr ""
@@ -1441,87 +1440,92 @@ msgstr ""
 msgid "Entering step `%s'\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:259
+#: ../install_steps_gtk.pm_.c:259 ../unused/install_steps_graphical.pm_.c:255
 msgid "You must have a swap partition"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:261
+#: ../install_steps_gtk.pm_.c:261 ../unused/install_steps_graphical.pm_.c:258
 msgid ""
 "You don't have a swap partition\n"
 "\n"
 "Continue anyway?"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:287
+#: ../install_steps_gtk.pm_.c:287
 msgid "Choose the size you want to install"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:334
+#: ../install_steps_gtk.pm_.c:334 ../unused/install_steps_graphical.pm_.c:314
 msgid "Total size: "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:346
+#: ../install_steps_gtk.pm_.c:346 ../unused/install_steps_graphical.pm_.c:284
 #, c-format
 msgid "Version: %s\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:347
+#: ../install_steps_gtk.pm_.c:347 ../unused/install_steps_graphical.pm_.c:285
 #, c-format
 msgid "Size: %d KB\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:462
+#: ../install_steps_gtk.pm_.c:462 ../unused/install_steps_graphical.pm_.c:421
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:465
+#: ../install_steps_gtk.pm_.c:465 ../unused/install_steps_graphical.pm_.c:424
 msgid "Info"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:473
-#: ../install_steps_interactive.pm_.c:87
+#: ../install_steps_gtk.pm_.c:473 ../install_steps_interactive.pm_.c:87
+#: ../unused/install_steps_graphical.pm_.c:432
 msgid "Install"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:492
-#: ../install_steps_interactive.pm_.c:251
+#: ../install_steps_gtk.pm_.c:492 ../install_steps_interactive.pm_.c:252
+#: ../unused/install_steps_graphical.pm_.c:451
 msgid "Installing"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:499
+#: ../install_steps_gtk.pm_.c:499 ../unused/install_steps_graphical.pm_.c:457
 msgid "Please wait, "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:501
+#: ../install_steps_gtk.pm_.c:501 ../unused/install_steps_graphical.pm_.c:459
 msgid "Time remaining "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:502
+#: ../install_steps_gtk.pm_.c:502 ../unused/install_steps_graphical.pm_.c:460
 msgid "Total time "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:507
-#: ../install_steps_interactive.pm_.c:251
+#: ../install_steps_gtk.pm_.c:507 ../install_steps_interactive.pm_.c:252
+#: ../unused/install_steps_graphical.pm_.c:465
 msgid "Preparing installation"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:522
+#: ../install_steps_gtk.pm_.c:517
+#, c-format
+msgid "%d packages"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:517
+msgid ", %U bytes"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:522 ../unused/install_steps_graphical.pm_.c:486
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:547
+#: ../install_steps_gtk.pm_.c:547 ../unused/install_steps_graphical.pm_.c:511
 msgid "Go on anyway?"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:547
+#: ../install_steps_gtk.pm_.c:547 ../unused/install_steps_graphical.pm_.c:511
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:916
-msgid "Use existing configuration for X11?"
-msgstr ""
-
 #: ../install_steps_interactive.pm_.c:43
 msgid "An error occurred"
 msgstr ""
@@ -1595,137 +1599,141 @@ msgstr ""
 msgid "What is the type of your mouse?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:142
+#: ../install_steps_interactive.pm_.c:141
 msgid "Emulate third button?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:145
+#: ../install_steps_interactive.pm_.c:144
 msgid "Mouse Port"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:146
+#: ../install_steps_interactive.pm_.c:145
 msgid "Which serial port is your mouse connected to?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:159
+#: ../install_steps_interactive.pm_.c:160
 msgid "no available partitions"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:161
+#: ../install_steps_interactive.pm_.c:162
 #, c-format
 msgid "(%dMb)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:168
+#: ../install_steps_interactive.pm_.c:169
 msgid "Which partition do you want to use as your root partition"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:175
+#: ../install_steps_interactive.pm_.c:176
 msgid "Choose the mount points"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:187
+#: ../install_steps_interactive.pm_.c:188
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:206
+#: ../install_steps_interactive.pm_.c:207
 msgid "Choose the partitions you want to format"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:225
+#: ../install_steps_interactive.pm_.c:226
 msgid "Looking for available packages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:231
+#: ../install_steps_interactive.pm_.c:232
 msgid "Finding packages to upgrade"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:240
+#: ../install_steps_interactive.pm_.c:241
 msgid "Package Group Selection"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:260
+#: ../install_steps_interactive.pm_.c:261
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:274
+#: ../install_steps_interactive.pm_.c:270
+msgid "Post install stuff"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:281
 msgid "Keep the current IP configuration"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:275
+#: ../install_steps_interactive.pm_.c:282
 msgid "Reconfigure network now"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:276
-#: ../install_steps_interactive.pm_.c:288
+#: ../install_steps_interactive.pm_.c:283
+#: ../install_steps_interactive.pm_.c:295
 msgid "Do not set up networking"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:278
-#: ../install_steps_interactive.pm_.c:286
+#: ../install_steps_interactive.pm_.c:285
+#: ../install_steps_interactive.pm_.c:293
 msgid "Network Configuration"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:279
+#: ../install_steps_interactive.pm_.c:286
 msgid "Local networking has already been configured. Do you want to:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:287
+#: ../install_steps_interactive.pm_.c:294
 msgid "Do you want to configure networking for yout system?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:288
+#: ../install_steps_interactive.pm_.c:295
 msgid "Dialup with modem"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:288
+#: ../install_steps_interactive.pm_.c:295
 msgid "Local LAN"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:297
+#: ../install_steps_interactive.pm_.c:304
 msgid "no network card found"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:326
+#: ../install_steps_interactive.pm_.c:333
 #, c-format
 msgid "Configuring network device %s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:327
+#: ../install_steps_interactive.pm_.c:334
 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:330
+#: ../install_steps_interactive.pm_.c:337
 msgid "Automatic IP"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:330
+#: ../install_steps_interactive.pm_.c:337
 msgid "IP address:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:330
+#: ../install_steps_interactive.pm_.c:337
 msgid "Netmask:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:331
+#: ../install_steps_interactive.pm_.c:338
 msgid "(bootp/dhcp)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:337
-#: ../install_steps_interactive.pm_.c:504
+#: ../install_steps_interactive.pm_.c:344
+#: ../install_steps_interactive.pm_.c:511
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:356
+#: ../install_steps_interactive.pm_.c:363
 msgid "Configuring network"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:357
+#: ../install_steps_interactive.pm_.c:364
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -1733,179 +1741,179 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:361
+#: ../install_steps_interactive.pm_.c:368
 msgid "DNS server:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:361
+#: ../install_steps_interactive.pm_.c:368
 msgid "Gateway device:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:361
+#: ../install_steps_interactive.pm_.c:368
 msgid "Gateway:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:361
+#: ../install_steps_interactive.pm_.c:368
 msgid "Host name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:374
+#: ../install_steps_interactive.pm_.c:381
 msgid "Try to find a modem?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:383
+#: ../install_steps_interactive.pm_.c:390
 msgid "Which serial port is your modem connected to?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:387
+#: ../install_steps_interactive.pm_.c:394
 msgid "Dialup options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:388
+#: ../install_steps_interactive.pm_.c:395
 msgid "Connection name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:389
+#: ../install_steps_interactive.pm_.c:396
 msgid "Phone number"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:390
+#: ../install_steps_interactive.pm_.c:397
 msgid "Login ID"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:391
-#: ../install_steps_interactive.pm_.c:616
-#: ../install_steps_interactive.pm_.c:662
-#: ../install_steps_interactive.pm_.c:753
+#: ../install_steps_interactive.pm_.c:398
+#: ../install_steps_interactive.pm_.c:634
+#: ../install_steps_interactive.pm_.c:680
+#: ../install_steps_interactive.pm_.c:771
 msgid "Password"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:392
+#: ../install_steps_interactive.pm_.c:399
 msgid "Authentication"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:392
+#: ../install_steps_interactive.pm_.c:399
 msgid "CHAP"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:392
+#: ../install_steps_interactive.pm_.c:399
 msgid "PAP"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:392
+#: ../install_steps_interactive.pm_.c:399
 msgid "Script-based"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:392
+#: ../install_steps_interactive.pm_.c:399
 msgid "Terminal-based"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:393
+#: ../install_steps_interactive.pm_.c:400
 msgid "Domain name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:394
+#: ../install_steps_interactive.pm_.c:401
 msgid "First DNS Server"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:402
 msgid "Second DNS Server"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:406
+#: ../install_steps_interactive.pm_.c:413
 msgid "Which is your timezone?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:407
+#: ../install_steps_interactive.pm_.c:414
 msgid "Is your hardware clock set to GMT?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:417
+#: ../install_steps_interactive.pm_.c:424
 msgid "Printer"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:425
 msgid "Would you like to configure a printer?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:430
+#: ../install_steps_interactive.pm_.c:437
 msgid "Local Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:431
+#: ../install_steps_interactive.pm_.c:438
 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"
 "name and directory should be used for this queue?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:434
+#: ../install_steps_interactive.pm_.c:441
 msgid "Name of queue:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:434
+#: ../install_steps_interactive.pm_.c:441
 msgid "Spool directory:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:445
+#: ../install_steps_interactive.pm_.c:452
 msgid "Select Printer Connection"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:446
+#: ../install_steps_interactive.pm_.c:453
 msgid "How is the printer connected?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:454
+#: ../install_steps_interactive.pm_.c:461
 msgid "Detecting devices..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:454
+#: ../install_steps_interactive.pm_.c:461
 msgid "Test ports"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:467
+#: ../install_steps_interactive.pm_.c:474
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:474
+#: ../install_steps_interactive.pm_.c:481
 msgid "Local Printer Device"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:475
+#: ../install_steps_interactive.pm_.c:482
 msgid ""
 "What device is your printer connected to  \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:476
+#: ../install_steps_interactive.pm_.c:483
 msgid "Printer Device:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:480
+#: ../install_steps_interactive.pm_.c:487
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:481
+#: ../install_steps_interactive.pm_.c:488
 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 ""
 
-#: ../install_steps_interactive.pm_.c:484
+#: ../install_steps_interactive.pm_.c:491
 msgid "Remote hostname:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:484
+#: ../install_steps_interactive.pm_.c:491
 msgid "Remote queue"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:489
+#: ../install_steps_interactive.pm_.c:496
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:490
+#: ../install_steps_interactive.pm_.c:497
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -1914,37 +1922,37 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:495
+#: ../install_steps_interactive.pm_.c:502
 msgid "SMB server IP:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:495
+#: ../install_steps_interactive.pm_.c:502
 msgid "SMB server host:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:496
-#: ../install_steps_interactive.pm_.c:518
+#: ../install_steps_interactive.pm_.c:503
+#: ../install_steps_interactive.pm_.c:525
 msgid "Password:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:496
+#: ../install_steps_interactive.pm_.c:503
 msgid "Share name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:496
-#: ../install_steps_interactive.pm_.c:518
+#: ../install_steps_interactive.pm_.c:503
+#: ../install_steps_interactive.pm_.c:525
 msgid "User name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:504
 msgid "Workgroup:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:512
+#: ../install_steps_interactive.pm_.c:519
 msgid "NetWare Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:513
+#: ../install_steps_interactive.pm_.c:520
 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"
@@ -1952,183 +1960,190 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:517
+#: ../install_steps_interactive.pm_.c:524
 msgid "Print Queue Name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:517
+#: ../install_steps_interactive.pm_.c:524
 msgid "Printer Server:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:528
+#: ../install_steps_interactive.pm_.c:535
 msgid "Yes, print ASCII test page"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:529
+#: ../install_steps_interactive.pm_.c:536
 msgid "Yes, print PostScript test page"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:530
+#: ../install_steps_interactive.pm_.c:537
 msgid "Yes, print both test pages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:531
-#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:52
+#: ../install_steps_interactive.pm_.c:538
+#: ../install_steps_interactive.pm_.c:1062 ../interactive.pm_.c:63
 #: ../my_gtk.pm_.c:437
 msgid "No"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:537
+#: ../install_steps_interactive.pm_.c:544
 msgid "Configure Printer"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:538
+#: ../install_steps_interactive.pm_.c:545
 msgid "What type of printer do you have?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:560
+#: ../install_steps_interactive.pm_.c:567
 msgid "Printer options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:561
+#: ../install_steps_interactive.pm_.c:568
 msgid "Paper Size"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:562
+#: ../install_steps_interactive.pm_.c:569
 msgid "Eject page after job?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:565
+#: ../install_steps_interactive.pm_.c:572
 msgid "Fix stair-stepping text?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:568
+#: ../install_steps_interactive.pm_.c:575
 msgid "Uniprint driver options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:569
+#: ../install_steps_interactive.pm_.c:576
 msgid "Color depth options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:578
+#: ../install_steps_interactive.pm_.c:585
 msgid "Do you want to test printing?"
 msgstr ""
 
 #: ../install_steps_interactive.pm_.c:614
+#, c-format
+msgid ""
+"Is this correct? Printing status:\n"
+"%s"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:632
 msgid "No password"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:614
-#: ../install_steps_interactive.pm_.c:824 ../interactive.pm_.c:47
-#: ../interactive.pm_.c:57 ../interactive.pm_.c:136
-#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:91
+#: ../install_steps_interactive.pm_.c:632
+#: ../install_steps_interactive.pm_.c:842 ../interactive.pm_.c:58
+#: ../interactive.pm_.c:68 ../interactive.pm_.c:147
+#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:90
 #: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:200 ../my_gtk.pm_.c:438
-#: ../my_gtk.pm_.c:535
+#: ../my_gtk.pm_.c:537 ../unused/install_steps_graphical.pm_.c:608
 msgid "Ok"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:617
-#: ../install_steps_interactive.pm_.c:663
+#: ../install_steps_interactive.pm_.c:635
+#: ../install_steps_interactive.pm_.c:681
 msgid "Password (again)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:619
+#: ../install_steps_interactive.pm_.c:637
 msgid "Use shadow file"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:619
+#: ../install_steps_interactive.pm_.c:637
 msgid "shadow"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:620
+#: ../install_steps_interactive.pm_.c:638
 msgid "MD5"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:620
+#: ../install_steps_interactive.pm_.c:638
 msgid "Use MD5 passwords"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:622
+#: ../install_steps_interactive.pm_.c:640
 msgid "Use NIS"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:622
+#: ../install_steps_interactive.pm_.c:640
 msgid "yellow pages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:626
-#: ../install_steps_interactive.pm_.c:674
+#: ../install_steps_interactive.pm_.c:644
+#: ../install_steps_interactive.pm_.c:692
 msgid "Please try again"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:626
-#: ../install_steps_interactive.pm_.c:674
+#: ../install_steps_interactive.pm_.c:644
+#: ../install_steps_interactive.pm_.c:692
 msgid "The passwords do not match"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:628
-#: ../install_steps_interactive.pm_.c:675
+#: ../install_steps_interactive.pm_.c:646
+#: ../install_steps_interactive.pm_.c:693
 msgid "This password is too simple"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:635
+#: ../install_steps_interactive.pm_.c:653
 msgid "Authentification NIS"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:636
+#: ../install_steps_interactive.pm_.c:654
 msgid "NIS Domain"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:636
+#: ../install_steps_interactive.pm_.c:654
 msgid "NIS Server"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:656
+#: ../install_steps_interactive.pm_.c:674
 msgid "Accept user"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:656
+#: ../install_steps_interactive.pm_.c:674
 msgid "Add user"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:657
+#: ../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:657
+#: ../install_steps_interactive.pm_.c:675
 #, c-format
 msgid ""
 "Enter a user\n"
 "%s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:659
+#: ../install_steps_interactive.pm_.c:677
 msgid "Real name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:660
+#: ../install_steps_interactive.pm_.c:678
 msgid "User name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:665
+#: ../install_steps_interactive.pm_.c:683
 msgid "Shell"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:676
+#: ../install_steps_interactive.pm_.c:694
 msgid "Please give a user name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:677
+#: ../install_steps_interactive.pm_.c:695
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:678
+#: ../install_steps_interactive.pm_.c:696
 msgid "This user name is already added"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:699
+#: ../install_steps_interactive.pm_.c:717
 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 "
@@ -2142,257 +2157,262 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:708
+#: ../install_steps_interactive.pm_.c:726
 msgid "Sorry, no floppy drive available"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:711
+#: ../install_steps_interactive.pm_.c:729
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:712
+#: ../install_steps_interactive.pm_.c:730
 msgid "Skip"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:716
+#: ../install_steps_interactive.pm_.c:734
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:717
+#: ../install_steps_interactive.pm_.c:735
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:724
+#: ../install_steps_interactive.pm_.c:742
 msgid "Preparing bootloader"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:736
+#: ../install_steps_interactive.pm_.c:754
 msgid "First sector of boot partition"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:736
+#: ../install_steps_interactive.pm_.c:754
 msgid "First sector of drive (MBR)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:740
+#: ../install_steps_interactive.pm_.c:758
 msgid "LILO Installation"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:741
+#: ../install_steps_interactive.pm_.c:759
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:744
+#: ../install_steps_interactive.pm_.c:762
 msgid "Do you want to use LILO?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:747
+#: ../install_steps_interactive.pm_.c:765
 msgid "Boot device"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:748
+#: ../install_steps_interactive.pm_.c:766
 msgid "Linear (needed for some SCSI drives)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:748
+#: ../install_steps_interactive.pm_.c:766
 msgid "linear"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:749
+#: ../install_steps_interactive.pm_.c:767
 msgid "Compact"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:749
+#: ../install_steps_interactive.pm_.c:767
 msgid "compact"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:750
+#: ../install_steps_interactive.pm_.c:768
 msgid "Delay before booting default image"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:751
+#: ../install_steps_interactive.pm_.c:769
 msgid "Video mode"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:754
+#: ../install_steps_interactive.pm_.c:772
 msgid "Restrict command line options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:754
+#: ../install_steps_interactive.pm_.c:772
 msgid "restrict"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:760
+#: ../install_steps_interactive.pm_.c:778
 msgid "LILO main options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:763
+#: ../install_steps_interactive.pm_.c:781
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:772
+#: ../install_steps_interactive.pm_.c:790
 msgid ""
 "Here are the following entries in LILO.\n"
 "You can add some more or change the existent ones."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:774
+#: ../install_steps_interactive.pm_.c:792
 msgid "Add"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:783
+#: ../install_steps_interactive.pm_.c:801
 msgid "Linux"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:783
+#: ../install_steps_interactive.pm_.c:801
 msgid "Other OS (windows...)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:783
+#: ../install_steps_interactive.pm_.c:801
 msgid "Which type of entry do you want to add"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:803
+#: ../install_steps_interactive.pm_.c:821
 msgid "Image"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:804
-#: ../install_steps_interactive.pm_.c:812
+#: ../install_steps_interactive.pm_.c:822
+#: ../install_steps_interactive.pm_.c:830
 msgid "Root"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:805
+#: ../install_steps_interactive.pm_.c:823
 msgid "Append"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:806
+#: ../install_steps_interactive.pm_.c:824
 msgid "Initrd"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:807
+#: ../install_steps_interactive.pm_.c:825
 msgid "Read-write"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:813
+#: ../install_steps_interactive.pm_.c:831
 msgid "Table"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:814
+#: ../install_steps_interactive.pm_.c:832
 msgid "Unsafe"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:819
+#: ../install_steps_interactive.pm_.c:837
 msgid "Label"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:821
+#: ../install_steps_interactive.pm_.c:839
 msgid "Default"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:824
+#: ../install_steps_interactive.pm_.c:842
 msgid "Remove entry"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:827
+#: ../install_steps_interactive.pm_.c:845
 msgid "Empty label not allowed"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:828
+#: ../install_steps_interactive.pm_.c:846
 msgid "This label is already in use"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:829
+#: ../install_steps_interactive.pm_.c:847
 #, c-format
 msgid "A entry %s already exists"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:843
+#: ../install_steps_interactive.pm_.c:861
 msgid "Installation of LILO failed. The following error occured:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:855
+#: ../install_steps_interactive.pm_.c:873
 msgid "Proxies configuration"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:856
+#: ../install_steps_interactive.pm_.c:874
 msgid "HTTP proxy"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:857
+#: ../install_steps_interactive.pm_.c:875
 msgid "FTP proxy"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:863
+#: ../install_steps_interactive.pm_.c:881
 msgid "Proxy should be http://..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:864
+#: ../install_steps_interactive.pm_.c:882
 msgid "Proxy should be ftp://..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:874
+#: ../install_steps_interactive.pm_.c:892
 msgid "Windows(TM)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:875
+#: ../install_steps_interactive.pm_.c:893
 msgid "Poor"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:876
+#: ../install_steps_interactive.pm_.c:894
 msgid "Low"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:877
+#: ../install_steps_interactive.pm_.c:895
 msgid "Medium"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:878
+#: ../install_steps_interactive.pm_.c:896
 msgid "High"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:879
+#: ../install_steps_interactive.pm_.c:897
 msgid "Paranoid"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:889
+#: ../install_steps_interactive.pm_.c:907
 msgid "Miscellaneous questions"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:890
+#: ../install_steps_interactive.pm_.c:908
 msgid "Is this machine a laptop?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:891
+#: ../install_steps_interactive.pm_.c:909
 msgid "Use hard drive optimisations?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:892
+#: ../install_steps_interactive.pm_.c:910
 msgid "Choose security level"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:893
+#: ../install_steps_interactive.pm_.c:911
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:896
+#: ../install_steps_interactive.pm_.c:914
 msgid "(may cause data corruption)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:901
+#: ../install_steps_interactive.pm_.c:919
 msgid "Give the ram size in Mb"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:940
+#: ../install_steps_interactive.pm_.c:934
+#: ../unused/install_steps_graphical.pm_.c:535
+msgid "Use existing configuration for X11?"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:959
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:945
+#: ../install_steps_interactive.pm_.c:966
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -2405,22 +2425,22 @@ msgid ""
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:966
+#: ../install_steps_interactive.pm_.c:987
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:967
+#: ../install_steps_interactive.pm_.c:988
 #, c-format
 msgid "(module %s)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:977
+#: ../install_steps_interactive.pm_.c:998
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:984
+#: ../install_steps_interactive.pm_.c:1005
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -2432,20 +2452,20 @@ msgid ""
 "not cause any damage."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:989
+#: ../install_steps_interactive.pm_.c:1010
 msgid "Autoprobe"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:989
+#: ../install_steps_interactive.pm_.c:1010
 msgid "Specify options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:993
+#: ../install_steps_interactive.pm_.c:1014
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:999
+#: ../install_steps_interactive.pm_.c:1020
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -2453,54 +2473,53 @@ msgid ""
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:1002
+#: ../install_steps_interactive.pm_.c:1023
 msgid "Module options:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:1012
+#: ../install_steps_interactive.pm_.c:1033
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
 "Do you want to try again with other parameters?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:1025
-#, c-format
-msgid "Skip %s PCMCIA probing"
+#: ../install_steps_interactive.pm_.c:1046
+msgid "Try to find PCMCIA cards?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:1026
+#: ../install_steps_interactive.pm_.c:1047
 msgid "Configuring PCMCIA cards..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:1026
+#: ../install_steps_interactive.pm_.c:1047
 msgid "PCMCIA"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:1033
+#: ../install_steps_interactive.pm_.c:1054
 msgid "Try to find PCI devices?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:1037
+#: ../install_steps_interactive.pm_.c:1058
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:1038
+#: ../install_steps_interactive.pm_.c:1059
 msgid "Do you have another one?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:1039
+#: ../install_steps_interactive.pm_.c:1060
 #, c-format
 msgid "Do you have any %s interface?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:52
+#: ../install_steps_interactive.pm_.c:1062 ../interactive.pm_.c:63
 #: ../my_gtk.pm_.c:437
 msgid "Yes"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:1042
+#: ../install_steps_interactive.pm_.c:1063
 msgid "See hardware info"
 msgstr ""
 
@@ -2514,13 +2533,13 @@ msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 
-#: ../interactive.pm_.c:57 ../interactive.pm_.c:135
-#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:91
+#: ../interactive.pm_.c:68 ../interactive.pm_.c:146
+#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:90
 #: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:201 ../my_gtk.pm_.c:438
 msgid "Cancel"
 msgstr ""
 
-#: ../interactive.pm_.c:153
+#: ../interactive.pm_.c:164
 msgid "Please wait"
 msgstr ""
 
@@ -2848,3 +2867,11 @@ msgstr ""
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr ""
+
+#: ../unused/install_steps_graphical.pm_.c:433
+msgid "Show less"
+msgstr ""
+
+#: ../unused/install_steps_graphical.pm_.c:434
+msgid "Show more"
+msgstr ""
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 46c5b6f63..28864acc1 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -17,9 +17,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-use lib qw(/usr/lib/libDrakX .);
+use lib qw(/usr/lib/libDrakX);
 
-use common qw(:file);
+use interactive;
 use Xconfigurator;
 use Xconfig;
 
@@ -35,25 +35,8 @@ $::skiptest = /--skiptest/;
 $::testing = /--testing/;
 $::isStandalone = 1;
 
-my $hasX = do { `xtest`; $? == 0 };
-
-my $in; if ($hasX) {
-    require 'interactive_gtk.pm';
-    $in = interactive_gtk->new;
-} else {
-    *log::l = undef;
-    *log::l = sub {};
-    require 'interactive_newt.pm';
-    $in = interactive_newt->new;
-}
-
-Xconfigurator::main('', Xconfig::getinfo(), $in,
-#   sub {
-#       use install_any;
-#	print "Here\n";
-#	my ($X) = glob_("/mnt/disk/XFree86-$_[0]-*") or die "$_[0]'s X server rpm not found";
-#	pkgs::install('', [ { name => $_[0], file => $X } ], 1, 0);
-#   }
-);
-
-exec 'true' if $hasX; #- workaround for perl-GTK
+my $in = vnew interactive;
+
+Xconfigurator::main('', Xconfig::getinfo(), $in, 0, sub { `urpmi --auto XFree86-$_[0]` });
+
+exec 'true' if ref($in) =~ /gtk/; #- workaround for perl-GTK
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
new file mode 100755
index 000000000..852c5e612
--- /dev/null
+++ b/perl-install/standalone/mousedrake
@@ -0,0 +1,51 @@
+#!/usr/bin/perl
+
+use lib qw(/usr/lib/libDrakX);
+
+use common qw(:system);
+use interactive;
+use mouse;
+
+local $_ = join '', @ARGV;
+
+/-h/ and die "usage: mousedrake [--auto] [--noauto] [--testing]\n";
+
+$::auto = /--auto/;
+$::noauto = /--noauto/;
+$::testing = /--testing/;
+$::isStandalone = 1;
+
+my $in = vnew interactive;
+
+my $mouse = mouse::detect() unless $::noauto;
+
+if (!(my $name = $mouse->{FULLNAME}) || !$::auto) {
+    $name ||= "Generic Mouse (serial)";
+    $name = $in->ask_from_list_('', _("What is the type of your mouse?"), [ mouse::names() ], $name);
+    $mouse = mouse::name2mouse($name);
+
+    if ($mouse->{device} eq "usbmouse") {
+	my ($c) = pci_probing::main::probe("serial_usb") or die _("no serial_usb found\n");
+	eval { modules::load($c->[1], "serial_usb") };
+    }
+}
+
+$mouse->{XEMU3} = 'yes' if $mouse->{nbuttons} < 3 && (!$::noauto || $in->ask_yesorno('', _("Emulate third button?"), 1));
+
+$mouse->{device} = mouse::serial_ports_names2dev(
+	$in->ask_from_list(_("Mouse Port"),
+			   _("Which serial port is your mouse connected to?"),
+			   [ mouse::serial_ports_names() ])) if $mouse->{device} eq "ttyS";
+
+mouse::write('', $mouse);
+modules::write_conf("/etc/conf.modules") if $mouse->{device} eq "usbmouse" && !$::testing;
+
+my $f = "/etc/X11/XF86Config";
+substInFile {
+    if (/^Section "Pointer"/ .. /^EndSection/) {
+	s|^(\s*Protocol\s+).*|$1 "$mouse->{XMOUSETYPE}"|;
+	s|^(\s*Device\s+).*|$1 "/dev/mouse"|;
+    }
+} $f if -e $f && !$::testing;
+
+exec 'true' if ref($in) =~ /gtk/; #- workaround for perl-GTK
diff --git a/update_kernel b/update_kernel
index b5de4cadc..3782895aa 100755
--- a/update_kernel
+++ b/update_kernel
@@ -2,24 +2,12 @@
 
 KERNEL_BOOT_PATH="kernel"
 
-SCSI_DRIVERS="
-     53c7,8xx.o AM53C974.o BusLogic.o NCR53c406a.o advansys.o aha152x.o
-     aha1542.o aha1740.o aic7xxx.o dtc.o eata_dma.o eata_pio.o fdomain.o
-     g_NCR5380.o gdth.o in2000.o initio.o megaraid.o ncr53c8xx.o pas16.o
-     qlogicisp.o seagate.o sym53c8xx.o t128.o u14-34f.o wd7000.o ultrastor.o"
-
-# broken network modules: at1700.o
-NETWORK_DRIVERS="
-     3c501.o 3c503.o 3c505.o 3c507.o 3c509.o 3c59x.o 3c90x.o 82596.o 8390.o ac3200.o
-     acenic.o epic100.o cs89x0.o de4x5.o de600.o de620.o dgrs.o e2100.o
-     eepro.o eepro100.o eexpress.o es3210.o eth16i.o hp-plus.o hp.o
-     hp100.o ibmtr.o lance.o lne390.o ne.o ne2k-pci.o ne3210.o ni52.o
-     ni5010.o ni65.o plip.o
-     pcnet32.o rtl8139.o sktr.o smc9194.o smc-ultra.o
-     smc-ultra32.o tlan.o 
-     tulip.o via-rhine.o wavelan.o wd.o yellowfin.o
+SCSI_DRIVERS=`perl -Iperl-install -e 'use modules; while (($m,$v)=each %modules::drivers) { print "$m.o\n" if $v->{type} eq "scsi" }'`
+
+NETWORK_DRIVERS=`perl -Iperl-install -e 'use modules; while (($m,$v)=each %modules::drivers) { print "$m.o\n" if $v->{type} eq "net" }'`
+NETWORK_DRIVERS="$NETWORK_DRIVERS 82596.o 8390.o cs89x0.o dgrs.o lockd.o nfs.o sunrpc.o wavelan.o"
+
 
-     nfs.o lockd.o sunrpc.o"
 #     3c589_cs.o ibmtr_cs.o nmclan_cs.o pcnet_cs.o smc91c92_cs.o wavelan_cs.o
 #     fmvj18x_cs.o netwave_cs.o xirc2ps_cs.o 3c574_cs.o"
 
@@ -56,8 +44,6 @@ LNX4WIN_MODULES="$FSMODULES loop.o isofs.o $SCSI_DRIVERS"
 
 PCMCIA_INSTALLMODULES="pcmcia_core.o tcic.o ds.o i82365.o"
 
-PRISTINE_MODULES="serial.o"
-
 cp -f "$KERNEL_BOOT_PATH"/boot/vmlinuz* vmlinuz
 cp -f "$KERNEL_BOOT_PATH"/boot/System.map* System.map
 
@@ -66,9 +52,9 @@ cp -f "$KERNEL_BOOT_PATH"/boot/System.map* System.map
 
 rm -rf modules ; install -d modules
 rm -rf install_pcmcia_modules ; install -d install_pcmcia_modules
+install -d lnx4win/initrd/modules
 (cd modules ; 
     cp -f `find ../"$KERNEL_BOOT_PATH"/lib/modules/ -name "*.o"` .
-    mkdir pristine ; cp $PRISTINE_MODULES pristine
     /sbin/depmod -m ../System.map -i -e *.o | grep ': ' | sed 's/\.o//g' > modules.dep
     ls *.o              | ../build_archive modules 400000
     ls *.o              | cpio --quiet -H crc -o | bzip2 -9> modules.cpio.bz2