*** empty log message ***

author: Francois Pons <fpons@mandriva.com> 2000-06-23 13:03:19 +0000
committer: Francois Pons <fpons@mandriva.com> 2000-06-23 13:03:19 +0000
commit: c8d8767aa3dfeb049fd662080ac8cf2a7075ca56 (patch)
tree: e424b6ad6a2f2142554bee44cedd04d5016de938
parent: b8820f0b8f1a137b9baa11b76626ad79e47cb707 (diff)
download: drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.tar
drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.tar.gz
drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.tar.bz2
drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.tar.xz
drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.zip
16 files changed, 627 insertions, 627 deletions
diff --git a/make_boot_img b/make_boot_img
index 58dff887e..d69715afc 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -252,11 +252,18 @@ To Build a Bootable CD-ROM, try:
 	_ "cp -f vmlinuz$I $dir/vmlinux$I.gz";
 	-f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd("${mnt}2", "$dir/$type.rdz");
 
+	output("$dir/boot.msg", "
+Welcome to Linux-Mandrake 7.1
+
+Press <Enter> to install or upgrade a system 7mLinux-Mandrake7m
+");
+
 	output("$dir/silo.conf", "
 partition=1
 default=linux
 timeout=100
 read-write
+message=/boot.msg
 image=/vmlinux$I.gz
   label=linux
   initrd=/$type.rdz
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index bc10d0ec9..0fc8f0f19 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,24 @@
+2000-06-23  Fran�ois Pons  <fpons@mandrakesoft.com>
+
+	* Xconfigurator.pm: better approach for Sun* server in newbie.
+	* fs.pm: added romfs support for mount.
+	* fsedit.pm: changed auto allocation for partitions for sparc*.
+	* install2.pm: restored bootdisk creation and auto install boot
+	disk creation for sparc*.
+	* install_any.pm: changed vfat to romfs when mounting kickstart
+	floppy on sparc*.
+	* install_steps.pm: avoid proposing formating sunos partition.
+	* install_steps_interactive.pm: boot disk for sparc* and support for
+	installation of SILO on /boot partition (sparc*).
+	* install_steps_newt.pm: removed cylinder 0 bug warning.
+	* interactive.pm: fixed typo for not_edit set to 1 by default.
+	* partition_table.pm: fixed get_holes on sparc* where a whole disk
+	partition caused problems.
+	* partition_table_sun.pm: removed cylinder 0 bug as found in mke2fs.
+	* silo.pm: handle /boot partition, install silo.conf in /boot and
+	make a symlink from /etc.
+	* share/list.sparc: added losetup and genromfs for boot disk creation.
+
 2000-06-21  Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* lang.pm: changed the way console font data is written; not all
@@ -5,7 +26,6 @@
 	Also added a variable $CHARSET for /etc/sysconfig/i18n; it can then
 	be used by console-tools to load the proper compose table
 
-
 2000-06-20  Fran�ois Pons  <fpons@mandrakesoft.com>
 
 	* c/sbus.c: added some functions for silo.c integration.
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 2cc67e0ce..1de705d0f 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -536,10 +536,12 @@ sub resolutionsConfiguration($%) {
 	$card->{depth}{8} = [[ 640, 480 ]];
 	return;
     } elsif ($card->{server} =~ /Sun/) {
-	$card->{depth}{2} = [[ 1152, 864 ]] if $card->{server} eq "SunMono";
-	$card->{depth}{8} = [[ 1152, 864 ]] if $card->{server} eq "Sun";
-	$card->{depth}{24} = [[ 1152, 864 ]] if $card->{server} eq "Sun24";
-	return;
+	$card->{depth}{2} = [[ 1152, 864 ]] if $card->{server} =~ /^(SunMono)$/;
+	$card->{depth}{8} = [[ 1152, 864 ]] if $card->{server} =~ /^(SunMono|Sun)$/;
+	$card->{depth}{24} = [[ 1152, 864 ]] if $card->{server} =~ /^(SunMono|Sun|Sun24)$/;
+	$card->{default_wres} = 1152;
+	$o->{default_depth} = max(keys %{$card->{depth}});
+	return 1; #- aka we cannot test, assumed as good (should be).
     }
 
     #- some of these guys hate to be poked
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 33dc8229b..2eb7c4bf9 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -204,6 +204,8 @@ sub mount($$$;$) {
 	    #- without knowing it, / is forced to be mounted with notail
 	    $mount_opt = 'notail' if $where =~ m|/(boot)?$|;
 	    eval { modules::load('reiserfs') };
+	} elsif ($fs eq 'romfs') {
+	    eval { modules::load('romfs') };
 	}
 
 	$where =~ s|/$||;
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 6d30a73ab..599a7af5e 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -22,14 +22,9 @@ use log;
 #- Globals
 #-#####################################################################################
 my @suggestions = (
-arch() =~ /^sparc/ ? (
-  { mntpoint => "/",        size =>  50 << 11, type => 0x83, ratio => 1, maxsize => 1000 << 11 },
-  { mntpoint => "swap",     size =>  30 << 11, type => 0x82, ratio => 1, maxsize => 500 << 11 },
-) : (
+  { mntpoint => "/boot",    size =>  16 << 11, type => 0x83, ratio => 1, maxsize =>  30 << 11 },
   { mntpoint => "/",        size =>  50 << 11, type => 0x83, ratio => 1, maxsize => 300 << 11 },
   { mntpoint => "swap",     size =>  30 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 },
-),
-  { mntpoint => "/boot",    size =>  16 << 11, type => 0x83, ratio => 1, maxsize =>  30 << 11 },
   { mntpoint => "/usr",     size => 200 << 11, type => 0x83, ratio => 6, maxsize =>3000 << 11 },
   { mntpoint => "/home",    size =>  50 << 11, type => 0x83, ratio => 3 },
   { mntpoint => "/var",     size => 200 << 11, type => 0x83, ratio => 1, maxsize =>1000 << 11 },
@@ -168,7 +163,6 @@ sub computeSize($$$$) {
 	} @l;
     }
     my $size = int min($max, $best->{size} + $free_space * ($tot_ratios && $best->{ratio} / $tot_ratios));
-
     #- verify other entry can fill the hole
     if (grep { $_->{size} < $max - $size } @L) { $size } else { $max }
 }
diff --git a/perl-install/help.pm b/perl-install/help.pm
index 25668d026..242adcc1c 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -385,6 +385,11 @@ in this case, you will need a boot disk in order to boot them!"),
 
 setupSILOGeneral =>
  __("SILO main options are:
+  - Bootloader installation: Indicate where you want to place the
+information required to boot to GNU/Linux. Unless you know exactly
+what you are doing, choose \"First sector of drive (MBR)\".
+
+
   - Delay before booting default image: Specifies the number in tenths
 of a second the boot loader should wait before booting the first image.
 This is useful on systems that immediately boot from the hard disk after
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 1e1f26320..b1ec9847c 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -58,12 +58,12 @@ my (%installSteps, @orderedInstallSteps);
   configurePrinter   => [ __("Configure printer"), 1, 0, '', "doInstallStep" ],
   setRootPassword    => [ __("Set root password"), 1, 1, '', "formatPartitions" ],
   addUser            => [ __("Add a user"), 1, 1, '' ],
-arch() !~ /alpha|sparc/ ? (
+arch() !~ /alpha/ ? (
   createBootdisk     => [ __("Create a bootdisk"), 1, 0, '$::o->{lnx4win} && !$::expert', "doInstallStep" ],
 ) : (),
   setupBootloader    => [ __("Install bootloader"), 1, 1, '$::o->{lnx4win} && !$::expert', "doInstallStep" ],
   configureX         => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"] ],
-arch() !~ /alpha|sparc/ ? (
+arch() !~ /alpha/ ? (
   generateAutoInstFloppy => [ __("Auto install floppy"), 1, 1, '!$::expert || $o->{lnx4win}', "doInstallStep" ],
 ) : (),
   exitInstall        => [ __("Exit install"), 0, 0, '$::beginner' ],
@@ -92,44 +92,31 @@ my @install_classes = qw(normal developer server);
 my %suggestedPartitions = (
 arch() =~ /^sparc/ ? (
   normal => [
-    { mntpoint => "/",     size => 600 << 11, type => 0x83, ratio => 5, maxsize =>1000 << 11 },
-    { mntpoint => "swap",  size => 128 << 11, type => 0x82, ratio => 1, maxsize => 400 << 11 },
-    { mntpoint => "/usr",  size => 300 << 11, type => 0x83, ratio => 4, maxsize =>3000 << 11 },
-    { mntpoint => "/home", size => 300 << 11, type => 0x83, ratio => 2 },
-  ],
-  developer => [
-    { mntpoint => "/",     size => 300 << 11, type => 0x83, ratio => 1, maxsize =>1000 << 11 },
-    { mntpoint => "swap",  size => 128 << 11, type => 0x82, ratio => 1, maxsize => 400 << 11 },
+    { mntpoint => "/",     size => 150 << 11, type => 0x83, ratio => 1, maxsize =>1000 << 11 },
+    { mntpoint => "swap",  size =>  64 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 },
     { mntpoint => "/usr",  size => 300 << 11, type => 0x83, ratio => 4, maxsize =>3000 << 11 },
-    { mntpoint => "/home", size => 100 << 11, type => 0x83, ratio => 5 },
-  ],
-  server => [
-    { mntpoint => "/",     size => 300 << 11, type => 0x83, ratio => 1, maxsize =>1000 << 11 },
-    { mntpoint => "swap",  size => 128 << 11, type => 0x82, ratio => 2, maxsize => 800 << 11 },
-    { mntpoint => "/usr",  size => 300 << 11, type => 0x83, ratio => 3, maxsize =>3000 << 11 },
-    { mntpoint => "/var",  size => 100 << 11, type => 0x83, ratio => 4 },
-    { mntpoint => "/home", size => 100 << 11, type => 0x83, ratio => 5 },
+    { mntpoint => "/home", size => 300 << 11, type => 0x83, ratio => 3 },
   ],
 ) : (
   normal => [
-    { mntpoint => "/",     size => 300 << 11, type => 0x83, ratio => 5, maxsize => 3500 << 11 },
+    { mntpoint => "/",     size => 300 << 11, type => 0x83, ratio => 5, maxsize =>3500 << 11 },
     { mntpoint => "swap",  size =>  64 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 },
     { mntpoint => "/home", size => 300 << 11, type => 0x83, ratio => 3 },
   ],
+),
   developer => [
-    { mntpoint => "swap",  size =>  64 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 },
     { mntpoint => "/",     size => 150 << 11, type => 0x83, ratio => 1, maxsize => 300 << 11 },
+    { mntpoint => "swap",  size =>  64 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 },
     { mntpoint => "/usr",  size => 300 << 11, type => 0x83, ratio => 4, maxsize =>3000 << 11 },
     { mntpoint => "/home", size => 100 << 11, type => 0x83, ratio => 5 },
   ],
   server => [
-    { mntpoint => "swap",  size =>  64 << 11, type => 0x82, ratio => 2, maxsize => 400 << 11 },
     { mntpoint => "/",     size => 150 << 11, type => 0x83, ratio => 1, maxsize => 250 << 11 },
+    { mntpoint => "swap",  size =>  64 << 11, type => 0x82, ratio => 2, maxsize => 400 << 11 },
     { mntpoint => "/usr",  size => 300 << 11, type => 0x83, ratio => 3, maxsize =>3000 << 11 },
     { mntpoint => "/var",  size => 100 << 11, type => 0x83, ratio => 4 },
     { mntpoint => "/home", size => 100 << 11, type => 0x83, ratio => 5 },
   ],
-),
 );
 $suggestedPartitions{corporate} = $suggestedPartitions{server};
 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 920bfb5e8..7a5be64f1 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -598,7 +598,7 @@ sub loadO {
     if ($f =~ /^(floppy|patch)$/) {
 	my $f = $f eq "floppy" ? "auto_inst.cfg" : "patch";
 	unless ($::testing) {
-	    fs::mount(devices::make("fd0"), "/mnt", "vfat", 'readonly');
+	    fs::mount(devices::make("fd0"), "/mnt", (arch() =~ /sparc/ ? "romfs" : "vfat"), 'readonly');
 	    $f = "/mnt/$f";
 	}
 	-e $f or $f .= ".pl";
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 319a4c54a..0733ad852 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -202,7 +202,7 @@ sub choosePartitionsToFormat($$) {
 	      fsedit::typeOfPart($_->{device});
 	    $_->{toFormatUnsure} = $_->{mntpoint} eq "/" ||
 	      #- if detected dos/win, it's not precise enough to just compare the types (too many of them)
-	      (isOtherAvailableFS({ type => $t }) ? !isOtherAvailableFS($_) : $t != $_->{type});
+	      (!$t || isOtherAvailableFS({ type => $t }) ? !isOtherAvailableFS($_) : $t != $_->{type});
 	}
     }
 }
@@ -852,6 +852,7 @@ sub setupBootloader($) {
 #	  map_index { "$::i:$b->{part_nb}$_ root=$b->{root} $b->{perImageAppend}\n" }
 #	    map { /$o->{prefix}(.*)/ } eval { glob_("$o->{prefix}/boot/vmlinux*") };
     } elsif (arch() =~ /^sparc/) {
+        silo::set_promvars($o->{fstab}, $o->{bootloader});
         silo::install($o->{prefix}, $o->{bootloader});
     } else {
 	lilo::install($o->{prefix}, $o->{bootloader}, $o->{fstab}, $o->{hds});
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 354b31ea9..6bca6cdad 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -742,34 +742,52 @@ sub createBootdisk {
 
     return if $first_time && $::beginner || $o->{lnx4win};
 
-    my @l = detect_devices::floppies();
-    my %l = (
-	     'fd0'  => __("First floppy drive"),
-	     'fd1'  => __("Second floppy drive"),
-	     'Skip' => __("Skip"),
-	    );
-    $l{$_} ||= $_ foreach @l;
+    if (arch() =~ /sparc/) {
+	#- as probing floppies is a bit more different on sparc, assume always /dev/fd0.
+	$o->ask_okcancel('',
+			 _("A custom bootdisk provides a way of booting into your Linux system without
+depending on the normal bootloader. This is useful if you don't want to install
+SILO on your system, or another operating system removes SILO, or SILO doesn't
+work with your hardware configuration. A custom bootdisk can also be used with
+the Mandrake rescue image, making it much easier to recover from severe system
+failures.
 
-    if ($first_time || @l == 1) {
-	$o->ask_yesorno('',
-			_("A custom bootdisk provides a way of booting into your Linux system without
+If you want to create a bootdisk for your system, insert a floppy in the first
+drive and press \"Ok\"."),
+			 $o->{mkbootdisk}) or return $o->{mkbootdisk} = '';
+	my @l = detect_devices::floppies();
+	$o->{mkbootdisk} = $l[0] if !$o->{mkbootdisk} || $o->{mkbootdisk} eq "1";
+	$o->{mkbootdisk} or return;
+    } else {
+	my @l = detect_devices::floppies();
+	my %l = (
+		 'fd0'  => __("First floppy drive"),
+		 'fd1'  => __("Second floppy drive"),
+		 'Skip' => __("Skip"),
+		 );
+	$l{$_} ||= $_ foreach @l;
+
+	if ($first_time || @l == 1) {
+	    $o->ask_yesorno('',
+			    _("A custom bootdisk provides a way of booting into your Linux system without
 depending on the normal bootloader. This is useful if you don't want to install
 LILO (or grub) on your system, or another operating system removes LILO, or LILO doesn't
 work with your hardware configuration. A custom bootdisk can also be used with
 the Mandrake rescue image, making it much easier to recover from severe system
 failures. Would you like to create a bootdisk for your system?"), 
-			$o->{mkbootdisk}) or return $o->{mkbootdisk} = '';
-	$o->{mkbootdisk} = $l[0] if !$o->{mkbootdisk} || $o->{mkbootdisk} eq "1";
-    } else {
-	@l or die _("Sorry, no floppy drive available");
-
-	$o->{mkbootdisk} = ${{reverse %l}}{$o->ask_from_list_('',
-							      _("Choose the floppy drive you want to use to make the bootdisk"),
-							      [ @l{@l, "Skip"} ], $o->{mkbootdisk})};
-	return $o->{mkbootdisk} = '' if $o->{mkbootdisk} eq 'Skip';
+			    $o->{mkbootdisk}) or return $o->{mkbootdisk} = '';
+	    $o->{mkbootdisk} = $l[0] if !$o->{mkbootdisk} || $o->{mkbootdisk} eq "1";
+	} else {
+	    @l or die _("Sorry, no floppy drive available");
+
+	    $o->{mkbootdisk} = ${{reverse %l}}{$o->ask_from_list_('',
+								  _("Choose the floppy drive you want to use to make the bootdisk"),
+								  [ @l{@l, "Skip"} ], $o->{mkbootdisk})};
+	    return $o->{mkbootdisk} = '' if $o->{mkbootdisk} eq 'Skip';
+        }
+        $o->ask_warn('', _("Insert a floppy in drive %s", $l{$o->{mkbootdisk}}));
     }
 
-    $o->ask_warn('', _("Insert a floppy in drive %s", $l{$o->{mkbootdisk}}));
     my $w = $o->wait_message('', _("Creating bootdisk"));
     install_steps::createBootdisk($o);
 }
@@ -794,18 +812,21 @@ sub setupSILO {
     my ($o, $more) = @_;
     my $b = $o->{bootloader};
 
-    #- assume this default parameters.
-    $b->{root} = "/dev/" . fsedit::get_root($o->{fstab})->{device};
-    $b->{partition} = ($b->{root} =~ /\D*(\d*)/)[0] || '1';
-
-    if ($::beginner && $more == 1) {
-	#- nothing more to do here.
+    if ($::beginner && $more >= 1) {
+	my @silo_install = (__("First sector of drive (MBR)"), __("First sector of boot partition"));
+	$o->set_help('setupBootloaderBeginner') unless $::isStandalone; #- no problem of translation for this one.
+	$b->{use_partition} = $o->ask_from_list_(_("SILO Installation"),
+						 _("Where do you want to install the bootloader?"),
+						 \@silo_install, $silo_install[$b->{use_partition}]);
     } elsif ($more || !$::beginner) {
 	$o->set_help("setupSILOGeneral");
 
 	$::expert and $o->ask_yesorno('', _("Do you want to use SILO?"), 1) || return;
 
+	my @silo_install_lang = (_("First sector of drive (MBR)"), _("First sector of boot partition"));
+	my $silo_install_lang = $silo_install_lang[$b->{use_partition}];
 	my @l = (
+_("Bootloader installation") => { val => \$silo_install_lang, list => \@silo_install_lang, not_edit => 1 },
 _("Delay before booting default image") => \$b->{timeout},
 $o->{security} < 4 ? () : (
 _("Password") => { val => \$b->{password}, hidden => 1 },
@@ -822,6 +843,7 @@ _("Restrict command line options") => { val => \$b->{restricted}, type => "bool"
 				     0;
 				 }
 				) or return;
+	$b->{use_partition} = $silo_install_lang eq _("First sector of drive (MBR)") ? 0 : 1;
     }
 
     until ($::beginner && $more <= 1) {
@@ -1052,24 +1074,60 @@ _("Do you want to generate an auto install floppy for linux replication?"), $flo
     my $image = $o->{pcmcia} ? "pcmcia" :
       ${{ hd => 'hd', cdrom => 'cdrom', ftp => 'network', nfs => 'network', http => 'network' }}{$o->{method}};
 
-    {
+    if (arch() =~ /sparc/) {
+	$image .= arch() =~ /sparc64/ && "64"; #- for sparc64 there are a specific set of image.
+
+	my $imagefile = "$o->{prefix}/tmp/autoinst.img";
+	my $mountdir = "$o->{prefix}/tmp/mount"; -d $mountdir or mkdir $mountdir, 0755;
+	my $workdir = "$o->{prefix}/tmp/work"; -d $workdir or rmdir $workdir;
+
 	my $w = $o->wait_message('', _("Creating auto install floppy"));
-	install_any::getAndSaveFile("$image.img", $dev) or log::l("failed to write $dev"), return;
-    }
-    fs::mount($dev, "/floppy", "vfat", 0);
-    substInFile { s/timeout.*//; s/^(\s*append)/$1 kickstart=floppy/ } "/floppy/syslinux.cfg";
+        install_any::getAndSaveFile("$image.img", $imagefile) or log::l("failed to write $dev"), return;
+        devices::make($_) foreach qw(/dev/loop6 /dev/ram);
+
+        run_program::run("losetup", "/dev/loop6", $imagefile);
+        fs::mount("/dev/loop6", $mountdir, "romfs", 'readonly');
+        commands::cp("-f", $mountdir, $workdir);
+        fs::umount($mountdir);
+        run_program::run("losetup", "-d", "/dev/loop6");
+
+	substInFile { s/timeout.*//; s/^(\s*append\s*=\s*\".*)\"/$1 kickstart=floppy\"/ } "$workdir/silo.conf";
+	output "$workdir/ks.cfg", install_any::generate_ks_cfg($o);
+	output "$workdir/boot.msg", "\n7m",
+"!! If you press enter, an auto-install is going to start.
+   All data on this computer is going to be lost !!
+", "7m\n";
 
-    unlink "/floppy/help.msg";
-    output "/floppy/ks.cfg", install_any::generate_ks_cfg($o);
-    output "/floppy/boot.msg", "\n0c",
+	local $o->{partitioning}{clearall} = 1;
+	install_any::g_auto_install("$workdir/auto_inst.cfg");
+
+        run_program::run("genromfs", "-d", $workdir, "-f", "/dev/ram", "-A", "2048,/..", "-a", "512", "-V", "DrakX autoinst");
+        fs::mount("/dev/ram", $mountdir, 'romfs', 0);
+        run_program::run("silo", "-r", $mountdir, "-F", "-i", "/fd.b", "-b", "/second.b", "-C", "/silo.conf");
+        fs::umount($mountdir);
+        commands::dd("if=/dev/ram", "of=$dev", "bs=1440", "count=1024");
+
+        commands::rm("-rf", $workdir, $mountdir, $imagefile);
+    } else {
+	{
+	    my $w = $o->wait_message('', _("Creating auto install floppy"));
+	    install_any::getAndSaveFile("$image.img", $dev) or log::l("failed to write $dev"), return;
+	}
+        fs::mount($dev, "/floppy", "vfat", 0);
+	substInFile { s/timeout.*//; s/^(\s*append)/$1 kickstart=floppy/ } "/floppy/syslinux.cfg";
+
+	unlink "/floppy/help.msg";
+	output "/floppy/ks.cfg", install_any::generate_ks_cfg($o);
+	output "/floppy/boot.msg", "\n0c",
 "!! If you press enter, an auto-install is going to start.
    All data on this computer is going to be lost !!
 ", "07\n";
 
-    local $o->{partitioning}{clearall} = 1;
-    install_any::g_auto_install("/floppy/auto_inst.cfg");
+	local $o->{partitioning}{clearall} = 1;
+	install_any::g_auto_install("/floppy/auto_inst.cfg");
 
-    fs::umount("/floppy");
+	fs::umount("/floppy");
+    }
 }
 
 #------------------------------------------------------------------------------
diff --git a/perl-install/install_steps_newt.pm b/perl-install/install_steps_newt.pm
index 4cc5fd9a6..015de1c05 100644
--- a/perl-install/install_steps_newt.pm
+++ b/perl-install/install_steps_newt.pm
@@ -42,8 +42,6 @@ sub doPartitionDisks($$) {
 	print 
 _("You can now partition your %s hard drive
 When you are done, don't forget to save using `w'", $_->{device});
-	arch() =~ /sparc/ and print
-_("\nBE CAREFULL NOT TO USE CYLINDER 0 ELSE YOUR PARTITION TABLE WILL BE DESTROYED!");
 	print "\n\n";
 	my $pid = fork or exec "fdisk", devices::make($_->{device});
 	waitpid($pid, 0);
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 6f7b74fd0..8cef5ed7e 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -228,7 +228,7 @@ sub ask_from_entries_ref($$$$;$%) {
 	    { val => $_ }
 	} else {
 	    if (@{$_->{list} || []} > 1) {
-		add2hash($_, { not_edit => 1 })
+		add2hash_($_, { not_edit => 1 });
 		add2hash_($_, { type => 'list' });
 		${$_->{val}} = $_->{list}[0] if $_->{not_edit} && !member(${$_->{val}}, @{$_->{list}});
 	    }
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 8260740ed..63a7d632d 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -361,7 +361,7 @@ sub get_holes($) {
 	my $current = $start;
 	$start = $_->{start} + $_->{size};
 	{ start => $current, size => $_->{start} - $current }
-    } sort { $a->{start} <=> $b->{start} } get_normal_parts($hd), { start => $hd->{totalsectors}, size => 0 };    
+    } sort { $a->{start} <=> $b->{start} } grep { !isWholedisk($_) } get_normal_parts($hd), { start => $hd->{totalsectors}, size => 0 };    
 }
 
 
diff --git a/perl-install/partition_table_sun.pm b/perl-install/partition_table_sun.pm
index c2f8ce9e9..55c3ab775 100644
--- a/perl-install/partition_table_sun.pm
+++ b/perl-install/partition_table_sun.pm
@@ -45,13 +45,9 @@ sub adjustStart($$) {
 
     #- since partition must always start on cylinders boundaries on sparc,
     #- note that if start sector is on the first cylinder, it is adjusted
-    #- to 0 and it is valid, maybe not in fact, problem with Sun disk label.
-    #- IT COULD HURT IF STARTING AT 0, MAYBE THERE ARE SOME FLAGS FOR EXT2
-    #- TO AVOID WRITING ANYTHING ON THE FIRST 1024 BYTES OF DISK, ELSE PROM
-    #- MAY ERASE EVERYTHING... TO BE CHECKED LATER.
-    #- so now, starting on cylinder 1 is perfect altough it waste some disk space !
+    #- to 0 and it is valid, cylinder 0 bug is from bad define for sparc
+    #- compilation of mke2fs combined with a blind kernel...
     $part->{start} = round_down($part->{start}, $hd->cylinder_size());
-    $part->{start} = $hd->cylinder_size() if $part->{start} == 0;
     $part->{size} = $end - $part->{start};
     $part->{size} = $hd->cylinder_size() if $part->{size} <= 0;
 }
diff --git a/perl-install/share/list.sparc b/perl-install/share/list.sparc
index dca2dd4a9..16fb13a44 100644
--- a/perl-install/share/list.sparc
+++ b/perl-install/share/list.sparc
@@ -13,6 +13,8 @@
 /sbin/mkdosfs
 /sbin/mke2fs
 /sbin/raidstart
+/sbin/losetup
+/usr/bin/genromfs
 /usr/bin/bzip2
 /usr/bin/perl
 /usr/lib/libimlib-png.so
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 5e5cbc9b7..3b2046419 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-06-07 19:28+0200\n"
+"POT-Creation-Date: 2000-06-23 14:46+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"
@@ -119,7 +119,7 @@ msgstr ""
 msgid "An error has occurred, try to change some parameters"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:575
+#: ../../Xconfigurator.pm_.c:394 ../../Xconfigurator.pm_.c:577
 msgid "Automatic resolutions"
 msgstr ""
 
@@ -156,122 +156,122 @@ msgstr ""
 msgid "Resolutions"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:576
+#: ../../Xconfigurator.pm_.c:578
 msgid ""
 "I can try to find the available resolutions (eg: 800x600).\n"
 "Sometimes, though, it may hang the machine.\n"
 "Do you want to try?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:581
+#: ../../Xconfigurator.pm_.c:583
 msgid ""
 "No valid modes found\n"
 "Try with another video card or monitor"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:921
+#: ../../Xconfigurator.pm_.c:923
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:922
+#: ../../Xconfigurator.pm_.c:924
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:923
+#: ../../Xconfigurator.pm_.c:925
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:924
+#: ../../Xconfigurator.pm_.c:926
 #, c-format
 msgid "Monitor: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:925
+#: ../../Xconfigurator.pm_.c:927
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:926
+#: ../../Xconfigurator.pm_.c:928
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:927
+#: ../../Xconfigurator.pm_.c:929
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:930
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:931
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:946
 msgid "Preparing X-Window configuration"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:958
+#: ../../Xconfigurator.pm_.c:960
 msgid "Change Monitor"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:959
+#: ../../Xconfigurator.pm_.c:961
 msgid "Change Graphic card"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:960
+#: ../../Xconfigurator.pm_.c:962
 msgid "Change Server options"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:961
+#: ../../Xconfigurator.pm_.c:963
 msgid "Change Resolution"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:962
+#: ../../Xconfigurator.pm_.c:964
 msgid "Automatical resolutions search"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:966
+#: ../../Xconfigurator.pm_.c:968
 msgid "Show information"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:967
+#: ../../Xconfigurator.pm_.c:969
 msgid "Test again"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:968 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:970 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:972 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:974 ../../standalone/drakboot_.c:39
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:979
+#: ../../Xconfigurator.pm_.c:981
 msgid "Forget the changes?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:999
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1015
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1018
 msgid "X at startup"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1019
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -402,11 +402,14 @@ msgstr ""
 msgid "automagic"
 msgstr ""
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:60 ../../install_steps_interactive.pm_.c:816
+#: ../../install_steps_interactive.pm_.c:826
 msgid "First sector of boot partition"
 msgstr ""
 
-#: ../../any.pm_.c:60
+#: ../../any.pm_.c:60 ../../install_steps_interactive.pm_.c:816
+#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:846
 msgid "First sector of drive (MBR)"
 msgstr ""
 
@@ -414,7 +417,7 @@ msgstr ""
 msgid "LILO/grub Installation"
 msgstr ""
 
-#: ../../any.pm_.c:66
+#: ../../any.pm_.c:66 ../../install_steps_interactive.pm_.c:819
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
@@ -442,7 +445,7 @@ msgstr ""
 msgid "compact"
 msgstr ""
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
+#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:830
 msgid "Delay before booting default image"
 msgstr ""
 
@@ -453,23 +456,23 @@ msgstr ""
 #: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
 #: ../../install_steps_interactive.pm_.c:654
 #: ../../install_steps_interactive.pm_.c:705
-#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
+#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:85
 #: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr ""
 
 #: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
 #: ../../install_steps_interactive.pm_.c:706
-#: ../../install_steps_interactive.pm_.c:812
+#: ../../install_steps_interactive.pm_.c:833
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr ""
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:834
 msgid "Restrict command line options"
 msgstr ""
 
-#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:834
 msgid "restrict"
 msgstr ""
 
@@ -477,21 +480,21 @@ msgstr ""
 msgid "Bootloader main options"
 msgstr ""
 
-#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:841
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
 #: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
 #: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:842
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr ""
 
 #: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
 #: ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:842
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr ""
@@ -502,19 +505,19 @@ msgid ""
 "You can add some more or change the existing ones."
 msgstr ""
 
-#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
+#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:854
 #: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr ""
 
 #: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
 #: ../../install_steps_interactive.pm_.c:699
-#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
+#: ../../install_steps_interactive.pm_.c:854 ../../printerdrake.pm_.c:245
 #: ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr ""
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:123 ../../install_steps_interactive.pm_.c:863
 msgid "Linux"
 msgstr ""
 
@@ -522,28 +525,29 @@ msgstr ""
 msgid "Other OS (windows...)"
 msgstr ""
 
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:123 ../../install_steps_interactive.pm_.c:863
 msgid "Which type of entry do you want to add?"
 msgstr ""
 
-#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:883
 msgid "Image"
 msgstr ""
 
 #: ../../any.pm_.c:143 ../../any.pm_.c:151
-#: ../../install_steps_interactive.pm_.c:859
+#: ../../install_steps_interactive.pm_.c:885
+#: ../../install_steps_interactive.pm_.c:893
 msgid "Root"
 msgstr ""
 
-#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:886
 msgid "Append"
 msgstr ""
 
-#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:887
 msgid "Initrd"
 msgstr ""
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:888
 msgid "Read-write"
 msgstr ""
 
@@ -555,17 +559,17 @@ msgstr ""
 msgid "Unsafe"
 msgstr ""
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:897
 msgid "Label"
 msgstr ""
 
-#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:899
 msgid "Default"
 msgstr ""
 
 #: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:678
 #: ../../install_steps_interactive.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
+#: ../../install_steps_interactive.pm_.c:902 ../../interactive.pm_.c:74
 #: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
 #: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
 #: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
@@ -573,11 +577,11 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:902
 msgid "Remove entry"
 msgstr ""
 
-#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:905
 msgid "Empty label not allowed"
 msgstr ""
 
@@ -585,7 +589,7 @@ msgstr ""
 msgid "This label is already used"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
+#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:414
 msgid "Create"
 msgstr ""
 
@@ -593,7 +597,7 @@ msgstr ""
 msgid "Unmount"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:416
 msgid "Delete"
 msgstr ""
 
@@ -601,16 +605,16 @@ msgstr ""
 msgid "Format"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:591
+#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:592
 msgid "Resize"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
-#: ../../diskdrake.pm_.c:466
+#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:414
+#: ../../diskdrake.pm_.c:467
 msgid "Type"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:486
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:487
 msgid "Mount point"
 msgstr ""
 
@@ -689,10 +693,6 @@ msgid "loopback"
 msgstr ""
 
 #: ../../diskdrake.pm_.c:109
-msgid "Empty"
-msgstr ""
-
-#: ../../diskdrake.pm_.c:109
 msgid "Ext2"
 msgstr ""
 
@@ -705,22 +705,30 @@ msgid "HFS"
 msgstr ""
 
 #: ../../diskdrake.pm_.c:109
-msgid "Other"
+msgid "SunOS"
 msgstr ""
 
 #: ../../diskdrake.pm_.c:109
 msgid "Swap"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:115
+#: ../../diskdrake.pm_.c:110
+msgid "Empty"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:110
+msgid "Other"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:116
 msgid "Filesystem types:"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:125
 msgid "Details"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:138
+#: ../../diskdrake.pm_.c:139
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -728,172 +736,172 @@ msgid ""
 "(click on it, then click on \"Resize\")"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:143
+#: ../../diskdrake.pm_.c:144
 msgid "Please make a backup of your data first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
-#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:518
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:144 ../../diskdrake.pm_.c:161
+#: ../../diskdrake.pm_.c:170 ../../diskdrake.pm_.c:519
+#: ../../diskdrake.pm_.c:548
 msgid "Read carefully!"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:146
+#: ../../diskdrake.pm_.c:147
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
 "at the beginning of the disk"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:161
 msgid "Be careful: this operation is dangerous."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:333
+#: ../../diskdrake.pm_.c:198 ../../install_any.pm_.c:333
 #: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
 #: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
 #: ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:681
+#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:682
 msgid "Mount point: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
+#: ../../diskdrake.pm_.c:223 ../../diskdrake.pm_.c:264
 msgid "Device: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:223
+#: ../../diskdrake.pm_.c:224
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
+#: ../../diskdrake.pm_.c:225 ../../diskdrake.pm_.c:267
 msgid "Type: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:225
+#: ../../diskdrake.pm_.c:226
 #, c-format
 msgid "Start: sector %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:226
+#: ../../diskdrake.pm_.c:227
 #, c-format
 msgid "Size: %d MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:229
 #, c-format
 msgid ", %s sectors"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:231
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:232
 msgid "Formatted\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:233
 msgid "Not formatted\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:233
+#: ../../diskdrake.pm_.c:234
 msgid "Mounted\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:234
+#: ../../diskdrake.pm_.c:235
 #, c-format
 msgid "RAID md%s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake.pm_.c:236
 #, c-format
 msgid "Loopback file(s): %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:236
+#: ../../diskdrake.pm_.c:237
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake.pm_.c:239
 #, c-format
 msgid "Level %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:239
+#: ../../diskdrake.pm_.c:240
 #, c-format
 msgid "Chunk size %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:241
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:242
+#: ../../diskdrake.pm_.c:243
 #, c-format
 msgid "Loopback file name: %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:259
+#: ../../diskdrake.pm_.c:260
 msgid "Please click on a partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:264
+#: ../../diskdrake.pm_.c:265
 #, c-format
 msgid "Size: %d MB\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake.pm_.c:266
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:267
+#: ../../diskdrake.pm_.c:268
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:268
+#: ../../diskdrake.pm_.c:269
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:281
+#: ../../diskdrake.pm_.c:282
 msgid "Mount"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:282
+#: ../../diskdrake.pm_.c:283
 msgid "Active"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:283
+#: ../../diskdrake.pm_.c:284
 msgid "Add to RAID"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:284
+#: ../../diskdrake.pm_.c:285
 msgid "Remove from RAID"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:285
+#: ../../diskdrake.pm_.c:286
 msgid "Modify RAID"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:286
+#: ../../diskdrake.pm_.c:287
 msgid "Use for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:293
+#: ../../diskdrake.pm_.c:294
 msgid "Choose action"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:386
+#: ../../diskdrake.pm_.c:387
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -901,7 +909,7 @@ msgid ""
 "need /boot"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:390
+#: ../../diskdrake.pm_.c:391
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -909,236 +917,235 @@ msgid ""
 "If you plan to use the LILO boot manager, be careful to add a /boot partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:396
+#: ../../diskdrake.pm_.c:397
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
-"So be careful to add a /boot partition if you want to use lilo or grub"
+"So be careful to add a /boot partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
+#: ../../diskdrake.pm_.c:414 ../../diskdrake.pm_.c:416
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:418
+#: ../../diskdrake.pm_.c:419
 msgid "Use ``Unmount'' first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#: ../../diskdrake.pm_.c:420 ../../diskdrake.pm_.c:462
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:431
+#: ../../diskdrake.pm_.c:432
 msgid "Continue anyway?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:437
 msgid "Quit without saving"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:436
+#: ../../diskdrake.pm_.c:437
 msgid "Quit without writing the partition table?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:464
+#: ../../diskdrake.pm_.c:465
 msgid "Change partition type"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:465
+#: ../../diskdrake.pm_.c:466
 msgid "Which partition type do you want?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:468 ../../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:469 ../../diskdrake.pm_.c:714
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:484
+#: ../../diskdrake.pm_.c:485
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:485
+#: ../../diskdrake.pm_.c:486
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:490
+#: ../../diskdrake.pm_.c:491
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:509
+#: ../../diskdrake.pm_.c:510
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:511
+#: ../../diskdrake.pm_.c:512
 msgid "Formatting"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:512
+#: ../../diskdrake.pm_.c:513
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:513 ../../install_steps_interactive.pm_.c:253
+#: ../../diskdrake.pm_.c:514 ../../install_steps_interactive.pm_.c:253
 #, c-format
 msgid "Formatting partition %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:519
 msgid "After formatting all partitions,"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:518
+#: ../../diskdrake.pm_.c:519
 msgid "all data on these partitions will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake.pm_.c:529
 msgid "Move"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:529
+#: ../../diskdrake.pm_.c:530
 msgid "Which disk do you want to move it to?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:533
+#: ../../diskdrake.pm_.c:534
 msgid "Sector"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:535
 msgid "Which sector do you want to move it to?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:538
 msgid "Moving"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake.pm_.c:538
 msgid "Moving partition..."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:547
+#: ../../diskdrake.pm_.c:548
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:549
+#: ../../diskdrake.pm_.c:550
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:570 ../../install_steps_gtk.pm_.c:212
+#: ../../diskdrake.pm_.c:571 ../../install_steps_gtk.pm_.c:212
 msgid "Computing FAT filesystem bounds"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:570 ../../diskdrake.pm_.c:619
+#: ../../diskdrake.pm_.c:571 ../../diskdrake.pm_.c:620
 #: ../../install_steps_gtk.pm_.c:212
 msgid "Resizing"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:586
+#: ../../diskdrake.pm_.c:587
 msgid "All data on this partition should be backed-up"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:588
+#: ../../diskdrake.pm_.c:589
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake.pm_.c:599
 msgid "Choose the new size"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:598 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:599
 msgid "MB"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:653
+#: ../../diskdrake.pm_.c:654
 msgid "Create a new partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:674
 msgid "Start sector: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:677 ../../diskdrake.pm_.c:752
+#: ../../diskdrake.pm_.c:678 ../../diskdrake.pm_.c:753
 msgid "Size in MB: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:680 ../../diskdrake.pm_.c:755
+#: ../../diskdrake.pm_.c:681 ../../diskdrake.pm_.c:756
 msgid "Filesystem type: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:683
+#: ../../diskdrake.pm_.c:684
 msgid "Preference: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:731 ../../install_steps.pm_.c:134
+#: ../../diskdrake.pm_.c:732 ../../install_steps.pm_.c:134
 msgid "This partition can't be used for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:741
+#: ../../diskdrake.pm_.c:742
 msgid "Loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:751
+#: ../../diskdrake.pm_.c:752
 msgid "Loopback file name: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:777
+#: ../../diskdrake.pm_.c:778
 msgid "File already used by another loopback, choose another one"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:778
+#: ../../diskdrake.pm_.c:779
 msgid "File already exists. Use it?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:800 ../../diskdrake.pm_.c:816
+#: ../../diskdrake.pm_.c:801 ../../diskdrake.pm_.c:817
 msgid "Select file"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:809
+#: ../../diskdrake.pm_.c:810
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:817
+#: ../../diskdrake.pm_.c:818
 msgid "Warning"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:819
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:832
+#: ../../diskdrake.pm_.c:833
 msgid "Trying to rescue partition table"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:844
 msgid "device"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:845
 msgid "level"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:845
+#: ../../diskdrake.pm_.c:846
 msgid "chunk size"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:857
+#: ../../diskdrake.pm_.c:858
 msgid "Choose an existing RAID to add to"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:858
+#: ../../diskdrake.pm_.c:859
 msgid "new"
 msgstr ""
 
@@ -1156,45 +1163,45 @@ msgstr ""
 msgid "nfs mount failed"
 msgstr ""
 
-#: ../../fs.pm_.c:209
+#: ../../fs.pm_.c:213
 msgid "mount failed: "
 msgstr ""
 
-#: ../../fs.pm_.c:220
+#: ../../fs.pm_.c:224
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr ""
 
-#: ../../fsedit.pm_.c:250
+#: ../../fsedit.pm_.c:251
 msgid "Mount points must begin with a leading /"
 msgstr ""
 
-#: ../../fsedit.pm_.c:253
+#: ../../fsedit.pm_.c:254
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:261
+#: ../../fsedit.pm_.c:262
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:273
+#: ../../fsedit.pm_.c:274
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:355
+#: ../../fsedit.pm_.c:357
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr ""
 
-#: ../../fsedit.pm_.c:437
+#: ../../fsedit.pm_.c:439
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
 msgstr ""
 
-#: ../../fsedit.pm_.c:452
+#: ../../fsedit.pm_.c:454
 msgid "You don't have any partitions!"
 msgstr ""
 
@@ -1208,7 +1215,7 @@ msgstr ""
 
 #: ../../help.pm_.c:13
 msgid ""
-"Choose \"Install\" if there are no previous versions of Linux\n"
+"Choose \"Install\" if there are no previous versions of GNU/Linux\n"
 "installed, or if you wish to use multiple distributions or versions.\n"
 "\n"
 "Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
@@ -1220,7 +1227,7 @@ msgid ""
 "\n"
 "Select:\n"
 "\n"
-"  - Automated (recommended): If you have never installed Linux before, "
+"  - Automated (recommended): If you have never installed GNU/Linux before, "
 "choose this. NOTE:\n"
 "    networking will not be configured during installation, use "
 "\"LinuxConf\"\n"
@@ -1283,35 +1290,33 @@ msgstr ""
 
 #: ../../help.pm_.c:70
 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"
-"to use, it will insert it (them)  automatically.\n"
-"\n"
-"\n"
-"If your SCSI adapter is an ISA board, or is a PCI board but DrakX\n"
-"doesn't know which driver to use for this card, or if you have no\n"
-"SCSI adapters at all, you will then be prompted on whether you have\n"
-"one or not. If you have none, answer \"No\". If you have one or more,\n"
-"answer \"Yes\". A list of drivers will then pop up, from which you\n"
-"will have to select one.\n"
+"DrakX will attempt to look for PCI SCSI adapter(s). \n"
+"If DrakX finds a SCSI adapter and knows which driver to use it will\n"
+"automatically install it (or them).\n"
 "\n"
+"If you have no SCSI adapter, an ISA SCSI adapter, or a\n"
+"PCI SCSI adapter that DrakX doesn't recognize you will be asked if a\n"
+"SCSI adapter is present in your system. If there is no adapter present\n"
+"you can just click 'No'. If you click 'Yes' a list of drivers will be\n"
+"presented from which you can select your specific adapter.\n"
 "\n"
-"After you have selected the driver, DrakX will ask if you\n"
-"want to specify options for it. First, try and let the driver\n"
-"probe for the hardware: it usually works fine.\n"
 "\n"
+"If you had to manually specify your adapter, DrakX will\n"
+"ask if you want to specify options for it.  You should allow DrakX to\n"
+"probe the hardware for the options. This usually works well.\n"
 "\n"
-"If not, do not forget the information on your hardware that you\n"
-"could get from your documentation or from Windows (if you have it\n"
-"on your system), as suggested by the installation guide. These\n"
-"are the options you will need to provide to the driver."
+"If not, you will need to provide options to the driver.\n"
+"Review the Installation Guide for hints on retrieving this\n"
+"information from Windows (if you have it on your system),\n"
+"from hardware documentation, or from the manufacturer's\n"
+"website (if you have Internet access)."
 msgstr ""
 
-#: ../../help.pm_.c:94
+#: ../../help.pm_.c:92
 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"
-"previous install of Linux or from another partitionning tool). In other\n"
+"previous install of GNU/Linux or from another partitioning tool). In other\n"
 "cases, hard drive partitions must be defined. This operation consists of\n"
 "logically dividing the computer's hard drive capacity into separate\n"
 "areas for use.\n"
@@ -1319,7 +1324,8 @@ msgid ""
 "\n"
 "If you have to create new partitions, use \"Auto allocate\" to "
 "automatically\n"
-"create partitions for Linux. You can select the disk for partitionning by\n"
+"create partitions for GNU/Linux. You can select the disk for partitioning "
+"by\n"
 "clicking on \"hda\" for the first IDE drive,\n"
 "\"hdb\" for the second or \"sda\" for the first SCSI drive and so on.\n"
 "\n"
@@ -1347,7 +1353,7 @@ msgid ""
 "- Ctrl-m  to set the mount point\n"
 msgstr ""
 
-#: ../../help.pm_.c:131
+#: ../../help.pm_.c:129
 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"
@@ -1357,7 +1363,7 @@ msgid ""
 "Typically retained are /home and /usr/local."
 msgstr ""
 
-#: ../../help.pm_.c:139
+#: ../../help.pm_.c:137
 msgid ""
 "You may now select the group of packages you wish to\n"
 "install or upgrade.\n"
@@ -1373,14 +1379,14 @@ msgid ""
 "through more than 1000 packages..."
 msgstr ""
 
-#: ../../help.pm_.c:150
+#: ../../help.pm_.c:148
 msgid ""
 "If you have all the CDs in the list above, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: ../../help.pm_.c:155
+#: ../../help.pm_.c:153
 msgid ""
 "The packages selected are now being installed. This operation\n"
 "should take a few minutes unless you have chosen to upgrade an\n"
@@ -1388,30 +1394,29 @@ msgid ""
 "upgrade starts."
 msgstr ""
 
-#: ../../help.pm_.c:161
+#: ../../help.pm_.c:159
 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"
 "above.\n"
 "\n"
 "\n"
-"If you agree with DrakX' settings, just jump to the section\n"
-"you want by clicking on it in the menu on the left. Otherwise,\n"
-"choose a mouse type in the menu which you think is the closest\n"
-"match for your mouse.\n"
+"If you agree with DrakX's settings, just click 'Ok'.\n"
+"Otherwise you may choose the mouse that more closely matches your own\n"
+"from the menu above.\n"
 "\n"
 "\n"
 "In case of a serial mouse, you will also have to tell DrakX\n"
 "which serial port it is connected to."
 msgstr ""
 
-#: ../../help.pm_.c:176
+#: ../../help.pm_.c:173
 msgid ""
 "Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under Linux."
+"is named ttyS0 under GNU/Linux."
 msgstr ""
 
-#: ../../help.pm_.c:180
+#: ../../help.pm_.c:177
 msgid ""
 "This section is dedicated to configuring a local area\n"
 "network (LAN) or a modem.\n"
@@ -1443,7 +1448,7 @@ msgid ""
 "your modem is connected to."
 msgstr ""
 
-#: ../../help.pm_.c:210
+#: ../../help.pm_.c:207
 msgid ""
 "Enter:\n"
 "\n"
@@ -1455,24 +1460,24 @@ msgid ""
 "sure, ask your network administrator or ISP.\n"
 "\n"
 "\n"
-"  - Automatic IP: If your network uses bootp or dhcp protocol, select \n"
+"  - Automatic IP: If your network uses BOOTP or DHCP protocol, select \n"
 "this option. If selected, no value is needed in \"IP address\". If you are\n"
 "not sure, ask your network administrator or ISP.\n"
 msgstr ""
 
-#: ../../help.pm_.c:225
+#: ../../help.pm_.c:222
 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:229
+#: ../../help.pm_.c:226
 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:233
+#: ../../help.pm_.c:230
 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 "
@@ -1483,16 +1488,16 @@ msgid ""
 "to your legislation."
 msgstr ""
 
-#: ../../help.pm_.c:241
+#: ../../help.pm_.c:238
 msgid ""
 "You can now select your timezone according to where you live.\n"
 "\n"
 "\n"
-"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
+"GNU/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:248
+#: ../../help.pm_.c:245
 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"
@@ -1503,9 +1508,9 @@ msgid ""
 "want."
 msgstr ""
 
-#: ../../help.pm_.c:257
+#: ../../help.pm_.c:254
 msgid ""
-"Linux can deal with many types of printer. Each of these\n"
+"GNU/Linux can deal with many types of printer. Each of these\n"
 "types require a different setup. Note however that the print\n"
 "spooler uses 'lp' as the default printer name; so you\n"
 "must have one printer with such a name; but you can give\n"
@@ -1534,7 +1539,7 @@ msgid ""
 "for a NetWare printer, except that you need no workgroup information."
 msgstr ""
 
-#: ../../help.pm_.c:286
+#: ../../help.pm_.c:283
 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"
@@ -1552,19 +1557,19 @@ msgid ""
 "effort."
 msgstr ""
 
-#: ../../help.pm_.c:302
+#: ../../help.pm_.c:299
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
 msgstr ""
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:303
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
 msgstr ""
 
-#: ../../help.pm_.c:310
+#: ../../help.pm_.c:307
 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"
@@ -1588,34 +1593,34 @@ msgid ""
 "and maintenance purposes."
 msgstr ""
 
-#: ../../help.pm_.c:329
+#: ../../help.pm_.c:326
 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"
 "Unless you have made a bootdisk as suggested, you will not be able to\n"
-"boot into Linux any more."
+"boot into GNU/Linux any more."
 msgstr ""
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:332
 msgid ""
 "You need to indicate where you wish\n"
-"to place the information required to boot to Linux.\n"
+"to place the information required to boot to GNU/Linux.\n"
 "\n"
 "\n"
 "Unless you know exactly what you are doing, choose \"First sector of\n"
 "drive (MBR)\"."
 msgstr ""
 
-#: ../../help.pm_.c:343
+#: ../../help.pm_.c:340
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
 msgstr ""
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:344
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either Linux or any other operating system present on your computer.\n"
+"either GNU/Linux or any other operating system present on your computer.\n"
 "Normally, these other operating systems are correctly detected and\n"
 "installed. If this is not the case, you can add an entry by hand in this\n"
 "screen. Be careful as to choose the correct parameters.\n"
@@ -1626,7 +1631,7 @@ msgid ""
 "in this case, you will need a boot disk in order to boot them!"
 msgstr ""
 
-#: ../../help.pm_.c:359
+#: ../../help.pm_.c:356
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1647,10 +1652,39 @@ msgid ""
 "    * <number>:  use the corresponding text mode."
 msgstr ""
 
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:375
+msgid ""
+"SILO is a bootloader for SPARC: it is able to boot\n"
+"either GNU/Linux or any other operating system present on your computer.\n"
+"Normally, these other operating systems are correctly detected and\n"
+"installed. If this is not the case, you can add an entry by hand in this\n"
+"screen. Be careful as to choose the correct parameters.\n"
+"\n"
+"\n"
+"You may also want not to give access to these other operating systems to\n"
+"anyone, in which case you can delete the corresponding entries. But\n"
+"in this case, you will need a boot disk in order to boot them!"
+msgstr ""
+
+#: ../../help.pm_.c:387
+msgid ""
+"SILO main options are:\n"
+"  - Bootloader installation: Indicate where you want to place the\n"
+"information required to boot to GNU/Linux. Unless you know exactly\n"
+"what you are doing, choose \"First sector of drive (MBR)\".\n"
+"\n"
+"\n"
+"  - Delay before booting default image: Specifies the number in tenths\n"
+"of a second the boot loader should wait before booting the first image.\n"
+"This is useful on systems that immediately boot from the hard disk after\n"
+"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+"omitted or is set to zero."
+msgstr ""
+
+#: ../../help.pm_.c:400
 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"
+"core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
 "you must configure your video card and monitor. Most of these\n"
 "steps are automated, though, therefore your work may only consist\n"
 "of verifying what has been done and accept the settings :)\n"
@@ -1662,19 +1696,19 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:413
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
 msgstr ""
 
-#: ../../help.pm_.c:395
+#: ../../help.pm_.c:417
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
 msgstr ""
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:421
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
@@ -1689,17 +1723,13 @@ msgid ""
 "  - 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"
+"    you don't know, select \"Medium\".\n"
 "\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"
+"    computer. As a consequence, GNU/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"
@@ -1712,7 +1742,7 @@ msgid ""
 "    select this option (Note: NumLock may or may not work under X)."
 msgstr ""
 
-#: ../../help.pm_.c:428
+#: ../../help.pm_.c:446
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -1721,96 +1751,96 @@ msgid ""
 "the additional instructions."
 msgstr ""
 
-#: ../../install2.pm_.c:43
+#: ../../install2.pm_.c:44
 msgid "Choose your language"
 msgstr ""
 
-#: ../../install2.pm_.c:44
+#: ../../install2.pm_.c:45
 msgid "Select installation class"
 msgstr ""
 
-#: ../../install2.pm_.c:45
+#: ../../install2.pm_.c:46
 msgid "Hard drive detection"
 msgstr ""
 
-#: ../../install2.pm_.c:46
+#: ../../install2.pm_.c:47
 msgid "Configure mouse"
 msgstr ""
 
-#: ../../install2.pm_.c:47
+#: ../../install2.pm_.c:48
 msgid "Choose your keyboard"
 msgstr ""
 
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
+#: ../../install2.pm_.c:49 ../../install_steps_interactive.pm_.c:318
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:50
 msgid "Setup filesystems"
 msgstr ""
 
-#: ../../install2.pm_.c:50
+#: ../../install2.pm_.c:51
 msgid "Format partitions"
 msgstr ""
 
-#: ../../install2.pm_.c:51
+#: ../../install2.pm_.c:52
 msgid "Choose packages to install"
 msgstr ""
 
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:53
 msgid "Install system"
 msgstr ""
 
-#: ../../install2.pm_.c:53
+#: ../../install2.pm_.c:54
 msgid "Configure networking"
 msgstr ""
 
-#: ../../install2.pm_.c:54
+#: ../../install2.pm_.c:55
 msgid "Cryptographic"
 msgstr ""
 
-#: ../../install2.pm_.c:55
+#: ../../install2.pm_.c:56
 msgid "Configure timezone"
 msgstr ""
 
-#: ../../install2.pm_.c:56
+#: ../../install2.pm_.c:57
 msgid "Configure services"
 msgstr ""
 
-#: ../../install2.pm_.c:57
+#: ../../install2.pm_.c:58
 msgid "Configure printer"
 msgstr ""
 
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
+#: ../../install2.pm_.c:59 ../../install_steps_interactive.pm_.c:652
 #: ../../install_steps_interactive.pm_.c:653
 msgid "Set root password"
 msgstr ""
 
-#: ../../install2.pm_.c:59
+#: ../../install2.pm_.c:60
 msgid "Add a user"
 msgstr ""
 
-#: ../../install2.pm_.c:61
+#: ../../install2.pm_.c:62
 msgid "Create a bootdisk"
 msgstr ""
 
-#: ../../install2.pm_.c:63
+#: ../../install2.pm_.c:64
 msgid "Install bootloader"
 msgstr ""
 
-#: ../../install2.pm_.c:64
+#: ../../install2.pm_.c:65
 msgid "Configure X"
 msgstr ""
 
-#: ../../install2.pm_.c:66
+#: ../../install2.pm_.c:67
 msgid "Auto install floppy"
 msgstr ""
 
-#: ../../install2.pm_.c:68
+#: ../../install2.pm_.c:69
 msgid "Exit install"
 msgstr ""
 
-#: ../../install2.pm_.c:337
+#: ../../install2.pm_.c:325
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -1829,28 +1859,28 @@ msgid ""
 "Continue at your own risk!"
 msgstr ""
 
-#: ../../install_any.pm_.c:373
+#: ../../install_any.pm_.c:381
 msgid "Searching root partition."
 msgstr ""
 
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:410
 msgid "Information"
 msgstr ""
 
-#: ../../install_any.pm_.c:403
+#: ../../install_any.pm_.c:411
 #, c-format
 msgid "%s: This is not a root partition, please select another one."
 msgstr ""
 
-#: ../../install_any.pm_.c:405
+#: ../../install_any.pm_.c:413
 msgid "No root partition found"
 msgstr ""
 
-#: ../../install_any.pm_.c:443
+#: ../../install_any.pm_.c:451
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
-#: ../../install_any.pm_.c:606
+#: ../../install_any.pm_.c:614
 msgid "Error reading file $f"
 msgstr ""
 
@@ -1888,91 +1918,6 @@ msgstr ""
 msgid "Entering step `%s'\n"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:253
-msgid "You must have a swap partition"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:255
-msgid ""
-"You don't have a swap partition\n"
-"\n"
-"Continue anyway?"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:287
-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:451
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:452
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:364
-msgid "Choose the packages you want to install"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:367
-msgid "Info"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:372
-#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:537
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Installing"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:543
-msgid "Please wait, "
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:545
-msgid "Time remaining "
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:546
-msgid "Total time "
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:555
-#: ../../install_steps_interactive.pm_.c:382
-msgid "Preparing installation"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:570
-#, c-format
-msgid "Installing package %s"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-#: ../../install_steps_gtk.pm_.c:615
-msgid "Go on anyway?"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:611
-msgid "There was an error ordering packages:"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:999
-msgid "Use existing configuration for X11?"
-msgstr ""
-
 #: ../../install_steps_gtk.pm_.c:158
 msgid "Please, choose one of the following classes of installation:"
 msgstr ""
@@ -2001,6 +1946,17 @@ msgstr ""
 msgid "Automatic resizing failed"
 msgstr ""
 
+#: ../../install_steps_gtk.pm_.c:253
+msgid "You must have a swap partition"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:255
+msgid ""
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+
 #: ../../install_steps_gtk.pm_.c:265
 msgid "Which partition do you want to use to put Linux4Win?"
 msgstr ""
@@ -2050,6 +2006,19 @@ msgstr ""
 msgid "Percentage of packages to install"
 msgstr ""
 
+#: ../../install_steps_gtk.pm_.c:364
+msgid "Choose the packages you want to install"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:367
+msgid "Info"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:372 ../../install_steps_interactive.pm_.c:129
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr ""
+
 #: ../../install_steps_gtk.pm_.c:376
 msgid "Automatic dependencies"
 msgstr ""
@@ -2075,6 +2044,16 @@ msgstr ""
 msgid "Name: %s\n"
 msgstr ""
 
+#: ../../install_steps_gtk.pm_.c:451 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:452 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr ""
+
 #: ../../install_steps_gtk.pm_.c:453
 #, c-format
 msgid "Importance: %s\n"
@@ -2116,10 +2095,26 @@ msgstr ""
 msgid "You can't select/unselect this package"
 msgstr ""
 
+#: ../../install_steps_gtk.pm_.c:537 ../../install_steps_interactive.pm_.c:382
+msgid "Installing"
+msgstr ""
+
 #: ../../install_steps_gtk.pm_.c:540
 msgid "Estimating"
 msgstr ""
 
+#: ../../install_steps_gtk.pm_.c:543
+msgid "Please wait, "
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:545
+msgid "Time remaining "
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:546
+msgid "Total time "
+msgstr ""
+
 #: ../../install_steps_gtk.pm_.c:552 ../../interactive.pm_.c:84
 #: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
 #: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
@@ -2127,6 +2122,10 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+#: ../../install_steps_gtk.pm_.c:555 ../../install_steps_interactive.pm_.c:382
+msgid "Preparing installation"
+msgstr ""
+
 #: ../../install_steps_gtk.pm_.c:565
 #, c-format
 msgid "%d packages"
@@ -2136,6 +2135,11 @@ msgstr ""
 msgid ", %U MB"
 msgstr ""
 
+#: ../../install_steps_gtk.pm_.c:570
+#, c-format
+msgid "Installing package %s"
+msgstr ""
+
 #: ../../install_steps_gtk.pm_.c:596
 #, c-format
 msgid ""
@@ -2146,6 +2150,14 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
+#: ../../install_steps_gtk.pm_.c:611 ../../install_steps_gtk.pm_.c:615
+msgid "Go on anyway?"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:611
+msgid "There was an error ordering packages:"
+msgstr ""
+
 #: ../../install_steps_gtk.pm_.c:615
 msgid "There was an error installing packages:"
 msgstr ""
@@ -2213,7 +2225,7 @@ msgstr ""
 #: ../../install_steps_interactive.pm_.c:122
 msgid ""
 "Are you sure you are an expert? \n"
-"You will be allowed to make powerfull but dangerous things here."
+"You will be allowed to make powerful but dangerous things here."
 msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:129
@@ -2664,19 +2676,37 @@ msgstr ""
 msgid "This user name is already added"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../install_steps_interactive.pm_.c:748
+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 "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:764
 msgid "First floppy drive"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:765
 msgid "Second floppy drive"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:766
 msgid "Skip"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:772
 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 "
@@ -2690,157 +2720,182 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:781
 msgid "Sorry, no floppy drive available"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:784
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:788
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:791
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:58
+#: ../../install_steps_interactive.pm_.c:803 ../../standalone/drakboot_.c:58
 msgid "Installation of LILO failed. The following error occured:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:806
+#: ../../install_steps_interactive.pm_.c:818
+msgid "SILO Installation"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:824
 msgid "Do you want to use SILO?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:817
+#: ../../install_steps_interactive.pm_.c:829
+msgid "Bootloader installation"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:838
 msgid "SILO main options"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:830
+#: ../../install_steps_interactive.pm_.c:852
 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:858
+#: ../../install_steps_interactive.pm_.c:863
+msgid "Other OS (SunOS...)"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:884
 msgid "Partition"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:878
+#: ../../install_steps_interactive.pm_.c:906
 msgid "This label is already in use"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:892
+#: ../../install_steps_interactive.pm_.c:920
 msgid "Installation of SILO failed. The following error occured:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:930
 msgid "Preparing bootloader"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:938
 msgid "Do you want to use aboot?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:941
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:930
+#: ../../install_steps_interactive.pm_.c:958
 msgid "Proxies configuration"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:931
+#: ../../install_steps_interactive.pm_.c:959
 msgid "HTTP proxy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:932
+#: ../../install_steps_interactive.pm_.c:960
 msgid "FTP proxy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:938
+#: ../../install_steps_interactive.pm_.c:966
 msgid "Proxy should be http://..."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:939
+#: ../../install_steps_interactive.pm_.c:967
 msgid "Proxy should be ftp://..."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:977 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:978 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:979 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:980 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:981 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:982 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:995
 msgid "Miscellaneous questions"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:996
 msgid "(may cause data corruption)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:996
 msgid "Use hard drive optimisations?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:969 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:997 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:998
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:1000
 msgid "Removable media automounting"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:1002
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:1005
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:1007
 msgid "Enable num lock at startup"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "Give the ram size in MB"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:1012
 msgid "Can't use supermount in high security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:1014
+msgid ""
+"beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
+"If you want to be root, you have to login as a user and then use \"su\".\n"
+"More generally, do not expect to use your machine for anything but as a "
+"server.\n"
+"You have been warned."
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1031
+msgid "Use existing configuration for X11?"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1036
 msgid ""
 "DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
 "By default, the 3.3 server is used because it works on more graphic cards.\n"
@@ -2848,159 +2903,23 @@ msgid ""
 "Do you want to try XFree 4.0?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1017
+#: ../../install_steps_interactive.pm_.c:1049
 msgid "Try to find PCI devices?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1068
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1070
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1084
 msgid "Creating auto install floppy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1070
-msgid ""
-"Some steps are not completed.\n"
-"\n"
-"Do you really want to quit now?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1077
-msgid ""
-"Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
-"\n"
-"For information on fixes which are available for this release of "
-"Linux-Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
-"\n"
-"Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1086
-msgid "Shutting down"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1098
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1099
-#, c-format
-msgid "(module %s)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1109
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1117
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Autoprobe"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1122
-msgid "Specify options"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1132
-#, c-format
-msgid ""
-"You may now provide its options to module %s.\n"
-"Options are in format ``name=value name2=value2 ...''.\n"
-"For instance, ``io=0x300 irq=7''"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1135
-msgid "Module options:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1145
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1158
-msgid "Try to find PCMCIA cards?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "Configuring PCMCIA cards..."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1159
-msgid "PCMCIA"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1171
-#, c-format
-msgid "Try to find %s devices?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1180
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Do you have another one?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1182
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
-msgid "No"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1184 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:458
-msgid "Yes"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "See hardware info"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1202
-msgid "Bringing up the network"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1207
-msgid "Bringing down the network"
-msgstr ""
-
 #: ../../install_steps_newt.pm_.c:21
 #, c-format
 msgid "Linux-Mandrake Installation %s"
@@ -3018,7 +2937,16 @@ msgid ""
 "When you are done, don't forget to save using `w'"
 msgstr ""
 
-#: ../../interactive.pm_.c:244
+#: ../../interactive.pm_.c:79 ../../my_gtk.pm_.c:458
+#: ../../printerdrake.pm_.c:124
+msgid "No"
+msgstr ""
+
+#: ../../interactive.pm_.c:79 ../../my_gtk.pm_.c:458
+msgid "Yes"
+msgstr ""
+
+#: ../../interactive.pm_.c:245
 msgid "Please wait"
 msgstr ""
 
@@ -3458,32 +3386,32 @@ msgstr ""
 msgid "Is this correct?"
 msgstr ""
 
-#: ../../partition_table.pm_.c:528
+#: ../../partition_table.pm_.c:538
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: ../../partition_table.pm_.c:546
+#: ../../partition_table.pm_.c:556
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions"
 msgstr ""
 
-#: ../../partition_table.pm_.c:635
+#: ../../partition_table.pm_.c:645
 #, c-format
 msgid "Error reading file %s"
 msgstr ""
 
-#: ../../partition_table.pm_.c:642
+#: ../../partition_table.pm_.c:652
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr ""
 
-#: ../../partition_table.pm_.c:644
+#: ../../partition_table.pm_.c:654
 msgid "Bad backup file"
 msgstr ""
 
-#: ../../partition_table.pm_.c:665
+#: ../../partition_table.pm_.c:675
 #, c-format
 msgid "Error writing to file %s"
 msgstr ""
@@ -3977,7 +3905,7 @@ msgstr ""
 msgid "Choose which services should be automatically started at boot time"
 msgstr ""
 
-#: ../../silo.pm_.c:146
+#: ../../silo.pm_.c:164
 #, c-format
 msgid ""
 "Welcome to SILO the operating system chooser!\n"
author	Francois Pons <fpons@mandriva.com>	2000-06-23 13:03:19 +0000
committer	Francois Pons <fpons@mandriva.com>	2000-06-23 13:03:19 +0000
commit	c8d8767aa3dfeb049fd662080ac8cf2a7075ca56 (patch)
tree	e424b6ad6a2f2142554bee44cedd04d5016de938
parent	b8820f0b8f1a137b9baa11b76626ad79e47cb707 (diff)
download	drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.tar drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.tar.gz drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.tar.bz2 drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.tar.xz drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.zip