no_comment

16 files changed, 207 insertions, 211 deletions

diff --git a/perl-install/common.pm b/perl-install/common.pm
index c9366977f..7a9bddc5d 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -6,7 +6,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $printable_chars $sizeof_int $bitof_int
 
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
-    common     => [ qw(__ even odd min max sqr sum sign product bool listlength bool2text text2bool to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX) ],
+    common     => [ qw(__ even odd min max sqr sum sign product bool invbool listlength bool2text text2bool to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX) ],
     functional => [ qw(fold_left compose map_index grep_index map_each grep_each map_tab_hash mapn mapn_ difference2 before_leaving catch_cdie cdie) ],
     file       => [ qw(dirname basename touch all glob_ cat_ symlinkf chop_ mode typeFromMagic) ],
     system     => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ crypt_ getVarsFromSh setVarsInSh) ],
@@ -58,6 +58,7 @@ sub member { my $e = shift; foreach (@_) { $e eq $_ and return 1 } 0 }
 sub dirname { @_ == 1 or die "usage: dirname <name>\n"; local $_ = shift; s|[^/]*/*\s*$||; s|(.)/*$|$1|; $_ || '.' }
 sub basename { @_ == 1 or die "usage: basename <name>\n"; local $_ = shift; s|/*\s*$||; s|.*/||; $_ }
 sub bool { $_[0] ? 1 : 0 }
+sub invbool { my $a = shift; $$a = !$$a; $$a }
 sub listlength { scalar @_ }
 sub bool2text { $_[0] ? "true" : "false" }
 sub text2bool { my $t = lc($_[0]); $t eq "true" || $t eq "yes" ? 1 : 0 }
diff --git a/perl-install/help.pm b/perl-install/help.pm
index f12f3413d..f57716e08 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -36,18 +36,18 @@ this.
 a highly customized installation, this Install Class is for you."),
 
 setupSCSI =>
