no_comment

10 files changed, 27 insertions, 45 deletions

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index bbef90222..2bf151c32 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -66,10 +66,10 @@ sub get_mntpoints_from_fstab {
     foreach (read_fstab("$prefix/etc/fstab")) {
 	foreach my $p (@$fstab) {
 	    $p->{device} eq $_->{device} or next;
+	    $_->{type} ne 'auto' && $_->{type} ne type2fs($p->{type}) and
+		log::l("err, fstab and partition table do not agree for $_->{device} type: " . (type2fs($p->{type}) || type2name($p->{type})) . " vs $_->{type}"), next;
 	    $p->{mntpoint} ||= $_->{mntpoint};
 	    $p->{options} ||= $_->{options};
-	    $_->{type} ne 'auto' && $_->{type} ne type2fs($p->{type}) and
-		log::l("err, fstab and partition table do not agree for $_->{device} type: " . (type2fs($p->{type}) || type2name($p->{type})) . " vs $_->{type}");
 	}
     }
 }
diff --git a/perl-install/help.pm b/perl-install/help.pm
index f86f5af05..9662b6150 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -9,13 +9,12 @@ __("Choose preferred language for install and system usage."),
 selectKeyboard =>
  __("Choose the layout corresponding to your keyboard from the list above"),
 
