no_comment

14 files changed, 398 insertions, 293 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index 20fb2b1ab..cb49dbb09 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -11,7 +11,7 @@ BASE        = $(ROOTDEST)/Mandrake/base
 DESTREP4PMS = $(DEST)$(REP4PMS)
 STAGE2TMP   = /tmp/stage2_tmp
 PERL        = perl
-LOCALFILES  = $(PERL) mouseconfig ddcxinfos
+LOCALFILES  = mouseconfig ddcxinfos
 DIRS        = c po pci_probing resize_fat
 EXCLUDE     = $(LOCALFILES) boot.img keymaps consolefonts install
 RPMS        = $(wildcard $(ROOTDEST)/Mandrake/RPMS/*.rpm)
@@ -33,9 +33,6 @@ clean:
 tar: clean
 	cd .. ; tar cfy perl-install.tar.bz2 $(EXCLUDE:%=--exclude %) perl-install
 
-floppy:
-	dd if=/dev/zero of=/tmp/initrd bs=1k count=2000 ; $(MKE2FS) /tmp/initrd ; mount /tmp/initrd /mnt/disk/ -o loop ; cp -a ../install1/* /mnt/disk/ ; umount /mnt/disk ; gzip -c /tmp/initrd > /tmp/initrd.img ; mcopy -o /tmp/initrd.img a:
-
 tar-diskdrake: clean pci_probing
 	cd .. ; rm -rf diskdrake ; cp -af perl-install diskdrake
 
@@ -151,7 +148,7 @@ get_needed_files: $(DIRS)
 #	echo -e "#!/bin/sh\n\nexec '/usr/bin/sh'" > $(DEST)/usr/bin/runinstall2
 #	chmod a+x $(DEST)/usr/bin/runinstall2
 
-	cp -a ../install/install1_pcmcia/etc/pcmcia $(DEST)/etc
+	tar xyC $(DEST) -f ../install/install1_pcmcia.tar.bz2 ./etc/pcmcia
 
 as_root:
 	/bin/dd if=/dev/zero of=/tmp/initrd bs=1k count=4000
diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index af5c10f39..67f5d4138 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -5,6 +5,7 @@ use strict;
 
 use common qw(:common :file :system);
 use mouse;
+use devices;
 use Xconfigurator;
 
 # otherwise uses the rule substr($keymap, 0, 2)
@@ -115,6 +116,7 @@ sub getinfoFromDDC {
     my $o = shift || {};
     my $O = $o->{monitor} ||= {};
     #- return $o if $O->{hsyncrange} && $O->{vsyncrange} && $O->{modelines};
+    devices::make("/dev/zero"); #- needed by ddcxinfos
     my ($m, @l) = `ddcxinfos`;
     $? == 0 or return $o;
 
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index c6f68c37a..a739452b0 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -290,9 +290,7 @@ sub dd {
     ref $h{if} eq 'GLOB' ? *IF = $h{if} : sysopen(IF, $h{if}, 0   ) || die "error: can't open file $h{if}\n";
     ref $h{of} eq 'GLOB' ? *OF = $h{of} : sysopen(OF, $h{of}, 0x41) || die "error: can't open file $h{of}\n";
 
-    $h{bs} =~ /(\d+)k$/ and $h{bs} = $1 * 1024;
-    $h{bs} =~ /(\d+)M$/ and $h{bs} = $1 * 1024 * 1024;
-    $h{bs} =~ /(\d+)G$/ and $h{bs} = $1 * 1024 * 1024 * 1024;
+    $h{bs} = removeXiBSuffix($h{bs});
 
     for ($nb = 0; !$h{count} || $nb < $h{count}; $nb++) {
 	printf "\r%02.1d%%", 100 * $nb / $h{count} if $h{count} && $percent;
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 09f39db3b..b32f9ff11 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -9,7 +9,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $printable_chars $sizeof_int $bitof_int
     common     => [ qw(__ even odd min max sqr sum sign product bool invbool listlength bool2text text2bool to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX formatLines) ],
     functional => [ qw(fold_left compose map_index grep_index map_each grep_each map_tab_hash mapn mapn_ difference2 before_leaving catch_cdie cdie) ],
     file       => [ qw(dirname basename touch all glob_ cat_ symlinkf chop_ mode typeFromMagic) ],
-    system     => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ salt getVarsFromSh setVarsInSh setVarsInCsh substInFile) ],
+    system     => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ salt getVarsFromSh setVarsInSh setVarsInCsh substInFile availableRam availableMemory removeXiBSuffix) ],
     constant   => [ qw($printable_chars $sizeof_int $bitof_int $SECTORSIZE) ],
 );
 @EXPORT_OK = map { @$_ } values %EXPORT_TAGS;
@@ -325,6 +325,7 @@ sub setVarsInSh {
     my ($file, $l, @fields) = @_;
     @fields = keys %$l unless @fields;
 
+    my $b = 1; $b &&= $l->{$_} foreach @fields; $b or return;
     local *F;
     open F, "> $_[0]" or die "cannot create config file $file";
     $l->{$_} and print F "$_=$l->{$_}\n" foreach @fields;
@@ -333,6 +334,7 @@ sub setVarsInCsh {
     my ($file, $l, @fields) = @_;
     @fields = keys %$l unless @fields;
 
+    my $b = 1; $b &&= $l->{$_} foreach @fields; $b or return;
     local *F;
     open F, "> $_[0]" or die "cannot create config file $file";
     $l->{$_} and print F "setenv $_ $l->{$_}\n" foreach @fields;
@@ -409,6 +411,17 @@ sub typeFromMagic($@) {
     undef;
 }
 
+sub availableRam()    { sum map { /(\d+)/ } grep { /^(MemTotal):/           } cat_("/proc/meminfo"); }
+sub availableMemory() { sum map { /(\d+)/ } grep { /^(MemTotal|SwapTotal):/ } cat_("/proc/meminfo"); }
+
+sub removeXiBSuffix($) {
+    local $_ = shift;
+
+    /(\d+)k$/i and return $1 * 1024;
+    /(\d+)M$/i and return $1 * 1024 * 1024;
+    /(\d+)G$/i and return $1 * 1024 * 1024 * 1024;
+    $_;
+}
 
 #-######################################################################################
 #- Wonderful perl :(
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index c1cd5f397..fd08d7739 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -80,6 +80,7 @@ sub make($) {
 		   "lp"     => [ c::S_IFCHR(), 6,  0 ],
 		   "scd"    => [ c::S_IFBLK(), 11, 0 ],
 		   "nst"    => [ c::S_IFCHR(), 9, 128 ],
+		   "hidbp-mse-" => [ c::S_IFCHR(), 10, 32 ],
 	       }}{$1}};
 	    $minor += $2;
     }
@@ -94,10 +95,13 @@ sub make($) {
 		   "gscd"    => [ c::S_IFBLK(), 16, 0 ],
 		   "mcd"     => [ c::S_IFBLK(), 23, 0 ],
 		   "mcdx"    => [ c::S_IFBLK(), 20, 0 ],
+		   "mem"     => [ c::S_IFCHR(), 1,  1 ],
 		   "random"  => [ c::S_IFCHR(), 1,  8 ],
 		   "optcd"   => [ c::S_IFBLK(), 17, 0 ],
 		   "sbpcd"   => [ c::S_IFBLK(), 25, 0 ],
 		   "sjcd"    => [ c::S_IFBLK(), 18, 0 ],
+		   "usbmouse"=> [ c::S_IFCHR(), 10, 32], #- aka hidbp-mse-0
+		   "zero"    => [ c::S_IFCHR(), 1,  5 ],		     
 	       }}{$_} or die "unknown device $_" };
     }
 
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index c0a6f0c53..ddd77d49c 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -28,7 +28,7 @@ use printer;
 use modules;
 use detect_devices;
 use modparm;
-#-use install_steps_graphical;
+use install_steps_graphical;
 use run_program;
 
 #-######################################################################################
@@ -311,6 +311,8 @@ sub formatPartitions {
 	    fs::mount_all([ grep { isExt2($_) || isSwap($_) } @{$o->{fstab}} ], $o->{prefix});
 	}
 	eval { $o = $::o = install_any::loadO($o) } if $_[1] == 1;
+
+	die _("Not enough swap to fulfill installation, please add some") if availableMemory < 40 * 1024;
     }
     mkdir "$o->{prefix}/$_", 0755 foreach 
       qw(dev etc etc/profile.d etc/sysconfig etc/sysconfig/console etc/sysconfig/network-scripts
@@ -319,7 +321,6 @@ sub formatPartitions {
 }
 
 #------------------------------------------------------------------------------
-#-PADTODO
 sub choosePackages {
     $o->setPackages if $_[1] == 1;
     $o->selectPackagesToUpgrade($o) if $o->{isUpgrade} && $_[1] == 1;
@@ -341,8 +342,12 @@ sub doInstallStep {
 }
 #------------------------------------------------------------------------------
 sub miscellaneous { 
+    $o->{miscellaneous}{memsize} ||= $1 if first(cat_("/proc/cmdline")) =~ /mem=(\S+)/;
     $o->miscellaneous($_[0]); 
-    addToBeDone { install_any::fsck_option() } 'doInstallStep';
+    addToBeDone { 
+	install_any::fsck_option();
+	run_program::rooted($o->{prefix}, "chkconfig --del kudzu") unless $o->{miscellaneous}{kudzu};
+    } 'doInstallStep';
 }
 
 #------------------------------------------------------------------------------
@@ -372,8 +377,8 @@ sub configureTimezone {
 	#- can't be done in install cuz' timeconfig %post creates funny things
 	add2hash($o->{timezone}, { timezone::read($f) });
     }
-    $o->{timezone}{GMT} = 1 unless exists $o->{timezone}{GMT}; #- take GMT by default if nothing else.
-    $o->timeConfig($f);
+    $o->{timezone}{GMT} = !$::beginner && !grep { isFat($_) } @{$o->{fstab}} unless exists $o->{timezone}{GMT};
+    $o->timeConfig($f, $clicked);
 }
 #------------------------------------------------------------------------------
 sub configureServices {
@@ -387,7 +392,7 @@ sub configurePrinter  { $o->printerConfig   }
 sub setRootPassword {
     return if $o->{isUpgrade};
 
-    $o->setRootPassword;
+    $o->setRootPassword($_[0]);
     addToBeDone { install_any::setAuthentication() } 'doInstallStep';
 }
 #------------------------------------------------------------------------------
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 608401f1a..06c135288 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -19,6 +19,8 @@ use run_program;
 use partition_table qw(:types);
 use devices;
 use fsedit;
+use network;
+use lilo;
 use detect_devices;
 use pkgs;
 use fs;
@@ -253,9 +255,22 @@ sub write_ldsoconf {
 }
 
 sub setAuthentication() {
-    my ($shadow, $md5) = @{$::o->{authentification} || {}}{qw(shadow md5)};
-    enableMD5Shadow($::o->{prefix}, $shadow, $md5);
+    my ($shadow, $md5, $nis, $nis_server) = @{$::o->{authentification} || {}}{qw(shadow md5 NIS NIS_server)};
+    my $p = $::o->{prefix};
+    enableMD5Shadow($p, $shadow, $md5);
     enableShadow() if $shadow;
+    if ($nis) {
+	pkg_install($::o, "ypbind");
+	my $domain = $::o->{netc}{NISDOMAIN};
+	$domain || $nis_server ne "broadcast" or die _("Can't use broadcast with no NIS domain");
+	my $t = $domain ? "domain $domain" . ($nis_server ne "broadcast" && " server")
+	                : "ypserver";
+	substInFile {
+	    $_ = "#~$_" unless /^#/;
+	    $_ .= "$t $nis_server\n" if eof;
+	} "$p/etc/yp.conf";
+	network::write_conf("$p/etc/sysconfig/network", $::o->{netc});
+    }
 }
 
 sub enableShadow() {
@@ -395,11 +410,11 @@ sub loadO {
 
 sub pkg_install {
     my ($o, $name) = @_;
-    my $p = $o->{packages}{$name} or die "$name rpm not found";
-    pkgs::install($o->{prefix}, [ $p ]);
+    pkgs::select($o->{packages}, $o->{packages}{$name} || die "$name rpm not found");
+    install_steps::installPackages ($o, $o->{packages});
 }
 
 sub fsck_option() {
-    my $y = $::o->{security} < 4 && $::beginner && " -y";
-    substInFile { s/("fsck)( -y)?/$1$y/ } "$::o->{prefix}/etc/rc.d/rc.sysinit";
+    my $y = $::o->{security} < 4 && $::beginner && "-y ";
+    substInFile { s/^(\s*fsckoptions=)(-y )?/$1$y/ } "$::o->{prefix}/etc/rc.d/rc.sysinit";
 }
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 5cffd1d75..dd30e6dd9 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -383,6 +383,7 @@ sub readBootloaderConfigBeforeInstall {
 
 sub setupBootloaderBefore {
     my ($o) = @_;
+    $o->{bootloader}{perImageAppend} = "mem=$o->{miscellaneous}{memsize}" if $o->{miscellaneous}{memsize};
     lilo::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion());
     $o->{bootloader}{keytable} ||= keyboard::kmap($o->{keyboard});
 }
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2f9f9d4b8..f4790cf3d 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -10,7 +10,7 @@ use vars qw(@ISA);
 #-######################################################################################
 #- misc imports
 #-######################################################################################
-use common qw(:common :file :functional);
+use common qw(:common :file :functional :system);
 use partition_table qw(:types);
 use install_steps;
 use pci_probing::main;
@@ -267,7 +267,7 @@ sub configureNetwork($) {
 
 sub configureNetworkIntf {
     my ($o, $intf) = @_;
-    my $pump = 0;
+    my $pump = $intf->{BOOTPROTO} =~ /^(dhcp|bootp)$/;
     delete $intf->{NETWORK};
     delete $intf->{BROADCAST};
     my @fields = qw(IPADDR NETMASK);
@@ -314,11 +314,11 @@ You may also enter the IP address of the gateway if you have one"),
 
 #------------------------------------------------------------------------------
 sub timeConfig {
-    my ($o, $f) = @_;
+    my ($o, $f, $clicked) = @_;
 
-    $o->{timezone}{GMT} = $o->ask_yesorno('', _("Is your hardware clock set to GMT?"), $o->{timezone}{GMT});
     $o->{timezone}{timezone} ||= timezone::bestTimezone(lang::lang2text($o->{lang}));
     $o->{timezone}{timezone} = $o->ask_from_list('', _("Which is your timezone?"), [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone});
+    $o->{timezone}{GMT} = $o->ask_yesorno('', _("Is your hardware clock set to GMT?"), $o->{timezone}{GMT}) if $::expert || $clicked;
     install_steps::timeConfig($o,$f);
 }
 
@@ -335,9 +335,7 @@ sub printerConfig($) {
 
     unless (($::testing)) {
 	printer::set_prefix($o->{prefix});
-	pkgs::select($o->{packages}, $o->{packages}{'rhs-printfilters'});
-	$o->installPackages($o->{packages});
-
+	install_any::pkg_install($o, 'rhs-printfilters');
     }
     printer::read_printer_db();
 
@@ -522,11 +520,11 @@ wish to access and any applicable user name and password."),
 
 #------------------------------------------------------------------------------
 sub setRootPassword($) {
-    my ($o) = @_;
+    my ($o, $clicked) = @_;
     my $sup = $o->{superuser} ||= {};
     $sup->{password2} ||= $sup->{password} ||= "";
 
-    return if $o->{security} < 2;
+    return if $o->{security} < 2 && !$clicked;
 
     $o->{security} < 2 or 
       $o->ask_from_entries_ref([_("Set root password"), _("Ok"), _("No password")],
@@ -544,7 +542,16 @@ sub setRootPassword($) {
 			       and $o->ask_warn('', _("This password is too simple")), return (1,0);
 			     return 0
 			 }
-    );
+    ) or return;
+
+    if ($o->{authentification}{NIS}) {
+	$o->ask_from_entries_ref('',
+				 _("TODO"),
+				 [ _("NIS Domain"), _("NIS Server") ],
+				 [ \ ($o->{netc}{NISDOMAIN} ||= $o->{netc}{DOMAINNAME}),
+				   { val => \$o->{authentification}{NIS_server}, list => ["broadcast"] },
+				 ]);
+    }
     install_steps::setRootPassword($o);
 }
 
@@ -609,8 +616,8 @@ failures. Would you like to create a bootdisk for your system?"),
 
 	$o->{mkbootdisk} = $o->ask_from_list_('',
 					      _("Choose the floppy drive you want to use to make the bootdisk"),
-					      [ @l, 'Cancel' ], $o->{mkbootdisk});
-	return $o->{mkbootdisk} = '' if $o->{mkbootdisk} eq 'Cancel';
+					      [ @l, __("Skip") ], $o->{mkbootdisk});
+	return $o->{mkbootdisk} = '' if $o->{mkbootdisk} eq 'Skip';
     }
 
     $o->ask_warn('', _("Insert a floppy in drive %s", $o->{mkbootdisk}));
@@ -762,21 +769,25 @@ sub miscellaneous {
 	  _("Security level"),
 	  _("HTTP proxy"),
 	  _("FTP proxy"),
+	  _("Use kudzu"),
+	  _("Precise ram size (found %d MB)", availableRam / 1024),
 	],
 	[ { val => \$u->{LAPTOP}, type => 'bool' },
 	  { val => \$u->{HDPARM}, type => 'bool', text => _("(may cause disk problems)") },
 	  { val => \$s, list => [ map { $l{$_} } ikeys %l ] },
 	  \$u->{http_proxy},
 	  \$u->{ftp_proxy},
+	  { val => \$u->{kudzu}, type => 'bool' },
+	  \$u->{memsize},
 	],
         complete => sub {
 	    $u->{http_proxy} =~ m,^($|http://), or $o->ask_warn('', _("Proxy should be http://...")), return 1,3;
 	    $u->{ftp_proxy} =~ m,^($|ftp://), or $o->ask_warn('', _("Proxy should be ftp://...")), return 1,4;
 	    0;
 	}
-    ) or return;
+    ) || return;
     my %m = reverse %l; $o->{security} = $m{$s};
-    $o->SUPER::miscellaneous;
+    install_steps::miscellaneous($o);
 }
 
 #------------------------------------------------------------------------------
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 1a80ef560..12f0e6eb7 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -219,7 +219,7 @@ sub createScrolledWindow($) {
     } else {
 	my $w = new Gtk::ScrolledWindow(undef, undef);
 	$w->set_policy('automatic', 'automatic');
-	member(ref $W, qw(Gtk::CList)) ?
+	member(ref $W, qw(Gtk::CList Gtk::CTree)) ?
 	  $w->add($W) :
 	    $w->add_with_viewport($W);
 	$W->show;
diff --git a/perl-install/partition_table_raw.pm b/perl-install/partition_table_raw.pm
index 56b28e36e..87e0ffdf5 100644
--- a/perl-install/partition_table_raw.pm
+++ b/perl-install/partition_table_raw.pm
@@ -23,6 +23,7 @@ my @MBR_signatures = (
     [ 'system_commander', 0x1ad, "SYSCMNDRSYS" ],
     [ 'dos', 0xa0, "\x25\x03\x4E\x02\xCD\x13" ],
     [ 'dos', 0x60, "\xBB\x00\x7C\xB8\x01\x02\x57\xCD\x13\x5F\x73\x0C\x33\xC0\xCD\x13" ], #- nt's
+    [ 'dummy', 0xAC, "\x0E\xB3\x07\x56\xCD\x10\x5E\xEB" ], #- caldera?
     [ 'ranish', 0x100, "\x6A\x10\xB4\x42\x8B\xF4\xCD\x13\x8B\xE5\x73" ],
 );
 
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index c95c2544c..bdb2d2f56 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -61,6 +61,7 @@ comsat                                         0     0     0
 control-center                                70     0    10
 control-center-devel                           5     0    10
 control-panel                                 60     0    54
+cpio                                          90    90    90
 cpp                                            5     0    94
 cproto                                        15     0    80
 cracklib                                       1    99    35
diff --git a/perl-install/share/list b/perl-install/share/list
index a5ab91b05..e5dcd8be7 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -10,6 +10,7 @@
 /sbin/mkdosfs
 /sbin/mke2fs
 /usr/bin/bzip2
+/usr/bin/perl
 /usr/bin/zsh
 /usr/lib/perl5/5.00503/AutoLoader.pm
 /usr/lib/perl5/5.00503/Carp.pm
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 4abccf845..eaf2edf31 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-10-30 19:27+0200\n"
+"POT-Creation-Date: 1999-11-02 20:54+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"
@@ -82,12 +82,12 @@ msgid ""
 "try changing some parameters"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:317
+#: ../Xconfigurator.pm_.c:317 ../t2.pm_.c:15
 #, c-format
 msgid "(leaving in %d seconds)"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:321 ../my_gtk.pm_.c:431
+#: ../Xconfigurator.pm_.c:321 ../my_gtk.pm_.c:431 ../t2.pm_.c:19
 msgid "Is this correct?"
 msgstr ""
 
@@ -106,8 +106,8 @@ msgid ""
 "You can switch if off if you want, you'll hear a beep when it's over"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:391 ../install_steps_interactive.pm_.c:471
-#: ../install_steps_interactive.pm_.c:472
+#: ../Xconfigurator.pm_.c:391 ../install_steps_interactive.pm_.c:469
+#: ../install_steps_interactive.pm_.c:470
 msgid "Resolution"
 msgstr ""
 
@@ -350,15 +350,15 @@ msgstr ""
 msgid "Format"
 msgstr ""
 
-#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:384
+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:388
 msgid "Move"
 msgstr ""
 
-#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:442
+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:446
 msgid "Resize"
 msgstr ""
 
-#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:331
+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:335
 msgid "Type"
 msgstr ""
 
@@ -394,8 +394,8 @@ msgstr ""
 msgid "Save on floppy"
 msgstr ""
 
-#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:562
-#: ../install_steps_interactive.pm_.c:677
+#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:569
+#: ../install_steps_interactive.pm_.c:684
 msgid "Done"
 msgstr ""
 
@@ -441,130 +441,134 @@ msgstr ""
 msgid "Reload"
 msgstr ""
 
-#: ../diskdrake.pm_.c:95
-msgid "Details"
-msgstr ""
-
-#: ../diskdrake.pm_.c:99
+#: ../diskdrake.pm_.c:93
 msgid "Legend:"
 msgstr ""
 
-#: ../diskdrake.pm_.c:103
+#: ../diskdrake.pm_.c:97
 msgid "Empty"
 msgstr ""
 
-#: ../diskdrake.pm_.c:103
+#: ../diskdrake.pm_.c:97
 msgid "Ext2"
 msgstr ""
 
-#: ../diskdrake.pm_.c:103
+#: ../diskdrake.pm_.c:97
 msgid "FAT"
 msgstr ""
 
-#: ../diskdrake.pm_.c:103
+#: ../diskdrake.pm_.c:97
 msgid "Other"
 msgstr ""
 
-#: ../diskdrake.pm_.c:103
+#: ../diskdrake.pm_.c:97
 msgid "Swap"
 msgstr ""
 
-#: ../diskdrake.pm_.c:123
+#: ../diskdrake.pm_.c:100
+msgid "Choose action"
+msgstr ""
+
+#: ../diskdrake.pm_.c:102
+msgid "Details"
+msgstr ""
+
+#: ../diskdrake.pm_.c:127
 #, c-format
 msgid "After %s partition %s,"
 msgstr ""
 
-#: ../diskdrake.pm_.c:123 ../diskdrake.pm_.c:374 ../diskdrake.pm_.c:402
+#: ../diskdrake.pm_.c:127 ../diskdrake.pm_.c:378 ../diskdrake.pm_.c:406
 msgid "Read carefully!"
 msgstr ""
 
-#: ../diskdrake.pm_.c:123
+#: ../diskdrake.pm_.c:127
 msgid "all data on this partition will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:142 ../install_any.pm_.c:168 ../install_steps.pm_.c:70
+#: ../diskdrake.pm_.c:146 ../install_any.pm_.c:170 ../install_steps.pm_.c:70
 #: ../install_steps_interactive.pm_.c:38
 msgid "Error"
 msgstr ""
 
-#: ../diskdrake.pm_.c:163 ../diskdrake.pm_.c:519
+#: ../diskdrake.pm_.c:170 ../diskdrake.pm_.c:523
 msgid "Mount point: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:164 ../diskdrake.pm_.c:186
+#: ../diskdrake.pm_.c:171 ../diskdrake.pm_.c:195
 msgid "Device: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:165
+#: ../diskdrake.pm_.c:172
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:166 ../diskdrake.pm_.c:189
+#: ../diskdrake.pm_.c:173 ../diskdrake.pm_.c:198
 msgid "Type: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:167
+#: ../diskdrake.pm_.c:174
 #, c-format
 msgid "Start: sector %s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:168
+#: ../diskdrake.pm_.c:175
 msgid "Size: %s MB (%s%%)"
 msgstr ""
 
-#: ../diskdrake.pm_.c:169
+#: ../diskdrake.pm_.c:176
 #, c-format
 msgid ", %s sectors"
 msgstr ""
 
-#: ../diskdrake.pm_.c:171
+#: ../diskdrake.pm_.c:178
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:172
+#: ../diskdrake.pm_.c:179
 msgid "Formatted\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:173
+#: ../diskdrake.pm_.c:180
 msgid "Not formatted\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:174
+#: ../diskdrake.pm_.c:181
 msgid "Mounted\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:175
+#: ../diskdrake.pm_.c:182
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:187
+#: ../diskdrake.pm_.c:196
 #, c-format
 msgid "Size: %d MB\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:188
+#: ../diskdrake.pm_.c:197
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:190
+#: ../diskdrake.pm_.c:199
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:202
+#: ../diskdrake.pm_.c:211
 msgid "Mount"
 msgstr ""
 
-#: ../diskdrake.pm_.c:204
+#: ../diskdrake.pm_.c:213
 msgid "Active"
 msgstr ""
 
-#: ../diskdrake.pm_.c:293
+#: ../diskdrake.pm_.c:297
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -572,7 +576,7 @@ msgid ""
 "need /boot"
 msgstr ""
 
-#: ../diskdrake.pm_.c:297
+#: ../diskdrake.pm_.c:301
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -580,137 +584,139 @@ msgid ""
 "If you plan to use the LILO boot manager, be careful to add a /boot partition"
 msgstr ""
 
-#: ../diskdrake.pm_.c:311
+#: ../diskdrake.pm_.c:315
 msgid "Quit without saving"
 msgstr ""
 
-#: ../diskdrake.pm_.c:311
+#: ../diskdrake.pm_.c:315
 msgid "Quit without writing the partition table?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:326
+#: ../diskdrake.pm_.c:330
 msgid "changing type of"
 msgstr ""
 
-#: ../diskdrake.pm_.c:329
+#: ../diskdrake.pm_.c:333
 msgid "Change partition type"
 msgstr ""
 
-#: ../diskdrake.pm_.c:330
+#: ../diskdrake.pm_.c:334
 msgid "Which partition type do you want?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:346
+#: ../diskdrake.pm_.c:350
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:347
+#: ../diskdrake.pm_.c:351
 msgid "Mount point"
 msgstr ""
 
-#: ../diskdrake.pm_.c:368
+#: ../diskdrake.pm_.c:372
 msgid "formatting"
 msgstr ""
 
-#: ../diskdrake.pm_.c:374
+#: ../diskdrake.pm_.c:378
 msgid "After formatting all partitions,"
 msgstr ""
 
-#: ../diskdrake.pm_.c:374
+#: ../diskdrake.pm_.c:378
 msgid "all data on these partitions will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:385
+#: ../diskdrake.pm_.c:389
 msgid "Which disk do you want to move to?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:389
+#: ../diskdrake.pm_.c:393
 msgid "Sector"
 msgstr ""
 
-#: ../diskdrake.pm_.c:390
+#: ../diskdrake.pm_.c:394
 msgid "Which sector do you want to move to?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:393
+#: ../diskdrake.pm_.c:397
 msgid "Moving"
 msgstr ""
 
-#: ../diskdrake.pm_.c:393
+#: ../diskdrake.pm_.c:397
 msgid "Moving partition..."
 msgstr ""
 
-#: ../diskdrake.pm_.c:402
+#: ../diskdrake.pm_.c:406
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr ""
 
-#: ../diskdrake.pm_.c:404
+#: ../diskdrake.pm_.c:408
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 
-#: ../diskdrake.pm_.c:425
+#: ../diskdrake.pm_.c:429
 msgid "Computing fat filesystem bounds"
 msgstr ""
 
-#: ../diskdrake.pm_.c:425 ../diskdrake.pm_.c:470
+#: ../diskdrake.pm_.c:429 ../diskdrake.pm_.c:474
 msgid "Resizing"
 msgstr ""
 
-#: ../diskdrake.pm_.c:439
+#: ../diskdrake.pm_.c:443
 msgid "resizing"
 msgstr ""
 
-#: ../diskdrake.pm_.c:449
+#: ../diskdrake.pm_.c:453
 msgid "Choose the new size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:449 ../install_steps_graphical.pm_.c:305
+#: ../diskdrake.pm_.c:453 ../install_steps_graphical.pm_.c:283
+#: ../install_steps_graphical.pm_.c:329
+#: ../unused/install_steps_graphical.pm_.c:313
 msgid "MB"
 msgstr ""
 
-#: ../diskdrake.pm_.c:496
+#: ../diskdrake.pm_.c:500
 msgid "Create a new partition"
 msgstr ""
 
-#: ../diskdrake.pm_.c:512
+#: ../diskdrake.pm_.c:516
 msgid "Start sector: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:515
+#: ../diskdrake.pm_.c:519
 msgid "Size in MB: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:518
+#: ../diskdrake.pm_.c:522
 msgid "Filesystem type: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:520
+#: ../diskdrake.pm_.c:524
 msgid "Preference: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:562 ../diskdrake.pm_.c:578
+#: ../diskdrake.pm_.c:566 ../diskdrake.pm_.c:582
 msgid "Select file"
 msgstr ""
 
-#: ../diskdrake.pm_.c:571
+#: ../diskdrake.pm_.c:575
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:579
+#: ../diskdrake.pm_.c:583
 msgid "Warning"
 msgstr ""
 
-#: ../diskdrake.pm_.c:580
+#: ../diskdrake.pm_.c:584
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:594
+#: ../diskdrake.pm_.c:598
 msgid "Trying to rescue partition table"
 msgstr ""
 
@@ -1153,8 +1159,8 @@ msgstr ""
 msgid "Configure printer"
 msgstr ""
 
-#: ../install2.pm_.c:54 ../install_steps_interactive.pm_.c:532
-#: ../install_steps_interactive.pm_.c:533
+#: ../install2.pm_.c:54 ../install_steps_interactive.pm_.c:530
+#: ../install_steps_interactive.pm_.c:531
 msgid "Set root password"
 msgstr ""
 
@@ -1198,42 +1204,50 @@ msgstr ""
 msgid "Partitioning failed: no root filesystem"
 msgstr ""
 
-#: ../install_any.pm_.c:169
+#: ../install2.pm_.c:315
+msgid "Not enough swap to fulfill installation, please add some"
+msgstr ""
+
+#: ../install_any.pm_.c:171
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
 msgstr ""
 
-#: ../install_any.pm_.c:185
+#: ../install_any.pm_.c:187
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
 msgstr ""
 
-#: ../install_any.pm_.c:224
+#: ../install_any.pm_.c:226
 msgid "Information"
 msgstr ""
 
-#: ../install_any.pm_.c:225
+#: ../install_any.pm_.c:227
 #, c-format
 msgid "%s: This is not a root partition, please select another one."
 msgstr ""
 
-#: ../install_any.pm_.c:227
+#: ../install_any.pm_.c:229
 msgid "No root partition found"
 msgstr ""
 
-#: ../install_any.pm_.c:343
+#: ../install_any.pm_.c:265
+msgid "Can't use broadcast with no NIS domain"
+msgstr ""
+
+#: ../install_any.pm_.c:358
 msgid ""
 "I can't access the kernel with frame buffer support.\n"
 "Disabling automatic X11 startup if any."
 msgstr ""
 
-#: ../install_any.pm_.c:385
+#: ../install_any.pm_.c:400
 msgid "Error reading file $f"
 msgstr ""
 
-#: ../install_any.pm_.c:390
+#: ../install_any.pm_.c:405
 #, c-format
 msgid "Bad kickstart file %s (failed %s)"
 msgstr ""
@@ -1258,99 +1272,115 @@ msgstr ""
 msgid "Entering step `%s'\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:257
+#: ../install_steps_graphical.pm_.c:255
+#: ../unused/install_steps_graphical.pm_.c:254
 msgid "You must have a swap partition"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:260
+#: ../install_steps_graphical.pm_.c:258
+#: ../unused/install_steps_graphical.pm_.c:257
 msgid ""
 "You don't have a swap partition\n"
 "\n"
 "Continue anyway?"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:305
+#: ../install_steps_graphical.pm_.c:283
+msgid "Choose the size you want to install"
+msgstr ""
+
+#: ../install_steps_graphical.pm_.c:329
+#: ../unused/install_steps_graphical.pm_.c:313
 msgid "Total size: "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:317
+#: ../install_steps_graphical.pm_.c:341
+#: ../unused/install_steps_graphical.pm_.c:283
 #, c-format
 msgid "Version: %s\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:318
+#: ../install_steps_graphical.pm_.c:342
+#: ../unused/install_steps_graphical.pm_.c:284
 #, c-format
 msgid "Size: %d KB\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:433
+#: ../install_steps_graphical.pm_.c:457
+#: ../unused/install_steps_graphical.pm_.c:420
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:436
+#: ../install_steps_graphical.pm_.c:460
+#: ../unused/install_steps_graphical.pm_.c:423
 msgid "Info"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:444 ../install_steps_interactive.pm_.c:82
+#: ../install_steps_graphical.pm_.c:468 ../install_steps_interactive.pm_.c:82
+#: ../unused/install_steps_graphical.pm_.c:431
 msgid "Install"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:445
-msgid "Select less"
-msgstr ""
-
-#: ../install_steps_graphical.pm_.c:446
-msgid "Select more"
-msgstr ""
-
-#: ../install_steps_graphical.pm_.c:447
+#: ../install_steps_graphical.pm_.c:469
+#: ../unused/install_steps_graphical.pm_.c:432
 msgid "Show less"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:448
+#: ../install_steps_graphical.pm_.c:470
+#: ../unused/install_steps_graphical.pm_.c:433
 msgid "Show more"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:465
+#: ../install_steps_graphical.pm_.c:487
+#: ../unused/install_steps_graphical.pm_.c:450
 msgid "Installing"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:471
+#: ../install_steps_graphical.pm_.c:493
+#: ../unused/install_steps_graphical.pm_.c:456
 msgid "Please wait, "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:473
+#: ../install_steps_graphical.pm_.c:495
+#: ../unused/install_steps_graphical.pm_.c:458
 msgid "Time remaining "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:474
+#: ../install_steps_graphical.pm_.c:496
+#: ../unused/install_steps_graphical.pm_.c:459
 msgid "Total time "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:479
+#: ../install_steps_graphical.pm_.c:501
+#: ../unused/install_steps_graphical.pm_.c:464
 msgid "Preparing installation"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:500
+#: ../install_steps_graphical.pm_.c:522
+#: ../unused/install_steps_graphical.pm_.c:485
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:525
+#: ../install_steps_graphical.pm_.c:547
+#: ../unused/install_steps_graphical.pm_.c:510
 msgid "Go on anyway?"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:525
+#: ../install_steps_graphical.pm_.c:547
+#: ../unused/install_steps_graphical.pm_.c:510
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:549
+#: ../install_steps_graphical.pm_.c:571
+#: ../unused/install_steps_graphical.pm_.c:534
 msgid "Use existing configuration for X11?"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:625 ../install_steps_interactive.pm_.c:532
+#: ../install_steps_graphical.pm_.c:647 ../install_steps_interactive.pm_.c:530
 #: ../interactive.pm_.c:47 ../interactive.pm_.c:57 ../my_gtk.pm_.c:194
 #: ../my_gtk.pm_.c:431 ../my_gtk.pm_.c:527
+#: ../unused/install_steps_graphical.pm_.c:607
 msgid "Ok"
 msgstr ""
 
@@ -1510,7 +1540,7 @@ msgid "(bootp/dhcp)"
 msgstr ""
 
 #: ../install_steps_interactive.pm_.c:285
-#: ../install_steps_interactive.pm_.c:425
+#: ../install_steps_interactive.pm_.c:423
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
@@ -1542,12 +1572,12 @@ msgstr ""
 msgid "Host name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:319
-msgid "Is your hardware clock set to GMT?"
+#: ../install_steps_interactive.pm_.c:320
+msgid "Which is your timezone?"
 msgstr ""
 
 #: ../install_steps_interactive.pm_.c:321
-msgid "Which is your timezone?"
+msgid "Is your hardware clock set to GMT?"
 msgstr ""
 
 #: ../install_steps_interactive.pm_.c:331
@@ -1558,84 +1588,84 @@ msgstr ""
 msgid "Would you like to configure a printer?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:348
+#: ../install_steps_interactive.pm_.c:346
 msgid "Local Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:349
+#: ../install_steps_interactive.pm_.c:347
 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:352
+#: ../install_steps_interactive.pm_.c:350
 msgid "Name of queue:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:352
+#: ../install_steps_interactive.pm_.c:350
 msgid "Spool directory:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:363
+#: ../install_steps_interactive.pm_.c:361
 msgid "Select Printer Connection"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:362
 msgid "How is the printer connected?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:372
+#: ../install_steps_interactive.pm_.c:370
 msgid "Detecting devices..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:372
+#: ../install_steps_interactive.pm_.c:370
 msgid "Test ports"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:383
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:392
+#: ../install_steps_interactive.pm_.c:390
 msgid "Local Printer Device"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:393
+#: ../install_steps_interactive.pm_.c:391
 msgid ""
 "What device is your printer connected to  \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:394
+#: ../install_steps_interactive.pm_.c:392
 msgid "Printer Device:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:400
+#: ../install_steps_interactive.pm_.c:398
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:401
+#: ../install_steps_interactive.pm_.c:399
 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:404
+#: ../install_steps_interactive.pm_.c:402
 msgid "Remote hostname:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:404
+#: ../install_steps_interactive.pm_.c:402
 msgid "Remote queue"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:410
+#: ../install_steps_interactive.pm_.c:408
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:411
+#: ../install_steps_interactive.pm_.c:409
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -1644,38 +1674,38 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:416
+#: ../install_steps_interactive.pm_.c:414
 msgid "SMB server IP:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:416
+#: ../install_steps_interactive.pm_.c:414
 msgid "SMB server host:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:417
-#: ../install_steps_interactive.pm_.c:439
-#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:415
+#: ../install_steps_interactive.pm_.c:437
+#: ../install_steps_interactive.pm_.c:532
 msgid "Password:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:417
+#: ../install_steps_interactive.pm_.c:415
 msgid "Share name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:417
-#: ../install_steps_interactive.pm_.c:439
+#: ../install_steps_interactive.pm_.c:415
+#: ../install_steps_interactive.pm_.c:437
 msgid "User name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:416
 msgid "Workgroup:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:433
+#: ../install_steps_interactive.pm_.c:431
 msgid "NetWare Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:434
+#: ../install_steps_interactive.pm_.c:432
 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"
@@ -1683,148 +1713,160 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:438
+#: ../install_steps_interactive.pm_.c:436
 msgid "Print Queue Name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:438
+#: ../install_steps_interactive.pm_.c:436
 msgid "Printer Server:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:449
+#: ../install_steps_interactive.pm_.c:447
 msgid "Configure Printer"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:450
+#: ../install_steps_interactive.pm_.c:448
 msgid "What type of printer do you have?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:461
-#: ../install_steps_interactive.pm_.c:462
+#: ../install_steps_interactive.pm_.c:459
+#: ../install_steps_interactive.pm_.c:460
 msgid "Paper Size"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:481
+#: ../install_steps_interactive.pm_.c:479
 msgid "CRLF"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:482
+#: ../install_steps_interactive.pm_.c:480
 msgid "Fix stair-stepping text?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:498
+#: ../install_steps_interactive.pm_.c:496
 msgid "Configure Uniprint Driver"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:499
+#: ../install_steps_interactive.pm_.c:497
 msgid "You may now set the Uniprint driver options for this printer."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:507
+#: ../install_steps_interactive.pm_.c:505
 msgid "Configure Color Depth"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:508
+#: ../install_steps_interactive.pm_.c:506
 msgid "You may now configure the color options for this printer."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:532
+#: ../install_steps_interactive.pm_.c:530
 msgid "No password"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:532
 msgid "Password (again):"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:532
 msgid "Use MD5 passwords"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:532
 msgid "Use NIS"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:532
 msgid "Use shadow file"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:537
+#: ../install_steps_interactive.pm_.c:535
 msgid "shadow"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:538
+#: ../install_steps_interactive.pm_.c:536
 msgid "MD5"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:539
+#: ../install_steps_interactive.pm_.c:537
 msgid "yellow pages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:542
-#: ../install_steps_interactive.pm_.c:575
+#: ../install_steps_interactive.pm_.c:540
+#: ../install_steps_interactive.pm_.c:582
 msgid "Please try again"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:542
-#: ../install_steps_interactive.pm_.c:575
+#: ../install_steps_interactive.pm_.c:540
+#: ../install_steps_interactive.pm_.c:582
 msgid "The passwords do not match"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:544
+#: ../install_steps_interactive.pm_.c:542
 msgid "This password is too simple"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:562
+#: ../install_steps_interactive.pm_.c:549
+msgid "TODO"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:550
+msgid "NIS Domain"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:550
+msgid "NIS Server"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:569
 msgid "Accept user"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:562
+#: ../install_steps_interactive.pm_.c:569
 msgid "Add user"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:563
+#: ../install_steps_interactive.pm_.c:570
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:563
+#: ../install_steps_interactive.pm_.c:570
 #, c-format
 msgid ""
 "Enter a user\n"
 "%s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:564
-#: ../install_steps_interactive.pm_.c:653
+#: ../install_steps_interactive.pm_.c:571
+#: ../install_steps_interactive.pm_.c:660
 msgid "Password"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:564
+#: ../install_steps_interactive.pm_.c:571
 msgid "Password (again)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:564
+#: ../install_steps_interactive.pm_.c:571
 msgid "Real name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:564
+#: ../install_steps_interactive.pm_.c:571
 msgid "Shell"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:564
+#: ../install_steps_interactive.pm_.c:571
 msgid "User name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:577
+#: ../install_steps_interactive.pm_.c:584
 msgid "Please give a user name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:578
+#: ../install_steps_interactive.pm_.c:585
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:599
+#: ../install_steps_interactive.pm_.c:606
 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 "
@@ -1838,212 +1880,225 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:608
+#: ../install_steps_interactive.pm_.c:615
 msgid "Sorry, no floppy drive available"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:611
+#: ../install_steps_interactive.pm_.c:618
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:619
+msgid "Skip"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:623
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:624
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:624
+#: ../install_steps_interactive.pm_.c:631
 msgid "Preparing bootloader"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:636
+#: ../install_steps_interactive.pm_.c:643
 msgid "First sector of boot partition"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:636
+#: ../install_steps_interactive.pm_.c:643
 msgid "First sector of drive (MBR)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:640
+#: ../install_steps_interactive.pm_.c:647
 msgid "LILO Installation"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:641
+#: ../install_steps_interactive.pm_.c:648
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:644
+#: ../install_steps_interactive.pm_.c:651
 msgid "Do you want to use LILO?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:647
+#: ../install_steps_interactive.pm_.c:654
 msgid "Boot device"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:648
+#: ../install_steps_interactive.pm_.c:655
 msgid "Linear (needed for some SCSI drives)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:648
+#: ../install_steps_interactive.pm_.c:655
 msgid "linear"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:649
+#: ../install_steps_interactive.pm_.c:656
 msgid "Compact"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:649
+#: ../install_steps_interactive.pm_.c:656
 msgid "compact"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:650
+#: ../install_steps_interactive.pm_.c:657
 msgid "Delay before booting default image"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:651
+#: ../install_steps_interactive.pm_.c:658
 msgid "Video mode"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:654
+#: ../install_steps_interactive.pm_.c:661
 msgid "Restrict command line options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:654
+#: ../install_steps_interactive.pm_.c:661
 msgid "restrict"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:661
+#: ../install_steps_interactive.pm_.c:668
 msgid "LILO main options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:665
+#: ../install_steps_interactive.pm_.c:672
 msgid ""
 "At this level of security, a password (and a good one) in lilo is requested"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:666
+#: ../install_steps_interactive.pm_.c:673
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:675
+#: ../install_steps_interactive.pm_.c:682
 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:677
+#: ../install_steps_interactive.pm_.c:684
 msgid "Add"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:695
+#: ../install_steps_interactive.pm_.c:702
 msgid "Image"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:696
-#: ../install_steps_interactive.pm_.c:704
+#: ../install_steps_interactive.pm_.c:703
+#: ../install_steps_interactive.pm_.c:711
 msgid "Root"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:697
+#: ../install_steps_interactive.pm_.c:704
 msgid "Append"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:698
+#: ../install_steps_interactive.pm_.c:705
 msgid "Initrd"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:699
+#: ../install_steps_interactive.pm_.c:706
 msgid "Read-write"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:705
+#: ../install_steps_interactive.pm_.c:712
 msgid "Table"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:706
+#: ../install_steps_interactive.pm_.c:713
 msgid "Unsafe"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:711
+#: ../install_steps_interactive.pm_.c:718
 msgid "Label"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:713
+#: ../install_steps_interactive.pm_.c:720
 msgid "Default"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:732
+#: ../install_steps_interactive.pm_.c:739
 msgid "Installation of LILO failed. The following error occured:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:742
+#: ../install_steps_interactive.pm_.c:749
 msgid "Windows(TM)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:743
+#: ../install_steps_interactive.pm_.c:750
 msgid "Low"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:744
+#: ../install_steps_interactive.pm_.c:751
 msgid "Medium"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:745
+#: ../install_steps_interactive.pm_.c:752
 msgid "High"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:746
+#: ../install_steps_interactive.pm_.c:753
 msgid "Paranoid"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:759
+#: ../install_steps_interactive.pm_.c:766
 msgid "Miscellaneous questions"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:760
+#: ../install_steps_interactive.pm_.c:767
 msgid "Do you have a laptop?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:761
+#: ../install_steps_interactive.pm_.c:768
 msgid "Use hard drive optimizations"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:762
+#: ../install_steps_interactive.pm_.c:769
 msgid "Security level"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:763
+#: ../install_steps_interactive.pm_.c:770
 msgid "HTTP proxy"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:764
+#: ../install_steps_interactive.pm_.c:771
 msgid "FTP proxy"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:767
-msgid "(may cause disk problems)"
+#: ../install_steps_interactive.pm_.c:772
+msgid "Use kudzu"
 msgstr ""
 
 #: ../install_steps_interactive.pm_.c:773
+#, c-format
+msgid "Precise ram size (found %d MB)"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:776
+msgid "(may cause disk problems)"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:784
 msgid "Proxy should be http://..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:774
+#: ../install_steps_interactive.pm_.c:785
 msgid "Proxy should be ftp://..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:787
+#: ../install_steps_interactive.pm_.c:798
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:794
+#: ../install_steps_interactive.pm_.c:805
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -2056,22 +2111,22 @@ msgid ""
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:813
+#: ../install_steps_interactive.pm_.c:824
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:814
+#: ../install_steps_interactive.pm_.c:825
 #, c-format
 msgid "(module %s)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:824
+#: ../install_steps_interactive.pm_.c:835
 #, c-format
 msgid "What %s card do you have?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:831
+#: ../install_steps_interactive.pm_.c:842
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -2083,20 +2138,20 @@ msgid ""
 "not cause any damage."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:836
+#: ../install_steps_interactive.pm_.c:847
 msgid "Autoprobe"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:836
+#: ../install_steps_interactive.pm_.c:847
 msgid "Specify options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:840
+#: ../install_steps_interactive.pm_.c:851
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:846
+#: ../install_steps_interactive.pm_.c:857
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -2104,60 +2159,60 @@ msgid ""
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:849
+#: ../install_steps_interactive.pm_.c:860
 msgid "Module options:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:859
+#: ../install_steps_interactive.pm_.c:870
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
 "Do you want to try again with other parameters?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:872
+#: ../install_steps_interactive.pm_.c:883
 #, c-format
 msgid "Skip %s PCMCIA probing"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:873
+#: ../install_steps_interactive.pm_.c:884
 msgid "Configuring PCMCIA cards..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:873
+#: ../install_steps_interactive.pm_.c:884
 msgid "PCMCIA"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:880
+#: ../install_steps_interactive.pm_.c:891
 #, c-format
 msgid "Skip %s PCI probing"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:884
+#: ../install_steps_interactive.pm_.c:895
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:885
+#: ../install_steps_interactive.pm_.c:896
 msgid "Do you have another one?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:886
+#: ../install_steps_interactive.pm_.c:897
 #, c-format
 msgid "Do you have an %s interface?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:888 ../interactive.pm_.c:52
+#: ../install_steps_interactive.pm_.c:899 ../interactive.pm_.c:52
 #: ../my_gtk.pm_.c:430
 msgid "No"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:888 ../interactive.pm_.c:52
+#: ../install_steps_interactive.pm_.c:899 ../interactive.pm_.c:52
 #: ../my_gtk.pm_.c:430
 msgid "Yes"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:889
+#: ../install_steps_interactive.pm_.c:900
 msgid "See hardware info"
 msgstr ""
 
@@ -2302,13 +2357,14 @@ msgstr ""
 msgid "US keyboard"
 msgstr ""
 
-#: ../lilo.pm_.c:138
+#: ../lilo.pm_.c:139
+#, c-format
 msgid ""
 "Welcome to LILO the operating system chooser!\n"
 "\n"
 "To list the possible choices, press <TAB>.\n"
 "\n"
-"To load one of them, write its name and press <ENTER> or wait 5 seconds for "
+"To load one of them, write its name and press <ENTER> or wait %d seconds for "
 "default boot.\n"
 "\n"
 msgstr ""