no_comment

13 files changed, 681 insertions, 451 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index 3ec8a9bcc..f3ade7db5 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -78,6 +78,9 @@ install_pms: all
 		perl -ne 'print #unless /^use (diagnostics|vars|strict)/' $$i > $(DESTREP4PMS)/$$i; \
 	done
 
+	rm $(DESTREP4PMS)/c/c.xs.pm
+	mv -f $(DESTREP4PMS)/c/c.pm $(DESTREP4PMS)
+
 	cp *.rc $(DESTREP4PMS)
 	ln -sf perl-install/install2 $(DEST)/usr/bin
 	ln -sf perl-install/commands $(DEST)/usr/bin
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 4a4340f2f..44a49a17f 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -23,6 +23,8 @@ sub getopts {
     @r;
 }
 
+sub true { exit 0 }
+sub false { exit 1 }
 sub cat { @ARGV = @_; print while <> }
 sub which { ARG: foreach (@_) { foreach my $c (split /:/, $ENV{PATH}) { -x "$c/$_" and print("$c/$_\n"), next ARG; }}}
 sub dirname_ { print dirname(@_), "\n" }
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 90b02b82a..ca6d9840d 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -78,7 +78,6 @@ sub fold_left(&$@) {
 sub add_f4before_leaving {
     my ($f, $b, $name) = @_;
 
-#    print "add_f4before_leaving\n";
     unless ($common::before_leaving::{$name}) {
 	no strict 'refs';
 	${"common::before_leaving::$name"} = 1;
@@ -114,7 +113,6 @@ sub catch_cdie(&&) {
 sub cdie {
     $@ = join '', @_;
     foreach (@common::cdie_catches) {
-	print;
 	&{$_}(@_) and return;
     }
     die @_;
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 98bf55d1b..5bc1b9a30 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -20,31 +20,110 @@ use smp;
 use lang;
 use run_program;
 
-my @installStepsFields = qw(text help redoable onError needs);
+my %stepsHelp = (
+selectLanguage => 
+ __("Choose the language which you approved. This one govern the language's system."),
+selectPath => 
+ __("Choose \"Installation\" if you never have installed Linux system on this computer or if you wish
+to install several of them on this machine.
+
+Choose \"Update\" if you wish to update a Linux system Mandrake 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or
+ 6.0 (Venus)."),
+selectInstallClass => 
+ __("Select:
+  - Beginer: if you have never installed Linux system and wish to install the system elected 
+\"Product of the year\" for 1999, click here.
+  - Developer: if wish to use your Linux system to build software, you will find your happiness here.
+  - Server: if you wish to install the operating system elected \"Distribution/Server\" for 1999,
+choose this installation class.
+  - Expert: if you alway know very fine GNU/Linux and that you wish to preserve the whole
+control of the installation, this class is for you."),
+setupSCSI => 
+ __("The system did not detect a SCSI card. If you have one (or several) click on \"Yes\" and choose the module
+to be tested. In the contrary case, cliquez on \"Not\".
+
+If you don't know if you have interfaces SCSI, consult the documentation delivered with your computer
+or, if you use Microsoft Windows 95/98, consult the file \"Peripheral manager\" of the item \"System\"
+ of the \"Control panel\"."),
+partitionDisks => 
+ __("In this stage, you will must partion your hard disk. It consists in cutting your disk in several zones
+(which are not equal). This operation, for spectacular and intimidating that it is,
+ is not hardly if you be carrefull so that you do. 
+Also, take your time, are sure you before click on \"Finishing\" and READ the handbook of DiskDrake
+before use them."),
+formatPartitions => 
+ __("The partitions lately created must be formatted so that the system can use them.
+You can also format partitions before created and used if you wish to remove all the data which
+contain. Note that it is not necessary to format the partitions created before used if they contain data to
+which you want to keep (typical cases: / home and / usr/local)."),
+choosePackages => 
+ __("You now have the possibility of choosing the software which you wish to install.
+
+Please note that packages manage the dependences: that means that if you wish to install
+a software requiring the presence of another software, this last will be automatically selected
+and that it will be impossible for you to install the first without installing the second.
+
+Information on each category of packages and each one of enter of them are available in zone \"Infos\"
+located above buttons of confirmation/selection/deselection."),
+doInstallStep => 
+ __("Selected packages are now getting installed on your system. This operation take only a few minutes."),
+setRootPassword => 
+ __("The system now requires an administrator password for your Linux system.
+This passwd is required of you by twice in order to being certain of its spelling.
+
+Choose it carefully because it mainly conditions the good functioning of your system.
+Indeed, only the administrator (also named \"root\") is able to configure the computer.
+The password should not be too simple so that whoever cannot be connected under this account.
+It should not be either too sophisticated under penalty of being difficult to retain and, finally, forgotten.
+
+When you wish to connect yourselves on your Linux system as an administrator, the \"login\" 
+is \"root\" and the \"passswrd\", this one which you now will indicate."),
+addUser => 
+ __("You can now authorize one or more people to be connected on your Linux system. Each one of
+them will profit from his own environment will be able to configure.
+
+It is very important that you create at least one user even if you are the only person who will connect
+herself on this machine. Indeed, if runnig the system as \"root\" is attractive, that 
+is a very bad idea. This last having all the rights it is certain that at one time you will broke all.
+This is highly preferable you connect as simple user and that you use the account \"root\" only when
+that is essential."),
+doInstallStep => 
+ __("The system being now copied on your disk, he is now time to indicate to him from where he will have to start.
+With less than you know exactly what you do, always choose \"First sector of drive\"."),
+
+configureX => 
+ __("It is now time to configure the graphic server. First of all, choose your monitor. You have then
+the possibility of testing your configuration and of reconsidering your choices if the latter are not
+appropriate to you."),
+);
+
+
+my @installStepsFields = qw(text redoable onError needs);
 my @installSteps = (
-  selectLanguage => [ __("Choose your language"), "help", 1, 1 ],
-  selectPath => [ __("Choose install or upgrade"), __("help"), 0, 0 ],
-  selectInstallClass => [ __("Select installation class"), __("help"), 1, 1 ],
-  setupSCSI => [ __("Setup SCSI"), __("help"), 1, 0 ],	
-  partitionDisks => [ __("Setup filesystems"), __("help"), 1, 0 ],
-  formatPartitions => [ __("Format partitions"), __("help"), 1, -1, "partitionDisks" ],
-  choosePackages => [ __("Choose packages to install"), __("help"), 1, 1 ],
-  doInstallStep => [ __("Install system"), __("help"), 1, -1, ["formatPartitions", "selectPath"] ],
-#  configureMouse => [ __("Configure mouse"), __("help"), 0, 0 ],
-  finishNetworking => [ __("Configure networking"), __("help"), 1, 1, "formatPartitions" ],
-#  configureTimezone => [ __("Configure timezone"), __("help"), 0, 0 ],
-#  configureServices => [ __("Configure services"), __("help"), 0, 0 ],
-#  configurePrinter => [ __("Configure printer"), __("help"), 0, 0 ],
-  setRootPassword => [ __("Set root password"), __("help"), 1, 0, "formatPartitions" ],
-  addUser => [ __("Add a user"), __("help"), 1, 0, "formatPartitions" ],
-  createBootdisk => [ __("Create bootdisk"), __("help"), 1, 0, "doInstallStep" ],
-  setupBootloader => [ __("Install bootloader"), __("help"), 1, 1, "doInstallStep" ],
-  configureX => [ __("Configure X"), __("help"), 1, 0, "formatPartitions" ],
-  exitInstall => [ __("Exit install"), __("help"), 0, 0, "alldone" ],
+  selectLanguage => [ __("Choose your language"), 1, 1 ],
+  selectPath => [ __("Choose install or upgrade"), 0, 0 ],
+  selectInstallClass => [ __("Select installation class"), 1, 1, "selectPath" ],
+  setupSCSI => [ __("Setup SCSI"), 1, 0 ],	
+  partitionDisks => [ __("Setup filesystems"), 1, 0 ],
+  formatPartitions => [ __("Format partitions"), 1, -1, "partitionDisks" ],
+  choosePackages => [ __("Choose packages to install"), 1, 1, "selectInstallClass" ],
+  doInstallStep => [ __("Install system"), 1, -1, ["formatPartitions", "selectPath"] ],
+#  configureMouse => [ __("Configure mouse"), 0, 0 ],
+  finishNetworking => [ __("Configure networking"), 1, 1, "formatPartitions" ],
+#  configureTimezone => [ __("Configure timezone"), 0, 0 ],
+#  configureServices => [ __("Configure services"), 0, 0 ],
+#  configurePrinter => [ __("Configure printer"), 0, 0 ],
+  setRootPassword => [ __("Set root password"), 1, 0, "formatPartitions" ],
+  addUser => [ __("Add a user"), 1, 0, "formatPartitions" ],
+  createBootdisk => [ __("Create bootdisk"), 1, 0, "doInstallStep" ],
+  setupBootloader => [ __("Install bootloader"), 1, 1, "doInstallStep" ],
+  configureX => [ __("Configure X"), 1, 0, "doInstallStep" ],
+  exitInstall => [ __("Exit install"), 0, 0, "alldone" ],
 );
 my (%installSteps, %upgradeSteps, @orderedInstallSteps, @orderedUpgradeSteps);
 for (my $i = 0; $i < @installSteps; $i += 2) {
     my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] };
+    $h{help} = $stepsHelp{$installSteps[$i]} || __("Help");
     $h{next} = $installSteps[$i + 2];
     $h{onError} = $installSteps[$i + 2 * $h{onError}];
     $installSteps{ $installSteps[$i] } = \%h;
@@ -93,8 +172,7 @@ $o = $::o = { default => $default, steps => \%installSteps, orderedSteps => \@or
 
 
 sub selectLanguage {
-    $o->{lang} = $o->chooseLanguage;
-    lang::set($o->{lang});
+    lang::set($o->{lang} = $o->chooseLanguage);
     $o->{keyboard} = keyboard::setup();
 
     addToBeDone {
@@ -117,7 +195,9 @@ sub selectInstallClass {
     $o->{autoSCSI} = $o->default("autoSCSI") || $o->{installClass} eq "beginner";
 }
 
-sub setupSCSI { $o->setupSCSI }
+sub setupSCSI { 
+    $o->setupSCSI($o->default("autoSCSI") && $_[0]);
+}
 
 sub partitionDisks {
     $o->{drives} = [ detect_devices::hds() ];
@@ -162,19 +242,20 @@ sub formatPartitions {
 }
 
 sub choosePackages {
-    $o->{packages} = pkgs::psUsingDirectory();
-    pkgs::getDeps($o->{packages});
+    my @p = @{$o->{default}{base}};
 
-    $o->{compss} = pkgs::readCompss($o->{packages});
+    unless ($o->{packages}) {
+	$o->{packages} = pkgs::psUsingDirectory();
+	pkgs::getDeps($o->{packages});
 
-    my @p = @{$o->{default}{base}};
-    push @p, "kernel-smp" if smp::detect();
+	$o->{compss} = pkgs::readCompss($o->{packages});
+	push @p, "kernel-smp" if smp::detect();
 
-    foreach (@p) { $o->{packages}{$_}{base} = 1 }
+	foreach (@p) { $o->{packages}{$_}{base} = 1 }
 
-    pkgs::setCompssSelected($o->{compss}, $o->{packages}, $o->{installClass});
+	pkgs::setCompssSelected($o->{compss}, $o->{packages}, $o->{installClass});
+    }
     $o->choosePackages($o->{packages}, $o->{compss}); 
-
     foreach (@p) { $o->{packages}{$_}{selected} = 1 }
 }
 
@@ -191,7 +272,9 @@ sub configureServices { $o->servicesConfig }
 sub setRootPassword { $o->setRootPassword }
 sub addUser { 
     $o->addUser;
-    run_program::rooted($o->{prefix}, "pwconv") or log::l("pwconv failed"); # use shadow passwords
+    addToBeDone {
+	run_program::rooted($o->{prefix}, "pwconv") or log::l("pwconv failed"); # use shadow passwords
+    } 'doInstallStep';
 }
 
 sub createBootdisk {
@@ -204,7 +287,9 @@ sub setupBootloader {
     $o->{isUpgrade} or modules::read_conf("$o->{prefix}/etc/conf.modules");
     $o->setupBootloader;
 }
-sub configureX { $o->setupXfree if $o->{packages}{XFree86}{installed} }
+sub configureX {
+    $o->setupXfree if $o->{packages}{XFree86}{installed} || $_[0];
+}
 sub exitInstall { $o->exitInstall }
 
 
@@ -244,13 +329,15 @@ sub main {
     modules::load_deps("/modules/modules.dep");
     modules::read_conf("/tmp/conf.modules");
 
+    my $clicked = 0;
     for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep()) {
 	$o->enteringStep($o->{step});
 	$o->{steps}{$o->{step}}{entered} = 1;
 	eval { 
-	    &{$install2::{$o->{step}}}();
+	    &{$install2::{$o->{step}}}($clicked);
 	};
-	$@ =~ /^setstep (.*)/ and $o->{step} = $1, redo;
+	$clicked = 0;
+	$@ =~ /^setstep (.*)/ and $o->{step} = $1, $clicked = 1, redo;
 	$@ =~ /^theme_changed$/ and redo;
 	if ($@) {
 	    $o->errorInStep($@);
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 9cf68eb7b..0560e1016 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -98,6 +98,8 @@ sub shells($) {
 sub addToBeDone(&$) {
     my ($f, $step) = @_;
 
+    return &$f() if $::o->{steps}{$step}{done};
+
     push @{$::o->{steps}{$step}{toBeDone}}, $f;
 }
 
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 422c3657a..7184dde74 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -126,7 +126,7 @@ sub beforeInstallPackages($) {
 
 sub installPackages($$) {
     my ($o, $packages) = @_;
-    my $toInstall = [ grep { $_->{selected} } values %$packages ];
+    my $toInstall = [ grep { $_->{selected} && !$_->{installed} } values %$packages ];
     pkgs::install($o->{prefix}, $toInstall, $o->{isUpgrade}, 0);
 }
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 8f640d649..766220388 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -65,7 +65,7 @@ sub selectInstallClass($@) {
 }
 
 sub setupSCSI {
-    my ($o) = @_;
+    my ($o, $auto) = @_;
     my $w;
     my @l = modules::load_thiskind('scsi', sub { 
         $w = $o->wait_message('', 
@@ -75,7 +75,7 @@ sub setupSCSI {
     });
     undef $w; # kill wait_message
 
-    $o->default("autoSCSI") and return;
+    return if $auto;
     while (1) {
 	@l ?
 	  $o->ask_yesorno('', 
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 9a30749a7..aa0bd78a2 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -41,6 +41,8 @@ sub text2lang {
 sub set {
     my $lang = shift;
 
+    undef %po::I18N::I18N;
+
     if ($lang) {
 	$ENV{LANG} = $ENV{LINGUAS} = $lang;
 	$ENV{LC_ALL} = $languages{$lang}[3];
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index b530034fd..469f4c2d4 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -38,11 +38,9 @@ sub main($;$) {
     my ($o, $f) = @_;
     $o->show;
 
-    $o->{rwindow}->grab_add if $my_gtk::grab || $o->{grab};
     do { 
 	Gtk->main 
     } while ($o->{retval} && $f && !&$f());
-    $o->{rwindow}->grab_remove if $my_gtk::grab || $o->{grab};
     $o->destroy;
     $o->{retval}
 }
@@ -50,9 +48,11 @@ sub show($) {
     my ($o) = @_;
     $o->{window}->show;
     $o->{rwindow}->show;
+    $o->{rwindow}->grab_add if $my_gtk::grab || $o->{grab};
 }
 sub destroy($) { 
     my ($o) = @_;
+    $o->{rwindow}->grab_remove if $my_gtk::grab || $o->{grab};
     $o->{rwindow}->destroy;
     flush();
 }
@@ -263,7 +263,7 @@ sub _create_window($$) {
     my $f = new Gtk::Frame(undef);
     $w->set_name("Title");
 
-    if ($::isStandalone) {
+    if ($::isStandalone || $o->{no_border}) {
 	gtkadd($w, $f);
     } else {
 	my $t = new Gtk::Table(0, 0, 0);
diff --git a/perl-install/share/install.rc b/perl-install/share/install.rc
index 44e808c66..d02ae6105 100644
--- a/perl-install/share/install.rc
+++ b/perl-install/share/install.rc
@@ -8,7 +8,27 @@ style "steps"
 style "logo"
 {
   bg[NORMAL] = { 1.0, 1.0, 1.0 }
+  fg[NORMAL]        = { 1.0, 1.0, 1.0 }
+  text[NORMAL]      = { 1.0, 1.0, 1.0 }
+  fg[ACTIVE]        = { 1.0, 1.0, 1.0 }
+  text[ACTIVE]      = { 1.0, 1.0, 1.0 }
+  fg[PRELIGHT]      = { 1.0, 1.0, 1.0 }
+  text[PRELIGHT]    = { 1.0, 1.0, 1.0 }
+  fg[SELECTED]      = { 1.0, 1.0, 1.0 }
+  text[SELECTED]    = { 1.0, 1.0, 1.0 }
+  fg[INSENSITIVE]   = { 1.0, 1.0, 1.0 }
+  text[INSENSITIVE] = { 1.0, 1.0, 1.0 }
+  bg[NORMAL]        = { 1.0, 1.0, 1.0 }
+  base[NORMAL]      = { 1.0, 1.0, 1.0 }
+  bg[ACTIVE]        = { 1.0, 1.0, 1.0 }
+  base[ACTIVE]      = { 1.0, 1.0, 1.0 }
+  bg[PRELIGHT]      = { 1.0, 1.0, 1.0 }
+  base[PRELIGHT]    = { 1.0, 1.0, 1.0 }
+  bg[SELECTED]      = { 1.0, 1.0, 1.0 }
+  base[SELECTED]    = { 1.0, 1.0, 1.0 }
+  bg[INSENSITIVE]   = { 1.0, 1.0, 1.0 }
+  base[INSENSITIVE] = { 1.0, 1.0, 1.0 }
 }
 
 widget "*Steps*" style "steps"
-widget "*logo*" style "logo"
\ No newline at end of file
+widget "*logo*" style "logo"
diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index 9f3f08d30..331b4f16b 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -13,7 +13,7 @@ $(FROMPOFILES): %.pm: %.po
 
 $(POFILES): empty.po
 	cp -f $@ $@t
-	msgmerge $@t $< > $@
+	msgmerge $< $@t > $@
 	rm $@t
 
 empty.po: $(PMSFILES)
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 65edc1412..b8e520237 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -1,923 +1,1052 @@
 #: ../Xconfigurator.pm_.c:157
 msgid "Choose a graphic card"
-msgstr "Velg et grafikk-kort"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:179
 msgid "Give your graphic card memory size"
-msgstr "Oppgi hvor mye minne grafikk-kortet ditt har"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:192
 msgid "Choose a monitor"
-msgstr "Velg en monitor"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:224
 msgid "Monitor not configured yet"
-msgstr "Monitoren er ikke konfigurert ennå"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:227
 msgid "Graphic card not configured yet"
-msgstr "Grafikk-kortet er ikke konfigurert ennå"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:230
 msgid "Resolutions not chosen yet"
-msgstr "Oppløsninger er ikke valgt ennå"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:237
 msgid "Do you want to test configuration?"
-msgstr "Vil du teste konfigurasjonen?"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:237
 msgid "Test configuration"
-msgstr "Test konfigurasjon"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:269
 #, c-format
 msgid "(leaving in %d seconds)"
-msgstr "(slutter om %d sekunder)"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:273
 msgid "Is this ok?"
-msgstr "Er dette ok?"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:281
 msgid "An error occured, try changing some parameters"
-msgstr "En feil oppsto, prøv å endre noen parametere"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:289 ../Xconfigurator.pm_.c:429
 msgid "Automatic resolutions"
-msgstr "Automatiske oppløsninger"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:333
 msgid "Resolution"
-msgstr "Oppløsning"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:364
 msgid "Choose resolution and color depth"
-msgstr "Velg oppløsning og fargedybde"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:628
 msgid "Change Monitor"
-msgstr "Endre monitor"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:629
 msgid "Change Graphic card"
-msgstr "Endre grafikk-kort"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:630
 msgid "Change Resolution"
-msgstr "Endre oppløsning"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:631
 msgid "Automaticall resolutions search"
-msgstr "Automatisk oppløsningssøk"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:635
 msgid "Test again"
-msgstr "Test igjen"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:636
 msgid "Quit"
-msgstr "Slutt"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:639
 msgid "What do you want to do?"
-msgstr "Hva vil du gjøre?"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:644
 msgid "X at startup"
-msgstr "X ved oppstart"
+msgstr ""
 
 #: ../Xconfigurator.pm_.c:650
 msgid "X successfully configured"
-msgstr "Konfigurasjon av X vellykket"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:4
 msgid "256 colors"
-msgstr "256 farger"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:6
 msgid "65 thousand colors"
-msgstr "65 tusen farger"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:7
 msgid "16 millions of colors"
-msgstr "16 millioner farger"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:8
 msgid "4 billions of colors"
-msgstr "4 milliarder farger"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:20
 msgid "256 kb"
-msgstr "256 kb"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:21
 msgid "512 kb"
-msgstr "512 kb"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:22
 msgid "1 mb"
-msgstr "1 mb"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:23
 msgid "2 mb"
-msgstr "2 mb"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:24
 msgid "4 mb"
-msgstr "4 mb"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:25
 msgid "8 mb"
-msgstr "8 mb"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:26
 msgid "16 mb or more"
-msgstr "16 mb eller mer"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:30
 msgid "Standard VGA, 640x480 in 60 Hz"
-msgstr "Standard VGA, 640x480 i 60 Hz"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:31
 msgid "Super VGA, 800x600 in 56 Hz"
-msgstr "Super VGA 800x600 i 56 Hz"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:32
 msgid "8514 Compatible, 1024x768 in 87 Hz interlaced (no 800x600)"
-msgstr "8514 kompatibel, 1024x768 i 87 Hz interlaced (ikke 800x600)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:33
 msgid "Super VGA, 1024x768 in 87 Hz interlaced, 800x600 in 56 Hz"
-msgstr "Super VGA, 1024x768 i 87 Hz interlaced, 800x600 i 56 Hz"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:34
 msgid "Extended Super VGA, 800x600 in 60 Hz, 640x480 in 72 Hz"
-msgstr "Utvidet Super VGA, 800x600 i 60 Hz, 640x480 i 72 Hz"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:35
 msgid "Non-Interlaced SVGA, 1024x768 in 60 Hz, 800x600 in 72 Hz"
-msgstr "Ikke-interlaced SVGA, 1024x768 i 60 Hz, 800x600 i 72 Hz"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:36
 msgid "High Frequency SVGA, 1024x768 in 70 Hz"
-msgstr "Høyfrekvens SVGA, 1024x768 i 70 Hz"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:37
 msgid "Multi-frequency that can do 1280x1024 in 60 Hz"
-msgstr "Flerfrekvens som kan klare 1280x1024 i 60 Hz"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:38
 msgid "Multi-frequency that can do 1280x1024 in 74 Hz"
-msgstr "Flerfrekvens som kan klare 1280x1024 i 74 Hz"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:39
 msgid "Multi-frequency that can do 1280x1024 in 76 Hz"
-msgstr "Flerfrekvens som kan klare 1280x1024 i 76 Hz"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:40
 msgid "Monitor that can do 1600x1200 in 70 Hz"
-msgstr "Monitor som kan klare 1600x1200 i 70 Hz"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:41
 msgid "Monitor that can do 1600x1200 in 76 Hz"
-msgstr "Monitor som kan klare 1600x1200 i 76 Hz"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:46
 msgid "No RAMDAC Setting (recommended)"
-msgstr "Ingen RAMDAC innstilling (anbefalt)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:47
 msgid "AT&T 20C490 (S3 and AGX servers, ARK driver)"
-msgstr "AT&T 20C490 (S3 og AGX tjenere, ARK driver)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:48
 msgid "AT&T 20C498/21C498/22C498 (S3, autodetected)"
-msgstr "AT&T 20C498/21C498/22C498 (S3, oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:49
 msgid "AT&T 20C409/20C499 (S3, autodetected)"
-msgstr "AT&T 20C409/20C499 (S3, oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:50
 msgid "AT&T 20C505 (S3)"
-msgstr "AT&T 20C505 (S3)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:51
 msgid "BrookTree BT481 (AGX)"
-msgstr "BrookTree BT481 (AGX)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:52
 msgid "BrookTree BT482 (AGX)"
-msgstr "BrookTree BT482 (AGX)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:53
 msgid "BrookTree BT485/9485 (S3)"
-msgstr "BrookTree BT485/9485 (S3)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:54
 msgid "Sierra SC15025 (S3, AGX)"
-msgstr "Sierra SC15025 (S3, AGX)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:55
 msgid "S3 GenDAC (86C708) (autodetected)"
-msgstr "S3 GenDAC (86C708) (oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:56
 msgid "S3 SDAC (86C716) (autodetected)"
-msgstr "S3 SDAC (86C716) (oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:57
 msgid "STG-1700 (S3, autodetected)"
-msgstr "STG-1700 (S3, oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:58
 msgid "STG-1703 (S3, autodetected)"
-msgstr "STG-1703 (S3, oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:59
 msgid "TI 3020 (S3)"
-msgstr "TI 3020 (S3)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:60
 msgid "TI 3025 (S3, autodetected)"
-msgstr "TI 3025 (S3, oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:61
 msgid "TI 3026 (S3, autodetected)"
-msgstr "TI 3026 (S3, oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:62
 msgid "IBM RGB 514 (S3, autodetected)"
-msgstr "IBM RGB 514 (S3, oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:63
 msgid "IBM RGB 524 (S3, autodetected)"
-msgstr "IBM RGB 524 (S3, oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:64
 msgid "IBM RGB 525 (S3, autodetected)"
-msgstr "IBM RGB 525 (S3, oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:65
 msgid "IBM RGB 526 (S3)"
-msgstr "IBM RGB 526 (S3)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:66
 msgid "IBM RGB 528 (S3, autodetected)"
-msgstr "IBM RGB 528 (S3, oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:67
 msgid "ICS5342 (S3, ARK)"
-msgstr "ICS5342 (S3, ARK)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:68
 msgid "ICS5341 (W32)"
-msgstr "ICS5341 (W32)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:69
 msgid "IC Works w30C516 ZoomDac (ARK)"
-msgstr "IC Works w30C516 ZoomDac (ARK)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:70
 msgid "Normal DAC"
-msgstr "Normal DAC"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:74
 msgid "No Clockchip Setting (recommended)"
-msgstr "Ingen Clockchip innstilling (anbefalt)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:75
 msgid "Chrontel 8391"
-msgstr "Chrontel 8391"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:76
 msgid "ICD2061A and compatibles (ICS9161A => DCS2824)"
-msgstr "ICD2061A og kompatible (ICS9161A => DCS2824)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:77
 msgid "ICS2595"
-msgstr "ICS2595"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:78
 msgid "ICS5342 (similar to SDAC, but not completely compatible)"
-msgstr "ICS5342 (lik SDAC, men ikke helt kompatibel)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:79
 msgid "ICS5341"
-msgstr "ICS5341"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:80
 msgid "S3 GenDAC (86C708) and ICS5300 (autodetected)"
-msgstr "S3 GenDAC (86C708) og ICS5300 (oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:81
 msgid "S3 SDAC (86C716)"
-msgstr "S3 SDAC (86C716)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:82
 msgid "STG 1703 (autodetected)"
-msgstr "STG 1703 (oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:83
 msgid "Sierra SC11412"
-msgstr "Sierra SC11412"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:84
 msgid "TI 3025 (autodetected)"
-msgstr "TI 3025 (oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:85
 msgid "TI 3026 (autodetected)"
-msgstr "TI 3026 (oppdaget automatisk)"
+msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:86
 msgid "IBM RGB 51x/52x (autodetected)"
-msgstr "IBM RGB 51x/52x (oppdaget automatisk)"
+msgstr ""
 
 #: ../diskdrake.pm_.c:15
 msgid "Create"
-msgstr "Opprett"
+msgstr ""
 
 #: ../diskdrake.pm_.c:16
 msgid "Umount"
-msgstr "Demonter"
+msgstr ""
 
 #: ../diskdrake.pm_.c:17
 msgid "Delete"
-msgstr "Slett"
+msgstr ""
 
 #: ../diskdrake.pm_.c:17
 msgid "Format"
-msgstr "Formater"
+msgstr ""
 
-#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:382
+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:384
 msgid "Move"
-msgstr "Flytt"
+msgstr ""
 
-#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:429
+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:431
 msgid "Resize"
-msgstr "Endre størrelse"
+msgstr ""
 
 #: ../diskdrake.pm_.c:17
 msgid "Type"
-msgstr "Type"
+msgstr ""
 
 #: ../diskdrake.pm_.c:18
 msgid "Mount_point"
-msgstr "Monteringspunkt"
+msgstr ""
 
 #: ../diskdrake.pm_.c:30
 msgid "Write /etc/fstab"
-msgstr "Skriv /etc/fstab"
+msgstr ""
 
 #: ../diskdrake.pm_.c:31
 msgid "Normal > Expert"
-msgstr "Normal > Ekspert"
+msgstr ""
 
 #: ../diskdrake.pm_.c:32
 msgid "Expert > Normal"
-msgstr "Expert > Normal"
+msgstr ""
 
 #: ../diskdrake.pm_.c:33
 msgid "Restore from file"
-msgstr "Gjenopprett fra fil"
+msgstr ""
 
 #: ../diskdrake.pm_.c:34
 msgid "Save in file"
-msgstr "Lagre i fil"
+msgstr ""
 
 #: ../diskdrake.pm_.c:35
 msgid "Restore from floppy"
-msgstr "Gjenopprett fra diskett"
+msgstr ""
 
 #: ../diskdrake.pm_.c:36
 msgid "Save on floppy"
-msgstr "Lagre på diskett"
+msgstr ""
 
 #: ../diskdrake.pm_.c:37
 msgid "Done"
-msgstr "Ferdig"
+msgstr ""
 
 #: ../diskdrake.pm_.c:40
 msgid "Clear all"
-msgstr "Fjern alle"
+msgstr ""
 
 #: ../diskdrake.pm_.c:41
 msgid "Format all"
-msgstr "Formater alle"
+msgstr ""
 
 #: ../diskdrake.pm_.c:42
 msgid "Auto allocate"
-msgstr "Automatisk allokering"
+msgstr ""
 
 #: ../diskdrake.pm_.c:45
 msgid "All primary partitions are used"
-msgstr "Alle primære partisjoner er i bruk"
+msgstr ""
 
 #: ../diskdrake.pm_.c:45
 msgid "I can't add no more partition"
-msgstr "Jeg kan ikke legge til flere partisjoner"
+msgstr ""
 
 #: ../diskdrake.pm_.c:45
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr ""
-"For å ha flere partisjoner vennligst slett en for å kunne opprette en "
-"utvidet partisjon"
 
 #: ../diskdrake.pm_.c:48
 msgid "Undo"
-msgstr "Angre"
+msgstr ""
 
 #: ../diskdrake.pm_.c:49
 msgid "Write partition table"
-msgstr "Skriv partisjonstabell"
+msgstr ""
 
-#: ../diskdrake.pm_.c:114
+#: ../diskdrake.pm_.c:116
 #, c-format
 msgid "After %s partition %s,"
-msgstr "Etter %s partisjon %s,"
+msgstr ""
 
-#: ../diskdrake.pm_.c:114 ../diskdrake.pm_.c:373 ../diskdrake.pm_.c:400
+#: ../diskdrake.pm_.c:116 ../diskdrake.pm_.c:375 ../diskdrake.pm_.c:402
 msgid "Read carefully!"
-msgstr "Lese nøye!"
+msgstr ""
 
-#: ../diskdrake.pm_.c:114
+#: ../diskdrake.pm_.c:116
 msgid "all data on this partition will be lost"
-msgstr "alle data på denne partisjonen vil gå tapt"
+msgstr ""
 
-#: ../diskdrake.pm_.c:132 ../install_steps_interactive.pm_.c:41
+#: ../diskdrake.pm_.c:134 ../install_steps_interactive.pm_.c:41
 msgid "Error"
-msgstr "Feil"
+msgstr ""
 
-#: ../diskdrake.pm_.c:153 ../diskdrake.pm_.c:497
+#: ../diskdrake.pm_.c:155 ../diskdrake.pm_.c:499
 msgid "Mount point: "
-msgstr "Monteringspunkt: "
+msgstr ""
 
-#: ../diskdrake.pm_.c:154 ../diskdrake.pm_.c:176
+#: ../diskdrake.pm_.c:156 ../diskdrake.pm_.c:178
 msgid "Device: "
-msgstr "Enhet: "
+msgstr ""
 
-#: ../diskdrake.pm_.c:155
+#: ../diskdrake.pm_.c:157
 #, c-format
 msgid "DOS letter: %s (just a guess)\n"
-msgstr "DOS bokstav: %s (bare en gjetning)\n"
+msgstr ""
 
-#: ../diskdrake.pm_.c:156 ../diskdrake.pm_.c:179
+#: ../diskdrake.pm_.c:158 ../diskdrake.pm_.c:181
 msgid "Type: "
-msgstr "Type: "
+msgstr ""
 
-#: ../diskdrake.pm_.c:157
-#, fuzzy, c-format
+#: ../diskdrake.pm_.c:159
+#, c-format
 msgid "Start: sector /*%s\n"
-msgstr "Start: sektor /*%s\n"
+msgstr ""
 
-#: ../diskdrake.pm_.c:158
+#: ../diskdrake.pm_.c:160
 msgid "Size: %s MB (%s%%)"
-msgstr "Størrelse: %s MB (%s%%)"
+msgstr ""
 
-#: ../diskdrake.pm_.c:159
+#: ../diskdrake.pm_.c:161
 #, c-format
 msgid ", %s sectors"
-msgstr ", %s sektorer"
+msgstr ""
 
-#: ../diskdrake.pm_.c:161
+#: ../diskdrake.pm_.c:163
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
-msgstr "Sylinder %d til sylinder %d\n"
+msgstr ""
 
-#: ../diskdrake.pm_.c:162
+#: ../diskdrake.pm_.c:164
 msgid "Formatted\n"
-msgstr "Formatert\n"
+msgstr ""
 
-#: ../diskdrake.pm_.c:163
+#: ../diskdrake.pm_.c:165
 msgid "Not formatted\n"
-msgstr "Ikke formatert\n"
+msgstr ""
 
-#: ../diskdrake.pm_.c:164
+#: ../diskdrake.pm_.c:166
 msgid "Mounted\n"
-msgstr "Montert\n"
+msgstr ""
 
-#: ../diskdrake.pm_.c:165
+#: ../diskdrake.pm_.c:167
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
-"Partisjon startet opp som standard\n"
-"    (for MS-DOS oppstart, ikke for lilo)\n"
 
-#: ../diskdrake.pm_.c:177
-#, fuzzy, c-format
+#: ../diskdrake.pm_.c:179
+#, c-format
 msgid "Size: %d MB\n"
-msgstr "Størrelse: %d MB\n"
+msgstr ""
 
-#: ../diskdrake.pm_.c:178
+#: ../diskdrake.pm_.c:180
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometri: %s sylindere, %s hoder, %s sektorer\n"
+msgstr ""
 
-#: ../diskdrake.pm_.c:180
+#: ../diskdrake.pm_.c:182
 #, c-format
 msgid "on bus %d id %d\n"
-msgstr "på buss %d id %d\n"
+msgstr ""
 
-#: ../diskdrake.pm_.c:192
+#: ../diskdrake.pm_.c:194
 msgid "Mount"
-msgstr "Montere"
+msgstr ""
 
-#: ../diskdrake.pm_.c:194
+#: ../diskdrake.pm_.c:196
 msgid "Active"
-msgstr "Aktiv"
+msgstr ""
 
-#: ../diskdrake.pm_.c:286
+#: ../diskdrake.pm_.c:288
 msgid ""
 "You're adding a root partition far on the drive (on a cylinder > 1024),\n"
 "and you have no /boot partition. So if you plan to use lilo (the boot "
 "manager),\n"
 "be carefull to add a /boot partition"
 msgstr ""
-"Du er i ferd med å legge til en rotpartisjon langt ute på disken (på en\n"
-"sylinder > 1024), og du har ingen /boot partisjon. Så hvis du planlegger å "
-"bruke lilo (oppstartshåndtereren), så være forsiktig når du legger til\n"
-"en /boot partisjon."
 
-#: ../diskdrake.pm_.c:300
+#: ../diskdrake.pm_.c:302
 msgid "Leave without saving"
-msgstr "Slutt uten å lagre"
+msgstr ""
 
-#: ../diskdrake.pm_.c:300
+#: ../diskdrake.pm_.c:302
 msgid "Quit program without writing partition table?"
-msgstr "Avslutte programmet uten å skrive partisjonstabell?"
+msgstr ""
 
-#: ../diskdrake.pm_.c:315
+#: ../diskdrake.pm_.c:317
 msgid "changing type of"
-msgstr "endrer type av"
+msgstr ""
 
-#: ../diskdrake.pm_.c:317
+#: ../diskdrake.pm_.c:319
 msgid "Change partition type"
-msgstr "Endre partisjonstype"
+msgstr ""
 
-#: ../diskdrake.pm_.c:318
+#: ../diskdrake.pm_.c:320
 msgid "Which partition type do you want?"
-msgstr "Hvilken partisjonstype ønsker du?"
+msgstr ""
 
-#: ../diskdrake.pm_.c:335
+#: ../diskdrake.pm_.c:337
 #, c-format
 msgid "Where do you want to mount device %s?"
-msgstr "Hvor vil du montere %s enheten?"
+msgstr ""
 
-#: ../diskdrake.pm_.c:367
+#: ../diskdrake.pm_.c:369
 msgid "formatting"
-msgstr "formatering"
+msgstr ""
 
-#: ../diskdrake.pm_.c:373
+#: ../diskdrake.pm_.c:375
 msgid "After formatting all partitions,"
-msgstr "Etter formatering av alle partisjonene"
+msgstr ""
 
-#: ../diskdrake.pm_.c:373
+#: ../diskdrake.pm_.c:375
 msgid "all data on these partitions will be lost"
-msgstr "alle data på disse partisjonene vil gå tapt"
+msgstr ""
 
-#: ../diskdrake.pm_.c:383
+#: ../diskdrake.pm_.c:385
 msgid "Which disk do you want to move to?"
-msgstr "Hvilken disk vil du flytte til?"
+msgstr ""
 
-#: ../diskdrake.pm_.c:387
+#: ../diskdrake.pm_.c:389
 msgid "Sector"
-msgstr "Sektor"
+msgstr ""
 
-#: ../diskdrake.pm_.c:388
+#: ../diskdrake.pm_.c:390
 msgid "Which sector do you want to move to?"
-msgstr "Hvilken sektor vil du flytte til?"
+msgstr ""
 
-#: ../diskdrake.pm_.c:391
+#: ../diskdrake.pm_.c:393
 msgid "Moving"
-msgstr "Flytter"
+msgstr ""
 
-#: ../diskdrake.pm_.c:391
+#: ../diskdrake.pm_.c:393
 msgid "Moving partition..."
-msgstr "Flytter partisjon..."
+msgstr ""
 
-#: ../diskdrake.pm_.c:400
+#: ../diskdrake.pm_.c:402
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Partisjonstabellen på disk %s blir nå skrevet til disk!"
+msgstr ""
 
-#: ../diskdrake.pm_.c:420
+#: ../diskdrake.pm_.c:422
 msgid "Computing fat filesystem bounds"
-msgstr "Beregner fat filsystemgrense"
+msgstr ""
 
-#: ../diskdrake.pm_.c:420 ../diskdrake.pm_.c:456 ../interactive_gtk.pm_.c:81
+#: ../diskdrake.pm_.c:422 ../diskdrake.pm_.c:458 ../interactive_gtk.pm_.c:81
 msgid "Resizing"
-msgstr "Endrer størrelse"
+msgstr ""
 
-#: ../diskdrake.pm_.c:426
+#: ../diskdrake.pm_.c:428
 msgid "resizing"
-msgstr "Endrer størrelse"
+msgstr ""
 
-#: ../diskdrake.pm_.c:436
+#: ../diskdrake.pm_.c:438
 msgid "Choose the new size"
-msgstr "Velg ny størrelse"
+msgstr ""
 
-#: ../diskdrake.pm_.c:436
+#: ../diskdrake.pm_.c:438
 msgid "MB"
-msgstr "MB"
+msgstr ""
 
-#: ../diskdrake.pm_.c:474
+#: ../diskdrake.pm_.c:476
 msgid "Create a new partition"
-msgstr "Opprette en ny partisjon"
+msgstr ""
 
-#: ../diskdrake.pm_.c:490
+#: ../diskdrake.pm_.c:492
 msgid "Start sector: "
-msgstr "Start sektor: "
+msgstr ""
 
-#: ../diskdrake.pm_.c:493
+#: ../diskdrake.pm_.c:495
 msgid "Size in MB: "
-msgstr "Størrelse i MB: "
+msgstr ""
 
-#: ../diskdrake.pm_.c:496
+#: ../diskdrake.pm_.c:498
 msgid "Filesystem type: "
-msgstr "Filsystemtype: "
+msgstr ""
 
-#: ../diskdrake.pm_.c:498
+#: ../diskdrake.pm_.c:500
 msgid "Preference: "
-msgstr "Valg: "
+msgstr ""
 
-#: ../diskdrake.pm_.c:540 ../diskdrake.pm_.c:556
+#: ../diskdrake.pm_.c:542 ../diskdrake.pm_.c:558
 msgid "Select file"
-msgstr "Velg fil"
+msgstr ""
 
-#: ../diskdrake.pm_.c:557
+#: ../diskdrake.pm_.c:559
 msgid "Warning"
-msgstr "Advarsel"
+msgstr ""
 
 #: ../fs.pm_.c:69 ../fs.pm_.c:75
 #, c-format
 msgid "%s formatting of %s failed"
-msgstr "%s formatering av %s mislykket"
+msgstr ""
 
 #: ../fs.pm_.c:94
 #, c-format
 msgid "don't know how to format %s in type %s"
-msgstr "Vet ikke hvordan formatere %s i type %s"
+msgstr ""
 
 #: ../fs.pm_.c:107
 msgid "nfs mount failed"
-msgstr "nfs montering mislykket"
+msgstr ""
 
 #: ../fs.pm_.c:124
 msgid "mount failed: "
-msgstr "montering mislykket: "
+msgstr ""
 
 #: ../fs.pm_.c:134
 #, c-format
 msgid "error unmounting %s: %s"
-msgstr "feil ved demontering av %s: %s"
+msgstr ""
 
 #: ../fsedit.pm_.c:43
 #, c-format
 msgid "An error occurred while getting the geometry of block device %s: %s"
-msgstr "En feil oppsto ved henting av geometrien til blokkenhet %s: %s"
+msgstr ""
 
 #: ../fsedit.pm_.c:124
 msgid "Mount points must begin with a leading /"
-msgstr "Monteringspunkter må begynne med /"
+msgstr ""
 
 #: ../fsedit.pm_.c:127
 #, c-format
 msgid "There is already a partition with mount point %s"
-msgstr "Det finnes allerede en partisjon med monteringspunkt %s"
+msgstr ""
 
 #: ../fsedit.pm_.c:251
 #, c-format
 msgid "Error opening %s for writing: %s"
-msgstr "Feil ved åpning av %s for skriving: %s"
+msgstr ""
 
 #: ../install2.pm_.c:25
+msgid ""
+"Choose the language which you approved. This one govern the language's "
+"system."
+msgstr ""
+
+#: ../install2.pm_.c:27
+msgid ""
+"Choose \"Installation\" if you never have installed Linux system on this "
+"computer or if you wish\n"
+"to install several of them on this machine.\n"
+"\n"
+"Choose \"Update\" if you wish to update a Linux system Mandrake 5.1 "
+"(Venice), 5.2 (Leeloo), 5.3 (Festen) or\n"
+" 6.0 (Venus)."
+msgstr ""
+
+#: ../install2.pm_.c:33
+msgid ""
+"Select:\n"
+"  - Beginer: if you have never installed Linux system and wish to install "
+"the system elected \n"
+"\"Product of the year\" for 1999, click here.\n"
+"  - Developer: if wish to use your Linux system to build software, you will "
+"find your happiness here.\n"
+"  - Server: if you wish to install the operating system elected "
+"\"Distribution/Server\" for 1999,\n"
+"choose this installation class.\n"
+"  - Expert: if you alway know very fine GNU/Linux and that you wish to "
+"preserve the whole\n"
+"control of the installation, this class is for you."
+msgstr ""
+
+#: ../install2.pm_.c:42
+msgid ""
+"The system did not detect a SCSI card. If you have one (or several) click on "
+"\"Yes\" and choose the module\n"
+"to be tested. In the contrary case, cliquez on \"Not\".\n"
+"\n"
+"If you don't know if you have interfaces SCSI, consult the documentation "
+"delivered with your computer\n"
+"or, if you use Microsoft Windows 95/98, consult the file \"Peripheral "
+"manager\" of the item \"System\"\n"
+" of the \"Control panel\"."
+msgstr ""
+
+#: ../install2.pm_.c:49
+msgid ""
+"In this stage, you will must partion your hard disk. It consists in cutting "
+"your disk in several zones\n"
+"(which are not equal). This operation, for spectacular and intimidating that "
+"it is,\n"
+" is not hardly if you be carrefull so that you do. \n"
+"Also, take your time, are sure you before click on \"Finishing\" and READ "
+"the handbook of DiskDrake\n"
+"before use them."
+msgstr ""
+
+#: ../install2.pm_.c:55
+msgid ""
+"The partitions lately created must be formatted so that the system can use "
+"them.\n"
+"You can also format partitions before created and used if you wish to remove "
+"all the data which\n"
+"contain. Note that it is not necessary to format the partitions created "
+"before used if they contain data to\n"
+"which you want to keep (typical cases: / home and / usr/local)."
+msgstr ""
+
+#: ../install2.pm_.c:60
+msgid ""
+"You now have the possibility of choosing the software which you wish to "
+"install.\n"
+"\n"
+"Please note that packages manage the dependences: that means that if you "
+"wish to install\n"
+"a software requiring the presence of another software, this last will be "
+"automatically selected\n"
+"and that it will be impossible for you to install the first without "
+"installing the second.\n"
+"\n"
+"Information on each category of packages and each one of enter of them are "
+"available in zone \"Infos\"\n"
+"located above buttons of confirmation/selection/deselection."
+msgstr ""
+
+#: ../install2.pm_.c:69
+msgid ""
+"Selected packages are now getting installed on your system. This operation "
+"take only a few minutes."
+msgstr ""
+
+#: ../install2.pm_.c:71
+msgid ""
+"The system now requires an administrator password for your Linux system.\n"
+"This passwd is required of you by twice in order to being certain of its "
+"spelling.\n"
+"\n"
+"Choose it carefully because it mainly conditions the good functioning of "
+"your system.\n"
+"Indeed, only the administrator (also named \"root\") is able to configure "
+"the computer.\n"
+"The password should not be too simple so that whoever cannot be connected "
+"under this account.\n"
+"It should not be either too sophisticated under penalty of being difficult "
+"to retain and, finally, forgotten.\n"
+"\n"
+"When you wish to connect yourselves on your Linux system as an "
+"administrator, the \"login\" \n"
+"is \"root\" and the \"passswrd\", this one which you now will indicate."
+msgstr ""
+
+#: ../install2.pm_.c:82
+msgid ""
+"You can now authorize one or more people to be connected on your Linux "
+"system. Each one of\n"
+"them will profit from his own environment will be able to configure.\n"
+"\n"
+"It is very important that you create at least one user even if you are the "
+"only person who will connect\n"
+"herself on this machine. Indeed, if runnig the system as \"root\" is "
+"attractive, that \n"
+"is a very bad idea. This last having all the rights it is certain that at "
+"one time you will broke all.\n"
+"This is highly preferable you connect as simple user and that you use the "
+"account \"root\" only when\n"
+"that is essential."
+msgstr ""
+
+#: ../install2.pm_.c:91
+msgid ""
+"The system being now copied on your disk, he is now time to indicate to him "
+"from where he will have to start.\n"
+"With less than you know exactly what you do, always choose \"First sector of "
+"drive\"."
+msgstr ""
+
+#: ../install2.pm_.c:95
+msgid ""
+"It is now time to configure the graphic server. First of all, choose your "
+"monitor. You have then\n"
+"the possibility of testing your configuration and of reconsidering your "
+"choices if the latter are not\n"
+"appropriate to you."
+msgstr ""
+
+#: ../install2.pm_.c:103
 msgid "Choose your language"
-msgstr "Velg ditt språk"
+msgstr ""
 
-#: ../install2.pm_.c:26
+#: ../install2.pm_.c:104
 msgid "Choose install or upgrade"
-msgstr "Velg installering eller oppgradering"
-
-#: ../install2.pm_.c:26 ../install2.pm_.c:27 ../install2.pm_.c:28
-#: ../install2.pm_.c:29 ../install2.pm_.c:30 ../install2.pm_.c:31
-#: ../install2.pm_.c:32 ../install2.pm_.c:34 ../install2.pm_.c:38
-#: ../install2.pm_.c:39 ../install2.pm_.c:40 ../install2.pm_.c:41
-#: ../install2.pm_.c:42 ../install2.pm_.c:43
-msgid "help"
-msgstr "hjelp"
+msgstr ""
 
-#: ../install2.pm_.c:27
+#: ../install2.pm_.c:105
 msgid "Select installation class"
-msgstr "Velg installasjonsklasse"
+msgstr ""
 
-#: ../install2.pm_.c:28
+#: ../install2.pm_.c:106
 msgid "Setup SCSI"
-msgstr "Oppsett SCSI"
+msgstr ""
 
-#: ../install2.pm_.c:29
+#: ../install2.pm_.c:107
 msgid "Setup filesystems"
-msgstr "Oppsett filsystemer"
+msgstr ""
 
-#: ../install2.pm_.c:30
+#: ../install2.pm_.c:108
 msgid "Format partitions"
-msgstr "Formater partisjoner"
+msgstr ""
 
-#: ../install2.pm_.c:31
+#: ../install2.pm_.c:109
 msgid "Choose packages to install"
-msgstr "Velg pakker for installering"
+msgstr ""
 
-#: ../install2.pm_.c:32
+#: ../install2.pm_.c:110
 msgid "Install system"
-msgstr "Installer systemet"
+msgstr ""
 
-#: ../install2.pm_.c:34
+#: ../install2.pm_.c:112
 msgid "Configure networking"
-msgstr "Konfigurer nettverk"
+msgstr ""
 
-#: ../install2.pm_.c:38 ../install_steps_graphical.pm_.c:369
+#: ../install2.pm_.c:116 ../install_steps_graphical.pm_.c:370
 msgid "Set root password"
-msgstr "Sett root passord"
+msgstr ""
 
-#: ../install2.pm_.c:39
+#: ../install2.pm_.c:117
 msgid "Add a user"
-msgstr "Legg til en bruker"
+msgstr ""
 
-#: ../install2.pm_.c:40
+#: ../install2.pm_.c:118
 msgid "Create bootdisk"
-msgstr "Opprett oppstartdiskett"
+msgstr ""
 
-#: ../install2.pm_.c:41
+#: ../install2.pm_.c:119
 msgid "Install bootloader"
-msgstr "Installer oppstartslaster"
+msgstr ""
 
-#: ../install2.pm_.c:42
+#: ../install2.pm_.c:120
 msgid "Configure X"
-msgstr "Konfigurer X"
+msgstr ""
 
-#: ../install2.pm_.c:43
+#: ../install2.pm_.c:121
 msgid "Exit install"
-msgstr "Gå ut av installering"
+msgstr ""
+
+#: ../install2.pm_.c:126
+msgid "Help"
+msgstr ""
 
-#: ../install2.pm_.c:56
+#: ../install2.pm_.c:135
 msgid "beginner"
 msgstr ""
 
-#: ../install2.pm_.c:56
+#: ../install2.pm_.c:135
 msgid "developer"
-msgstr "utvikler"
+msgstr ""
 
-#: ../install2.pm_.c:56
+#: ../install2.pm_.c:135
 msgid "expert"
-msgstr "Ekspert"
+msgstr ""
 
-#: ../install2.pm_.c:56
+#: ../install2.pm_.c:135
 msgid "server"
-msgstr "tjener"
+msgstr ""
 
-#: ../install2.pm_.c:129
+#: ../install2.pm_.c:209
 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 ""
-"En feil har oppstått - ingen gyldige enheter ble funnet for å opprette nye "
-"filsystemer. Vennligst sjekk maskinvaren din for årsaken til dette problemet"
 
-#: ../install2.pm_.c:150
+#: ../install2.pm_.c:230
 msgid "partitionning failed: no root filesystem"
-msgstr "partisjonering feilet: intet root filsystem"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:216
-#, fuzzy
+#: ../install_steps_graphical.pm_.c:217
 msgid "Select All"
-msgstr "Velg fil"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:216
-#, fuzzy
+#: ../install_steps_graphical.pm_.c:217
 msgid "Unselect All"
-msgstr "Velg fil"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:265
+#: ../install_steps_graphical.pm_.c:266
 msgid "Choose the packages you want to install"
-msgstr "Velg pakker du ønsker å installere"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:276
+#: ../install_steps_graphical.pm_.c:277
 msgid " Mb"
-msgstr "Mb"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:276
+#: ../install_steps_graphical.pm_.c:277
 msgid "Total size: "
-msgstr "Total størrelse: "
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:284
+#: ../install_steps_graphical.pm_.c:285
 msgid "Show All"
-msgstr "Vis alle"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:303
+#: ../install_steps_graphical.pm_.c:304
 msgid "Installing"
-msgstr "Installerer"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:309
+#: ../install_steps_graphical.pm_.c:310
 msgid "Please wait, "
-msgstr "Vennligst vent, "
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:311
+#: ../install_steps_graphical.pm_.c:312
 msgid "Time remaining "
-msgstr "Tid som gjenstår "
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:312
+#: ../install_steps_graphical.pm_.c:313
 msgid "Total time "
-msgstr "Total tid "
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:317
+#: ../install_steps_graphical.pm_.c:318
 msgid "preparing installation"
-msgstr "forbereder installasjon"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:338
+#: ../install_steps_graphical.pm_.c:339
 #, c-format
 msgid "installing package %s"
-msgstr "installerer pakke %s"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:373 ../install_steps_graphical.pm_.c:407
+#: ../install_steps_graphical.pm_.c:374 ../install_steps_graphical.pm_.c:408
 msgid "Password"
-msgstr "Passord"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:374 ../install_steps_graphical.pm_.c:408
+#: ../install_steps_graphical.pm_.c:375 ../install_steps_graphical.pm_.c:409
 msgid "Password (again)"
-msgstr "Passord (igjen)"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:390 ../install_steps_graphical.pm_.c:431
+#: ../install_steps_graphical.pm_.c:391 ../install_steps_graphical.pm_.c:432
 msgid "Please try again"
-msgstr "Vennligst prøv igjen"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:390 ../install_steps_graphical.pm_.c:431
+#: ../install_steps_graphical.pm_.c:391 ../install_steps_graphical.pm_.c:432
 msgid "You must enter the same password"
-msgstr "Du må skrive inn det samme passordet"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:391
+#: ../install_steps_graphical.pm_.c:392
 msgid "This password is too simple"
-msgstr "Dette passordet er for enkelt"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:402
+#: ../install_steps_graphical.pm_.c:403
 msgid "Add user"
-msgstr "Legg til bruker"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:406
+#: ../install_steps_graphical.pm_.c:407
 msgid "User name"
-msgstr "Brukernavn"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:409
+#: ../install_steps_graphical.pm_.c:410
 msgid "Real name"
-msgstr "Virkelig navn"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:410
+#: ../install_steps_graphical.pm_.c:411
 msgid "Shell"
-msgstr "Skall"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:433
+#: ../install_steps_graphical.pm_.c:434
 msgid "Please give a user name"
-msgstr "Vennligst oppgi et brukernavn"
+msgstr ""
 
-#: ../install_steps_graphical.pm_.c:434
+#: ../install_steps_graphical.pm_.c:435
 msgid "The user name must contain only letters, numbers, `-' and `_'"
-msgstr "Brukernavnet kan kun inneholde bokstaver, tall, `-' og `_'"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:41
 msgid "An error occured"
-msgstr "En feil oppsto"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:48
 msgid "Which language do you want?"
-msgstr "Hvilket språk ønsker du?"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:54
 msgid "Install/Upgrade"
-msgstr "Installer/Oppgrader"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:55
-#, fuzzy
 msgid "Is it an install or an updgrade?"
-msgstr "Er det en installasjon eller en oppgradering?"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:56
 msgid "Install"
-msgstr "Installer"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:56
 msgid "Upgrade"
-msgstr "Oppgrader"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:62
 msgid "Install Class"
-msgstr "Installeringsklasse"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:63
 msgid "What type of user will you have?"
-msgstr "Hva slags brukertype vil du ha?"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:72
 #, c-format
@@ -930,40 +1059,37 @@ msgid "(module %s)"
 msgstr ""
 
 #: ../install_steps_interactive.pm_.c:82
-#, fuzzy
 msgid " scsi interfaces"
-msgstr "scsi grensesnitt"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:82
 msgid "Found "
-msgstr "Funnet"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:83
 msgid "Do you have another one?"
-msgstr "Har du enda ett?"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:84
 msgid "Do you have an scsi interface?"
-msgstr "Har du et scsi grensesnitt"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:86
 msgid "What scsi card have you?"
-msgstr "Hva slags scsi-kort har du?"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:95
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
-"Du må starte maskinen på nytt for at modifiseringene av partisjonstabellen "
-"skal tre i kraft"
 
 #: ../install_steps_interactive.pm_.c:103
 msgid "Choose the partitions you want to format"
-msgstr "Velg de partisjonene du ønsker å formatere"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:116
-#, fuzzy, c-format
+#, c-format
 msgid "Formatting partition %s"
-msgstr "Formater partisjoner"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:126
 msgid ""
@@ -978,157 +1104,146 @@ msgid ""
 "system\n"
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
-"En egendefinert oppstartsdiskett tilbyr en måte å laste opp Linux systemet\n"
-"ditt på uten å være avhengig av den vanlige oppstartslasteren. Dette er "
-"nyttig hvis du ikke ønsker å installere\n"
-"lilo, eller hvis et annet operativsystem fjerner lilo, eller hvis lilo ikke "
-"virker\n"
-"med din maskinvarekonfigurasjon. En egendefinert oppstartsdiskett kan også "
-"brukes sammen med\n"
-"Mandrake's redningsdiskett som gjør det lettere å gjenopprette etter "
-"systemfeil.\n"
-"Ønsker du å opprette en oppstartsdisk for systemet ditt?"
 
 #: ../install_steps_interactive.pm_.c:133
 msgid "Insert a floppy in drive fd0 (aka A:)"
 msgstr ""
 
 #: ../install_steps_interactive.pm_.c:134
-#, fuzzy
 msgid "Creating bootdisk"
-msgstr "Opprett oppstartdiskett"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:141
 msgid "First sector of boot partition"
-msgstr "Første sektor av oppstartspartisjonen"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:141
 msgid "First sector of drive"
-msgstr "Første sektor av disk"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:144
 msgid "Lilo Installation"
-msgstr "Lilo installasjon"
+msgstr ""
 
 #: ../install_steps_interactive.pm_.c:145
 msgid "Where do you want to install the bootloader?"
-msgstr "Hvor ønsker du å installer oppstartslasteren?"
+msgstr ""
 
 #: ../install_steps_stdio.pm_.c:21
 #, c-format
 msgid "Starting step `%s'\n"
-msgstr "Starter steg `%s'\n"
+msgstr ""
 
 #: ../interactive.pm_.c:19 ../interactive.pm_.c:27 ../my_gtk.pm_.c:174
 #: ../my_gtk.pm_.c:316 ../my_gtk.pm_.c:390
 msgid "Ok"
-msgstr "Ok"
+msgstr ""
 
 #: ../interactive.pm_.c:23 ../my_gtk.pm_.c:315
 msgid "No"
-msgstr "Nei"
+msgstr ""
 
 #: ../interactive.pm_.c:23 ../my_gtk.pm_.c:315
 msgid "Yes"
-msgstr "Ja"
+msgstr ""
 
 #: ../interactive.pm_.c:27 ../my_gtk.pm_.c:175 ../my_gtk.pm_.c:316
 msgid "Cancel"
-msgstr "Avbryt"
+msgstr ""
 
 #: ../interactive.pm_.c:65
 msgid "Please wait"
-msgstr "Vennligst vent"
+msgstr ""
 
 #: ../interactive_stdio.pm_.c:34
 #, c-format
 msgid "Ambiguity (%s) be more precise\n"
-msgstr "Tvetydig (%s) vær mere presis\n"
+msgstr ""
 
 #: ../interactive_stdio.pm_.c:35 ../interactive_stdio.pm_.c:50
 #: ../interactive_stdio.pm_.c:69
 msgid "Bad choice, try again\n"
-msgstr "Dårlig valg, prøv igjen\n"
+msgstr ""
 
 #: ../interactive_stdio.pm_.c:38
 #, c-format
 msgid " ? (default %s) "
-msgstr " ? (standard %s) "
+msgstr ""
 
 #: ../interactive_stdio.pm_.c:51
 #, c-format
 msgid "Your choice? (default %s) "
-msgstr "Ditt valg? (standard %s) "
+msgstr ""
 
 #: ../interactive_stdio.pm_.c:70
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
-msgstr "Ditt valg? (standard %s  trykk `none' for ingen) "
+msgstr ""
 
 #: ../my_gtk.pm_.c:316
 msgid "Is it ok?"
-msgstr "Er det ok?"
+msgstr ""
 
 #: ../partition_table.pm_.c:457
 #, c-format
 msgid "Error reading file %s"
-msgstr "Feil ved lesing av fil %s"
+msgstr ""
 
 #: ../partition_table.pm_.c:464
 #, c-format
 msgid "Restoring from file %s failed: %s"
-msgstr "Gjenoppretting fra fil %s mislykket: %s"
+msgstr ""
 
 #: ../partition_table.pm_.c:466
 msgid "Bad backup file"
-msgstr "Dårlig backup-fil"
+msgstr ""
 
 #: ../partition_table.pm_.c:486
 #, c-format
 msgid "Error writing to file %s"
-msgstr "Feil ved skriving til fil %s"
+msgstr ""
 
-#~ msgid "Expert"
-#~ msgstr "Expert"
+msgid "Expert"
+msgstr "Expert"
 
-#~ msgid "Start: sector"
-#~ msgstr "Start: sektor"
+msgid "Start: sector"
+msgstr "Start: sektor"
 
-#~ msgid "Mb\n"
-#~ msgstr "Mb\n"
+msgid "Mb\n"
+msgstr "Mb\n"
 
-#~ msgid "Size: "
-#~ msgstr "Størrelse: "
+msgid "Size: "
+msgstr "Størrelse: "
 
-#~ msgid "Size: %s Mb (%s%%)\n"
-#~ msgstr "Størrelse: %s Mb (%s%%)\n"
+msgid "Size: %s Mb (%s%%)\n"
+msgstr "Størrelse: %s Mb (%s%%)\n"
 
-#~ msgid "Forget the modification to partition table?"
-#~ msgstr "Glem modifiseringen til partisjonstabellen?"
+msgid "Forget the modification to partition table?"
+msgstr "Glem modifiseringen til partisjonstabellen?"
 
-#~ msgid "Mb"
-#~ msgstr "Mb"
+msgid "Mb"
+msgstr "Mb"
 
-#~ msgid "Size in Mb: "
-#~ msgstr "Størrelse i Mb: "
+msgid "Size in Mb: "
+msgstr "Størrelse i Mb: "
 
-#~ msgid "Find installation files"
-#~ msgstr "Finn installasjonsfiler"
+msgid "Find installation files"
+msgstr "Finn installasjonsfiler"
 
-#~ msgid "Find current installation"
-#~ msgstr "Finn nåværende installasjon"
+msgid "Find current installation"
+msgstr "Finn nåværende installasjon"
 
-#~ msgid "Choose packages to upgrade"
-#~ msgstr "Velg pakker som skal oppgraderes"
+msgid "Choose packages to upgrade"
+msgstr "Velg pakker som skal oppgraderes"
 
-#~ msgid "Upgrade system"
-#~ msgstr "Oppgrader systemet"
+msgid "Upgrade system"
+msgstr "Oppgrader systemet"
 
-#~ msgid "newbie"
-#~ msgstr "nybegynner"
+msgid "newbie"
+msgstr "nybegynner"
 
-#~ msgid "Choose partitions you want to format"
-#~ msgstr "Velg partisjoner du ønsker å formatere"
+msgid "Choose partitions you want to format"
+msgstr "Velg partisjoner du ønsker å formatere"
 
-#~ msgid "You must give a password"
-#~ msgstr "Du må oppgi et passord"
+msgid "You must give a password"
+msgstr "Du må oppgi et passord"
diff --git a/perl-install/share/themes-savane.rc b/perl-install/share/themes-savane.rc
index 43e67583c..38ecc11d5 100644
--- a/perl-install/share/themes-savane.rc
+++ b/perl-install/share/themes-savane.rc
@@ -3,13 +3,14 @@ style "any"
   font = "-adobe-helvetica-medium-r-normal-*-*-100-*-*-p-*-iso8859-1"
 
   bg[NORMAL]      = { 0.67, 0.33, 0 }
+  bg[ACTIVE]      = { 1.0, 0.67, 0 }
   bg[PRELIGHT]      = { 1.0, 1.0, 0 }
   bg[INSENSITIVE] = { 1.0, 0, 0.67 }
   
   fg[NORMAL] = { 1.0, 1.0, 1.0 }
-  fg[ACTIVE] = { 1.0, 1.0, 1.0 }
-  fg[PRELIGHT] = { 1.0, 1.0, 1.0 }
-  fg[INSENSITIVE]   = { 1.0, 1.0, 1.0 }
+  fg[ACTIVE] = { 0, 0, 0 }
+  fg[PRELIGHT] = { 0, 0, 0 }
+  fg[INSENSITIVE]   = { 0, 0, 0 }
 }
 
 style "entry"