-selectInstallClass =>
+selectInstallClass => [
  __("Choose \"Install\" if there are no previous versions of GNU/Linux
 installed, or if you wish to use multiple distributions or versions.
 
 Choose \"Upgrade\" if you wish to update a previous version of Mandrake Linux:
-5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold 2000
-or 7.0 (Air).
+%s or %s.
 
 
 Select:
@@ -29,7 +28,7 @@ Select:
     perform a highly customized installation. As for a \"Customized\"
     installation class, you will be able to select the usage for your system.
     But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE DOING!
-"),
+"), '5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold 2000', '7.0 (Air)' ],
 
 selectInstallClassCorpo =>
  __("Select:
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 77a92f034..1c5950ebd 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -399,7 +399,6 @@ sub miscellaneous {
 sub configureNetwork {
     $::live and return;
     #- get current configuration of network device.
-    log::l("debugging: $o->{netc}{HOSTNAME}");
     eval {
 	$o->{netc} ||= {}; $o->{intf} ||= [];
 	add2hash($o->{netc}, network::read_conf("$o->{prefix}/etc/sysconfig/network")) if -r "$o->{prefix}/etc/sysconfig/network";
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 36e80e7f1..d0a5b2b21 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -150,8 +150,8 @@ sub doPartitionDisksAfter {
     if (my $s = delete $o->{stage1_hd}) {
 	my ($part) = grep { $_->{device} eq $s->{device} } @{$o->{fstab}};
 	$part->{isMounted} ?
-	  symlinkf("$o->{prefix}$part->{mntpoint}", "/tmp/hdimage") :
-	  eval { fs::mount($s->{dev}, "/tmp/hdimage", $s->{fs}) };
+	  do { rmdir "/tmp/hdimage" ; symlinkf("$o->{prefix}$part->{mntpoint}", "/tmp/hdimage") } :
+	  eval { fs::mount($s->{device}, "/tmp/hdimage", $s->{type}) };
     }
 
     cat_("/proc/mounts") =~ m|(\S+)\s+/tmp/rhimage nfs| &&
@@ -381,8 +381,10 @@ Consoles 1,3,4,7 may also contain interesting information";
     #- create /etc/sysconfig/desktop file according to user choice and presence of /usr/bin/kdm or /usr/bin/gdm.
     my $f = "$o->{prefix}/etc/sysconfig/desktop";
     if ($o->{compssUsersChoice}{KDE} && -x "$o->{prefix}/usr/bin/kdm") {
+	log::l("setting desktop to KDE");
 	output($f, "KDE\n");
     } elsif ($o->{compssUsersChoice}{Gnome} && -x "$o->{prefix}/usr/bin/gdm") {
+	log::l("setting desktop to GNOME");
 	output($f, "GNOME\n");
     }
 
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index b5ae9772c..00c452066 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -576,7 +576,7 @@ sub create_big_help {
     gtkadd($w->{window},
 	   gtkpack_(new Gtk::VBox(0,0),
 		    1, createScrolledWindow(gtktext_insert(new Gtk::Text, 
-							   formatAlaTeX(translate($help::steps{$::o->{step}})))),
+							   formatAlaTeX(_ deref($help::steps{$::o->{step}})))),
 		    0, gtksignal_connect(new Gtk::Button(_("Ok")), "clicked" => sub { Gtk->main_quit }),
 		   ));
     $w->main;
@@ -599,38 +599,14 @@ sub create_help_window {
 	$w->{rwindow}->set_usize($::helpwidth, $::helpheight);
 	$w->sync;
     }
-
-#-    my $b = new Gtk::Button;
-#-    $b->signal_connect(clicked => sub {
-#-	  my $w = my_gtk->new('', grab => 1, force_position => [ $stepswidth, $logoheight ]);
-#-	  $w->{rwindow}->set_usize($logowidth, $height - $logoheight);
-#-	  gtkadd($w->{window},
-#-		 gtkpack_(new Gtk::VBox(0,0),
-#-			  1, createScrolledWindow(gtktext_insert(new Gtk::Text, 
-#-								 formatAlaTeX(translate($help::steps_long{$o->{step}})))),
-#-			  0, gtksignal_connect(new Gtk::Button(_("Ok")), "clicked" => sub { Gtk->main_quit }),
-#-			  ));
-#-	  $w->main;
-#-    });
-#-    my @l = (@questionmark_head,
-#-	       join('', "X c #", map { sprintf "%02X", $_ / 256 } @background1),
-#-	       join('', "O c #", map { sprintf "%02X", $_ / 256 } @background2),
-#-	       @questionmark_body);
-#-    my @pixmap = Gtk::Gdk::Pixmap->create_from_xpm_d($w->{window}->window, undef, @l);
-#-    gtkadd($b, new Gtk::Pixmap(@pixmap));
-
-#    Gtk::XmHTML->init;
     my $pixmap = new Gtk::Pixmap( gtkcreate_xpm($w->{window}, "$ENV{SHARE_PATH}/help.xpm"));
     gtkadd($w->{window},
 	   gtkpack_(new Gtk::HBox(0,-2),
-#-		    0, $b,
-#-		    1, createScrolledWindow($w_help = new Gtk::XmHTML)));
 		    0, $pixmap,
 		    1, createScrolledWindow($w_help = new Gtk::Text)
 		   ));
 
-#-    $w_help->source($o->{step} ? translate($o->{steps}{$o->{step}}{help}) : '');
-    gtktext_insert($w_help, $o->{step} ? formatAlaTeX(translate($help::steps{$o->{step}})) : '');
+    gtktext_insert($w_help, $o->{step} ? formatAlaTeX(_ deref($help::steps{$o->{step}})) : '');
 
     $w->show;
     $o->{help_window} = $w;
@@ -641,7 +617,7 @@ sub set_help {
     shift;
     gtktext_insert($w_help, 
 		   formatAlaTeX(join "\n", 
-				map { translate($help::steps{$_}) } @_));
+				map { _ deref($help::steps{$_}) } @_));
     1;
 }
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2a0593834..6f5f4d79e 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -61,7 +61,13 @@ sub selectLanguage($) {
 				    $o->{lang});
     install_steps::selectLanguage($o);
 
-    $o->ask_warn('', "No translation is available yet during installation in this language") if $o->{lang} !~ /^en/ && translate("_I18N_");
+    $o->ask_warn('', 
+"If you see this message it is because you choose a language for which
+DrakX does not include a translation yet; however the fact that it is
+listed means there is some support for it anyway. That is, once GNU/Linux
+will be installed, you will be able to at least read and write in that
+language; and possibly more (various fonts, spell checkers, various programs
+translated etc. that varies from language to language).") if $o->{lang} !~ /^en/ && translate("_I18N_");
 
 #-    $o->{useless_thing_accepted} = $o->ask_from_list_('', 
 #-"Warning no warranty", 
@@ -92,7 +98,7 @@ sub selectInstallClass1 {
     my ($o, $verif, $l, $def, $l2, $def2) = @_;
     $verif->($o->ask_from_list(_("Install Class"), _("Which installation class do you want?"), $l, $def));
 
-    $o->ask_from_list_(_("Install/Upgrade"), _("Is this an install or an upgrade?"), $l2, $def2);
+    $o->ask_from_list_(_("Install/Rescue"), _("Is this an install or a rescue?"), $l2, $def2);
 }
 
 #------------------------------------------------------------------------------
@@ -326,7 +332,7 @@ sub choosePackages {
     require pkgs;
 
     my $min_size = pkgs::selectedSize($packages);
-    $min_size < $availableC or die _("Your system has not enough space left for installation or upgrade");
+    $min_size < $availableC or die _("Your system has not enough space left for installation or upgrade (%d > %d)", $min_size, $availableC);
 
     $o->chooseGroups($packages, $compssUsers, $compssUsersSorted, \$individual) unless $::beginner || $::corporate;
 
@@ -336,7 +342,7 @@ sub choosePackages {
 	my ($size, $level) = pkgs::fakeSetSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, 0, $o->{installClass});
 	my $max_size = 1 + $size; #- avoid division by zero.
 	
-	my $size2install = do {
+	my $size2install = min($availableC, do {
 	    if ($::beginner) {
 		my @l = (300, 700, round_up(min($max_size, $availableC) / sqr(1024), 100));
 		$l[2] > $l[1] + 200 or splice(@l, 1, 1); #- not worth proposing too alike stuff
@@ -346,7 +352,7 @@ sub choosePackages {
 	    } else {
 		$o->chooseSizeToInstall($packages, $min_size, $max_size, $availableC, $individual) || goto &choosePackages;
 	    }
-	};
+	});
 	($o->{packages_}{ind}) =
 	  pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, $size2install, $o->{installClass});
     }
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 3dbbfa8fa..0d1cca5d5 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -152,7 +152,7 @@ my %xim = (
 
 sub std2 { "-*-*-medium-r-normal-*-$_[1]-*-*-*-*-*-$_[0]" }
 sub std_ { std2($_[0], 10), std2($_[0], 10) }
-sub std  { std2($_[0], 10), std2($_[0],  8) }
+sub std  { std2($_[0], 12), std2($_[0],  8) }
 
 #- [0]: console font name; [1]: unicode map for console font
 #- [2]: acm file for console font; [3]: X11 fontset
@@ -177,7 +177,7 @@ my %charsets = (
   "iso-8859-4" => [ "lat4u-16",		undef,		"iso04",
 	std_("iso8859-4") ],
   "iso-8859-5" => [ "iso05.f16",	"iso05",	"trivial.trans",
-	std("iso8859-5") ],
+	std2("iso8859-5", 10), std2("iso8859-5",  8) ],
 #- arabic needs special console driver for text mode [acon]
 #- (and gtk support isn't done yet)
   "iso-8859-6" => [ "iso06.f16",	"iso06",	"trivial.trans",
diff --git a/perl-install/share/fonts.tar.bz2 b/perl-install/share/fonts.tar.bz2
index 9589c97af..90d5abe74 100644
--- a/perl-install/share/fonts.tar.bz2
+++ b/perl-install/share/fonts.tar.bz2
diff --git a/perl-install/share/install.rc b/perl-install/share/install.rc
index d08a29432..b86a22c29 100644
--- a/perl-install/share/install.rc
+++ b/perl-install/share/install.rc
@@ -1,6 +1,6 @@
 style "default-font" 
 {
-  fontset = "-*-*-medium-r-normal-*-10-*-*-*-*-*-iso8859-15"
+  fontset = "-*-*-medium-r-normal-*-12-*-*-*-*-*-iso8859-15"
 }
 
 style "small-font"
diff --git a/perl-install/share/themes-marble3d.rc b/perl-install/share/themes-marble3d.rc
index 5d38424ef..1bbf48355 100644
--- a/perl-install/share/themes-marble3d.rc
+++ b/perl-install/share/themes-marble3d.rc
@@ -154,7 +154,7 @@ 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 }
+  fg[NORMAL] = { 0, 0, 0 }
 }
 
 style "notebook"