From 7d8c8f8b00a34baadfd02dfd098f864591253716 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 17 Apr 2000 22:59:53 +0000
Subject: no_comment

---
 perl-install/Xconfigurator.pm     |   2 +-
 perl-install/crypto.pm            |   4 +-
 perl-install/ftp.pm               |   9 +
 perl-install/install_steps.pm     |  11 +-
 perl-install/install_steps_gtk.pm |   4 +-
 perl-install/lang.pm              |   2 +-
 perl-install/pkgs.pm              |  36 +-
 perl-install/printerdrake.pm      |   4 +-
 perl-install/share/po/DrakX.pot   | 824 ++++++++++++++++++++------------------
 perl-install/swap.pm              |   2 +
 10 files changed, 467 insertions(+), 431 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 088565b82..88081cf98 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -357,7 +357,7 @@ sub testFinalConfig($;$$) {
 	$ENV{DISPLAY} = ":9";
 
         gtkset_mousecursor(68);
-        gtkset_background(200 * 256, 210 * 256, 210 * 256);
+        gtkset_background(200 * 257, 210 * 257, 210 * 257);
         my ($h, $w) = Gtk::Gdk::Window->new_foreign(Gtk::Gdk->ROOT_WINDOW)->get_size;
         $my_gtk::force_position = [ $w / 3, $h / 2.4 ];
 	$my_gtk::force_focus = 1;
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 2951c001c..c824af475 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -36,8 +36,8 @@ sub getFile($$) {
     my ($file, $host) = @_;
     log::l("getting crypto file $file on directory $host:$mirrors{$host}[1]/$::VERSION with login $mirrors{$host}[2]");
     my ($ftp, $retr) = ftp::new($_[1], "$mirrors{$host}[1]/$::VERSION",
-				($mirrors{$host}[2] ? ($mirrors{$host}[2]) : ()),
-				($mirrors{$host}[3] ? ($mirrors{$host}[3]) : ())
+				$mirrors{$host}[2] ? $mirrors{$host}[2] : (),
+				$mirrors{$host}[3] ? $mirrors{$host}[3] : ()
 			       );
     $$retr->close if $$retr;
     $$retr   = $ftp->retr($file) or ftp::rewindGetFile();
diff --git a/perl-install/ftp.pm b/perl-install/ftp.pm
index 8e5989ae4..5bb5cfdf2 100644
--- a/perl-install/ftp.pm
+++ b/perl-install/ftp.pm
@@ -58,6 +58,15 @@ sub getFile {
     $$retr ||= $ftp->retr(install_any::relGetFile($f));
 }
 
+#-sub closeFiles() {
+#-    #- close any existing connections
+#-    foreach (values %hosts) {
+#-	  my $retr = $_->[1] if ref $_;
+#-	  $$retr->close if $$retr;
+#-	  undef $$retr;
+#-    }
+#-}
+
 sub rewindGetFile() {
     #- close any existing connection.
     foreach (values %hosts) {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 7ca9537dc..256f37122 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -130,9 +130,9 @@ sub doPartitionDisks {
 	my $handle = loopback::inspect($real_part, '', 'rw') or die _("This partition can't be used for loopback");
 	my $size = loopback::getFree($handle->{dir}, $real_part); 
 
-	my $max_linux = 250 << 11; $max_linux *= 10 if $::expert;
-	my $min_linux =  200 << 11; $max_linux /=  3 if $::expert;
-	my $min_freewin = 100 << 11;
+	my $max_linux = 1000 << 11; $max_linux *= 10 if $::expert;
+	my $min_linux =  300 << 11; $max_linux /=  3 if $::expert;
+	my $min_freewin = 100 << 11; $min_freewin = 0 if $::expert;
 
 	my $swap = { type => 0x82, loopback_file => '/lnx4win/swapfile',     mntpoint => 'swap', size => 64 << 11, device => $real_part, notFormatted => 1 };	
 	my $root = { type => 0x83, loopback_file => '/lnx4win/linuxsys.img', mntpoint => '/',    size => 0, device => $real_part, notFormatted => 1 };
@@ -189,8 +189,9 @@ sub choosePartitionsToFormat($$) {
     foreach (@$fstab) {
 	$_->{mntpoint} = "swap" if isSwap($_);
 	$_->{mntpoint} or next;
-
-	unless ($_->{toFormat} = $_->{notFormatted} || $o->{partitioning}{autoformat}) {
+	
+	add2hash_($_, { toFormat => $_->{notFormatted} || $o->{partitioning}{autoformat} });
+	if (!$_->{toFormat}) {
 	    my $t = isLoopback($_) ? 
 	      eval { fsedit::typeOfPart($o->{prefix} . loopback::file($_)) } :
 	      fsedit::typeOfPart($_->{device});
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 2c61db33b..351a58d5b 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -579,8 +579,8 @@ sub load_rc($) {
 	Gtk::Rc->parse($f);
 	foreach (cat_($f)) {
 	    if (/style\s+"background"/ .. /^\s*$/) {
-		@background1 = map { $_ * 256 * 256 } split ',', $1 if /NORMAL.*\{(.*)\}/;
-		@background2 = map { $_ * 256 * 256 } split ',', $1 if /PRELIGHT.*\{(.*)\}/;
+		@background1 = map { $_ * 256 * 257 } split ',', $1 if /NORMAL.*\{(.*)\}/;
+		@background2 = map { $_ * 256 * 257 } split ',', $1 if /PRELIGHT.*\{(.*)\}/;
 	    }
 	}
     }
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 04f2a1fe6..b7a1ffb53 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -222,7 +222,7 @@ sub set {
 
 	    eval { commands::rm("-r", "$ENV{SHARE_PATH}/locale") };
 	    require 'run_program.pm';
-	    run_program::run("extract_archive", "$ENV{SHARE_PATH}/locale.cz2", '$ENV{SHARE_PATH}/locale', $languages{$lang}[2]);
+	    run_program::run("extract_archive", "$ENV{SHARE_PATH}/locale.cz2", "$ENV{SHARE_PATH}/locale", $languages{$lang}[2]);
 	}
 
 	$ENV{LC_ALL}    = $lang;
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 915ce84f4..7eb9ede5b 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -911,21 +911,25 @@ sub install($$$;$$) {
 	    } while (scalar(@transToInstall) == 0); #- avoid null transaction, it a nop that cost a bit.
 	}
 
+	#- reset ftp handlers before forking, otherwise well ;-(
+	require ftp;
+	ftp::rewindGetFile();
+
 	#- extract headers for parent as they are used by callback.
 	extractHeaders($prefix, \@transToInstall, $media->{$medium});
 
-	my $pid;
 	local (*INPUT, *OUTPUT); pipe INPUT, OUTPUT;
-	if ($pid = fork()) {
+	if (my $pid = fork()) {
 	    close OUTPUT;
 	    my $error_msg = '';
-	    foreach (<INPUT>) {
+	    local $_;
+	    while (<INPUT>) {
 		if (/^die:(.*)/) {
 		    $error_msg = $1;
 		    last;
 		} else {
 		    chomp;
-		    my @params = split ":", $_;
+		    my @params = split ":";
 		    if ($params[0] eq 'close') {
 			&$callbackClose($params[1]);
 		    } else {
@@ -933,8 +937,8 @@ sub install($$$;$$) {
 		    }
 		}
 	    }
-	    $error_msg and $error_msg .= <INPUT>;
-	    waitpid($pid, 0);
+	    $error_msg and $error_msg .= join('', <INPUT>);
+	    waitpid $pid, 0;
 	    close INPUT;
 	    $error_msg and die $error_msg;
 	} else {
@@ -949,32 +953,20 @@ sub install($$$;$$) {
 		c::rpmtransAddPackage($trans, $_->{header}, packageName($_), $isUpgrade && packageName($_) !~ /kernel/) #- TODO: replace `named kernel' by `provides kernel'
 		    foreach @transToInstall;
 
-		my $close = sub {
-		    c::rpmtransFree($trans);
-		};
-
 		c::rpmdepOrder($trans) or
-		    cdie "error ordering package list: " . c::rpmErrorString(), sub {
-			&$close();
-			c::rpmdbClose($db);
-		    };
+		    die "error ordering package list: " . c::rpmErrorString(), 
+		      sub { c::rpmdbClose($db) };
 		c::rpmtransSetScriptFd($trans, fileno LOG);
 
 		log::l("rpmRunTransactions start");
-
 		my @probs = c::rpmRunTransactions($trans, $callbackOpen,
 						  sub { #- callbackClose
-						      print OUTPUT "close:$_[0]\n";
-						  },
+						      print OUTPUT "close:$_[0]\n"; },
 						  sub { #- installCallback
-						      print OUTPUT join(":", @_), "\n";
-						  },
+						      print OUTPUT join(":", @_), "\n"; },
 						  0);
 		log::l("rpmRunTransactions done");
-		log::l("ERROR: rpmRunTransactions pb $_") foreach @probs;
 
-		&$close();
-		log::l("after close");
 		if (@probs) {
 		    my %parts;
 		    @probs = reverse grep {
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index fd6787591..e3d199f1d 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -147,8 +147,8 @@ sub setup_gsdriver($$) {
 	$printer->{NUP} = 1 unless member($printer->{NUP}, qw(1 2 4 8));
 	$printer->{RTLFTMAR} = 18 unless $printer->{RTLFTMAR} =~ /^\d+$/;
 	$printer->{TOPBOTMAR} = 18 unless $printer->{TOPBOTMAR} =~ /^\d+$/;
-	$printer->{EXTRA_GS_OPTIONS} =~ s/^\"(.*)\"/$1/;
-	$printer->{TEXTONLYOPTIONS} =~ s/^\"(.*)\"/$1/;
+	$printer->{EXTRA_GS_OPTIONS} =~ s/^"(.*)"/$1/;
+	$printer->{TEXTONLYOPTIONS} =~ s/^"(.*)"/$1/;
 
 	return if !$in->ask_from_entries_refH('', _("Printer options"), [
 _("Paper Size") => { val => \$printer->{PAPERSIZE}, type => 'list', not_edit => !$::expert, list => \@printer::papersize_type },
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index b255bd7b3..cab327834 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-16 19:01+0200\n"
+"POT-Creation-Date: 2000-04-17 19:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -438,7 +438,7 @@ msgstr ""
 msgid "compact"
 msgstr ""
 
-#: ../../any.pm_.c:78 ../../install_steps_interactive.pm_.c:782
+#: ../../any.pm_.c:78 ../../install_steps_interactive.pm_.c:765
 msgid "Delay before booting default image"
 msgstr ""
 
@@ -446,26 +446,26 @@ msgstr ""
 msgid "Video mode"
 msgstr ""
 
-#: ../../any.pm_.c:81 ../../install_steps_interactive.pm_.c:505
-#: ../../install_steps_interactive.pm_.c:626
-#: ../../install_steps_interactive.pm_.c:678
-#: ../../install_steps_interactive.pm_.c:784 ../../printerdrake.pm_.c:79
+#: ../../any.pm_.c:81 ../../install_steps_interactive.pm_.c:498
+#: ../../install_steps_interactive.pm_.c:609
+#: ../../install_steps_interactive.pm_.c:661
+#: ../../install_steps_interactive.pm_.c:767 ../../printerdrake.pm_.c:79
 #: ../../printerdrake.pm_.c:104 ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr ""
 
-#: ../../any.pm_.c:82 ../../install_steps_interactive.pm_.c:627
-#: ../../install_steps_interactive.pm_.c:679
-#: ../../install_steps_interactive.pm_.c:785
+#: ../../any.pm_.c:82 ../../install_steps_interactive.pm_.c:610
+#: ../../install_steps_interactive.pm_.c:662
+#: ../../install_steps_interactive.pm_.c:768
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr ""
 
-#: ../../any.pm_.c:83 ../../install_steps_interactive.pm_.c:786
+#: ../../any.pm_.c:83 ../../install_steps_interactive.pm_.c:769
 msgid "Restrict command line options"
 msgstr ""
 
-#: ../../any.pm_.c:83 ../../install_steps_interactive.pm_.c:786
+#: ../../any.pm_.c:83 ../../install_steps_interactive.pm_.c:769
 msgid "restrict"
 msgstr ""
 
@@ -473,21 +473,21 @@ msgstr ""
 msgid "LILO main options"
 msgstr ""
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:793
+#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:776
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: ../../any.pm_.c:93 ../../install_steps_interactive.pm_.c:636
-#: ../../install_steps_interactive.pm_.c:692
-#: ../../install_steps_interactive.pm_.c:794
+#: ../../any.pm_.c:93 ../../install_steps_interactive.pm_.c:619
+#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:777
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr ""
 
-#: ../../any.pm_.c:93 ../../install_steps_interactive.pm_.c:636
-#: ../../install_steps_interactive.pm_.c:692
-#: ../../install_steps_interactive.pm_.c:794
+#: ../../any.pm_.c:93 ../../install_steps_interactive.pm_.c:619
+#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:777
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr ""
@@ -498,14 +498,14 @@ msgid ""
 "You can add some more or change the existing ones."
 msgstr ""
 
-#: ../../any.pm_.c:105 ../../install_steps_interactive.pm_.c:805
+#: ../../any.pm_.c:105 ../../install_steps_interactive.pm_.c:788
 #: ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr ""
 
 #: ../../any.pm_.c:105 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:672
-#: ../../install_steps_interactive.pm_.c:805
+#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:788
 #: ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr ""
@@ -522,24 +522,24 @@ msgstr ""
 msgid "Which type of entry do you want to add?"
 msgstr ""
 
-#: ../../any.pm_.c:133 ../../install_steps_interactive.pm_.c:830
+#: ../../any.pm_.c:133 ../../install_steps_interactive.pm_.c:813
 msgid "Image"
 msgstr ""
 
 #: ../../any.pm_.c:134 ../../any.pm_.c:142
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:815
 msgid "Root"
 msgstr ""
 
-#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:833
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:816
 msgid "Append"
 msgstr ""
 
-#: ../../any.pm_.c:136 ../../install_steps_interactive.pm_.c:834
+#: ../../any.pm_.c:136 ../../install_steps_interactive.pm_.c:817
 msgid "Initrd"
 msgstr ""
 
-#: ../../any.pm_.c:137 ../../install_steps_interactive.pm_.c:835
+#: ../../any.pm_.c:137 ../../install_steps_interactive.pm_.c:818
 msgid "Read-write"
 msgstr ""
 
@@ -551,29 +551,29 @@ msgstr ""
 msgid "Unsafe"
 msgstr ""
 
-#: ../../any.pm_.c:149 ../../install_steps_interactive.pm_.c:842
+#: ../../any.pm_.c:149 ../../install_steps_interactive.pm_.c:825
 msgid "Label"
 msgstr ""
 
-#: ../../any.pm_.c:151 ../../install_steps_interactive.pm_.c:844
+#: ../../any.pm_.c:151 ../../install_steps_interactive.pm_.c:827
 msgid "Default"
 msgstr ""
 
-#: ../../any.pm_.c:154 ../../install_steps_gtk.pm_.c:625
-#: ../../install_steps_interactive.pm_.c:621
-#: ../../install_steps_interactive.pm_.c:847 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:225
-#: ../../interactive_newt.pm_.c:50 ../../interactive_newt.pm_.c:97
+#: ../../any.pm_.c:154 ../../install_steps_gtk.pm_.c:627
+#: ../../install_steps_interactive.pm_.c:604
+#: ../../install_steps_interactive.pm_.c:830 ../../interactive.pm_.c:74
+#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:218
+#: ../../interactive_newt.pm_.c:50 ../../interactive_newt.pm_.c:99
 #: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:198
 #: ../../my_gtk.pm_.c:456 ../../my_gtk.pm_.c:632
 msgid "Ok"
 msgstr ""
 
-#: ../../any.pm_.c:154 ../../install_steps_interactive.pm_.c:847
+#: ../../any.pm_.c:154 ../../install_steps_interactive.pm_.c:830
 msgid "Remove entry"
 msgstr ""
 
-#: ../../any.pm_.c:157 ../../install_steps_interactive.pm_.c:850
+#: ../../any.pm_.c:157 ../../install_steps_interactive.pm_.c:833
 msgid "Empty label not allowed"
 msgstr ""
 
@@ -714,7 +714,7 @@ msgstr ""
 
 #: ../../diskdrake.pm_.c:138
 msgid ""
-"You have one big fat partition\n"
+"You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
 "I suggest you first resize that partition\n"
 "(click on it, then click on \"Resize\")"
@@ -741,7 +741,7 @@ msgstr ""
 msgid "Be careful: this operation is dangerous."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:313
+#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:304
 #: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
 #: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
 #: ../../standalone/rpmdrake_.c:304
@@ -1012,12 +1012,12 @@ msgstr ""
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:561 ../../install_steps_gtk.pm_.c:204
-msgid "Computing fat filesystem bounds"
+#: ../../diskdrake.pm_.c:561 ../../install_steps_gtk.pm_.c:206
+msgid "Computing FAT filesystem bounds"
 msgstr ""
 
 #: ../../diskdrake.pm_.c:561 ../../diskdrake.pm_.c:610
-#: ../../install_steps_gtk.pm_.c:204
+#: ../../install_steps_gtk.pm_.c:206
 msgid "Resizing"
 msgstr ""
 
@@ -1034,8 +1034,7 @@ msgstr ""
 msgid "Choose the new size"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:589 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334 ../../install_steps_gtk.pm_.c:314
+#: ../../diskdrake.pm_.c:589 ../../install_steps_gtk.pm_.c:316
 msgid "MB"
 msgstr ""
 
@@ -1133,15 +1132,15 @@ msgstr ""
 msgid "I don't know how to format %s in type %s"
 msgstr ""
 
-#: ../../fs.pm_.c:178
+#: ../../fs.pm_.c:185
 msgid "nfs mount failed"
 msgstr ""
 
-#: ../../fs.pm_.c:200
+#: ../../fs.pm_.c:207
 msgid "mount failed: "
 msgstr ""
 
-#: ../../fs.pm_.c:211
+#: ../../fs.pm_.c:218
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr ""
@@ -1189,32 +1188,60 @@ msgid ""
 "installed, or if you wish to use multiple distributions or versions.\n"
 "\n"
 "\n"
-"Choose \"Upgrade\" if you wish to update a previous version of Mandrake\n"
-"Linux: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1\n"
-"(Helios) or Gold 2000."
+"Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
+"Linux:\n"
+"5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
+"2000\n"
+"or 7.0 (Air)."
 msgstr ""
 
 #: ../../help.pm_.c:22
 msgid ""
 "Select:\n"
 "\n"
-"  - Recommended: If you have never installed Linux before.\n"
+"  - Recommended: If you have never installed Linux before, choose this. "
+"NOTE:\n"
+"    networking will not be configured during installation, use "
+"\"LinuxConf\"\n"
+"    to configure it after the install completes.\n"
+"\n"
+"  - Customized: If you are familiar enough with GNU/Linux, you may then "
+"choose\n"
+"    the primary usage for your machine. See below for details.\n"
 "\n"
+"  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
+"    perform a highly customized installation. As for a \"Customized\"\n"
+"    installation class, you will be able to select the usage for your "
+"system.\n"
+"    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
+"DOING!\n"
+"\n"
+"The different choices for your machine's usage (provided, hence, that you "
+"have\n"
+"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
+"following:\n"
 "\n"
-"  - Customized: If you are familiar with Linux, you will be able to \n"
-"select the usage for the installed system between normal, development or\n"
-"server. Choose \"Normal\" for a general purpose installation of your\n"
-"computer. You may choose \"Development\" if you will be using the computer\n"
-"primarily for software development, or choose \"Server\" if you wish to\n"
-"install a general purpose server (for mail, printing...).\n"
+"  - Normal: choose this if you intend to use your machine primarily for\n"
+"    everyday use (office work, graphics manipulation and so on). Do not\n"
+"    expect any compiler, development utility et al. installed.\n"
 "\n"
+"  - Development: as its name says. Choose this if you intend to use your\n"
+"    machine primarily for software development. You will then have a "
+"complete\n"
+"    collection of software installed in order to compile, debug and format\n"
+"    source code, or create software packages.\n"
 "\n"
-"  - Expert: If you are fluent with GNU/Linux and want to perform\n"
-"a highly customized installation, this Install Class is for you. You will\n"
-"be able to select the usage of your installed system as for \"Customized\"."
+"  - Server: choose this if the machine which you're installing "
+"Linux-Mandrake\n"
+"    on is intended to be used as a server. Either a file server (NFS or "
+"SMB),\n"
+"    a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
+"    printing), an authentication server (NIS), a database server and so on. "
+"As\n"
+"    such, do not expect any gimmicks (KDE, GNOME...) to be installed.\n"
 msgstr ""
 
-#: ../../help.pm_.c:40
+#: ../../help.pm_.c:57
 msgid ""
 "DrakX will attempt at first to look for one or more PCI\n"
 "SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
@@ -1240,7 +1267,7 @@ msgid ""
 "are the options you will need to provide to the driver."
 msgstr ""
 
-#: ../../help.pm_.c:64
+#: ../../help.pm_.c:81
 msgid ""
 "At this point, you may choose what partition(s) to use to install\n"
 "your Linux-Mandrake system if they have been already defined (from a\n"
@@ -1280,7 +1307,7 @@ msgid ""
 "- Ctrl-m  to set the mount point\n"
 msgstr ""
 
-#: ../../help.pm_.c:101
+#: ../../help.pm_.c:118
 msgid ""
 "Any partitions that have been newly defined must be formatted for\n"
 "use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -1290,7 +1317,7 @@ msgid ""
 "Typically retained are /home and /usr/local."
 msgstr ""
 
-#: ../../help.pm_.c:109
+#: ../../help.pm_.c:126
 msgid ""
 "You may now select the packages you wish to install.\n"
 "\n"
@@ -1308,7 +1335,7 @@ msgid ""
 "of its dependencies."
 msgstr ""
 
-#: ../../help.pm_.c:125
+#: ../../help.pm_.c:142
 msgid ""
 "The packages selected are now being installed. This operation\n"
 "should take a few minutes unless you have chosen to upgrade an\n"
@@ -1316,7 +1343,7 @@ msgid ""
 "upgrade starts."
 msgstr ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:148
 msgid ""
 "If DrakX failed to find your mouse, or if you want to\n"
 "check what it has done, you will be presented the list of mice\n"
@@ -1333,13 +1360,13 @@ msgid ""
 "which serial port it is connected to."
 msgstr ""
 
-#: ../../help.pm_.c:146
+#: ../../help.pm_.c:163
 msgid ""
 "Please select the correct port. For example, the COM1 port under MS Windows\n"
 "is named ttyS0 under Linux."
 msgstr ""
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:167
 msgid ""
 "This section is dedicated to configuring a local area\n"
 "network (LAN) or a modem.\n"
@@ -1371,7 +1398,7 @@ msgid ""
 "your modem is connected to."
 msgstr ""
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:197
 msgid ""
 "Enter:\n"
 "\n"
@@ -1388,19 +1415,19 @@ msgid ""
 "not sure, ask your network administrator or ISP.\n"
 msgstr ""
 
-#: ../../help.pm_.c:195
+#: ../../help.pm_.c:212
 msgid ""
 "You may now enter dialup options. If you're not sure what to enter, the\n"
 "correct information can be obtained from your ISP."
 msgstr ""
 
-#: ../../help.pm_.c:199
+#: ../../help.pm_.c:216
 msgid ""
 "If you will use proxies, please configure them now. If you don't know if\n"
 "you should use proxies, ask your network administrator or your ISP."
 msgstr ""
 
-#: ../../help.pm_.c:203
+#: ../../help.pm_.c:220
 msgid ""
 "You can install cryptographic package if your internet connection has been\n"
 "set up correctly. First choose a mirror where you wish to download packages "
@@ -1411,20 +1438,27 @@ msgid ""
 "to your legislation."
 msgstr ""
 
-#: ../../help.pm_.c:211
+#: ../../help.pm_.c:228
 msgid ""
 "You can now select your timezone according to where you live.\n"
 "\n"
 "\n"
-"Linux manages time in GMT or \"Greenwich Meridian Time\" and translates it\n"
+"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
 "in local time according to the time zone you have selected."
 msgstr ""
 
-#: ../../help.pm_.c:218
-msgid "Help"
+#: ../../help.pm_.c:235
+msgid ""
+"You may now choose which services you want to see started at boot time.\n"
+"When your mouse comes over an item, a small balloon help will popup which\n"
+"describes the role of the service.\n"
+"\n"
+"Be especially careful in this step if you intend to use your machine as a\n"
+"server: you will probably want not to start any services which you don't\n"
+"want."
 msgstr ""
 
-#: ../../help.pm_.c:221
+#: ../../help.pm_.c:244
 msgid ""
 "Linux can deal with many types of printer. Each of these\n"
 "types require a different setup. Note however that the print\n"
@@ -1436,7 +1470,7 @@ msgid ""
 "The printer having \"lp\" in its name(s) will be the default printer.\n"
 "\n"
 "\n"
-"If your printer is directly connected to your computer, select\n"
+"If your printer is physically connected to your computer, select\n"
 "\"Local printer\". You will then have to tell which port your\n"
 "printer is connected to, and select the appropriate filter.\n"
 "\n"
@@ -1455,7 +1489,7 @@ msgid ""
 "for a NetWare printer, except that you need no workgroup information."
 msgstr ""
 
-#: ../../help.pm_.c:250
+#: ../../help.pm_.c:273
 msgid ""
 "You can now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
@@ -1468,24 +1502,24 @@ msgid ""
 "be extremely dangerous to the integrity of the system and its data,\n"
 "and other systems connected to it. The password should be a\n"
 "mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should *never* be written down. Do not make the password too long or\n"
+"should NEVER be written down. Do not make the password too long or\n"
 "complicated, though: you must be able to remember without too much\n"
 "effort."
 msgstr ""
 
-#: ../../help.pm_.c:266
+#: ../../help.pm_.c:289
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
 msgstr ""
 
-#: ../../help.pm_.c:270
+#: ../../help.pm_.c:293
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
 msgstr ""
 
-#: ../../help.pm_.c:274
+#: ../../help.pm_.c:297
 msgid ""
 "You may now create one or more \"regular\" user account(s), as\n"
 "opposed to the \"privileged\" user account, root. You can create\n"
@@ -1509,7 +1543,7 @@ msgid ""
 "and maintenance purposes."
 msgstr ""
 
-#: ../../help.pm_.c:293
+#: ../../help.pm_.c:316
 msgid ""
 "It is strongly recommended that you answer \"Yes\" here. If you install\n"
 "Microsoft Windows at a later date it will overwrite the boot sector.\n"
@@ -1517,7 +1551,7 @@ msgid ""
 "boot into Linux any more."
 msgstr ""
 
-#: ../../help.pm_.c:299
+#: ../../help.pm_.c:322
 msgid ""
 "You need to indicate where you wish\n"
 "to place the information required to boot to Linux.\n"
@@ -1527,13 +1561,13 @@ msgid ""
 "drive (MBR)\"."
 msgstr ""
 
-#: ../../help.pm_.c:307
+#: ../../help.pm_.c:330
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
-"(the master drive on the primary channel)."
+" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
 msgstr ""
 
-#: ../../help.pm_.c:311
+#: ../../help.pm_.c:334
 msgid ""
 "LILO (the LInux LOader) can boot Linux and other operating systems.\n"
 "Normally they are correctly detected during installation. If you don't\n"
@@ -1545,7 +1579,7 @@ msgid ""
 "it now (a boot disk will be needed to boot it)."
 msgstr ""
 
-#: ../../help.pm_.c:320
+#: ../../help.pm_.c:343
 msgid ""
 "LILO main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1582,7 +1616,7 @@ msgid ""
 "    * <number>:  use the corresponding text mode."
 msgstr ""
 
-#: ../../help.pm_.c:355
+#: ../../help.pm_.c:378
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
 "core of the Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -1597,49 +1631,57 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 
-#: ../../help.pm_.c:368
+#: ../../help.pm_.c:391
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
 msgstr ""
 
-#: ../../help.pm_.c:372
+#: ../../help.pm_.c:395
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
 msgstr ""
 
-#: ../../help.pm_.c:376
+#: ../../help.pm_.c:399
 msgid ""
-"You can now select some miscellaneous options for you system.\n"
-"\n"
-"  - Use hard drive optimizations: This option can improve hard disk\n"
-"accesses but is only for advanced users, it can ruin your hard drive if\n"
-"used incorrectly. Use it only if you know how.\n"
-"\n"
-"\n"
-"  - Choose security level: You can choose a security level for your\n"
-"system.\n"
-"    Please refer to the manual for more information.\n"
-"\n"
+"You can now select some miscellaneous options for your system.\n"
 "\n"
-"  - Precise RAM size if needed: In some cases, Linux is unable to\n"
-"correctly detect all the installed RAM on some systems. If this is the\n"
-"case, specify the correct quantity. Note: a difference of 2 or 4 Mb is\n"
-"normal.\n"
+"  - Use hard drive optimizations: this option can improve hard disk "
+"performance\n"
+"    but is only for advanced users: some buggy chipsets can ruin your data, "
+"so\n"
+"    beware. Note that the kernel has a builtin blacklist of drives and\n"
+"    chipsets, but if you want to avoid bad surprises, leave this option "
+"unset.\n"
 "\n"
+"  - Choose security level: you can choose a security level for your\n"
+"    system. Please refer to the manual for complete information. Basically: "
+"if\n"
+"    you don't know, select \"Medium\" ; if you really want to have a secure\n"
+"    machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
+"    CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
+"user\n"
+"    and then use \"su\". More generally, do not expect to use your machine\n"
+"    for anything but as a server. You have been warned.\n"
 "\n"
-"  - Removable media automounting: If you would prefer not to manually\n"
-"mount removable drives (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"\"umount\", select this option. \n"
+"  - Precise RAM size if needed: unfortunately, in today's PC world, there is "
+"no\n"
+"    standard method to ask the BIOS about the amount of RAM present in your\n"
+"    computer. As a consequence, Linux may fail to detect your amount of RAM\n"
+"    correctly. If this is the case, you can specify the correct amount of "
+"RAM\n"
+"    here. Note that a difference of 2 or 4 MB is normal.\n"
 "\n"
+"  - Removable media automounting: if you would prefer not to manually\n"
+"    mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
+"    \"umount\", select this option. \n"
 "\n"
-"  - Enable Num Lock at startup: If you want Number Lock enabled after\n"
-"booting, select this option (Note: Num Lock will still not work under\n"
-"X)."
+"  - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
+"    select this option (Note: NumLock may or may not work under X)."
 msgstr ""
 
-#: ../../help.pm_.c:404
+#: ../../help.pm_.c:428
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -1668,7 +1710,7 @@ msgstr ""
 msgid "Choose your keyboard"
 msgstr ""
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:320
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:312
 msgid "Miscellaneous"
 msgstr ""
 
@@ -1708,8 +1750,8 @@ msgstr ""
 msgid "Configure printer"
 msgstr ""
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:621
-#: ../../install_steps_interactive.pm_.c:622
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:604
+#: ../../install_steps_interactive.pm_.c:605
 msgid "Set root password"
 msgstr ""
 
@@ -1744,40 +1786,40 @@ msgid ""
 "Then choose action ``Mount point'' and set it to `/'"
 msgstr ""
 
-#: ../../install_any.pm_.c:314 ../../standalone/diskdrake_.c:61
+#: ../../install_any.pm_.c:305 ../../standalone/diskdrake_.c:61
 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:331
+#: ../../install_any.pm_.c:322
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
 msgstr ""
 
-#: ../../install_any.pm_.c:348
+#: ../../install_any.pm_.c:339
 msgid "Searching root partition."
 msgstr ""
 
-#: ../../install_any.pm_.c:377
+#: ../../install_any.pm_.c:368
 msgid "Information"
 msgstr ""
 
-#: ../../install_any.pm_.c:378
+#: ../../install_any.pm_.c:369
 #, c-format
 msgid "%s: This is not a root partition, please select another one."
 msgstr ""
 
-#: ../../install_any.pm_.c:380
+#: ../../install_any.pm_.c:371
 msgid "No root partition found"
 msgstr ""
 
-#: ../../install_any.pm_.c:417
+#: ../../install_any.pm_.c:409
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
-#: ../../install_any.pm_.c:581
+#: ../../install_any.pm_.c:571
 msgid "Error reading file $f"
 msgstr ""
 
@@ -1787,17 +1829,17 @@ msgid ""
 "Continue at your own risk."
 msgstr ""
 
-#: ../../install_steps.pm_.c:169
+#: ../../install_steps.pm_.c:171
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr ""
 
-#: ../../install_steps.pm_.c:342
+#: ../../install_steps.pm_.c:367
 #, c-format
 msgid "Welcome to %s"
 msgstr ""
 
-#: ../../install_steps.pm_.c:625
+#: ../../install_steps.pm_.c:646
 msgid "No floppy drive available"
 msgstr ""
 
@@ -1807,100 +1849,19 @@ msgstr ""
 msgid "Entering step `%s'\n"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:245
-msgid "You must have a swap partition"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:247
-msgid ""
-"You don't have a swap partition\n"
-"\n"
-"Continue anyway?"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:287 ../../install_steps_gtk.pm_.c:314
-msgid "Choose the size you want to install"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:421
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:422
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:338
-msgid "Choose the packages you want to install"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:341
-msgid "Info"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:346
-#: ../../install_steps_interactive.pm_.c:124 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:487
-#: ../../install_steps_interactive.pm_.c:357
-msgid "Installing"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:493
-msgid "Please wait, "
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:495
-msgid "Time remaining "
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:496
-msgid "Total time "
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:505
-#: ../../install_steps_interactive.pm_.c:357
-msgid "Preparing installation"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:520
-#, c-format
-msgid "Installing package %s"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:558
-#: ../../install_steps_gtk.pm_.c:562
-msgid "Go on anyway?"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:558
-msgid "There was an error ordering packages:"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:970
-msgid "Use existing configuration for X11?"
-msgstr ""
-
 #: ../../install_steps_gtk.pm_.c:154
 msgid "Please, choose one of the following classes of installation:"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:194
+#: ../../install_steps_gtk.pm_.c:193
 msgid "You don't have any windows partitions!"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:209
+#: ../../install_steps_gtk.pm_.c:195
+msgid "You don't have any enough room for Lnx4win"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:211
 msgid ""
 "WARNING!\n"
 "\n"
@@ -1912,96 +1873,159 @@ msgid ""
 "When sure, press Ok."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:228
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Automatic resizing failed"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:257
+#: ../../install_steps_gtk.pm_.c:247
+msgid "You must have a swap partition"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:249
+msgid ""
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:259
 msgid "Which partition do you want to use to put Linux4Win?"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:276
+#: ../../install_steps_gtk.pm_.c:278
 msgid "Choose the sizes"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:278
+#: ../../install_steps_gtk.pm_.c:280
 msgid "Root partition size in MB: "
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:280
+#: ../../install_steps_gtk.pm_.c:282
 msgid "Swap partition size in MB: "
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:309
+#: ../../install_steps_gtk.pm_.c:311
 msgid ""
 "Now that you've selected desired groups, please choose \n"
 "how many packages you want, ranging from minimal to full \n"
 "installation of each selected groups."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:312
+#: ../../install_steps_gtk.pm_.c:314
 msgid "You will be able to choose them more specificaly in the next step"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:350
+#: ../../install_steps_gtk.pm_.c:316
+msgid "Choose the size you want to install"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:340
+msgid "Choose the packages you want to install"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:343
+msgid "Info"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:348 ../../install_steps_interactive.pm_.c:124
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:352
 msgid "Automatic dependencies"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:400 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:402 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:401 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:403 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:402
+#: ../../install_steps_gtk.pm_.c:404
 msgid "Toggle between flat and group sorted"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:420
+#: ../../install_steps_gtk.pm_.c:422
 msgid "Bad package"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:423
+#: ../../install_steps_gtk.pm_.c:423 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:424 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:425
 #, c-format
 msgid "Importance: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:434
+#: ../../install_steps_gtk.pm_.c:436
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:446
+#: ../../install_steps_gtk.pm_.c:448
 msgid "The following packages are going to be installed/removed"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:455
+#: ../../install_steps_gtk.pm_.c:457
 msgid "This is a mandatory package, it can't be unselected"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:490
+#: ../../install_steps_gtk.pm_.c:489 ../../install_steps_interactive.pm_.c:350
+msgid "Installing"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:492
 msgid "Estimating"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:502 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:224 ../../interactive_newt.pm_.c:50
-#: ../../interactive_newt.pm_.c:97 ../../interactive_stdio.pm_.c:27
+#: ../../install_steps_gtk.pm_.c:495
+msgid "Please wait, "
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:497
+msgid "Time remaining "
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:498
+msgid "Total time "
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:504 ../../interactive.pm_.c:84
+#: ../../interactive.pm_.c:217 ../../interactive_newt.pm_.c:50
+#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
 #: ../../my_gtk.pm_.c:199 ../../my_gtk.pm_.c:456
 msgid "Cancel"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:515
+#: ../../install_steps_gtk.pm_.c:507 ../../install_steps_interactive.pm_.c:350
+msgid "Preparing installation"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:517
 #, c-format
 msgid "%d packages"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:515
+#: ../../install_steps_gtk.pm_.c:517
 msgid ", %U MB"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:546
+#: ../../install_steps_gtk.pm_.c:522
+#, c-format
+msgid "Installing package %s"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:548
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2011,7 +2035,15 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:562
+#: ../../install_steps_gtk.pm_.c:560 ../../install_steps_gtk.pm_.c:564
+msgid "Go on anyway?"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:560
+msgid "There was an error ordering packages:"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:564
 msgid "There was an error installing packages:"
 msgstr ""
 
@@ -2172,116 +2204,116 @@ msgstr ""
 msgid "Finding packages to upgrade"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:296
+#: ../../install_steps_interactive.pm_.c:290
 #, c-format
 msgid ""
 "You need %dMB for a full install of the groups you selected.\n"
 "You can go on anyway, but be warned that you won't get all packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:319
+#: ../../install_steps_interactive.pm_.c:311
 msgid "Package Group Selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:314
 msgid "Individual package selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:346
+#: ../../install_steps_interactive.pm_.c:339
 msgid "Choose other CD to install"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:347
+#: ../../install_steps_interactive.pm_.c:340
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:366
+#: ../../install_steps_interactive.pm_.c:359
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:375
+#: ../../install_steps_interactive.pm_.c:368
 msgid "Post-install configuration"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:385
+#: ../../install_steps_interactive.pm_.c:378
 msgid "Keep the current IP configuration"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:386
+#: ../../install_steps_interactive.pm_.c:379
 msgid "Reconfigure network now"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:387
+#: ../../install_steps_interactive.pm_.c:380
 msgid "Do not set up networking"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:390
-#: ../../install_steps_interactive.pm_.c:395
+#: ../../install_steps_interactive.pm_.c:383
+#: ../../install_steps_interactive.pm_.c:388
 msgid "Network Configuration"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:391
+#: ../../install_steps_interactive.pm_.c:384
 msgid "Local networking has already been configured. Do you want to:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:396
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Do you want to configure a local network for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:402
+#: ../../install_steps_interactive.pm_.c:395
 msgid "no network card found"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:425
+#: ../../install_steps_interactive.pm_.c:418
 msgid "Modem Configuration"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:426
+#: ../../install_steps_interactive.pm_.c:419
 msgid ""
 "Do you want to configure a dialup connection with modem for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:438
-#: ../../install_steps_interactive.pm_.c:439
+#: ../../install_steps_interactive.pm_.c:431
+#: ../../install_steps_interactive.pm_.c:432
 #, c-format
 msgid "Configuring network device %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:440
+#: ../../install_steps_interactive.pm_.c:433
 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:443
+#: ../../install_steps_interactive.pm_.c:436
 msgid "Automatic IP"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:443
+#: ../../install_steps_interactive.pm_.c:436
 msgid "IP address:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:443
+#: ../../install_steps_interactive.pm_.c:436
 msgid "Netmask:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:437
 msgid "(bootp/dhcp)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:450 ../../printerdrake.pm_.c:83
+#: ../../install_steps_interactive.pm_.c:443 ../../printerdrake.pm_.c:83
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:468
+#: ../../install_steps_interactive.pm_.c:461
 msgid "Configuring network"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:469
+#: ../../install_steps_interactive.pm_.c:462
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -2289,83 +2321,79 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:473
+#: ../../install_steps_interactive.pm_.c:466
 msgid "DNS server:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:473
+#: ../../install_steps_interactive.pm_.c:466
 msgid "Gateway device:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:473
+#: ../../install_steps_interactive.pm_.c:466
 msgid "Gateway:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:473
+#: ../../install_steps_interactive.pm_.c:466
 msgid "Host name:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:479
 msgid "Try to find a modem?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:496
-msgid "Please choose on which serial port your modem is connected to."
+#: ../../install_steps_interactive.pm_.c:489
+msgid "Please choose which serial port your modem is connected to."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:501
+#: ../../install_steps_interactive.pm_.c:494
 msgid "Dialup options"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:502
+#: ../../install_steps_interactive.pm_.c:495
 msgid "Connection name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:503
+#: ../../install_steps_interactive.pm_.c:496
 msgid "Phone number"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:504
+#: ../../install_steps_interactive.pm_.c:497
 msgid "Login ID"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:506
+#: ../../install_steps_interactive.pm_.c:499
 msgid "Authentication"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:506
+#: ../../install_steps_interactive.pm_.c:499
 msgid "CHAP"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:506
+#: ../../install_steps_interactive.pm_.c:499
 msgid "PAP"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:506
+#: ../../install_steps_interactive.pm_.c:499
 msgid "Script-based"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:506
+#: ../../install_steps_interactive.pm_.c:499
 msgid "Terminal-based"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:507
+#: ../../install_steps_interactive.pm_.c:500
 msgid "Domain name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:502
 msgid "First DNS Server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:510
+#: ../../install_steps_interactive.pm_.c:503
 msgid "Second DNS Server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:522
-msgid "Bringing up the network"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:531
+#: ../../install_steps_interactive.pm_.c:516
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -2404,97 +2432,93 @@ msgid ""
 "USA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:562
+#: ../../install_steps_interactive.pm_.c:547
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:567
+#: ../../install_steps_interactive.pm_.c:554
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:573
+#: ../../install_steps_interactive.pm_.c:558
 msgid "Please choose the packages you want to install."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:577
-msgid "Downloading cryptographic packages"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:586
+#: ../../install_steps_interactive.pm_.c:569
 msgid "Which is your timezone?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:587
+#: ../../install_steps_interactive.pm_.c:570
 msgid "Is your hardware clock set to GMT?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:621
+#: ../../install_steps_interactive.pm_.c:604
 msgid "No password"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:624
+#: ../../install_steps_interactive.pm_.c:607
 msgid ""
 "(a user ``mandrake'' with password ``mandrake'' has been automatically added)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:612
 msgid "Use shadow file"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:612
 msgid "shadow"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:630
+#: ../../install_steps_interactive.pm_.c:613
 msgid "MD5"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:630
+#: ../../install_steps_interactive.pm_.c:613
 msgid "Use MD5 passwords"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_interactive.pm_.c:615
 msgid "Use NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_interactive.pm_.c:615
 msgid "yellow pages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:638
+#: ../../install_steps_interactive.pm_.c:621
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:645
+#: ../../install_steps_interactive.pm_.c:628
 msgid "Authentification NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:646
+#: ../../install_steps_interactive.pm_.c:629
 msgid "NIS Domain"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:646
+#: ../../install_steps_interactive.pm_.c:629
 msgid "NIS Server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:672
+#: ../../install_steps_interactive.pm_.c:655
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:672
+#: ../../install_steps_interactive.pm_.c:655
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:656
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:673
+#: ../../install_steps_interactive.pm_.c:656
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -2502,60 +2526,60 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:658
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:676 ../../printerdrake.pm_.c:78
+#: ../../install_steps_interactive.pm_.c:659 ../../printerdrake.pm_.c:78
 #: ../../printerdrake.pm_.c:103 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:681
+#: ../../install_steps_interactive.pm_.c:664
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:683
+#: ../../install_steps_interactive.pm_.c:666
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:676
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:694
+#: ../../install_steps_interactive.pm_.c:677
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:695
+#: ../../install_steps_interactive.pm_.c:678
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:696
+#: ../../install_steps_interactive.pm_.c:679
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:703
 msgid "First floppy drive"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:721
+#: ../../install_steps_interactive.pm_.c:704
 msgid "Second floppy drive"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:705
 msgid "Skip"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:728
+#: ../../install_steps_interactive.pm_.c:711
 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 "
@@ -2569,178 +2593,182 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:737
+#: ../../install_steps_interactive.pm_.c:720
 msgid "Sorry, no floppy drive available"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:740
+#: ../../install_steps_interactive.pm_.c:723
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:745
+#: ../../install_steps_interactive.pm_.c:728
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:746
+#: ../../install_steps_interactive.pm_.c:729
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:758 ../../standalone/drakboot_.c:36
+#: ../../install_steps_interactive.pm_.c:741 ../../standalone/drakboot_.c:36
 msgid "Installation of LILO failed. The following error occured:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:779
+#: ../../install_steps_interactive.pm_.c:762
 msgid "Do you want to use SILO?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:790
+#: ../../install_steps_interactive.pm_.c:773
 msgid "SILO main options"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:803
+#: ../../install_steps_interactive.pm_.c:786
 msgid ""
 "Here are the following entries in SILO.\n"
 "You can add some more or change the existing ones."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:831
+#: ../../install_steps_interactive.pm_.c:814
 msgid "Partition"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:851
+#: ../../install_steps_interactive.pm_.c:834
 msgid "This label is already in use"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:864
+#: ../../install_steps_interactive.pm_.c:847
 msgid "Installation of SILO failed. The following error occured:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:874
+#: ../../install_steps_interactive.pm_.c:857
 msgid "Preparing bootloader"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:882
+#: ../../install_steps_interactive.pm_.c:865
 msgid "Do you want to use aboot?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:885
+#: ../../install_steps_interactive.pm_.c:868
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:885
 msgid "Proxies configuration"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:903
+#: ../../install_steps_interactive.pm_.c:886
 msgid "HTTP proxy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:904
+#: ../../install_steps_interactive.pm_.c:887
 msgid "FTP proxy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:893
 msgid "Proxy should be http://..."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:911
+#: ../../install_steps_interactive.pm_.c:894
 msgid "Proxy should be ftp://..."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:921 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:904 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:922 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:905 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:923 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:906 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:924 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:907 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:925 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:908 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:926 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:909 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:939
+#: ../../install_steps_interactive.pm_.c:922
 msgid "Miscellaneous questions"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:940
+#: ../../install_steps_interactive.pm_.c:923
 msgid "(may cause data corruption)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:940
+#: ../../install_steps_interactive.pm_.c:923
 msgid "Use hard drive optimisations?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:941 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:924 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:942
+#: ../../install_steps_interactive.pm_.c:925
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:943
+#: ../../install_steps_interactive.pm_.c:926
 msgid "Removable media automounting"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:945
+#: ../../install_steps_interactive.pm_.c:928
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:948
+#: ../../install_steps_interactive.pm_.c:931
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:950
+#: ../../install_steps_interactive.pm_.c:933
 msgid "Enable num lock at startup"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:953
+#: ../../install_steps_interactive.pm_.c:936
 msgid "Give the ram size in Mb"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:955
+#: ../../install_steps_interactive.pm_.c:938
 msgid "Can't use supermount in high security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:982
-#: ../../install_steps_interactive.pm_.c:1133
+#: ../../install_steps_interactive.pm_.c:953
+msgid "Use existing configuration for X11?"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:965
+#: ../../install_steps_interactive.pm_.c:1116
 msgid "Try to find PCI devices?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1003
+#: ../../install_steps_interactive.pm_.c:986
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1011
+#: ../../install_steps_interactive.pm_.c:994
 msgid "Creating auto install floppy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1034
+#: ../../install_steps_interactive.pm_.c:1017
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1041
+#: ../../install_steps_interactive.pm_.c:1024
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -2753,26 +2781,26 @@ msgid ""
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1050
+#: ../../install_steps_interactive.pm_.c:1033
 msgid "Shutting down"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1062
+#: ../../install_steps_interactive.pm_.c:1045
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1063
+#: ../../install_steps_interactive.pm_.c:1046
 #, c-format
 msgid "(module %s)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1073
+#: ../../install_steps_interactive.pm_.c:1056
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1081
+#: ../../install_steps_interactive.pm_.c:1064
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -2784,20 +2812,20 @@ msgid ""
 "not cause any damage."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1086
+#: ../../install_steps_interactive.pm_.c:1069
 msgid "Autoprobe"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1086
+#: ../../install_steps_interactive.pm_.c:1069
 msgid "Specify options"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1090
+#: ../../install_steps_interactive.pm_.c:1073
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1096
+#: ../../install_steps_interactive.pm_.c:1079
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -2805,57 +2833,61 @@ msgid ""
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1099
+#: ../../install_steps_interactive.pm_.c:1082
 msgid "Module options:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1109
+#: ../../install_steps_interactive.pm_.c:1092
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
 "Do you want to try again with other parameters?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1122
+#: ../../install_steps_interactive.pm_.c:1105
 msgid "Try to find PCMCIA cards?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1123
+#: ../../install_steps_interactive.pm_.c:1106
 msgid "Configuring PCMCIA cards..."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1123
+#: ../../install_steps_interactive.pm_.c:1106
 msgid "PCMCIA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1152
+#: ../../install_steps_interactive.pm_.c:1135
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1153
+#: ../../install_steps_interactive.pm_.c:1136
 msgid "Do you have another one?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1154
+#: ../../install_steps_interactive.pm_.c:1137
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1156 ../../interactive.pm_.c:79
+#: ../../install_steps_interactive.pm_.c:1139 ../../interactive.pm_.c:79
 #: ../../my_gtk.pm_.c:455 ../../printerdrake.pm_.c:118
 msgid "No"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1156 ../../interactive.pm_.c:79
+#: ../../install_steps_interactive.pm_.c:1139 ../../interactive.pm_.c:79
 #: ../../my_gtk.pm_.c:455
 msgid "Yes"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1157
+#: ../../install_steps_interactive.pm_.c:1140
 msgid "See hardware info"
 msgstr ""
 
+#: ../../install_steps_interactive.pm_.c:1157
+msgid "Bringing up the network"
+msgstr ""
+
 #: ../../install_steps_newt.pm_.c:21
 #, c-format
 msgid "Linux-Mandrake Installation %s"
@@ -2873,7 +2905,7 @@ msgid ""
 "When you are done, don't forget to save using `w'"
 msgstr ""
 
-#: ../../interactive.pm_.c:242
+#: ../../interactive.pm_.c:235
 msgid "Please wait"
 msgstr ""
 
@@ -3114,34 +3146,34 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../lilo.pm_.c:427
+#: ../../lilo.pm_.c:422
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr ""
 
-#: ../../lilo.pm_.c:428
+#: ../../lilo.pm_.c:423
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr ""
 
-#: ../../lilo.pm_.c:429
+#: ../../lilo.pm_.c:424
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr ""
 
-#: ../../lilo.pm_.c:430
+#: ../../lilo.pm_.c:425
 msgid "commands before booting, or 'c' for a command-line."
 msgstr ""
 
-#: ../../lilo.pm_.c:431
+#: ../../lilo.pm_.c:426
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr ""
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:504
+#: ../../lilo.pm_.c:499
 msgid "Desktop"
 msgstr ""
 
-#: ../../lilo.pm_.c:504
+#: ../../lilo.pm_.c:499
 msgid "Start Menu"
 msgstr ""
 
diff --git a/perl-install/swap.pm b/perl-install/swap.pm
index 17033f39f..c3d14e4b7 100644
--- a/perl-install/swap.pm
+++ b/perl-install/swap.pm
@@ -126,8 +126,10 @@ sub enable($;$) {
 }
 
 sub swapon($) {
+    log::l("swapon called with $_[0]");
     syscall_('swapon', devices::make($_[0]), 0) or die "swapon($_[0]) failed: $!";
 }
+
 sub swapoff($) {
     syscall_('swapoff', devices::make($_[0])) or die "swapoff($_[0]) failed: $!";
 }
-- 
cgit v1.2.1