- __("Panoramix will attempt at first to look for one or more PCI
+ __("DrakX will attempt at first to look for one or more PCI
 SCSI adapter(s). If it finds it (or them)  and knows which driver(s)
 to use, it will insert it (them)  automatically.
 
-If your SCSI adapter is ISA, or is PCI but Panoramix doesn't know
+If your SCSI adapter is ISA, or is PCI but DrakX doesn't know
 which driver to use for this card, or if you have no SCSI adapters
 at all, you will then be prompted on whether you have one or not.
 If you have none, answer \"No\". If you have one or more, answer
 \"Yes\". A list of drivers will then pop up, from which you will
 have to select one.
 
-After you have selected the driver, Panoramix will ask if you
+After you have selected the driver, DrakX will ask if you
 want to specify options for it. First, try and let the driver
 probe for the hardware: it usually works fine.
 
@@ -103,22 +103,22 @@ doInstallStep =>
 should only take a few minutes."),
 
 configureMouse =>
- __("If Panoramix failed to find your mouse, or if you want to
+ __("If DrakX failed to find your mouse, or if you want to
 check what it has done, you will be presented the list of mice
 above.
 
 
-If you agree with Panoramix' settings, just jump to the section
+If you agree with DrakX' settings, just jump to the section
 you want by clicking on it in the menu on the left. Otherwise,
 choose a mouse type in the menu which you think is the closest
 match for your mouse.
 
-In case of a serial mouse, you will also have to tell Panoramix
+In case of a serial mouse, you will also have to tell DrakX
 which serial port it is connected to."),
 
 configureNetwork =>
  __("This section is dedicated to configuring a local area network,
-or LAN. If you answer \"Yes\" here, Panoramix will try to find an
+or LAN. If you answer \"Yes\" here, DrakX will try to find an
 Ethernet adapter on your machine. PCI adapters should be found and
 initialized automatically. However, if your peripheral is ISA,
 autodetection will not work, and you will have to choose a driver
@@ -224,7 +224,7 @@ steps are automated, though, therefore your work may only consist
 of verifying what has been done and accept the settings :)
 
 When the configuration is over, X will be started (unless you
-ask Panoramix not to) so that you can check and see if the
+ask DrakX not to) so that you can check and see if the
 settings suit you. If they don't, you can come back and
 change them, as many times as necessary."),
 
@@ -267,18 +267,18 @@ this.
 a highly customized installation, this Install Class is for you."),
 
 setupSCSI =>
- __("Panoramix will attempt at first to look for one or more PCI
+ __("DrakX will attempt at first to look for one or more PCI
 SCSI adapter(s). If it finds it (or them)  and knows which driver(s)
 to use, it will insert it (them)  automatically.
 
-If your SCSI adapter is ISA, or is PCI but Panoramix doesn't know
+If your SCSI adapter is ISA, or is PCI but DrakX doesn't know
 which driver to use for this card, or if you have no SCSI adapters
 at all, you will then be prompted on whether you have one or not.
 If you have none, answer \"No\". If you have one or more, answer
 \"Yes\". A list of drivers will then pop up, from which you will
 have to select one.
 
-After you have selected the driver, Panoramix will ask if you
+After you have selected the driver, DrakX will ask if you
 want to specify options for it. First, try and let the driver
 probe for the hardware: it usually works fine.
 
@@ -334,22 +334,22 @@ doInstallStep =>
 should only take a few minutes."),
 
 configureMouse =>
- __("If Panoramix failed to find your mouse, or if you want to
+ __("If DrakX failed to find your mouse, or if you want to
 check what it has done, you will be presented the list of mice
 above.
 
 
-If you agree with Panoramix' settings, just jump to the section
+If you agree with DrakX' settings, just jump to the section
 you want by clicking on it in the menu on the left. Otherwise,
 choose a mouse type in the menu which you think is the closest
 match for your mouse.
 
-In case of a serial mouse, you will also have to tell Panoramix
+In case of a serial mouse, you will also have to tell DrakX
 which serial port it is connected to."),
 
 configureNetwork =>
  __("This section is dedicated to configuring a local area network,
-or LAN. If you answer \"Yes\" here, Panoramix will try to find an
+or LAN. If you answer \"Yes\" here, DrakX will try to find an
 Ethernet adapter on your machine. PCI adapters should be found and
 initialized automatically. However, if your peripheral is ISA,
 autodetection will not work, and you will have to choose a driver
@@ -455,7 +455,7 @@ steps are automated, though, therefore your work may only consist
 of verifying what has been done and accept the settings :)
 
 When the configuration is over, X will be started (unless you
-ask Panoramix not to) so that you can check and see if the
+ask DrakX not to) so that you can check and see if the
 settings suit you. If they don't, you can come back and
 change them, as many times as necessary."),
 
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 0639fd6a1..0d9d59783 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -121,7 +121,7 @@ $o = $::o = {
     autoSCSI   => 0,
     mkbootdisk => 1, #- no mkbootdisk if 0 or undef,   find a floppy with 1
 #-    packages   => [ qw() ],
-    partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0, autoformat => 0, readonly => 1 },
+    partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0, autoformat => 0, readonly => 0 },
 #-    partitions => [
 #-		      { mntpoint => "/boot", size =>  16 << 11, type => 0x83 },
 #-		      { mntpoint => "/",     size => 256 << 11, type => 0x83 },
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index e46428db5..96cd86be6 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -98,8 +98,8 @@ sub shells($) {
 sub getAvailableSpace {
     my ($o) = @_;
 
-    do { $_->{mntpoint} eq '/usr' and return $_->{size} * 512 } foreach @{$o->{fstab}};
-    do { $_->{mntpoint} eq '/'    and return $_->{size} * 512 } foreach @{$o->{fstab}};
+    do { $_->{mntpoint} eq '/usr' and return int($_->{size} * 512 / 1.03) } foreach @{$o->{fstab}};
+    do { $_->{mntpoint} eq '/'    and return int($_->{size} * 512 / 1.03) } foreach @{$o->{fstab}};
 
     if ($::testing) {
 	log::l("taking 200MB for testing");
@@ -120,8 +120,8 @@ sub setPackages($$) {
 
 	pkgs::getDeps($o->{packages});
 
-	$o->{compss} = pkgs::readCompss($o->{packages});
-	$o->{compssListLevels} = pkgs::readCompssList($o->{packages}, $o->{compss});
+	my $c; ($o->{compss}, $c) = pkgs::readCompss($o->{packages});
+	$o->{compssListLevels} = pkgs::readCompssList($o->{packages}, $c);
 	$o->{compssListLevels} ||= $install_classes;
 	push @{$o->{base}}, "kernel-smp" if detect_devices::hasSMP();
 	push @{$o->{base}}, "kernel-pcmcia-cs" if $o->{pcmcia};
@@ -136,7 +136,6 @@ sub setPackages($$) {
 	} foreach @{$o->{base}};
     }
 
-    pkgs::setShowFromCompss($o->{compss}, $o->{installClass}, $o->{lang});
     ($o->{packages_}{ind}, $o->{packages_}{select_level}) = pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, getAvailableSpace($o) * 0.7, $o->{installClass}, $o->{lang}, $o->{isUpgrade});
 }
 
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index f8623a206..49b4313ed 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -63,7 +63,7 @@ sub ask_many_from_list_refW($$$$$) {
 			       my $nn = $n++;
 			       my $o = Gtk::CheckButton->new($_);
 			       $o->set_active(${$val->[$nn]});
-			       $o->signal_connect(clicked => sub { ${$val->[$nn]} = !${$val->[$nn]} });
+			       $o->signal_connect(clicked => sub { invbool \${$val->[$nn]} });
 			       $o;
 			   } @$list),
 		   $w->create_okcancel,
@@ -94,7 +94,7 @@ sub ask_from_entries_refW {
 	} elsif ($_->{type} eq "bool") {
 	    my $w = Gtk::CheckButton->new($_->{text});
 	    $w->set_active(${$_->{val}});
-	    my $i = $_; $w->signal_connect(clicked => sub { $ignore or ${$i->{val}} = !${$i->{val}} });
+	    my $i = $_; $w->signal_connect(clicked => sub { $ignore or invbool \${$i->{val}} });
 	    $w;
 	} else {
 	    new Gtk::Entry;
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 2f8eb812e..02812483f 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -130,6 +130,7 @@ sub gtkadd($@) {
 
 sub gtktext_insert($$) {
     my ($w, $t) = @_;
+    $w->backward_delete($w->get_length);
     $w->insert(undef, undef, undef, "$t\n"); #- needs \n otherwise in case of one line text the beginning is not shown (even with the vadj->set_value)
     $w->set_word_wrap(1);
     $w->vadj->set_value(0);
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index b78ec1d24..eb72a1bf1 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -170,7 +170,7 @@ sub getDeps($) {
 
 sub readCompss($) {
     my ($packages) = @_;
-    my (@compss, $ps);
+    my ($compss, $compss_, $ps) = { childs => {} };
 
     my $f = install_any::getFile("compss") or die "can't find compss";
     foreach (<$f>) {
@@ -178,19 +178,25 @@ sub readCompss($) {
 	s/#.*//;
 
 	if (/^(\S+)/) {
-	    $ps = [];
-	    push @compss, { name => $1, packages => $ps };
+	    my $p = $compss;
+	    my @l = split ':', $1;
+	    pop @l if $l[-1] =~ /^(x11|console)$/;
+	    foreach (@l) {
+		$p->{childs}{$_} ||= { childs => {} };
+		$p = $p->{childs}{$_};
+	    }
+	    $ps = $p->{packages} ||= [];
+	    $compss_->{$1} = $p;
 	} else {
 	    /(\S+)/ or log::l("bad line in compss: $_"), next;
 	    push @$ps, $packages->{$1} || do { log::l("unknown package $1 (in compss)"); next };
 	}
     }
-    \@compss;
+    ($compss, $compss_);
 }
 
 sub readCompssList($$) {
-    my ($packages, $compss) = @_;
-    my %compss; map { $compss{$_->{name}} = $_ } @$compss;
+    my ($packages, $compss_) = @_;
 
     my $f = install_any::getFile("compssList") or die "can't find compssList";
     local $_ = <$f>;
@@ -201,7 +207,7 @@ sub readCompssList($$) {
 	/^\s*$/ || /^#/ and next;
 
 	/^packages\s*$/ and do { $e = $packages; next };
-	/^categories\s*$/ and do { $e = \%compss; next };
+	/^categories\s*$/ and do { $e = $compss_; next };
 
 	my ($name, @values) = split;
 
@@ -221,20 +227,6 @@ sub verif_lang($$) {
     !($1 eq $lang || eval { lang::text2lang($1) eq $lang } && !$@);
 }
 
-sub setShowFromCompss($$$) {
-    my ($compss, $install_class, $lang) = @_;
-
-    my $l = substr($install_class, 0, 1);
-
-    foreach my $c (@$compss) {
-	$c->{show} = bool($c->{options} =~ /($l|\*)/);
-	foreach my $p (@{$c->{packages}}) {
-	    local $_ = $p->{options};
-	    $p->{show} = /$l|\*/ && verif_lang($p, $lang);
-	}
-    }
-}
-
 sub setSelectedFromCompssList($$$$$$) {
     my ($compssListLevels, $packages, $size, $install_class, $lang, $isUpgrade) = @_;
     my ($level, $ind) = 100;
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index d5efa27ca..4686ae38f 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -222,7 +222,7 @@ Example of data-struct:
 
 #-#####################################################################################
 
-#-if we are in an panoramix config
+#-if we are in an DrakX config
 my $prefix = "";
 
 #-location of the printer database in an installed system
diff --git a/perl-install/resize_fat/io.pm b/perl-install/resize_fat/io.pm
index 48309db91..7255bc437 100644
--- a/perl-install/resize_fat/io.pm
+++ b/perl-install/resize_fat/io.pm
@@ -47,7 +47,7 @@ sub read_file($$) {
     my ($fs, $cluster) = @_;
     my $buf = '';
 
-    for (; !resize_fat::fat::is_eof($cluster); $cluster = resize_fat::fat::next($fs, $cluster)) {
+    for (; !resize_fat::fat::is_eof($cluster); $cluster = resize_fat::fat::next ($fs, $cluster)) {
 	$cluster == 0 and die "Bad FAT: unterminated chain\n";
 	$buf .= read_cluster($fs, $cluster);
     }
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 408f31c36..fc122e937 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -4,7 +4,7 @@ packages
 
 adjtimex                                  0    99    95
 AfterStep                                42     0     0
-afterstep-apps                            0     0     0
+AfterStep-APPS                            0     0     0
 aktion                                   85     0    15
 am-utils                                  0     0     0
 anacron                                  70     0    98
@@ -57,12 +57,12 @@ cervisia                                  0     0     0
 chkconfig                                22     0    10
 chkfontpath                              44     0    50
 chos                                      0     0     0
-chos-chos                                 0     0     0
+chos-vchos                                 0     0     0
 cleanfeed                                 0    99     0
 colorgcc                                  0     0    99
 comanche                                  0    80     0
 compat-glibc                              0     0    99
-comstat                                   0     0     0
+comsat                                   0     0     0
 console-tools                            40    99    99
 control-center                           78     0    10
 control-center-devel                     25     0    10
@@ -72,6 +72,7 @@ cpp                                      50     0    98
 cproto                                   50     0    90
 cracklib                                 50    99    35
 cracklib-dicts                           50    99    35
+cron					100	100	100
 crontabs                                 75    98    98
 ctags                                    50     0    90
 cvs                                      50    99    80
@@ -140,7 +141,7 @@ ftp                                      75     0     0
 fvwm                                     75     0     0
 fvwm2                                    40     0     0
 fvwm2-icons                              45     0     0
-fwois                                     0     0     0
+fwhois                                     0     0     0
 gaddr                                    56     0     0
 gated                                     0    99     0
 gatos                                    65     0     0
@@ -216,7 +217,7 @@ g-print                                   0     0     0
 gqview                                   65     0     0
 grep                                     80     0    98
 groff                                    60     0     0
-groff-gxeditview                          0     0     0
+groff-gxditview                          0     0     0
 grpmi                                    35     0     0
 gscript                                   0     0     0
 gsl                                       0     0     0
@@ -225,7 +226,7 @@ gtk+                                     50     0    70
 gtk+-devel                               25     0    70
 gtk-engines                              40     0    70
 gtkglarea                                 0     0     0
-gtkszip                                   0     0     0
+gtkzip                                   0     0     0
 gtop                                     85     0     0
 guavac                                    0     0    90
 guile                                     0     0    85
@@ -236,8 +237,8 @@ gzip                                     70    99    98
 hdparm                                   75    99    99
 helptool                                 75     0     0
 hexedit                                   0     0    95
-howot-croatian                            0     0     0
 howto                                    75     0     0
+howot-croatian                            0     0     0
 howto-chinese                             0     0     0
 howto-french                              0     0     0
 howto-german                              0     0     0
@@ -246,7 +247,7 @@ howto-html                                0     0     0
 howto-indonesian                          0     0     0
 howto-italian                             0     0     0
 howto-japanese                            0     0     0
-howto-koeran                              0     0     0
+howto-korean                              0     0     0
 howto-polish                              0     0     0
 howto-serbian                             0     0     0
 howto-sgml                                0     0     0
@@ -262,8 +263,8 @@ icewm-themes                             62     0     0
 ImageMagick                               0     0    65
 ImageMagick-devel                         0     0    65
 imap                                      0    99     0
-imblib-cfgeditor                          0     0    75
 imlib                                    50     0    75
+imbib-cfgeditor                          0     0    75
 imlib-devel                              25     0    50
 imwheel                                  85     0     0
 indent                                   40     0    97
@@ -300,7 +301,7 @@ kcdwrite                                  0     0     0
 kcmclock                                  0     0     0
 kcmlaptop                                 1     0     0
 kcpumon                                   0     0     0
-kdbconfig                                99    99    99
+kbdconfig                                99    99    99
 kdbg                                      0     0     0
 kdeadmin                                 70     0     0
 kdebase                                  85     0     0
@@ -313,7 +314,7 @@ kdenetwork                               90     0     0
 kderadio                                  0     0     0
 kdesu                                    90     0     0
 kdesupport                               75     0     0
-kdethemes                                 0     0     0
+kde-themes                                 0     0     0
 kdetoys                                  57     0     0
 kdeutils                                 85     0     0
 kdevelop                                  0     0     0
@@ -323,16 +324,17 @@ kdiskcat                                  0     0     0
 kdpms                                    78     0     0
 keasycd                                   0     0     0
 kencoder                                  0     0     0
-kernekcfg                                 0     0     0
+kernelcfg                                 0     0     0
 kernel                                   99    99    99
 kernel-BOOT                               0     0     0
 kernel-doc                                0     0    75
 kernel-headers                            0     0    99
-kernel-icbs                               0     0     0
-kernel-pcmci-cs                           0     0     0
+kernel-ibcs                               0     0     0
+kernel-pcmcia-cs                           0     0     0
 kernel-smp                                0     0     0
 kernel-smp-fb                             0     0     0
 kernel-source                             0     0    99
+kernelcfg				100	100	100
 kfortune                                 94     0     0
 kfsstatus                                 0     0     0
 kfun21                                    0     0     0
@@ -344,7 +346,7 @@ khylafax                                  0     0     0
 killustrator                             89     0     0
 kimon                                     0     0     0
 kinterruptinfo                            0     0     0
-kisndload                                 0     0     0
+kisdnload                                 0     0     0
 kjumpingcube                              0     0     0
 kless                                     0     0     0
 klibreta                                  0     0     0
@@ -353,6 +355,7 @@ klyx                                     80     0     0
 kmag                                      0     0     0
 kmemmon                                   0     0     0
 kmol                                      0     0     0
+kmp3te-devel				100	100	100
 kmpg                                     80     0     0
 kmsgmodem                                 0     0     0
 knc                                       0     0     0
@@ -366,8 +369,8 @@ kover                                     0     0     0
 kpackage                                 79     0     0
 kpacman                                   0     0     0
 kpilot                                   50     0     0
-kmpg3te                                   0     0     0
-kmpg3te-devel                             0     0     0
+kmp3te                                   0     0     0
+kmp3te-devel                             0     0     0
 kpppload                                 49     0     0
 krubik                                   68     0     0
 ksendfax                                 11     0     0
@@ -385,10 +388,11 @@ ktop                                      0     0     0
 ktron                                     0     0     0
 kuickshow                                 0     0     0
 kvirc                                     0     0     0
+kvncviewer				100	100	100
 kvoice                                   11     0     0
 kweather                                  0     0     0
 kwvdial                                   0     0     0
-lbtrace                                   0     0     0
+ltrace                                   0     0     0
 ldconfig                                  0     0    98
 ld.so                                    70     0    98
 less                                     10     0    97
@@ -479,7 +483,6 @@ mgetty-voice                             10     0     0
 mikmod                                   80     0     0
 mingetty                                 24     0     0
 minicom                                   0     0     0
-minigetty                                 0     0     0
 mirrordir                                 0    99     0
 mkbootdisk                               66     0     0
 mkdosfs-ygg                               0     0     0
@@ -502,7 +505,8 @@ mt-st                                    65     0     0
 multimedia                               75     0     0
 mutt                                     60     0     0
 mxp                                       0     0     0
-mysql-share                               0     0     0
+MySQL-shared-libs                          0     0     0
+MySQL_GPL-shared-libs			0	0	0
 nag                                       0     0    25
 nc                                        0     0     0
 ncftp                                    75     0     0
@@ -512,9 +516,12 @@ ncurses                                  75     0    90
 ncurses-devel                            25     0    90
 netcfg                                   75     0     0
 netkit-base                              80    99    80
+netscape-castellano
 netscape-common                          90     0     0
 netscape-communicator                    95     0     0
+netscape-francais			100	100	100
 netscape-navigator                        0     0     0
+netscape-walon
 net-tools                                50    99    90
 newt                                     60     0    85
 newt-devel                               25     0    85
@@ -533,7 +540,7 @@ patch                                    80     0    80
 pciutils                                  0     0     0
 pdksh                                     0     0     0
 perl                                     60    99    90
-perlfitlib                                0     0     0
+perlftlib                                0     0     0
 perl-GTK                                  0     0    80
 perl-MD5                                  0    99    85
 perl-Parse-RecDescent                     0     0    85
@@ -549,7 +556,7 @@ pine                                     60     0     0
 playmidi                                 65     0     0
 playmidi-X11                              0     0     0
 pmake                                    10     0    85
-pmake-custom                              0     0    80
+pmake-customs                             0     0    80
 popt                                     50     0    90
 portmap                                  32    99     0
 postfix                                   0     0     0
@@ -603,19 +610,19 @@ rwall                                     0     0     0
 rwho                                     50     0     0
 rxvt                                     09     0    99
 sag                                      65     0    25
-sahsh                                     0     0     0
+sash                                     0     0     0
 samba                                     0    99     0
 sane                                     75     0     0
 sane-devel                                0     0     0
 screen                                    0     0     0
 sed                                       5     0    98
 sendmail                                  0    99     0
-sendmail.cf                               0    99     0
+sendmail-cf                               0    99     0
 sendmail-doc                              0     0     0
 setconsole                               58     0     0
 setserial                                80     0     0
 setup                                    80     0     0
-setuptoll                                 0     0     0
+setuptool                                 0     0     0
 sgml-tools                                0     0    85
 shadow-utils                              0    99     0
 shapecfg                                  0     0     0
@@ -637,11 +644,11 @@ statserial                                0     0     0
 strace                                   50     0    95
 svgalib                                  94     0    75
 svgalib-devel                            25     0    75
-svgatextmod                               0     0     0
+SVGATextMode                            0     0     0
 swatch                                    0     0     0
+switchdesk                                0     0     0
 switchdesk-gnome                          0     0     0
 switchdesk-kde                           85     0     0
-sxitchdesk                                0     0     0
 symlinks                                  0     0     0
 sysklogd                                 50     0     0
 SysVinit                                 99    99    99
@@ -662,14 +669,15 @@ tetex-afm                                15     0    40
 tetex-dvilj                              15     0    40
 tetex-dvips                              15     0    40
 tetex-latex                              15     0    40
+tetex-xdvi				0	0	50
 texinfo                                   0     0    50
 textutils                                50    99    90
-text-xdvi                                 0     0    50
 tftp                                     35     0     0
 thud                                      0     0     0
 time                                     50     0    95
 timeconfig                               75     0     0
 timed                                    50     0     0
+timex					  0	0     0
 timetool                                 85     0     0
 TiMidity++                                0     0     0
 timidity-instruments                      0     0     0
@@ -691,13 +699,13 @@ ucd-snmp-devel                            0     0    85
 ucd-snmp-utils                            0     0    85
 umb-scheme                                0     0    85
 unarj                                     0     0     0
-unit                                      0     0     0
+units                                      0     0     0
 unzip                                    90    99    97
 urlview                                   0     0     0
 urw-fonts                                48     0     0
 usermode                                 80     0     0
 usernet                                  70     0     0
-utemper                                   0     0     0
+utempter                                   0     0     0
 util-linux                               90    99    98
 uucp                                      0    99     0
 vigmeup                                   0     0     0
@@ -825,7 +833,6 @@ categories
 administration:rpm:console		90	90	90
 administration:rpm:x11			90	00	90
 administration:system:console		00	00	90
-administration:system:x11		00	00	90
 administration:utilities:console	90	90	90
 administration:utilities:x11		90	00	90
 amusement:console			00	00	90
@@ -835,32 +842,29 @@ archiving:x11				90	00	90
 base					00	00	90
 cd-burning:console			00	00	90
 cd-burning:x11				00	00	90
-communications:fax:console		00	90	90
-communications:fax:x11			90	00	90
 communications:modem:console		90	90	90
 communications:modem:x11		90	90	90
 communications:pilot:console		00	90	90
 communications:pilot:x11		90	00	90
 compression:console			10	20	30
 compression:x11				40	50	60
+configuration:kernel:console		50	60	70
+configuration:kernel:x11		50	10	70
+configuration:keyboard:console		60	10	60
 configuration:identification:console	70	80	90
 configuration:identification:x11	90	01	10
-configuration:libs:console		20	20	30
 configuration:libs:x11			40	50	60
+configuration:mail:console		50	80	60
 configuration:network:firewall:console	70	80	90
 configuration:network:firewall:x11	00	10	20
-configuration:network:ftp:console	30	40	50
 configuration:network:ftp:x11		60	70	80
-configuration:network:http:console	90	10	10
 configuration:network:http:x11		20	30	40
 configuration:network:mail:console	50	60	70
 configuration:network:mail:x11		80	90	10
-configuration:power:console		10	30	30
 configuration:power:x11			40	60	60
 configuration:time:console		70	90	90
 configuration:time:x11			00	10	20
 configuration:sound:console		30	40	50
-configuration:sound:x11			60	70	80
 configuration:system:console		90	10	10
 configuration:system:x11		20	30	40
 configuration:xfree:console		50	60	70
@@ -895,18 +899,21 @@ daemons:security			00	00	00
 daemons:sound				00	00	00
 daemons:time				00	00	00
 daemons:xfree86				00	00	00
-database:console			10	80	00
-database:x11				60	00	00
-developpment:debuggers			00	00	90
+database				10	80	00
+developpment:debuggers:console		00	00	90
+developpment:debuggers:x11		10	10	90
 developpment:libs:cdrecord		00	00	90
+developpment:libs:compression		00	00	90
 developpment:libs:database		00	00	90
+developpment:libs:fonts			00	00	90
 developpment:libs:gnome			00	00	90
 developpment:libs:graphics		00	00	90
 developpment:libs:gtk			00	00	90
-developpment:libs:gtk			00	00	90
 developpment:libs:filesystems		00	00	90
 developpment:libs:kde			00	00	90
+developpment:libs:language		00	10	90
 developpment:libs:misc			00	00	90
+developpment:libs:mouse			00	00	90
 developpment:libs:network		00	00	90
 developpment:libs:qt			00	00	90
 developpment:libs:sound			00	00	90
@@ -929,6 +936,9 @@ documentation:languages:korean		90	90	90
 documentation:languages:polish		90	90	90
 documentation:languages:russian		90	90	90
 documentation:languages:serbian		90	90	90
+documentation:languages:slovenian	90	90	90
+documentation:languages:spanish		90	90	90
+documentation:languages:swedish		90	90	90
 documentation:languages:turkish		90	90	90
 documentation:misc			90	90	90
 documentation:tools:console		70	80	80
@@ -936,23 +946,20 @@ documentation:tools:x11			90	10	50
 editors:console				30	80	80
 editors:x11				80	10	80
 emulators:console			50	10	50
-emulators:x11				80	10	50
+emulators				80	10	50
 filemanagers:console			40	80	80
 filemanagers:x11			70	00	70
-files					00	50	10
-finances:console			00	00	10
-finances:x11				50	10	50
+files:console				00	50	10
+files:x11				80	10	50
+finances				00	00	00
 games:console				40	10	40
 games:x11				60	10	60
 gnome					80	10	40
-identification:console			10	50	20
 identification:x11			10	40	30
 info:console				40	90	90
 info:x11				60	20	90
 kde					90	10	90
 kernel					00	50	90
-kernel:tools:console			10	50	90
-kernel:tools:x11			20	50	90
 libs:application			00	10	90
 libs:compression			00	10	90
 libs:database				00	10	90
@@ -970,10 +977,7 @@ libs:qt					00	10	90
 libs:sound				00	10	90
 libs:user_interface			00	10	90
 misc:console				50	80	80
-misc:x11				50	80	80
-monitoring:cpu:console			30	90	90
 monitoring:cpu:x11			50	80	90
-monitoring:disks:console		30	90	90
 monitoring:disks:x11			50	80	90
 monitoring:misc:console			30	90	90
 monitoring:misc:x11			50	80	90
@@ -981,18 +985,15 @@ monitoring:memory:console		30	90	90
 monitoring:memory:x11			50	80	90
 monitoring:network:console		30	90	90
 monitoring:network:x11			50	80	90
-monitoring:power:console		30	90	90
 monitoring:power:x11			50	80	90
-multimedia:graphic:acquisition:console	70	20	70
-multimedia:graphic:acquisition:x11	80	10	80
+multimedia:graphic:acquisition		70	20	70
 multimedia:graphic:console		70	20	70
 multimedia:graphic:image-viewer		90	10	80
 multimedia:graphic:x11			90	10	80
 multimedia:sound:players:console	80	10	70
 multimedia:sound:players:x11		90	10	70
-multimedia:sounds			90	10	60
-multimedia:video:console		80	10	60
-multimedia:video:x11			90	10	60
+multimedia:sounds:sounds		90	10	60
+multimedia:video			90	10	60
 network:ftp:console			70	60	70
 network:ftp:x11				80	10	70
 network:irc&co:console			80	60	70
@@ -1002,20 +1003,22 @@ network:mail:x11			70	10	80
 network:misc:console			50	90	80
 network:misc:x11			60	10	80
 network:netware:console			30	90	80
-network:netware:x11			40	10	80
 network:nfs:console			30	90	80
-network:nfs:x11				40	10	80
 network:nis:console			30	90	80
-network:nis:x11				40	10	80
 network:tools:console			30	90	80
 network:tools:x11			40	10	80
 network:usenet:console			40	90	80
 network:usenet:x11			80	10	80
 network:web:console			10	90	80
 network:web:x11				90	10	90
+office:dictionary:console		80	50	80
+office:textviewer:x11			80	10	80
+office:word_processor:console		50	50	80
+office:word_processor:x11		90	10	80
+print:console				60	90	60
+print:x11				70	10	70
 productivity:console			60	50	50
 productivity:x11			90	00	80
-science:chemistry:console		50	00	80
 science:chemistry:x11			80	00	80
 science:math:console			20	00	80
 science:math:x11			80	00	80
@@ -1031,13 +1034,13 @@ time:x11				90	10	90
 translations				90	90	90
 updates:console				00	90	90
 updates:x11				90	00	90
-utilities:console:files			20	90	90
 utilities:console:kernel		00	80	90
 utilities:console:misc			50	80	80
 utilities:x11:misc			80	00	80
-window-managers:backgrounds		90	00	90
-window-managers:configuration		90	00	90
+window-managers:configuration:console	70	10	70
+window-managers:configuration:x11	90	00	90
 window-managers:themes			90	00	90
 window-managers:window-managers		90	00	90
+xfree86:backgrounds			90	10	90
 xfree86:base				00	00	00
 xfree86:fonts				00	00	00
diff --git a/perl-install/share/po/Changelog b/perl-install/share/po/Changelog
index 51d5a0f21..4e024a298 100644
--- a/perl-install/share/po/Changelog
+++ b/perl-install/share/po/Changelog
@@ -31,7 +31,7 @@
 
 1999-08-25  Pablo Saratxaga <pablo@mandrakesoft.com>
 	* Makefile: corrected the msgmerge update (translations were
-	being deleted !). make it so panoramix.pot has a header
+	being deleted !). make it so DrakX.pot has a header
 	* *.po: get back all *.po files to the latest version including
 	translated strings. add headers
 	* id.po: update from indonesian team
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 9ecc97e38..b5589df59 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-13 00:04+0200\n"
+"POT-Creation-Date: 1999-10-13 13:44+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"
@@ -346,11 +346,11 @@ msgstr ""
 msgid "Format"
 msgstr ""
 
-#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:376
+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:378
 msgid "Move"
 msgstr ""
 
-#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:434
+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:436
 msgid "Resize"
 msgstr ""
 
@@ -441,122 +441,122 @@ msgstr ""
 msgid "Legend"
 msgstr ""
 
-#: ../diskdrake.pm_.c:100
+#: ../diskdrake.pm_.c:102
 msgid "Empty"
 msgstr ""
 
-#: ../diskdrake.pm_.c:100
+#: ../diskdrake.pm_.c:102
 msgid "Ext2"
 msgstr ""
 
-#: ../diskdrake.pm_.c:100
+#: ../diskdrake.pm_.c:102
 msgid "FAT"
 msgstr ""
 
-#: ../diskdrake.pm_.c:100
+#: ../diskdrake.pm_.c:102
 msgid "Other"
 msgstr ""
 
-#: ../diskdrake.pm_.c:100
+#: ../diskdrake.pm_.c:102
 msgid "Swap"
 msgstr ""
 
-#: ../diskdrake.pm_.c:120
+#: ../diskdrake.pm_.c:122
 #, c-format
 msgid "After %s partition %s,"
 msgstr ""
 
-#: ../diskdrake.pm_.c:120 ../diskdrake.pm_.c:367 ../diskdrake.pm_.c:394
+#: ../diskdrake.pm_.c:122 ../diskdrake.pm_.c:369 ../diskdrake.pm_.c:396
 msgid "Read carefully!"
 msgstr ""
 
-#: ../diskdrake.pm_.c:120
+#: ../diskdrake.pm_.c:122
 msgid "all data on this partition will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:138 ../install_any.pm_.c:177 ../install_steps.pm_.c:67
+#: ../diskdrake.pm_.c:140 ../install_any.pm_.c:177 ../install_steps.pm_.c:67
 #: ../install_steps_interactive.pm_.c:37
 msgid "Error"
 msgstr ""
 
-#: ../diskdrake.pm_.c:159 ../diskdrake.pm_.c:511
+#: ../diskdrake.pm_.c:161 ../diskdrake.pm_.c:513
 msgid "Mount point: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:160 ../diskdrake.pm_.c:182
+#: ../diskdrake.pm_.c:162 ../diskdrake.pm_.c:184
 msgid "Device: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:161
+#: ../diskdrake.pm_.c:163
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:162 ../diskdrake.pm_.c:185
+#: ../diskdrake.pm_.c:164 ../diskdrake.pm_.c:187
 msgid "Type: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:163
+#: ../diskdrake.pm_.c:165
 #, c-format
 msgid "Start: sector /*%s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:164
+#: ../diskdrake.pm_.c:166
 msgid "Size: %s MB (%s%%)"
 msgstr ""
 
-#: ../diskdrake.pm_.c:165
+#: ../diskdrake.pm_.c:167
 #, c-format
 msgid ", %s sectors"
 msgstr ""
 
-#: ../diskdrake.pm_.c:167
+#: ../diskdrake.pm_.c:169
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:168
+#: ../diskdrake.pm_.c:170
 msgid "Formatted\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:169
+#: ../diskdrake.pm_.c:171
 msgid "Not formatted\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:170
+#: ../diskdrake.pm_.c:172
 msgid "Mounted\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:171
+#: ../diskdrake.pm_.c:173
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:183
+#: ../diskdrake.pm_.c:185
 #, c-format
 msgid "Size: %d MB\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:184
+#: ../diskdrake.pm_.c:186
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:186
+#: ../diskdrake.pm_.c:188
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:198
+#: ../diskdrake.pm_.c:200
 msgid "Mount"
 msgstr ""
 
-#: ../diskdrake.pm_.c:200
+#: ../diskdrake.pm_.c:202
 msgid "Active"
 msgstr ""
 
-#: ../diskdrake.pm_.c:289
+#: ../diskdrake.pm_.c:291
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -564,7 +564,7 @@ msgid ""
 "need /boot"
 msgstr ""
 
-#: ../diskdrake.pm_.c:293
+#: ../diskdrake.pm_.c:295
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -572,137 +572,137 @@ msgid ""
 "If you plan to use the LILO boot manager, be careful to add a /boot partition"
 msgstr ""
 
-#: ../diskdrake.pm_.c:307
+#: ../diskdrake.pm_.c:309
 msgid "Quit without saving"
 msgstr ""
 
-#: ../diskdrake.pm_.c:307
+#: ../diskdrake.pm_.c:309
 msgid "Quit without writing the partition table?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:322
+#: ../diskdrake.pm_.c:324
 msgid "changing type of"
 msgstr ""
 
-#: ../diskdrake.pm_.c:324
+#: ../diskdrake.pm_.c:326
 msgid "Change partition type"
 msgstr ""
 
-#: ../diskdrake.pm_.c:325
+#: ../diskdrake.pm_.c:327
 msgid "Which partition type do you want?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:339
+#: ../diskdrake.pm_.c:341
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:340
+#: ../diskdrake.pm_.c:342
 msgid "Mount point"
 msgstr ""
 
-#: ../diskdrake.pm_.c:361
+#: ../diskdrake.pm_.c:363
 msgid "formatting"
 msgstr ""
 
-#: ../diskdrake.pm_.c:367
+#: ../diskdrake.pm_.c:369
 msgid "After formatting all partitions,"
 msgstr ""
 
-#: ../diskdrake.pm_.c:367
+#: ../diskdrake.pm_.c:369
 msgid "all data on these partitions will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:377
+#: ../diskdrake.pm_.c:379
 msgid "Which disk do you want to move to?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:381
+#: ../diskdrake.pm_.c:383
 msgid "Sector"
 msgstr ""
 
-#: ../diskdrake.pm_.c:382
+#: ../diskdrake.pm_.c:384
 msgid "Which sector do you want to move to?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:385
+#: ../diskdrake.pm_.c:387
 msgid "Moving"
 msgstr ""
 
-#: ../diskdrake.pm_.c:385
+#: ../diskdrake.pm_.c:387
 msgid "Moving partition..."
 msgstr ""
 
-#: ../diskdrake.pm_.c:394
+#: ../diskdrake.pm_.c:396
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr ""
 
-#: ../diskdrake.pm_.c:396
+#: ../diskdrake.pm_.c:398
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 
-#: ../diskdrake.pm_.c:417
+#: ../diskdrake.pm_.c:419
 msgid "Computing fat filesystem bounds"
 msgstr ""
 
-#: ../diskdrake.pm_.c:417 ../diskdrake.pm_.c:462
+#: ../diskdrake.pm_.c:419 ../diskdrake.pm_.c:464
 msgid "Resizing"
 msgstr ""
 
-#: ../diskdrake.pm_.c:431
+#: ../diskdrake.pm_.c:433
 msgid "resizing"
 msgstr ""
 
-#: ../diskdrake.pm_.c:441
+#: ../diskdrake.pm_.c:443
 msgid "Choose the new size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:441 ../install_steps_graphical.pm_.c:303
+#: ../diskdrake.pm_.c:443 ../install_steps_graphical.pm_.c:304
 msgid "MB"
 msgstr ""
 
-#: ../diskdrake.pm_.c:488
+#: ../diskdrake.pm_.c:490
 msgid "Create a new partition"
 msgstr ""
 
-#: ../diskdrake.pm_.c:504
+#: ../diskdrake.pm_.c:506
 msgid "Start sector: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:507
+#: ../diskdrake.pm_.c:509
 msgid "Size in MB: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:510
+#: ../diskdrake.pm_.c:512
 msgid "Filesystem type: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:512
+#: ../diskdrake.pm_.c:514
 msgid "Preference: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:554 ../diskdrake.pm_.c:570
+#: ../diskdrake.pm_.c:556 ../diskdrake.pm_.c:572
 msgid "Select file"
 msgstr ""
 
-#: ../diskdrake.pm_.c:563
+#: ../diskdrake.pm_.c:565
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:571
+#: ../diskdrake.pm_.c:573
 msgid "Warning"
 msgstr ""
 
-#: ../diskdrake.pm_.c:572
+#: ../diskdrake.pm_.c:574
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:586
+#: ../diskdrake.pm_.c:588
 msgid "Trying to rescue partition table"
 msgstr ""
 
@@ -1193,93 +1193,93 @@ msgid ""
 "Continue anyway?"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:303
+#: ../install_steps_graphical.pm_.c:304
 msgid "Total size: "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:313
+#: ../install_steps_graphical.pm_.c:315
 #, c-format
 msgid "Version: %s\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:314
+#: ../install_steps_graphical.pm_.c:316
 #, c-format
 msgid "Size: %d KB\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:315
+#: ../install_steps_graphical.pm_.c:317
 #, c-format
 msgid ""
 "Summary: %s\n"
 "\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:404
+#: ../install_steps_graphical.pm_.c:429
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:407
+#: ../install_steps_graphical.pm_.c:432
 msgid "Info"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:415
+#: ../install_steps_graphical.pm_.c:440
 msgid "Go"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:416
+#: ../install_steps_graphical.pm_.c:441
 msgid "Select less"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:417
+#: ../install_steps_graphical.pm_.c:442
 msgid "Select more"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:418
+#: ../install_steps_graphical.pm_.c:443
 msgid "Show less"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:419
+#: ../install_steps_graphical.pm_.c:444
 msgid "Show more"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:437
+#: ../install_steps_graphical.pm_.c:462
 msgid "Installing"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:443
+#: ../install_steps_graphical.pm_.c:468
 msgid "Please wait, "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:445
+#: ../install_steps_graphical.pm_.c:470
 msgid "Time remaining "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:446
+#: ../install_steps_graphical.pm_.c:471
 msgid "Total time "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:451
+#: ../install_steps_graphical.pm_.c:476
 msgid "Preparing installation"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:472
+#: ../install_steps_graphical.pm_.c:497
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:497
+#: ../install_steps_graphical.pm_.c:522
 msgid "Go on anyway?"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:497
+#: ../install_steps_graphical.pm_.c:522
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:521
+#: ../install_steps_graphical.pm_.c:546
 msgid "Use existing configuration for X11?"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:594 ../interactive.pm_.c:47
+#: ../install_steps_graphical.pm_.c:619 ../interactive.pm_.c:47
 #: ../interactive.pm_.c:57 ../my_gtk.pm_.c:194 ../my_gtk.pm_.c:348
 #: ../my_gtk.pm_.c:438
 msgid "Ok"
diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index 3e8e1a72b..e556b5e36 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -9,16 +9,16 @@ clean:
 
 verif:
 	perl -ne '/^\s*#/ or $$i += my @l = /\b__?\(/g; END { print "$$i\n" }' $(PMSFILES)
-	perl -ne '$$i += my @l = /\.c:/g; END { print "$$i\n" }' panoramix.pot
+	perl -ne '$$i += my @l = /\.c:/g; END { print "$$i\n" }' DrakX.pot
 
-$(POFILES): panoramix.pot
+$(POFILES): DrakX.pot
 	cp -f $@ $@t
 	msgmerge $@t $< > $@
 	rm $@t
 
-panoramix.pot: $(PMSFILES)
+DrakX.pot: $(PMSFILES)
 	$(MAKE) $(PMSCFILES);
-	xgettext -F -n --keyword=_ --keyword=__ -o panoramix.pot $(PMSCFILES)
+	xgettext -F -n --keyword=_ --keyword=__ -o DrakX.pot $(PMSCFILES)
 	rm $(PMSCFILES)
 
 $(PMSCFILES): %_.c: %
diff --git a/perl-install/share/themes-blackwhite.rc b/perl-install/share/themes-blackwhite.rc
index a370637eb..3e09c4b96 100644
--- a/perl-install/share/themes-blackwhite.rc
+++ b/perl-install/share/themes-blackwhite.rc
@@ -13,6 +13,9 @@ style "any"
   fg[PRELIGHT]    = { 1.0, 1.0, 1.0 }
   fg[INSENSITIVE] = { 1.0, 1.0, 1.0 }
   text[INSENSITIVE]={ 1.0, 1.0, 1.0 }
+
+  bg[SELECTED]    = { 1.0, 1.0, 1.0 }
+  fg[SELECTED]    = { 0, 0, 0 }
 }
 
 style "entry"
@@ -20,9 +23,6 @@ style "entry"
   base[NORMAL] = { 1.0, 1.0, 1.0 }
   base[ACTIVE] = { 1.0, 1.0, 1.0 }
   fg[NORMAL] = { 0.67, 0.67, 0.67 }
-
-  bg[SELECTED] = { 0.67, 0.67, 0.67 }
-  fg[SELECTED] = { 1.0, 1.0, 1.0 }
 }
 
 style "button" = "any"
diff --git a/perl-install/share/themes-blue.rc b/perl-install/share/themes-blue.rc
index ab2344f8b..a23bd6df2 100644
--- a/perl-install/share/themes-blue.rc
+++ b/perl-install/share/themes-blue.rc
@@ -13,6 +13,9 @@ style "any"
   text[INSENSITIVE]={ 1.0, 1.0, 1.0 }
   fg[ACTIVE]  	  = { 1.0, 1.0, 1.0 }
   fg[PRELIGHT]    = { 1.0, 1.0, 1.0 }
+
+  bg[SELECTED]    = { 0, 0, 1.0 }
+  fg[SELECTED]    = { 1.0, 1.0, 0 }
 }
 
 style "entry"
@@ -20,9 +23,6 @@ style "entry"
   base[NORMAL] = { 0, 1.0, 1.0 }
   base[ACTIVE] = { 0, 1.0, 1.0 }
   fg[NORMAL]   = { 0.67, 0, 0.67 }
-
-  bg[SELECTED] = { 1.0, 1.0, 1.0 }
-  fg[SELECTED] = { 0, 0, 1.0 }
 }
 
 style "button" = "any"
diff --git a/perl-install/share/themes-savane.rc b/perl-install/share/themes-savane.rc
index 123a523cc..dbf51f9f0 100644
--- a/perl-install/share/themes-savane.rc
+++ b/perl-install/share/themes-savane.rc
@@ -13,6 +13,9 @@ style "any"
   fg[PRELIGHT]	  = { 0, 0, 0 }
   fg[INSENSITIVE] = { 0, 0, 0 }
   text[INSENSITIVE]={ 0, 0, 0 }
+
+  bg[SELECTED]    = { 1.0, 1.0, 1.0 }
+  fg[SELECTED]    = { 0.67, 0.33, 0 }
 }
 
 style "entry"
@@ -20,9 +23,6 @@ style "entry"
   base[NORMAL] = { 1.0, 1.0, 1.0 }
   base[ACTIVE] = { 1.0, 1.0, 1.0 }
   fg[NORMAL] = { 0, 0, 0 }
-
-  bg[SELECTED] = { 1.0, 1.0, 1.0 }
-  fg[SELECTED] = { 0.67, 0.33, 0 }
 }
 
 style "button" = "any"