diff options
author | Pascal Rigaux <pixel@mandriva.com> | 1999-11-08 01:48:28 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 1999-11-08 01:48:28 +0000 |
commit | 0f16f9693f47687136e5058916d0d04dcb611217 (patch) | |
tree | 621a0c76850737d6353385ece3f3fda54219f7b0 | |
parent | 83e615434cf1bc3a692ab95b9b8aac3af6c366c8 (diff) | |
download | drakx-0f16f9693f47687136e5058916d0d04dcb611217.tar drakx-0f16f9693f47687136e5058916d0d04dcb611217.tar.gz drakx-0f16f9693f47687136e5058916d0d04dcb611217.tar.bz2 drakx-0f16f9693f47687136e5058916d0d04dcb611217.tar.xz drakx-0f16f9693f47687136e5058916d0d04dcb611217.zip |
no_comment
-rw-r--r-- | perl-install/Makefile | 7 | ||||
-rw-r--r-- | perl-install/Xconfigurator.pm | 16 | ||||
-rw-r--r-- | perl-install/common.pm | 4 | ||||
-rw-r--r-- | perl-install/detect_devices.pm | 6 | ||||
-rw-r--r-- | perl-install/help.pm | 6 | ||||
-rw-r--r-- | perl-install/install2.pm | 23 | ||||
-rw-r--r-- | perl-install/install_any.pm | 6 | ||||
-rw-r--r-- | perl-install/install_steps.pm | 47 | ||||
-rw-r--r-- | perl-install/install_steps_interactive.pm | 181 | ||||
-rw-r--r-- | perl-install/interactive.pm | 10 | ||||
-rw-r--r-- | perl-install/interactive_gtk.pm | 6 | ||||
-rw-r--r-- | perl-install/lang.pm | 97 | ||||
-rw-r--r-- | perl-install/modules.pm | 12 | ||||
-rw-r--r-- | perl-install/mouse.pm | 4 | ||||
-rw-r--r-- | perl-install/share/install.rc | 38 | ||||
-rw-r--r-- | perl-install/share/po/DrakX.pot | 752 | ||||
-rw-r--r-- | perl-install/share/po/no.po | 783 | ||||
-rw-r--r-- | perl-install/share/themes-marble3d.rc | 2 |
18 files changed, 1007 insertions, 993 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 532956cfc..942c272b7 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -74,12 +74,13 @@ install_pms: $(DIRS) dest=$(DESTREP4PMS)/`dirname $$i`; \ install -d $$dest; \ perl -ne 'print' $$i > $(DESTREP4PMS)/$$i; \ - perl -pe 's/#-.*//; $$_ = "\n" if (/^=head/ .. /^=cut/) || /use (diagnostics|vars|strict)/' $$i > $(DESTREP4PMS)/$$i; \ + perl -pe 's/#-.*//; $$_ = "\n" if (/^=head/ .. /^=cut/) || /use (diagnostics)/' $$i > $(DESTREP4PMS)/$$i; \ done +# perl -pe 's/#-.*//; $$_ = "\n" if (/^=head/ .. /^=cut/) || /use (diagnostics|vars|strict)/' $$i > $(DESTREP4PMS)/$$i; \ cp *.rc $(DESTREP4PMS) install -d $(DESTREP4PMS)/po - cp po/*.po* $(DESTREP4PMS)/po + cp -f po/*.po* $(DESTREP4PMS)/po || true ln -sf perl-install/install2 $(DEST)/usr/bin ln -sf perl-install/commands $(DEST)/usr/bin chmod a+x $(DESTREP4PMS)/install2 @@ -149,7 +150,7 @@ get_needed_files: $(DIRS) else \ cp -f ../modules/modules.cpio.bz2 $(DEST)/lib/; \ install -d $(DEST)/lib/modules; \ - cp -f ../modules/pristine/* $(DEST)/lib/modules; \ + cp -f ../modules/pristine/* $(DEST)/lib/modules || true; \ fi ln -s install2 $(DEST)/usr/bin/runinstall2 diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 21b6f197f..e1acec491 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -19,6 +19,10 @@ my ($prefix, %cards, %monitors); sub getVGAMode($) { $_[0]->{card}{vga_mode} || $vgamodes{"640x480x16"}; } +sub restart_xfs() { + run_program::rooted($prefix, "/etc/rc.d/init.d/xfs", $_) foreach "stop", "start"; +} + sub setVirtual($) { my $vt = ''; local *C; @@ -153,9 +157,8 @@ sub cardConfiguration(;$$$) { add2hash($card, $cards{$card->{type}}) if $card->{type}; #- try to get info from given type $card->{type} = undef unless $card->{server}; #- bad type as we can't find the server - add2hash($card, cardConfigurationAuto()) unless $card->{server} || $noauto; - $card->{server} = 'FBDev' unless !$allowFB || $card->{server} || $noauto; + $card->{server} = 'FBDev' unless !$allowFB || $card->{server} || $card->{type} || $noauto; $card->{type} = $in->ask_from_list('', _("Select a graphic card"), ['Unlisted', keys %cards]) unless $card->{type} || $card->{server}; $card->{type} = undef, $card->{server} = $in->ask_from_list('', _("Choose a X server"), $allowFB ? \@allservers : \@allbutfbservers ) if $card->{type} eq "Unlisted"; @@ -226,6 +229,7 @@ sub testConfig($) { write_XF86Config($o, $tmpconfig); unlink "/tmp/.X9-lock"; + restart_xfs; local *F; open F, "$prefix$o->{card}{prog} :9 -probeonly -pn -xf86config $tmpconfig 2>&1 |"; @@ -270,8 +274,7 @@ sub testFinalConfig($;$) { #- create a link from the non-prefixed /tmp/.X11-unix/X9 to the prefixed one #- that way, you can talk to :9 without doing a chroot symlinkf "$prefix/tmp/.X11-unix/X9", "/tmp/.X11-unix/X9" if $prefix; - run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/xfs", "stop"); - run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/xfs", "start"); + restart_xfs; my $f_err = "$prefix/tmp/Xoutput"; my $pid; @@ -289,8 +292,9 @@ sub testFinalConfig($;$) { local *F; open F, $f_err; while (<F>) { - if (/\berror\b/i) { - my @msg; while (<F>) { + if (/\b(error|not supported)\b/i) { + my @msg = !/error/ && $_ ; + while (<F>) { /^$/ and last; push @msg, $_; } diff --git a/perl-install/common.pm b/perl-install/common.pm index b1133b4ca..8cb221afb 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -325,7 +325,7 @@ sub setVarsInSh { my ($file, $l, @fields) = @_; @fields = keys %$l unless @fields; - my $b = 1; $b &&= $l->{$_} foreach @fields; $b or return; +#- my $b = 1; $b &&= $l->{$_} foreach @fields; $b or return; local *F; open F, "> $_[0]" or die "cannot create config file $file"; $l->{$_} and print F "$_=$l->{$_}\n" foreach @fields; @@ -334,7 +334,7 @@ sub setVarsInCsh { my ($file, $l, @fields) = @_; @fields = keys %$l unless @fields; - my $b = 1; $b &&= $l->{$_} foreach @fields; $b or return; +#- my $b = 1; $b &&= $l->{$_} foreach @fields; $b or return; local *F; open F, "> $_[0]" or die "cannot create config file $file"; $l->{$_} and print F "setenv $_ $l->{$_}\n" foreach @fields; diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 78930e6f8..a7fe2ed86 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -178,11 +178,7 @@ sub syslog { `dmesg`; } -sub hasSMP { -#- my $nb = grep { /^processor/ } cat_("/proc/cpuinfo"); -#- $nb > 1; - c::detectSMP(); -} +sub hasSMP { c::detectSMP() } sub whatParport() { my @res =(); diff --git a/perl-install/help.pm b/perl-install/help.pm index abbb66c28..9d9e35aa7 100644 --- a/perl-install/help.pm +++ b/perl-install/help.pm @@ -354,8 +354,10 @@ area titled \"Info\", located between list of packages and the five buttons \"Install\", \"Select more/less\" and \"Show more/less\"."), doInstallStep => - __("The packages selected are now being installed. This operation -should only take a few minutes."), + __("The packages selected are now being installed. + + +This operation should take a few minutes."), selectMouse => __("If DrakX failed to find your mouse, or if you want to diff --git a/perl-install/install2.pm b/perl-install/install2.pm index bcb98cb47..8d1181316 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -180,8 +180,8 @@ $o = $::o = { steps => \%installSteps, orderedSteps => \@orderedInstallSteps, -#- base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which perl-base) ], - base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron rhs-hwdiag utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which cpio perl) ], +#-GOLD base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which perl-base) ], + base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which cpio perl) ], #- for the list of fields available for user and superuser, see @etc_pass_fields in install_steps.pm #- intf => [ { DEVICE => "eth0", IPADDR => '1.2.3.4', NETMASK => '255.255.255.128' } ], @@ -221,7 +221,14 @@ sub selectMouse { add2hash($o->{mouse} ||= {}, { mouse::read($o->{prefix}) }) if $o->{isUpgrade} && !$clicked; $o->selectMouse($clicked); - addToBeDone { mouse::write($o->{prefix}, $o->{mouse}); } 'formatPartitions'; + addToBeDone { + mouse::write($o->{prefix}, $o->{mouse}); + my $t = "modprobe usbmouse\n"; + substInFile { + s/$t//; + $_ .= $t if eof; + } "$o->{prefix}/etc/rc.d/rc.local" if $o->{mouse}{FULLNAME} =~ /USB/i; + } 'doInstallStep'; } #------------------------------------------------------------------------------ @@ -342,13 +349,13 @@ sub miscellaneous { $o->miscellaneous($_[0]); addToBeDone { install_any::fsck_option(); - run_program::rooted($o->{prefix}, "chkconfig --del kudzu") unless $o->{miscellaneous}{kudzu}; +#-GOLD run_program::rooted($o->{prefix}, "chkconfig --del kudzu") unless $o->{miscellaneous}{kudzu}; } 'doInstallStep'; } #------------------------------------------------------------------------------ sub configureNetwork { - my ($clicked, $entered) = @_; + my ($clicked) = @_; if ($o->{isUpgrade} && !$clicked) { $o->{netc} or $o->{netc} = {}; @@ -361,11 +368,11 @@ sub configureNetwork { } } - $o->configureNetwork($entered == 1 && !$clicked) + $o->configureNetwork; } #------------------------------------------------------------------------------ sub configureTimezone { - my ($clicked) = $_[0]; + my ($clicked) = @_; my $f = "$o->{prefix}/etc/sysconfig/clock"; if ($o->{isUpgrade} && -r $f && -s $f > 0) { @@ -524,7 +531,7 @@ sub main { } modules::load_deps("/modules/modules.dep"); - $o->{modules} = modules::get_stage1_conf($o->{modules}, "/tmp/conf.modules"); + modules::read_stage1_conf("/tmp/conf.modules"); modules::read_already_loaded(); modparm::read_modparm_file(-e "modparm.lst" ? "modparm.lst" : "/usr/share/modparm.lst"); diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 34540d103..ed87b688a 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -129,6 +129,8 @@ sub setPackages($) { $o->{compssUsers} = pkgs::readCompssUsers($o->{packages}, $o->{compss}); push @{$o->{base}}, "kernel-smp" if detect_devices::hasSMP(); push @{$o->{base}}, "kernel-pcmcia-cs" if $o->{pcmcia}; + + grep { !$o->{packages}{$_} && log::l("missing base package $_") } @{$o->{base}} and die "missing some base packages"; } else { $_->{selected} = 0 foreach values %{$o->{packages}}; } @@ -375,7 +377,7 @@ sub auto_inst_file() { "$::o->{prefix}/root/auto_inst.cfg.pl" } sub g_auto_install(;$) { my ($f) = @_; $f ||= auto_inst_file; - my $o = bless {}; + my $o = {}; $o->{default_packages} = [ map { $_->{name} } grep { $_->{selected} && !$_->{base} } values %{$::o->{packages}} ]; @@ -428,5 +430,5 @@ sub pkg_install { sub fsck_option() { my $y = $::o->{security} < 3 && $::beginner && "-y "; - substInFile { s/^(\s*fsckoptions=)(-y )?/$1$y/ } "$::o->{prefix}/etc/rc.d/rc.sysinit"; + substInFile { s/^(\s*fsckoptions="?)(-y )?/$1$y/ } "$::o->{prefix}/etc/rc.d/rc.sysinit"; } diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index bbe35e2f7..8bcc53898 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -102,7 +102,7 @@ sub selectPath {} sub selectInstallClass($@) { my ($o) = @_; $o->{installClass} ||= "normal"; - $o->{security} || ${{ + $o->{security} ||= ${{ normal => 2, developer => 3, server => 4, @@ -205,7 +205,6 @@ sub installPackages($$) { } push @toInstall, grep { $_->{base} && $_->{selected} && !$_->{installed} && !$firstInstalled{$_->{name}} } values %$packages; push @toInstall, grep { !$_->{base} && $_->{selected} && !$_->{installed} && !$firstInstalled{$_->{name}} } values %$packages; - print int @toInstall, "<<<<<<\n"; pkgs::install($o->{prefix}, \@toInstall); } @@ -237,6 +236,26 @@ sub configureNetwork($) { install_any::pkg_install($o, "dhcpcd") if grep { $_->{BOOTPROTO} =~ /^(dhcp|bootp)$/ } @{$o->{intf}}; #-res_init(); #- reinit the resolver so DNS changes take affect + + pppConfig($o); +} + +#------------------------------------------------------------------------------ +sub pppConfig { + my ($o) = @_; + $o->{modem} or return; + + symlinkf($o->{modem}{device}, "$o->{prefix}/dev/modem"); + install_any::pkg_install($o, "ppp"); + + my %toreplace; + $toreplace{$_} = $o->{modem}{$_} foreach qw(connection phone login passwd auth domain); + $toreplace{phone} =~ s/[^\d]//g; + $toreplace{dnsserver} = join '', map { "$o->{modem}{$_}," } "dns1", "dns2"; + + foreach ("$o->{prefix}/root", "$o->{prefix}/etc/skel") { + template2file("/usr/share/kppprc.in", "$_/.kde/share/config/kppprc", %toreplace) if -d "$_/.kde/share/config"; + } } #------------------------------------------------------------------------------ @@ -255,24 +274,6 @@ sub pcmciaConfig($) { } #------------------------------------------------------------------------------ -sub modemConfig { - my ($o) = @_; - symlinkf($o->{modem}{device}, "$o->{prefix}/dev/modem") if $o->{modem}; -} - -sub pppConfig { - my ($o) = @_; - my %toreplace; - - $toreplace{$_} = $o->{modem}{$_} foreach qw(connection phone login passwd auth domain); - $toreplace{phone} =~ s/[^\d]//g; - $toreplace{dnsserver} = ($o->{modem}{dns1} && "$o->{modem}{dns1},") . ($o->{modem}{dns2} && "$o->{modem}{dns2},"); - foreach ("$o->{prefix}/root", "$o->{prefix}/etc/skel") { - template2file("/usr/share/kppprc.in", "$_/.kde/share/config/kppprc", %toreplace) if -d "$_/.kde/share/config"; - } -} - -#------------------------------------------------------------------------------ sub timeConfig { my ($o, $f) = @_; timezone::write($o->{prefix}, $o->{timezone}, $f); @@ -336,9 +337,9 @@ sub addUser($) { if (!$g || getgrgid($g)) { for ($g = 500; getgrgid($g) || $gids{$g}; $g++) {} } $_->{home} ||= "/home/$_->{name}"; - $_->{uid} = $u; - $_->{gid} = $g; - $_{pw} ||= $_->{password} && install_any::crypt($_->{password}); + $_->{uid} = $u; $uids{$u} = 1; + $_->{gid} = $g; $gids{$g} = 1; + $_->{pw} ||= $_->{password} && install_any::crypt($_->{password}); $done{$_->{name}} = 1; } } @{$o->{users} || []}; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 782a8f3cc..3b5471588 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -18,6 +18,7 @@ use install_any; use detect_devices; use timezone; use run_program; +use commands; use fsedit; use network; use mouse; @@ -243,7 +244,7 @@ sub choosePackages { #------------------------------------------------------------------------------ sub configureNetwork($) { my ($o, $first_time) = @_; - my $r = ''; + local $_; if ($o->{intf}) { if (!$::beginner && $first_time) { my @l = ( @@ -251,64 +252,46 @@ sub configureNetwork($) { __("Reconfigure network now"), __("Do not set up networking"), ); - $r = $o->ask_from_list_([ _("Network Configuration") ], + $_ = $o->ask_from_list_([ _("Network Configuration") ], _("Local networking has already been configured. Do you want to:"), [ @l ]) || "Do not"; - } - $r = "Keep" if $::beginner; + } else { $_ = "Keep"; } } elsif ($o->{modem}) { - $r = "Dialup"; + $_ = "Dialup"; } else { - $r = !$::beginner && + $_ = $::beginner ? "Do not" : $o->ask_from_list_([ _("Network Configuration") ], _("Do you want to configure networking for yout system?"), - [ __("Local LAN"), __("Dialup with modem"), __("Do not set up networking") ]) || "Do not"; + [ __("Local LAN"), __("Dialup with modem"), __("Do not set up networking") ]); } - if ($r =~ /^Dialup/) { - my ($device, $desc) = $o->{modem}{device}; - unless ($device || $::expert && $o->ask_yesorno('', _("Skip modem autodetection?"), 1)) { - foreach (0..3) { - next if readlink("$o->{prefix}/dev/mouse") =~ /ttyS$_/; - $desc = detect_devices::hasModem("$o->{prefix}/dev/ttyS$_"); - $device = "ttyS$_" if $desc; - last if $device; - } - } - $device = mouse::serial_ports_names2dev($o->ask_from_list('', _("Which serial port is your modem connected to?"), - [ mouse::serial_ports_names() ])) unless $device; - log::l("using modem at /dev/$device"); - $o->{modem}{device} = $device; - install_steps::modemConfig($o); - - $o->pppConfig(); - } else { - if ($r =~ /^Do not/) { - $o->{netc}{NETWORKING} = "false"; - } elsif ($r !~ /^Keep/) { - $o->setup_thiskind('net', !$::expert, 1); - my @l = detect_devices::getNet() or die _("no network card found"); - - my $last; foreach ($::beginner ? $l[0] : @l) { - my $intf = network::findIntf($o->{intf} ||= [], $_); - add2hash($intf, $last); - add2hash($intf, { NETMASK => '255.255.255.0' }); - $o->configureNetworkIntf($intf) or return; - - $o->{netc} ||= {}; - delete $o->{netc}{dnsServer}; - delete $o->{netc}{GATEWAY}; - $last = $intf; - } - #- { - #- my $wait = $o->wait_message(_("Hostname"), _("Determining host name and domain...")); - #- network::guessHostname($o->{prefix}, $o->{netc}, $o->{intf}); - #- } - $last->{BOOTPROTO} =~ /^(dhcp|bootp)$/ || - $o->configureNetworkNet($o->{netc}, $last ||= {}, @l) or return; + if (/^Dialup/) { + $o->pppConfig; + } elsif (/^Do not/) { + $o->{netc}{NETWORKING} = "false"; + } elsif (!/^Keep/) { + $o->setup_thiskind('net', !$::expert, 1); + my @l = detect_devices::getNet() or die _("no network card found"); + + my $last; foreach ($::beginner ? $l[0] : @l) { + my $intf = network::findIntf($o->{intf} ||= [], $_); + add2hash($intf, $last); + add2hash($intf, { NETMASK => '255.255.255.0' }); + $o->configureNetworkIntf($intf) or return; + + $o->{netc} ||= {}; + delete $o->{netc}{dnsServer}; + delete $o->{netc}{GATEWAY}; + $last = $intf; } - install_steps::configureNetwork($o); + #- { + #- my $wait = $o->wait_message(_("Hostname"), _("Determining host name and domain...")); + #- network::guessHostname($o->{prefix}, $o->{netc}, $o->{intf}); + #- } + $last->{BOOTPROTO} =~ /^(dhcp|bootp)$/ || + $o->configureNetworkNet($o->{netc}, $last ||= {}, @l) or return; } + install_steps::configureNetwork($o); } sub configureNetworkIntf { @@ -361,22 +344,31 @@ You may also enter the IP address of the gateway if you have one"), #------------------------------------------------------------------------------ sub pppConfig { my ($o) = @_; + my $m = $o->{modem} ||= {}; - my @l = ( -_("Connection name") => \$o->{modem}{connection}, -_("Phone number") => \$o->{modem}{phone}, -_("Login ID") => \$o->{modem}{login}, -_("Password") => { val => \$o->{modem}{passwd}, hidden => 1 }, -_("Authentication") => { val => \$o->{modem}{auth}, list => [ __("PAP"), __("CHAP"), __("Terminal-based"), __("Script-based") ] }, -_("Domain name") => \$o->{modem}{domain}, -_("First DNS Server") => \$o->{modem}{dns1}, -_("Second DNS Server") => \$o->{modem}{dns2}, - ); + unless ($m->{device} || $::expert && $o->ask_yesorno('', _("Skip modem autodetection?"), 1)) { + foreach (0..3) { + next if readlink("$o->{prefix}/dev/mouse") =~ /ttyS$_/; + detect_devices::hasModem("$o->{prefix}/dev/ttyS$_") + and $m->{device} = "ttyS$_", last; + } + } + + $m->{device} ||= mouse::serial_ports_names2dev( + $o->ask_from_list('', _("Which serial port is your modem connected to?"), + [ mouse::serial_ports_names ])); - install_steps::pppConfig($o) if $o->ask_from_entries_ref('', - _("Dialup options"), - [ grep_index { even($::i) } @l ], - [ grep_index { odd($::i) } @l ]); + install_steps::pppConfig($o) if $o->ask_from_entries_refH('', + _("Dialup options"), [ +_("Connection name") => \$m->{connection}, +_("Phone number") => \$m->{phone}, +_("Login ID") => \$m->{login}, +_("Password") => { val => \$m->{passwd}, hidden => 1 }, +_("Authentication") => { val => \$m->{auth}, list => [ __("PAP"), __("CHAP"), __("Terminal-based"), __("Script-based") ] }, +_("Domain name") => \$m->{domain}, +_("First DNS Server") => \$m->{dns1}, +_("Second DNS Server") => \$m->{dns2}, + ]); } #------------------------------------------------------------------------------ @@ -537,7 +529,7 @@ wish to access and any applicable user name and password."), $o->{printer}{BITSPERPIXEL} = $depth_to_col{$o->{printer}{BITSPERPIXEL}} || $o->{printer}{BITSPERPIXEL}; #- translate. - my @l = ( + $o->ask_from_entries_refH('', _("Printer options"), [ _("Paper Size") => { val => \$o->{printer}{PAPERSIZE}, type => 'list', , not_edit => !$::expert, list => \@printer::papersize_type }, @list_res ? ( _("Resolution") => { val => \$o->{printer}{RESOLUTION}, type => 'list', , not_edit => !$::expert, list => \@res } ) : (), @@ -546,12 +538,7 @@ _("Fix stair-stepping text?") => { val => \$o->{printer}{CRLF}, type => "bool" } $is_uniprint ? ( _("Uniprint driver options") => { val => \$o->{printer}{BITSPERPIXEL}, type => 'list', , not_edit => !$::expert, list => \@col } ) : ( _("Color depth options") => { val => \$o->{printer}{BITSPERPIXEL}, type => 'list', , not_edit => !$::expert, list => \@col } ), ) : () -); - - $o->ask_from_entries_ref('', - _("Printer options"), - [ grep_index { even($::i) } @l ], - [ grep_index { odd($::i) } @l ]); +]);; $o->{printer}{BITSPERPIXEL} = $col_to_depth{$o->{printer}{BITSPERPIXEL}} || $o->{printer}{BITSPERPIXEL}; #- translate. @@ -592,15 +579,16 @@ sub setRootPassword($) { return if $o->{security} < 1 && !$clicked; - $o->ask_from_entries_ref([_("Set root password"), _("Ok"), $o->{security} > 3 ? () : _("No password")], - _("Set root password"), - [_("Password:"), _("Password (again):"), $o->{installClass} eq "server" || $::expert ? (_("Use shadow file"), _("Use MD5 passwords")) : (), $::beginner ? () : _("Use NIS") ], - [{ val => \$sup->{password}, hidden => 1 }, - { val => \$sup->{password2}, hidden => 1 }, - { val => \$o->{authentification}{shadow}, type => 'bool', text => _("shadow") }, - { val => \$o->{authentification}{md5}, type => 'bool', text => _("MD5") }, - { val => \$o->{authentification}{NIS}, type => 'bool', text => _("yellow pages") }, - ], + $o->ask_from_entries_refH([_("Set root password"), _("Ok"), $o->{security} > 3 ? () : _("No password")], + _("Set root password"), [ +_("Password") => { val => \$sup->{password}, hidden => 1 }, +_("Password (again)") => { val => \$sup->{password2}, hidden => 1 }, + $o->{installClass} eq "server" || $::expert ? ( +_("Use shadow file") => { val => \$o->{authentification}{shadow}, type => 'bool', text => _("shadow") }, +_("Use MD5 passwords") => { val => \$o->{authentification}{md5}, type => 'bool', text => _("MD5") }, + ) : (), $::beginner ? () : +_("Use NIS") => { val => \$o->{authentification}{NIS}, type => 'bool', text => _("yellow pages") } + ], complete => sub { $sup->{password} eq $sup->{password2} or $o->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return (1,1); length $sup->{password} < ($o->{security} > 3 ? 10 : 6) @@ -631,13 +619,17 @@ sub addUser($) { my @fields = qw(realname name password password2); my @shells = install_any::shells($o); - if ($o->{security} < 2 && !$clicked || $o->ask_from_entries_ref( + if ($o->{security} < 2 && !$clicked || $o->ask_from_entries_refH( [ _("Add user"), _("Accept user"), _("Done") ], _("Enter a user\n%s", $o->{users} ? _("(already added %s)", join(", ", map { $_->{realname} || $_->{name} } @{$o->{users}})) : ''), - [ _("Real name"), _("User name"), $o->{security} < 2 ? () : (_("Password"), _("Password (again)")), $::beginner ? () : _("Shell") ], - [ \$u->{realname}, \$u->{name}, - {val => \$u->{password}, hidden => 1}, {val => \$u->{password2}, hidden => 1}, - {val => \$u->{shell}, list => \@shells, not_edit => !$::expert}, + [ + _("Real name") => \$u->{realname}, + _("User name") => \$u->{name}, + $o->{security} < 2 ? () : ( + _("Password") => {val => \$u->{password}, hidden => 1}, + _("Password (again)") => {val => \$u->{password2}, hidden => 1}, + ), $::beginner ? () : + _("Shell") => {val => \$u->{shell}, list => \@shells, not_edit => !$::expert} ], focus_out => sub { if ($_[0] eq 0) { @@ -731,10 +723,7 @@ _("Restrict command line options") => { val => \$b->{restricted}, type => "bool" @l = @l[0..3] if $::beginner; $b->{vga} ||= 'Normal'; - $o->ask_from_entries_ref('', - _("LILO main options"), - [ grep_index { even($::i) } @l ], - [ grep_index { odd($::i) } @l ], + $o->ask_from_entries_refH('', _("LILO main options"), \@l, complete => sub { $o->{security} > 4 && length($b->{password}) < 6 and $o->ask_warn('', _("At this level of security, a password (and a good one) in lilo is requested")), return 1; $b->{restricted} && !$b->{password} and $o->ask_warn('', _("Option ``Restrict command line options'' is of no use without a password")), return 1; @@ -787,10 +776,10 @@ _("Label") => \$e->{label}, _("Default") => { val => \$default, type => 'bool' }, ); - if ($o->ask_from_entries_ref('', - '', - [ grep_index { even($::i) } @l ], - [ grep_index { odd($::i) } @l ], + if ($o->ask_from_entries_refH('', '', \@l, + complete => sub { + $name ne $old_name && $b->{entries}{$name} and $o->ask_warn("A entry %s already exists", $name), return 1; + } )) { $b->{default} = $old_default ^ $default ? $default && $e->{label} : $b->{default}; @@ -832,7 +821,7 @@ sub miscellaneous { _("Security level"), _("HTTP proxy"), _("FTP proxy"), - _("Use kudzu"), +#-GOLD _("Use kudzu"), _("Precise ram size (found %d MB)", availableRam / 1024), ], [ { val => \$u->{LAPTOP}, type => 'bool' }, @@ -840,13 +829,13 @@ sub miscellaneous { { val => \$s, list => [ map { $l{$_} } ikeys %l ] }, \$u->{http_proxy}, \$u->{ftp_proxy}, - { val => \$u->{kudzu}, type => 'bool' }, +#-GOLD { val => \$u->{kudzu}, type => 'bool' }, \$u->{memsize}, ], complete => sub { $u->{http_proxy} =~ m,^($|http://), or $o->ask_warn('', _("Proxy should be http://...")), return 1,3; $u->{ftp_proxy} =~ m,^($|ftp://), or $o->ask_warn('', _("Proxy should be ftp://...")), return 1,4; - $u->{memsize} =~ s/^(\d+)M?$/$1M/ or $o->ask_warn('', _("Give the ram size in Mb")), return 1,6; + !$u->{memsize} || $u->{memsize} =~ s/^(\d+)M?$/$1M/i or $o->ask_warn('', _("Give the ram size in Mb")), return 1; 0; } ) || return; @@ -970,7 +959,7 @@ sub setup_thiskind { push @l, \@r; } else { eval { commands::modprobe("isapnp") }; - $o->ask_warn('', [ pci_probing::main::list(), cat_("/proc/isapnp") ]); + $o->ask_warn('', [ pci_probing::main::list(), scalar cat_("/proc/isapnp") ]); } } } diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index ed2c79de4..a67cf7893 100644 --- a/perl-install/interactive.pm +++ b/perl-install/interactive.pm @@ -119,6 +119,16 @@ sub ask_from_entries($$$$;$%) { map { $$_ } @$val : undef; } + +sub ask_from_entries_refH($$$;$%) { + my ($o, $title, $message, $h, %callback) = @_; + + ask_from_entries_ref($o, $title, $message, + [ grep_index { even($::i) } @$h ], + [ grep_index { odd($::i) } @$h ], + %callback); +} + #- can get a hash of callback: focus_out changed and complete #- moreove if you pass a hash with a field list -> combo #- if you pass a hash with a field hidden -> emulate stty -echo diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm index 3063a2d19..dea36ff77 100644 --- a/perl-install/interactive_gtk.pm +++ b/perl-install/interactive_gtk.pm @@ -27,8 +27,12 @@ sub ask_from_listW { if (@$l < 5 && sum(map { length $_ } @$l) < 70) { my $defW; my $f = sub { $w->{retval} = $_[1]; Gtk->main_quit }; + my $box = (@$l <= 2 && (map { split "\n" } @$messages) > 6) ? + gtkpack(new Gtk::VBox(0,0), + gtkset_usize(createScrolledWindow(gtktext_insert(new Gtk::Text, join "\n", @$messages)), 400, 250)) : + create_box_with_title($w, @$messages); gtkadd($w->{window}, - gtkpack(create_box_with_title($w, @$messages), + gtkpack($box, gtkadd((@$l < 3 ? create_hbox() : create_vbox()), map { my $b = new Gtk::Button($_); diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 991eb1c73..d5eb23ec1 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -51,74 +51,42 @@ my %languages = ( 'zh_TW.Big5' => [ 'Chinese (Big5)', 'Big5', 'zh_TW.Big5', 'zh_TW.Big5:zh_TW.big5' ], ); +sub std2 { "-mdk-helvetica-medium-r-normal-*-*-$_[1]-*-*-*-*-$_[0]" } +sub std_ { std2($_[0], 100), std2($_[0], 100) } +sub std { std2($_[0], 100), std2($_[0], 80) } + my %charsets = ( - "armscii-8" => [ "arm8", "armscii8", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-*helv*-medium-r-normal--14-*-*-*-*-armscii-8" ], + "armscii-8" => [ "arm8", "armscii8", std_("armscii-8") ], #- chinese needs special console driver for text mode "Big5" => [ "?????", "????", - "*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1," . - "-taipei-*-medium-r-normal--16-*-*-*-*-*-big5-0" ], - "iso-8859-1" => [ "lat0-sun16", "iso15", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1" ], - "iso-8859-2" => [ "lat2-sun16", "iso02", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-2" ], - "iso-8859-3" => [ "iso03.f16", "iso03", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-3" ], - "iso-8859-4" => [ "lat4u-16", "iso04", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-4" ], - "iso-8859-5" => [ "iso05.f16", "iso05", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-5" ], + "-*-*-*-*-*-*-*-*-*-*-*-*-big5-0" ], + "iso-8859-1" => [ "lat0-sun16", "iso15", std("iso8859-1") ], + "iso-8859-2" => [ "lat2-sun16", "iso02", std("iso8859-2") ], + "iso-8859-3" => [ "iso03.f16", "iso03", std_("iso8859-3") ], + "iso-8859-4" => [ "lat4u-16", "iso04", std_("iso8859-4") ], + "iso-8859-5" => [ "iso05.f16", "iso05", std("iso8859-5") ], #- arabic needs special console driver for text mode [acon] #- (and gtk support isn't done yet) - "iso-8859-6" => [ "iso06.f16", "iso06", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-6" ], - "iso-8859-7" => [ "iso07.f16", "iso07", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-7" ], + "iso-8859-6" => [ "iso06.f16", "iso06", std_("iso8859-6") ], + "iso-8859-7" => [ "iso07.f16", "iso07", std_("iso8859-7") ], #- hebrew needs special console driver for text mode (none yet) #- (and gtk support isn't done yet) - "iso-8859-8" => [ "iso08.f16", "iso08", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-8" ], - "iso-8859-9" => [ "lat5-16", "iso09", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-9" ], - "iso-8859-13" => [ "??????", "?????", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-13" ], - "iso-8859-14" => [ "??????", "?????", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-14" ], - "iso-8859-15" => [ "lat0-sun16", "iso15", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-15" ], + "iso-8859-8" => [ "iso08.f16", "iso08", std_("iso8859-8") ], + "iso-8859-9" => [ "lat5-16", "iso09", std("iso8859-9") ], + "iso-8859-13" => [ "??????", "?????", std_("iso8859-13") ], + "iso-8859-14" => [ "??????", "?????", std_("iso8859-14") ], + "iso-8859-15" => [ "lat0-sun16", "iso15", std("iso8859-15") ], #- japanese needs special console driver for text mode [kon2] - "jisx0208" => [ "????", "????", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "-*-*-medium-r-normal--14-*-*-*-*-*-jisx0208.*-0," . - "-*-*-medium-r-normal--14-*-*-*-*-*-jisx0201.*-0" ], - "koi8-r" => [ "Cyr_a8x16", "koi2alt", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-koi8-r" ], - "koi8-u" => [ "ruscii_8x16", "koi2alt", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-koi8-u" ], + "jisx0208" => [ "????", "????", + "-*-*-*-*-*-*-*-*-*-*-*-*-jisx*.*-0" ], + "koi8-r" => [ "Cyr_a8x16", "koi2alt", std("koi8-r") ], + "koi8-u" => [ "ruscii_8x16", "koi2alt", std("koi2-u") ], #- korean needs special console driver for text mode "ksc5601" => [ "?????", "?????", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "-*-*-medium-*-*--14-*-*-*-*-*-ksc5601.1987-*" ], - "tcvn" => [ "tcvn8x16", "tcvn", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-tcvn-5712" ], + "-*-*-*-*-*-*-*-*-*-*-*-*-ksc5601.1987-*" ], + "tcvn" => [ "tcvn8x16", "tcvn", std2("tcvn-5712", 130), std2("tcvn-5712", 100) ], "viscii" => [ "viscii10-8x16", "viscii", - "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," . - "*-helvetica-medium-r-normal--14-*-*-*-*-viscii1.1-1" ], + "-*-*-*-*-*-*-*-*-*-*-*-*-viscii*.*-*" ], ); #-###################################################################################### @@ -229,14 +197,13 @@ sub load_po($) { #- #-} -#-sub get_x_fontset { -#- my ($lang) = @_; -#- my $def = "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1"; -#- -#- my $l = $languages{$lang} or return $def; -#- my $c = $charsets{$l->[1]} or return $def; -#- $c->[2]; -#-} +sub get_x_fontset { + my ($lang) = @_; + + my $l = $languages{$lang} or return; + my $c = $charsets{$l->[1]} or return; + @$c[2..3]; +} #-###################################################################################### #- Wonderful perl :( diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 3c3d00ff6..c9e2031f5 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -245,12 +245,12 @@ sub read_conf($;$) { add2hash($c{$a}, $v); } } - %c; + \%c; } sub write_conf { my ($file) = @_; - my %written = read_conf($file); + my $written = read_conf($file); my %net = detect_devices::net2module(); while (my ($k, $v) = each %net) { @@ -262,18 +262,16 @@ sub write_conf { while (my ($mod, $h) = each %conf) { while (my ($type, $v2) = each %$h) { - print F "$type $mod $v2\n" if $v2 && $type ne "loaded" && !$written{$mod}{$type}; + print F "$type $mod $v2\n" if $v2 && $type ne "loaded" && !$written->{$mod}{$type}; } } } -sub get_stage1_conf { - %conf = read_conf($_[1], \$scsi); - add2hash(\%conf, $_[0]); +sub read_stage1_conf { + add2hash(\%conf, read_conf($_[0], \$scsi)); $conf{parport_lowlevel}{alias} ||= "parport_pc"; $conf{pcmcia_core}{"pre-install"} ||= "CARDMGR_OPTS=-f /etc/rc.d/init.d/pcmcia start"; $conf{plip}{"pre-install"} ||= "modprobe parport_pc ; echo 7 > /proc/parport/0/irq"; - \%conf; } sub load_thiskind($;&$) { diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 44bde68ac..6303d3b1a 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -46,7 +46,7 @@ my @mouses = ( [ 2, "inportbm", "Busmouse", "BusMouse", __("Microsoft Bus Mouse") ], [ 3, "logibm", "Busmouse", "BusMouse", __("Logitech Bus Mouse") ], [ 2, "usbmouse", "ps/2", "PS/2", __("USB Mouse") ], - [ 5, "usbmouse", "ps/2", "PS/2", __("USB Mouse (3 buttons or more)") ], + [ 3, "usbmouse", "ps/2", "PS/2", __("USB Mouse (3 buttons or more)") ], ); map_index { my %l; @l{@mouses_fields} = @$_; @@ -63,7 +63,7 @@ sub name2mouse { die "$name not found"; } -sub serial_ports_names { +sub serial_ports_names() { map { "ttyS" . ($_ - 1) . " / COM$_" } 1..4; } sub serial_ports_names2dev { diff --git a/perl-install/share/install.rc b/perl-install/share/install.rc index 520bffc89..b7201ca94 100644 --- a/perl-install/share/install.rc +++ b/perl-install/share/install.rc @@ -1,44 +1,11 @@ style "default-font" { - fontset = "\ --mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,\ --mdk-helvetica-medium-r-normal-*-*-120-*-*-*-*-tis620.2533-1,\ --mdk-helvetica-medium-r-normal-*-*-130-*-*-*-*-tcvn-5712,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0208.1990-0,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0208.1983-0,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0201.1976-0,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-georgian-academy,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-georgian-rs,\ --*-*-medium-*-*-*-*-*-*-*-*-*-ksc5601.1987-*,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-mulelao-1,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-gb2312.1980-0,\ --taipei-*-medium-r-normal-*-*-*-*-*-*-*-big5-0" + fontset = "-mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-iso8859-15" } style "steps" { - fontset = "\ --mdk-helvetica-medium-r-normal-*-*-80-*-*-*-*-*-*,\ --mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-iso8859-3,\ --mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-iso8859-4,\ --mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-iso8859-6,\ --mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-iso8859-7,\ --mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-iso8859-8,\ --mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-iso8859-13,\ --mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-iso8859-14,\ --mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-armscii-8,\ --mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-microsoft-cp1251,\ --mdk-helvetica-medium-r-normal-*-*-120-*-*-*-*-tis620.2533-1,\ --mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-tcvn-5712,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0208.1990-0,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0208.1983-0,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0201.1976-0,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-georgian-academy,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-georgian-rs,\ --*-*-medium-*-*-*-*-*-*-*-*-*-ksc5601.1987-*,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-mulelao-1,\ --*-*-medium-r-normal-*-*-*-*-*-*-*-gb2312.1980-0,\ --taipei-*-medium-r-normal-*-*-*-*-*-*-*-big5-0" + fontset = "-mdk-helvetica-medium-r-normal-*-*-80-*-*-*-*-iso8859-15" } style "logo" @@ -54,3 +21,4 @@ widget "*" style "default-font" widget "*Steps*" style "steps" widget "*StepsReachable*" style "stepsReachable" widget "*logo*" style "logo" + diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index f79a6550d..1f50d15ce 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-11-06 19:37+0100\n" +"POT-Creation-Date: 1999-11-08 02:57+0100\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" @@ -14,23 +14,23 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: ../Xconfigurator.pm_.c:159 +#: ../Xconfigurator.pm_.c:162 msgid "Select a graphic card" msgstr "" -#: ../Xconfigurator.pm_.c:160 +#: ../Xconfigurator.pm_.c:163 msgid "Choose a X server" msgstr "" -#: ../Xconfigurator.pm_.c:179 +#: ../Xconfigurator.pm_.c:182 msgid "Select the memory size of your graphic card" msgstr "" -#: ../Xconfigurator.pm_.c:200 +#: ../Xconfigurator.pm_.c:203 msgid "Choose a monitor" msgstr "" -#: ../Xconfigurator.pm_.c:203 +#: ../Xconfigurator.pm_.c:206 msgid "" "The two critical parameters are the vertical refresh rate, which is the " "rate\n" @@ -44,175 +44,175 @@ msgid "" " If in doubt, choose a conservative setting." msgstr "" -#: ../Xconfigurator.pm_.c:210 +#: ../Xconfigurator.pm_.c:213 msgid "Horizontal refresh rate" msgstr "" -#: ../Xconfigurator.pm_.c:210 +#: ../Xconfigurator.pm_.c:213 msgid "Vertical refresh rate" msgstr "" -#: ../Xconfigurator.pm_.c:250 +#: ../Xconfigurator.pm_.c:254 msgid "Monitor not configured" msgstr "" -#: ../Xconfigurator.pm_.c:253 +#: ../Xconfigurator.pm_.c:257 msgid "Graphic card not configured yet" msgstr "" -#: ../Xconfigurator.pm_.c:256 +#: ../Xconfigurator.pm_.c:260 msgid "Resolutions not chosen yet" msgstr "" -#: ../Xconfigurator.pm_.c:265 +#: ../Xconfigurator.pm_.c:269 msgid "Do you want to test the configuration?" msgstr "" -#: ../Xconfigurator.pm_.c:265 +#: ../Xconfigurator.pm_.c:269 msgid "Test configuration" msgstr "" -#: ../Xconfigurator.pm_.c:297 +#: ../Xconfigurator.pm_.c:301 msgid "An error occurred:" msgstr "" -#: ../Xconfigurator.pm_.c:299 +#: ../Xconfigurator.pm_.c:303 msgid "" "\n" "try changing some parameters" msgstr "" -#: ../Xconfigurator.pm_.c:320 +#: ../Xconfigurator.pm_.c:324 ../t2.pm_.c:15 #, c-format msgid "(leaving in %d seconds)" msgstr "" -#: ../Xconfigurator.pm_.c:324 ../my_gtk.pm_.c:436 +#: ../Xconfigurator.pm_.c:328 ../my_gtk.pm_.c:436 ../t2.pm_.c:19 msgid "Is this correct?" msgstr "" -#: ../Xconfigurator.pm_.c:332 +#: ../Xconfigurator.pm_.c:336 msgid "An error occurred, try changing some parameters" msgstr "" -#: ../Xconfigurator.pm_.c:340 ../Xconfigurator.pm_.c:505 +#: ../Xconfigurator.pm_.c:344 ../Xconfigurator.pm_.c:509 msgid "Automatic resolutions" msgstr "" -#: ../Xconfigurator.pm_.c:341 +#: ../Xconfigurator.pm_.c:345 msgid "" "To find the available resolutions I will try different ones.\n" "Your screen will blink...\n" "You can switch if off if you want, you'll hear a beep when it's over" msgstr "" -#: ../Xconfigurator.pm_.c:392 ../install_steps_interactive.pm_.c:540 +#: ../Xconfigurator.pm_.c:396 ../install_steps_interactive.pm_.c:535 msgid "Resolution" msgstr "" -#: ../Xconfigurator.pm_.c:427 +#: ../Xconfigurator.pm_.c:431 msgid "Choose resolution and color depth" msgstr "" -#: ../Xconfigurator.pm_.c:435 +#: ../Xconfigurator.pm_.c:439 msgid "Show all" msgstr "" -#: ../Xconfigurator.pm_.c:506 +#: ../Xconfigurator.pm_.c:510 msgid "" "I can try to find the available resolutions (eg: 800x600).\n" "Sometimes, though, it may hang the machine.\n" "Do you want to try?" msgstr "" -#: ../Xconfigurator.pm_.c:511 +#: ../Xconfigurator.pm_.c:515 msgid "" "No valid modes found\n" "Try with another video card or monitor" msgstr "" -#: ../Xconfigurator.pm_.c:699 +#: ../Xconfigurator.pm_.c:703 #, c-format msgid "Keyboard layout: %s\n" msgstr "" -#: ../Xconfigurator.pm_.c:700 +#: ../Xconfigurator.pm_.c:704 #, c-format msgid "Mouse type: %s\n" msgstr "" -#: ../Xconfigurator.pm_.c:701 +#: ../Xconfigurator.pm_.c:705 #, c-format msgid "Mouse device: %s\n" msgstr "" -#: ../Xconfigurator.pm_.c:702 +#: ../Xconfigurator.pm_.c:706 #, c-format msgid "Monitor: %s\n" msgstr "" -#: ../Xconfigurator.pm_.c:703 +#: ../Xconfigurator.pm_.c:707 #, c-format msgid "Monitor HorizSync: %s\n" msgstr "" -#: ../Xconfigurator.pm_.c:704 +#: ../Xconfigurator.pm_.c:708 #, c-format msgid "Monitor VertRefresh: %s\n" msgstr "" -#: ../Xconfigurator.pm_.c:705 +#: ../Xconfigurator.pm_.c:709 #, c-format msgid "Graphic card: %s\n" msgstr "" -#: ../Xconfigurator.pm_.c:706 +#: ../Xconfigurator.pm_.c:710 #, c-format msgid "Graphic memory: %s kB\n" msgstr "" -#: ../Xconfigurator.pm_.c:707 +#: ../Xconfigurator.pm_.c:711 #, c-format msgid "XFree86 server: %s\n" msgstr "" -#: ../Xconfigurator.pm_.c:732 +#: ../Xconfigurator.pm_.c:736 msgid "Change Monitor" msgstr "" -#: ../Xconfigurator.pm_.c:733 +#: ../Xconfigurator.pm_.c:737 msgid "Change Graphic card" msgstr "" -#: ../Xconfigurator.pm_.c:734 +#: ../Xconfigurator.pm_.c:738 msgid "Change Resolution" msgstr "" -#: ../Xconfigurator.pm_.c:735 +#: ../Xconfigurator.pm_.c:739 msgid "Automatical resolutions search" msgstr "" -#: ../Xconfigurator.pm_.c:739 +#: ../Xconfigurator.pm_.c:743 msgid "Show information" msgstr "" -#: ../Xconfigurator.pm_.c:740 +#: ../Xconfigurator.pm_.c:744 msgid "Test again" msgstr "" -#: ../Xconfigurator.pm_.c:741 +#: ../Xconfigurator.pm_.c:745 msgid "Quit" msgstr "" -#: ../Xconfigurator.pm_.c:744 +#: ../Xconfigurator.pm_.c:748 msgid "What do you want to do?" msgstr "" -#: ../Xconfigurator.pm_.c:749 +#: ../Xconfigurator.pm_.c:753 msgid "X at startup" msgstr "" -#: ../Xconfigurator.pm_.c:750 +#: ../Xconfigurator.pm_.c:754 msgid "" "I can set up your computer to automatically start X upon booting.\n" "Would you like X to start when you reboot?" @@ -374,9 +374,9 @@ msgstr "" msgid "Save on floppy" msgstr "" -#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:508 -#: ../install_steps_interactive.pm_.c:632 -#: ../install_steps_interactive.pm_.c:748 +#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:503 +#: ../install_steps_interactive.pm_.c:623 +#: ../install_steps_interactive.pm_.c:740 msgid "Done" msgstr "" @@ -467,8 +467,8 @@ msgstr "" msgid "all data on this partition will be lost" msgstr "" -#: ../diskdrake.pm_.c:146 ../install_any.pm_.c:174 ../install_steps.pm_.c:70 -#: ../install_steps_interactive.pm_.c:39 +#: ../diskdrake.pm_.c:146 ../install_any.pm_.c:175 ../install_steps.pm_.c:70 +#: ../install_steps_interactive.pm_.c:40 msgid "Error" msgstr "" @@ -651,8 +651,9 @@ msgstr "" msgid "Choose the new size" msgstr "" -#: ../diskdrake.pm_.c:463 ../install_steps_graphical.pm_.c:284 -#: ../install_steps_graphical.pm_.c:331 +#: ../diskdrake.pm_.c:463 ../install_steps_graphical.pm_.c:286 +#: ../install_steps_graphical.pm_.c:333 +#: ../unused/install_steps_graphical.pm_.c:314 msgid "MB" msgstr "" @@ -844,13 +845,13 @@ msgid "" "buttons \"Install\", \"Select more/less\" and \"Show more/less\"." msgstr "" -#: ../help.pm_.c:122 ../help.pm_.c:357 +#: ../help.pm_.c:122 msgid "" "The packages selected are now being installed. This operation\n" "should only take a few minutes." msgstr "" -#: ../help.pm_.c:126 ../help.pm_.c:361 +#: ../help.pm_.c:126 ../help.pm_.c:363 msgid "" "If DrakX failed to find your mouse, or if you want to\n" "check what it has done, you will be presented the list of mice\n" @@ -866,7 +867,7 @@ msgid "" "which serial port it is connected to." msgstr "" -#: ../help.pm_.c:140 ../help.pm_.c:375 +#: ../help.pm_.c:140 ../help.pm_.c:377 msgid "" "This section is dedicated to configuring a local area network,\n" "or LAN. If you answer \"Yes\" here, DrakX will try to find an\n" @@ -890,8 +891,8 @@ msgid "" "addresses " msgstr "" -#: ../help.pm_.c:162 ../help.pm_.c:165 ../help.pm_.c:253 ../help.pm_.c:397 -#: ../help.pm_.c:400 ../help.pm_.c:488 ../install2.pm_.c:66 +#: ../help.pm_.c:162 ../help.pm_.c:165 ../help.pm_.c:253 ../help.pm_.c:399 +#: ../help.pm_.c:402 ../help.pm_.c:490 ../install2.pm_.c:67 msgid "Help" msgstr "" @@ -920,7 +921,7 @@ msgid "" "for a NetWare printer, except that you need no workgroup information." msgstr "" -#: ../help.pm_.c:191 ../help.pm_.c:426 +#: ../help.pm_.c:191 ../help.pm_.c:428 msgid "" "You must now enter the root password for your Linux-Mandrake\n" "system. The password must be entered twice to verify that both\n" @@ -938,7 +939,7 @@ msgid "" "effort." msgstr "" -#: ../help.pm_.c:207 ../help.pm_.c:442 +#: ../help.pm_.c:207 ../help.pm_.c:444 msgid "" "You may now create one or more \"regular\" user account(s), as\n" "opposed to the \"priviledged\" user account, root. You can create\n" @@ -962,7 +963,7 @@ msgid "" "and maintenance purposes." msgstr "" -#: ../help.pm_.c:226 ../help.pm_.c:461 +#: ../help.pm_.c:226 ../help.pm_.c:463 msgid "" "Please, please, answer \"Yes\" here! Just for example, when you\n" "reinstall Windows, it will overwrite the boot sector. Unless you have\n" @@ -970,7 +971,7 @@ msgid "" "any more!" msgstr "" -#: ../help.pm_.c:232 ../help.pm_.c:467 +#: ../help.pm_.c:232 ../help.pm_.c:469 msgid "" "You need to indicate where you wish\n" "to place the information required to boot to Linux.\n" @@ -980,7 +981,7 @@ msgid "" "drive (MBR)\"." msgstr "" -#: ../help.pm_.c:240 ../help.pm_.c:475 +#: ../help.pm_.c:240 ../help.pm_.c:477 msgid "" "Now it's time to configure the X Window System, which is the\n" "core of the Linux GUI (Graphical User Interface). For this purpose,\n" @@ -1038,7 +1039,15 @@ msgid "" "These are the options you will need to provide to the driver." msgstr "" -#: ../help.pm_.c:403 +#: ../help.pm_.c:357 +msgid "" +"The packages selected are now being installed.\n" +"\n" +"\n" +"This operation should take a few minutes." +msgstr "" + +#: ../help.pm_.c:405 msgid "" "Linux can deal with many types of printer. Each of these\n" "types require a different setup.\n" @@ -1063,151 +1072,145 @@ msgid "" "for a NetWare printer, except that you need no workgroup information." msgstr "" -#: ../install2.pm_.c:39 +#: ../install2.pm_.c:40 msgid "Choose your language" msgstr "" -#: ../install2.pm_.c:40 +#: ../install2.pm_.c:41 msgid "Select installation class" msgstr "" -#: ../install2.pm_.c:41 +#: ../install2.pm_.c:42 msgid "Setup SCSI" msgstr "" -#: ../install2.pm_.c:42 +#: ../install2.pm_.c:43 msgid "Choose install or upgrade" msgstr "" -#: ../install2.pm_.c:43 +#: ../install2.pm_.c:44 msgid "Configure mouse" msgstr "" -#: ../install2.pm_.c:44 +#: ../install2.pm_.c:45 msgid "Choose your keyboard" msgstr "" -#: ../install2.pm_.c:45 +#: ../install2.pm_.c:46 msgid "Setup filesystems" msgstr "" -#: ../install2.pm_.c:46 +#: ../install2.pm_.c:47 msgid "Format partitions" msgstr "" -#: ../install2.pm_.c:47 +#: ../install2.pm_.c:48 msgid "Choose packages to install" msgstr "" -#: ../install2.pm_.c:48 +#: ../install2.pm_.c:49 msgid "Install system" msgstr "" -#: ../install2.pm_.c:49 +#: ../install2.pm_.c:50 msgid "Miscellaneous" msgstr "" -#: ../install2.pm_.c:50 +#: ../install2.pm_.c:51 msgid "Configure networking" msgstr "" -#: ../install2.pm_.c:51 +#: ../install2.pm_.c:52 msgid "Configure timezone" msgstr "" -#: ../install2.pm_.c:53 +#: ../install2.pm_.c:54 msgid "Configure printer" msgstr "" -#: ../install2.pm_.c:54 ../install_steps_interactive.pm_.c:592 -#: ../install_steps_interactive.pm_.c:593 +#: ../install2.pm_.c:55 ../install_steps_interactive.pm_.c:582 +#: ../install_steps_interactive.pm_.c:583 msgid "Set root password" msgstr "" -#: ../install2.pm_.c:55 +#: ../install2.pm_.c:56 msgid "Add a user" msgstr "" -#: ../install2.pm_.c:56 +#: ../install2.pm_.c:57 msgid "Create a bootdisk" msgstr "" -#: ../install2.pm_.c:57 +#: ../install2.pm_.c:58 msgid "Install bootloader" msgstr "" -#: ../install2.pm_.c:58 +#: ../install2.pm_.c:59 msgid "Configure X" msgstr "" -#: ../install2.pm_.c:59 +#: ../install2.pm_.c:60 msgid "Exit install" msgstr "" -#: ../install2.pm_.c:83 +#: ../install2.pm_.c:84 msgid "beginner" msgstr "" -#: ../install2.pm_.c:83 +#: ../install2.pm_.c:84 msgid "developer" msgstr "" -#: ../install2.pm_.c:83 +#: ../install2.pm_.c:84 msgid "expert" msgstr "" -#: ../install2.pm_.c:83 +#: ../install2.pm_.c:84 msgid "server" msgstr "" -#: ../install2.pm_.c:301 +#: ../install2.pm_.c:305 msgid "Partitioning failed: no root filesystem" msgstr "" -#: ../install2.pm_.c:314 +#: ../install2.pm_.c:318 msgid "Not enough swap to fulfill installation, please add some" msgstr "" -#: ../install_any.pm_.c:175 +#: ../install_any.pm_.c:176 msgid "" "I can't read your partition table, it's too corrupted for me :(\n" "I'll try to go on blanking bad partitions" msgstr "" -#: ../install_any.pm_.c:191 +#: ../install_any.pm_.c:192 msgid "" "DiskDrake failed to read correctly the partition table.\n" "Continue at your own risk!" msgstr "" -#: ../install_any.pm_.c:230 +#: ../install_any.pm_.c:231 msgid "Information" msgstr "" -#: ../install_any.pm_.c:231 +#: ../install_any.pm_.c:232 #, c-format msgid "%s: This is not a root partition, please select another one." msgstr "" -#: ../install_any.pm_.c:233 +#: ../install_any.pm_.c:234 msgid "No root partition found" msgstr "" -#: ../install_any.pm_.c:269 +#: ../install_any.pm_.c:270 msgid "Can't use broadcast with no NIS domain" msgstr "" -#: ../install_any.pm_.c:362 -msgid "" -"I can't access the kernel with frame buffer support.\n" -"Disabling automatic X11 startup if any." -msgstr "" - -#: ../install_any.pm_.c:404 +#: ../install_any.pm_.c:414 msgid "Error reading file $f" msgstr "" -#: ../install_any.pm_.c:409 +#: ../install_any.pm_.c:419 #, c-format msgid "Bad kickstart file %s (failed %s)" msgstr "" @@ -1218,12 +1221,12 @@ msgid "" "Continue at your own risk." msgstr "" -#: ../install_steps.pm_.c:127 +#: ../install_steps.pm_.c:135 #, c-format msgid "Duplicate mount point %s" msgstr "" -#: ../install_steps.pm_.c:366 +#: ../install_steps.pm_.c:377 msgid "No floppy drive available" msgstr "" @@ -1232,303 +1235,314 @@ msgstr "" msgid "Entering step `%s'\n" msgstr "" -#: ../install_steps_graphical.pm_.c:257 +#: ../install_steps_graphical.pm_.c:258 +#: ../unused/install_steps_graphical.pm_.c:255 msgid "You must have a swap partition" msgstr "" -#: ../install_steps_graphical.pm_.c:260 +#: ../install_steps_graphical.pm_.c:261 +#: ../unused/install_steps_graphical.pm_.c:258 msgid "" "You don't have a swap partition\n" "\n" "Continue anyway?" msgstr "" -#: ../install_steps_graphical.pm_.c:284 +#: ../install_steps_graphical.pm_.c:286 msgid "Choose the size you want to install" msgstr "" -#: ../install_steps_graphical.pm_.c:331 +#: ../install_steps_graphical.pm_.c:333 +#: ../unused/install_steps_graphical.pm_.c:314 msgid "Total size: " msgstr "" -#: ../install_steps_graphical.pm_.c:343 +#: ../install_steps_graphical.pm_.c:345 +#: ../unused/install_steps_graphical.pm_.c:284 #, c-format msgid "Version: %s\n" msgstr "" -#: ../install_steps_graphical.pm_.c:344 +#: ../install_steps_graphical.pm_.c:346 +#: ../unused/install_steps_graphical.pm_.c:285 #, c-format msgid "Size: %d KB\n" msgstr "" -#: ../install_steps_graphical.pm_.c:459 +#: ../install_steps_graphical.pm_.c:461 +#: ../unused/install_steps_graphical.pm_.c:421 msgid "Choose the packages you want to install" msgstr "" -#: ../install_steps_graphical.pm_.c:462 +#: ../install_steps_graphical.pm_.c:464 +#: ../unused/install_steps_graphical.pm_.c:424 msgid "Info" msgstr "" -#: ../install_steps_graphical.pm_.c:470 ../install_steps_interactive.pm_.c:83 +#: ../install_steps_graphical.pm_.c:472 ../install_steps_interactive.pm_.c:84 +#: ../unused/install_steps_graphical.pm_.c:432 msgid "Install" msgstr "" -#: ../install_steps_graphical.pm_.c:471 +#: ../install_steps_graphical.pm_.c:473 +#: ../unused/install_steps_graphical.pm_.c:433 msgid "Show less" msgstr "" -#: ../install_steps_graphical.pm_.c:472 +#: ../install_steps_graphical.pm_.c:474 +#: ../unused/install_steps_graphical.pm_.c:434 msgid "Show more" msgstr "" -#: ../install_steps_graphical.pm_.c:489 +#: ../install_steps_graphical.pm_.c:491 +#: ../unused/install_steps_graphical.pm_.c:451 msgid "Installing" msgstr "" -#: ../install_steps_graphical.pm_.c:496 +#: ../install_steps_graphical.pm_.c:498 +#: ../unused/install_steps_graphical.pm_.c:457 msgid "Please wait, " msgstr "" -#: ../install_steps_graphical.pm_.c:498 +#: ../install_steps_graphical.pm_.c:500 +#: ../unused/install_steps_graphical.pm_.c:459 msgid "Time remaining " msgstr "" -#: ../install_steps_graphical.pm_.c:499 +#: ../install_steps_graphical.pm_.c:501 +#: ../unused/install_steps_graphical.pm_.c:460 msgid "Total time " msgstr "" -#: ../install_steps_graphical.pm_.c:504 +#: ../install_steps_graphical.pm_.c:506 +#: ../unused/install_steps_graphical.pm_.c:465 msgid "Preparing installation" msgstr "" -#: ../install_steps_graphical.pm_.c:527 +#: ../install_steps_graphical.pm_.c:529 +#: ../unused/install_steps_graphical.pm_.c:486 #, c-format msgid "Installing package %s" msgstr "" -#: ../install_steps_graphical.pm_.c:552 +#: ../install_steps_graphical.pm_.c:554 +#: ../unused/install_steps_graphical.pm_.c:511 msgid "Go on anyway?" msgstr "" -#: ../install_steps_graphical.pm_.c:552 +#: ../install_steps_graphical.pm_.c:554 +#: ../unused/install_steps_graphical.pm_.c:511 msgid "There was an error ordering packages:" msgstr "" -#: ../install_steps_graphical.pm_.c:576 +#: ../install_steps_graphical.pm_.c:578 +#: ../unused/install_steps_graphical.pm_.c:535 msgid "Use existing configuration for X11?" msgstr "" -#: ../install_steps_interactive.pm_.c:39 +#: ../install_steps_interactive.pm_.c:40 msgid "An error occurred" msgstr "" -#: ../install_steps_interactive.pm_.c:56 +#: ../install_steps_interactive.pm_.c:57 msgid "Which language do you want?" msgstr "" -#: ../install_steps_interactive.pm_.c:71 +#: ../install_steps_interactive.pm_.c:72 msgid "What is your keyboard layout?" msgstr "" -#: ../install_steps_interactive.pm_.c:81 +#: ../install_steps_interactive.pm_.c:82 msgid "Install/Upgrade" msgstr "" -#: ../install_steps_interactive.pm_.c:82 +#: ../install_steps_interactive.pm_.c:83 msgid "Is this an install or an upgrade?" msgstr "" -#: ../install_steps_interactive.pm_.c:83 +#: ../install_steps_interactive.pm_.c:84 msgid "Upgrade" msgstr "" -#: ../install_steps_interactive.pm_.c:91 +#: ../install_steps_interactive.pm_.c:92 msgid "Root Partition" msgstr "" -#: ../install_steps_interactive.pm_.c:92 +#: ../install_steps_interactive.pm_.c:93 msgid "What is the root partition (/) of your system?" msgstr "" -#: ../install_steps_interactive.pm_.c:102 +#: ../install_steps_interactive.pm_.c:103 msgid "Recommended" msgstr "" -#: ../install_steps_interactive.pm_.c:103 +#: ../install_steps_interactive.pm_.c:104 msgid "Personalized" msgstr "" -#: ../install_steps_interactive.pm_.c:104 +#: ../install_steps_interactive.pm_.c:105 msgid "Expert" msgstr "" -#: ../install_steps_interactive.pm_.c:106 -#: ../install_steps_interactive.pm_.c:120 +#: ../install_steps_interactive.pm_.c:107 +#: ../install_steps_interactive.pm_.c:121 msgid "Install Class" msgstr "" -#: ../install_steps_interactive.pm_.c:107 +#: ../install_steps_interactive.pm_.c:108 msgid "What installation class do you want?" msgstr "" -#: ../install_steps_interactive.pm_.c:116 +#: ../install_steps_interactive.pm_.c:117 msgid "Normal" msgstr "" -#: ../install_steps_interactive.pm_.c:117 +#: ../install_steps_interactive.pm_.c:118 msgid "Developement" msgstr "" -#: ../install_steps_interactive.pm_.c:118 +#: ../install_steps_interactive.pm_.c:119 msgid "Server" msgstr "" -#: ../install_steps_interactive.pm_.c:121 +#: ../install_steps_interactive.pm_.c:122 msgid "What usage do you want?" msgstr "" -#: ../install_steps_interactive.pm_.c:134 +#: ../install_steps_interactive.pm_.c:135 msgid "What is the type of your mouse?" msgstr "" -#: ../install_steps_interactive.pm_.c:138 +#: ../install_steps_interactive.pm_.c:139 msgid "Emulate third button?" msgstr "" -#: ../install_steps_interactive.pm_.c:141 +#: ../install_steps_interactive.pm_.c:142 msgid "Mouse Port" msgstr "" -#: ../install_steps_interactive.pm_.c:142 +#: ../install_steps_interactive.pm_.c:143 msgid "Which serial port is your mouse connected to?" msgstr "" -#: ../install_steps_interactive.pm_.c:155 +#: ../install_steps_interactive.pm_.c:156 msgid "no available partitions" msgstr "" -#: ../install_steps_interactive.pm_.c:157 +#: ../install_steps_interactive.pm_.c:158 #, c-format msgid "(%dMb)" msgstr "" -#: ../install_steps_interactive.pm_.c:164 +#: ../install_steps_interactive.pm_.c:165 msgid "Which partition do you want to use as your root partition" msgstr "" -#: ../install_steps_interactive.pm_.c:171 +#: ../install_steps_interactive.pm_.c:172 msgid "Choose the mount points" msgstr "" -#: ../install_steps_interactive.pm_.c:183 +#: ../install_steps_interactive.pm_.c:184 msgid "You need to reboot for the partition table modifications to take place" msgstr "" -#: ../install_steps_interactive.pm_.c:199 +#: ../install_steps_interactive.pm_.c:202 msgid "Choose the partitions you want to format" msgstr "" -#: ../install_steps_interactive.pm_.c:209 +#: ../install_steps_interactive.pm_.c:212 #, c-format msgid "Formatting partition %s" msgstr "" -#: ../install_steps_interactive.pm_.c:217 +#: ../install_steps_interactive.pm_.c:221 msgid "Looking for available packages" msgstr "" -#: ../install_steps_interactive.pm_.c:223 +#: ../install_steps_interactive.pm_.c:227 msgid "Finding packages to upgrade" msgstr "" -#: ../install_steps_interactive.pm_.c:232 +#: ../install_steps_interactive.pm_.c:236 msgid "Package Group Selection" msgstr "" -#: ../install_steps_interactive.pm_.c:247 +#: ../install_steps_interactive.pm_.c:251 msgid "Keep the current IP configuration" msgstr "" -#: ../install_steps_interactive.pm_.c:248 +#: ../install_steps_interactive.pm_.c:252 msgid "Reconfigure network now" msgstr "" -#: ../install_steps_interactive.pm_.c:249 -#: ../install_steps_interactive.pm_.c:262 +#: ../install_steps_interactive.pm_.c:253 +#: ../install_steps_interactive.pm_.c:265 msgid "Do not set up networking" msgstr "" -#: ../install_steps_interactive.pm_.c:251 -#: ../install_steps_interactive.pm_.c:260 +#: ../install_steps_interactive.pm_.c:255 +#: ../install_steps_interactive.pm_.c:263 msgid "Network Configuration" msgstr "" -#: ../install_steps_interactive.pm_.c:252 +#: ../install_steps_interactive.pm_.c:256 msgid "Local networking has already been configured. Do you want to:" msgstr "" -#: ../install_steps_interactive.pm_.c:261 +#: ../install_steps_interactive.pm_.c:264 msgid "Do you want to configure networking for yout system?" msgstr "" -#: ../install_steps_interactive.pm_.c:262 +#: ../install_steps_interactive.pm_.c:265 msgid "Dialup with modem" msgstr "" -#: ../install_steps_interactive.pm_.c:262 +#: ../install_steps_interactive.pm_.c:265 msgid "Local LAN" msgstr "" -#: ../install_steps_interactive.pm_.c:267 -msgid "Skip modem autodetection?" -msgstr "" - -#: ../install_steps_interactive.pm_.c:275 -msgid "Which serial port is your modem connected to?" -msgstr "" - -#: ../install_steps_interactive.pm_.c:287 +#: ../install_steps_interactive.pm_.c:274 msgid "no network card found" msgstr "" -#: ../install_steps_interactive.pm_.c:317 +#: ../install_steps_interactive.pm_.c:303 #, c-format msgid "Configuring network device %s" msgstr "" -#: ../install_steps_interactive.pm_.c:318 +#: ../install_steps_interactive.pm_.c:304 msgid "" "Please enter the IP configuration for this machine.\n" "Each item should be entered as an IP address in dotted-decimal\n" "notation (for example, 1.2.3.4)." msgstr "" -#: ../install_steps_interactive.pm_.c:321 +#: ../install_steps_interactive.pm_.c:307 msgid "Automatic IP" msgstr "" -#: ../install_steps_interactive.pm_.c:321 +#: ../install_steps_interactive.pm_.c:307 msgid "IP address:" msgstr "" -#: ../install_steps_interactive.pm_.c:321 +#: ../install_steps_interactive.pm_.c:307 msgid "Netmask:" msgstr "" -#: ../install_steps_interactive.pm_.c:322 +#: ../install_steps_interactive.pm_.c:308 msgid "(bootp/dhcp)" msgstr "" -#: ../install_steps_interactive.pm_.c:328 -#: ../install_steps_interactive.pm_.c:483 +#: ../install_steps_interactive.pm_.c:314 +#: ../install_steps_interactive.pm_.c:478 msgid "IP address should be in format 1.2.3.4" msgstr "" -#: ../install_steps_interactive.pm_.c:347 +#: ../install_steps_interactive.pm_.c:333 msgid "Configuring network" msgstr "" -#: ../install_steps_interactive.pm_.c:348 +#: ../install_steps_interactive.pm_.c:334 msgid "" "Please enter your host name.\n" "Your host name should be a fully-qualified host name,\n" @@ -1536,22 +1550,34 @@ msgid "" "You may also enter the IP address of the gateway if you have one" msgstr "" -#: ../install_steps_interactive.pm_.c:352 +#: ../install_steps_interactive.pm_.c:338 msgid "DNS server:" msgstr "" -#: ../install_steps_interactive.pm_.c:352 +#: ../install_steps_interactive.pm_.c:338 msgid "Gateway device:" msgstr "" -#: ../install_steps_interactive.pm_.c:352 +#: ../install_steps_interactive.pm_.c:338 msgid "Gateway:" msgstr "" -#: ../install_steps_interactive.pm_.c:352 +#: ../install_steps_interactive.pm_.c:338 msgid "Host name:" msgstr "" +#: ../install_steps_interactive.pm_.c:349 +msgid "Skip modem autodetection?" +msgstr "" + +#: ../install_steps_interactive.pm_.c:358 +msgid "Which serial port is your modem connected to?" +msgstr "" + +#: ../install_steps_interactive.pm_.c:362 +msgid "Dialup options" +msgstr "" + #: ../install_steps_interactive.pm_.c:363 msgid "Connection name" msgstr "" @@ -1565,8 +1591,9 @@ msgid "Login ID" msgstr "" #: ../install_steps_interactive.pm_.c:366 -#: ../install_steps_interactive.pm_.c:634 -#: ../install_steps_interactive.pm_.c:724 +#: ../install_steps_interactive.pm_.c:584 +#: ../install_steps_interactive.pm_.c:629 +#: ../install_steps_interactive.pm_.c:719 msgid "Password" msgstr "" @@ -1602,104 +1629,100 @@ msgstr "" msgid "Second DNS Server" msgstr "" -#: ../install_steps_interactive.pm_.c:374 -msgid "Dialup options" -msgstr "" - -#: ../install_steps_interactive.pm_.c:384 +#: ../install_steps_interactive.pm_.c:379 msgid "Which is your timezone?" msgstr "" -#: ../install_steps_interactive.pm_.c:385 +#: ../install_steps_interactive.pm_.c:380 msgid "Is your hardware clock set to GMT?" msgstr "" -#: ../install_steps_interactive.pm_.c:395 +#: ../install_steps_interactive.pm_.c:390 msgid "Printer" msgstr "" -#: ../install_steps_interactive.pm_.c:396 +#: ../install_steps_interactive.pm_.c:391 msgid "Would you like to configure a printer?" msgstr "" -#: ../install_steps_interactive.pm_.c:408 +#: ../install_steps_interactive.pm_.c:403 msgid "Local Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:409 +#: ../install_steps_interactive.pm_.c:404 msgid "" "Every print queue (which print jobs are directed to) needs a\n" "name (often lp) and a spool directory associated with it. What\n" "name and directory should be used for this queue?" msgstr "" -#: ../install_steps_interactive.pm_.c:412 +#: ../install_steps_interactive.pm_.c:407 msgid "Name of queue:" msgstr "" -#: ../install_steps_interactive.pm_.c:412 +#: ../install_steps_interactive.pm_.c:407 msgid "Spool directory:" msgstr "" -#: ../install_steps_interactive.pm_.c:423 +#: ../install_steps_interactive.pm_.c:418 msgid "Select Printer Connection" msgstr "" -#: ../install_steps_interactive.pm_.c:424 +#: ../install_steps_interactive.pm_.c:419 msgid "How is the printer connected?" msgstr "" -#: ../install_steps_interactive.pm_.c:432 +#: ../install_steps_interactive.pm_.c:427 msgid "Detecting devices..." msgstr "" -#: ../install_steps_interactive.pm_.c:432 +#: ../install_steps_interactive.pm_.c:427 msgid "Test ports" msgstr "" -#: ../install_steps_interactive.pm_.c:445 +#: ../install_steps_interactive.pm_.c:440 #, c-format msgid "A printer, model \"%s\", has been detected on " msgstr "" -#: ../install_steps_interactive.pm_.c:452 +#: ../install_steps_interactive.pm_.c:447 msgid "Local Printer Device" msgstr "" -#: ../install_steps_interactive.pm_.c:453 +#: ../install_steps_interactive.pm_.c:448 msgid "" "What device is your printer connected to \n" "(note that /dev/lp0 is equivalent to LPT1:)?\n" msgstr "" -#: ../install_steps_interactive.pm_.c:454 +#: ../install_steps_interactive.pm_.c:449 msgid "Printer Device:" msgstr "" -#: ../install_steps_interactive.pm_.c:458 +#: ../install_steps_interactive.pm_.c:453 msgid "Remote lpd Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:459 +#: ../install_steps_interactive.pm_.c:454 msgid "" "To use a remote lpd print queue, you need to supply\n" "the hostname of the printer server and the queue name\n" "on that server which jobs should be placed in." msgstr "" -#: ../install_steps_interactive.pm_.c:462 +#: ../install_steps_interactive.pm_.c:457 msgid "Remote hostname:" msgstr "" -#: ../install_steps_interactive.pm_.c:462 +#: ../install_steps_interactive.pm_.c:457 msgid "Remote queue" msgstr "" -#: ../install_steps_interactive.pm_.c:468 +#: ../install_steps_interactive.pm_.c:463 msgid "SMB (Windows 9x/NT) Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:469 +#: ../install_steps_interactive.pm_.c:464 msgid "" "To print to a SMB printer, you need to provide the\n" "SMB host name (Note! It may be different from its\n" @@ -1708,38 +1731,37 @@ msgid "" "applicable user name, password, and workgroup information." msgstr "" -#: ../install_steps_interactive.pm_.c:474 +#: ../install_steps_interactive.pm_.c:469 msgid "SMB server IP:" msgstr "" -#: ../install_steps_interactive.pm_.c:474 +#: ../install_steps_interactive.pm_.c:469 msgid "SMB server host:" msgstr "" -#: ../install_steps_interactive.pm_.c:475 -#: ../install_steps_interactive.pm_.c:496 -#: ../install_steps_interactive.pm_.c:594 +#: ../install_steps_interactive.pm_.c:470 +#: ../install_steps_interactive.pm_.c:491 msgid "Password:" msgstr "" -#: ../install_steps_interactive.pm_.c:475 +#: ../install_steps_interactive.pm_.c:470 msgid "Share name:" msgstr "" -#: ../install_steps_interactive.pm_.c:475 -#: ../install_steps_interactive.pm_.c:496 +#: ../install_steps_interactive.pm_.c:470 +#: ../install_steps_interactive.pm_.c:491 msgid "User name:" msgstr "" -#: ../install_steps_interactive.pm_.c:476 +#: ../install_steps_interactive.pm_.c:471 msgid "Workgroup:" msgstr "" -#: ../install_steps_interactive.pm_.c:490 +#: ../install_steps_interactive.pm_.c:485 msgid "NetWare Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:491 +#: ../install_steps_interactive.pm_.c:486 msgid "" "To print to a NetWare printer, you need to provide the\n" "NetWare print server name (Note! it may be different from its\n" @@ -1747,173 +1769,171 @@ msgid "" "wish to access and any applicable user name and password." msgstr "" -#: ../install_steps_interactive.pm_.c:495 +#: ../install_steps_interactive.pm_.c:490 msgid "Print Queue Name:" msgstr "" -#: ../install_steps_interactive.pm_.c:495 +#: ../install_steps_interactive.pm_.c:490 msgid "Printer Server:" msgstr "" -#: ../install_steps_interactive.pm_.c:505 +#: ../install_steps_interactive.pm_.c:500 msgid "Print test ascii page" msgstr "" -#: ../install_steps_interactive.pm_.c:506 +#: ../install_steps_interactive.pm_.c:501 msgid "Print test postscript page" msgstr "" -#: ../install_steps_interactive.pm_.c:507 +#: ../install_steps_interactive.pm_.c:502 msgid "Change printer" msgstr "" -#: ../install_steps_interactive.pm_.c:514 +#: ../install_steps_interactive.pm_.c:509 msgid "Configure Printer" msgstr "" -#: ../install_steps_interactive.pm_.c:515 +#: ../install_steps_interactive.pm_.c:510 msgid "What type of printer do you have?" msgstr "" -#: ../install_steps_interactive.pm_.c:538 +#: ../install_steps_interactive.pm_.c:532 +msgid "Printer options" +msgstr "" + +#: ../install_steps_interactive.pm_.c:533 msgid "Paper Size" msgstr "" -#: ../install_steps_interactive.pm_.c:541 +#: ../install_steps_interactive.pm_.c:536 msgid "Fix stair-stepping text?" msgstr "" -#: ../install_steps_interactive.pm_.c:544 +#: ../install_steps_interactive.pm_.c:539 msgid "Uniprint driver options" msgstr "" -#: ../install_steps_interactive.pm_.c:545 +#: ../install_steps_interactive.pm_.c:540 msgid "Color depth options" msgstr "" #: ../install_steps_interactive.pm_.c:549 -msgid "Printer options" -msgstr "" - -#: ../install_steps_interactive.pm_.c:559 msgid "What do you want to do" msgstr "" -#: ../install_steps_interactive.pm_.c:592 +#: ../install_steps_interactive.pm_.c:582 msgid "No password" msgstr "" -#: ../install_steps_interactive.pm_.c:592 ../interactive.pm_.c:47 +#: ../install_steps_interactive.pm_.c:582 ../interactive.pm_.c:47 #: ../interactive.pm_.c:57 ../interactive_newt.pm_.c:22 #: ../interactive_newt.pm_.c:54 ../my_gtk.pm_.c:199 ../my_gtk.pm_.c:436 -#: ../my_gtk.pm_.c:533 +#: ../my_gtk.pm_.c:533 ../unused/install_steps_graphical.pm_.c:608 msgid "Ok" msgstr "" -#: ../install_steps_interactive.pm_.c:594 -msgid "Password (again):" +#: ../install_steps_interactive.pm_.c:585 +#: ../install_steps_interactive.pm_.c:630 +msgid "Password (again)" msgstr "" -#: ../install_steps_interactive.pm_.c:594 -msgid "Use MD5 passwords" +#: ../install_steps_interactive.pm_.c:587 +msgid "Use shadow file" msgstr "" -#: ../install_steps_interactive.pm_.c:594 -msgid "Use NIS" +#: ../install_steps_interactive.pm_.c:587 +msgid "shadow" msgstr "" -#: ../install_steps_interactive.pm_.c:594 -msgid "Use shadow file" +#: ../install_steps_interactive.pm_.c:588 +msgid "MD5" msgstr "" -#: ../install_steps_interactive.pm_.c:597 -msgid "shadow" +#: ../install_steps_interactive.pm_.c:588 +msgid "Use MD5 passwords" msgstr "" -#: ../install_steps_interactive.pm_.c:598 -msgid "MD5" +#: ../install_steps_interactive.pm_.c:590 +msgid "Use NIS" msgstr "" -#: ../install_steps_interactive.pm_.c:599 +#: ../install_steps_interactive.pm_.c:590 msgid "yellow pages" msgstr "" -#: ../install_steps_interactive.pm_.c:602 -#: ../install_steps_interactive.pm_.c:645 +#: ../install_steps_interactive.pm_.c:593 +#: ../install_steps_interactive.pm_.c:640 msgid "Please try again" msgstr "" -#: ../install_steps_interactive.pm_.c:602 -#: ../install_steps_interactive.pm_.c:645 +#: ../install_steps_interactive.pm_.c:593 +#: ../install_steps_interactive.pm_.c:640 msgid "The passwords do not match" msgstr "" -#: ../install_steps_interactive.pm_.c:604 +#: ../install_steps_interactive.pm_.c:595 +#: ../install_steps_interactive.pm_.c:641 msgid "This password is too simple" msgstr "" -#: ../install_steps_interactive.pm_.c:611 +#: ../install_steps_interactive.pm_.c:602 msgid "TODO" msgstr "" -#: ../install_steps_interactive.pm_.c:612 +#: ../install_steps_interactive.pm_.c:603 msgid "NIS Domain" msgstr "" -#: ../install_steps_interactive.pm_.c:612 +#: ../install_steps_interactive.pm_.c:603 msgid "NIS Server" msgstr "" -#: ../install_steps_interactive.pm_.c:632 +#: ../install_steps_interactive.pm_.c:623 msgid "Accept user" msgstr "" -#: ../install_steps_interactive.pm_.c:632 +#: ../install_steps_interactive.pm_.c:623 msgid "Add user" msgstr "" -#: ../install_steps_interactive.pm_.c:633 +#: ../install_steps_interactive.pm_.c:624 #, c-format msgid "(already added %s)" msgstr "" -#: ../install_steps_interactive.pm_.c:633 +#: ../install_steps_interactive.pm_.c:624 #, c-format msgid "" "Enter a user\n" "%s" msgstr "" -#: ../install_steps_interactive.pm_.c:634 -msgid "Password (again)" -msgstr "" - -#: ../install_steps_interactive.pm_.c:634 +#: ../install_steps_interactive.pm_.c:626 msgid "Real name" msgstr "" -#: ../install_steps_interactive.pm_.c:634 -msgid "Shell" +#: ../install_steps_interactive.pm_.c:627 +msgid "User name" msgstr "" -#: ../install_steps_interactive.pm_.c:634 -msgid "User name" +#: ../install_steps_interactive.pm_.c:632 +msgid "Shell" msgstr "" -#: ../install_steps_interactive.pm_.c:647 +#: ../install_steps_interactive.pm_.c:642 msgid "Please give a user name" msgstr "" -#: ../install_steps_interactive.pm_.c:648 +#: ../install_steps_interactive.pm_.c:643 msgid "" "The user name must contain only lower cased letters, numbers, `-' and `_'" msgstr "" -#: ../install_steps_interactive.pm_.c:649 +#: ../install_steps_interactive.pm_.c:644 msgid "This user name is already added" msgstr "" -#: ../install_steps_interactive.pm_.c:670 +#: ../install_steps_interactive.pm_.c:665 msgid "" "A custom bootdisk provides a way of booting into your Linux system without\n" "depending on the normal bootloader. This is useful if you don't want to " @@ -1927,233 +1947,229 @@ msgid "" "failures. Would you like to create a bootdisk for your system?" msgstr "" -#: ../install_steps_interactive.pm_.c:679 +#: ../install_steps_interactive.pm_.c:674 msgid "Sorry, no floppy drive available" msgstr "" -#: ../install_steps_interactive.pm_.c:682 +#: ../install_steps_interactive.pm_.c:677 msgid "Choose the floppy drive you want to use to make the bootdisk" msgstr "" -#: ../install_steps_interactive.pm_.c:683 +#: ../install_steps_interactive.pm_.c:678 msgid "Skip" msgstr "" -#: ../install_steps_interactive.pm_.c:687 +#: ../install_steps_interactive.pm_.c:682 #, c-format msgid "Insert a floppy in drive %s" msgstr "" -#: ../install_steps_interactive.pm_.c:688 +#: ../install_steps_interactive.pm_.c:683 msgid "Creating bootdisk" msgstr "" -#: ../install_steps_interactive.pm_.c:695 +#: ../install_steps_interactive.pm_.c:690 msgid "Preparing bootloader" msgstr "" -#: ../install_steps_interactive.pm_.c:707 +#: ../install_steps_interactive.pm_.c:702 msgid "First sector of boot partition" msgstr "" -#: ../install_steps_interactive.pm_.c:707 +#: ../install_steps_interactive.pm_.c:702 msgid "First sector of drive (MBR)" msgstr "" -#: ../install_steps_interactive.pm_.c:711 +#: ../install_steps_interactive.pm_.c:706 msgid "LILO Installation" msgstr "" -#: ../install_steps_interactive.pm_.c:712 +#: ../install_steps_interactive.pm_.c:707 msgid "Where do you want to install the bootloader?" msgstr "" -#: ../install_steps_interactive.pm_.c:715 +#: ../install_steps_interactive.pm_.c:710 msgid "Do you want to use LILO?" msgstr "" -#: ../install_steps_interactive.pm_.c:718 +#: ../install_steps_interactive.pm_.c:713 msgid "Boot device" msgstr "" -#: ../install_steps_interactive.pm_.c:719 +#: ../install_steps_interactive.pm_.c:714 msgid "Linear (needed for some SCSI drives)" msgstr "" -#: ../install_steps_interactive.pm_.c:719 +#: ../install_steps_interactive.pm_.c:714 msgid "linear" msgstr "" -#: ../install_steps_interactive.pm_.c:720 +#: ../install_steps_interactive.pm_.c:715 msgid "Compact" msgstr "" -#: ../install_steps_interactive.pm_.c:720 +#: ../install_steps_interactive.pm_.c:715 msgid "compact" msgstr "" -#: ../install_steps_interactive.pm_.c:721 +#: ../install_steps_interactive.pm_.c:716 msgid "Delay before booting default image" msgstr "" -#: ../install_steps_interactive.pm_.c:722 +#: ../install_steps_interactive.pm_.c:717 msgid "Video mode" msgstr "" -#: ../install_steps_interactive.pm_.c:725 +#: ../install_steps_interactive.pm_.c:720 msgid "Restrict command line options" msgstr "" -#: ../install_steps_interactive.pm_.c:725 +#: ../install_steps_interactive.pm_.c:720 msgid "restrict" msgstr "" -#: ../install_steps_interactive.pm_.c:732 +#: ../install_steps_interactive.pm_.c:726 msgid "LILO main options" msgstr "" -#: ../install_steps_interactive.pm_.c:736 +#: ../install_steps_interactive.pm_.c:728 msgid "" "At this level of security, a password (and a good one) in lilo is requested" msgstr "" -#: ../install_steps_interactive.pm_.c:737 +#: ../install_steps_interactive.pm_.c:729 msgid "" "Option ``Restrict command line options'' is of no use without a password" msgstr "" -#: ../install_steps_interactive.pm_.c:746 +#: ../install_steps_interactive.pm_.c:738 msgid "" "Here are the following entries in LILO.\n" "You can add some more or change the existent ones." msgstr "" -#: ../install_steps_interactive.pm_.c:748 +#: ../install_steps_interactive.pm_.c:740 msgid "Add" msgstr "" -#: ../install_steps_interactive.pm_.c:766 +#: ../install_steps_interactive.pm_.c:758 msgid "Image" msgstr "" +#: ../install_steps_interactive.pm_.c:759 #: ../install_steps_interactive.pm_.c:767 -#: ../install_steps_interactive.pm_.c:775 msgid "Root" msgstr "" -#: ../install_steps_interactive.pm_.c:768 +#: ../install_steps_interactive.pm_.c:760 msgid "Append" msgstr "" -#: ../install_steps_interactive.pm_.c:769 +#: ../install_steps_interactive.pm_.c:761 msgid "Initrd" msgstr "" -#: ../install_steps_interactive.pm_.c:770 +#: ../install_steps_interactive.pm_.c:762 msgid "Read-write" msgstr "" -#: ../install_steps_interactive.pm_.c:776 +#: ../install_steps_interactive.pm_.c:768 msgid "Table" msgstr "" -#: ../install_steps_interactive.pm_.c:777 +#: ../install_steps_interactive.pm_.c:769 msgid "Unsafe" msgstr "" -#: ../install_steps_interactive.pm_.c:782 +#: ../install_steps_interactive.pm_.c:774 msgid "Label" msgstr "" -#: ../install_steps_interactive.pm_.c:784 +#: ../install_steps_interactive.pm_.c:776 msgid "Default" msgstr "" -#: ../install_steps_interactive.pm_.c:803 +#: ../install_steps_interactive.pm_.c:795 msgid "Installation of LILO failed. The following error occured:" msgstr "" -#: ../install_steps_interactive.pm_.c:813 +#: ../install_steps_interactive.pm_.c:805 msgid "Windows(TM)" msgstr "" -#: ../install_steps_interactive.pm_.c:814 +#: ../install_steps_interactive.pm_.c:806 msgid "Poor" msgstr "" -#: ../install_steps_interactive.pm_.c:815 +#: ../install_steps_interactive.pm_.c:807 msgid "Low" msgstr "" -#: ../install_steps_interactive.pm_.c:816 +#: ../install_steps_interactive.pm_.c:808 msgid "Medium" msgstr "" -#: ../install_steps_interactive.pm_.c:817 +#: ../install_steps_interactive.pm_.c:809 msgid "High" msgstr "" -#: ../install_steps_interactive.pm_.c:818 +#: ../install_steps_interactive.pm_.c:810 msgid "Paranoid" msgstr "" -#: ../install_steps_interactive.pm_.c:831 +#: ../install_steps_interactive.pm_.c:818 msgid "Miscellaneous questions" msgstr "" -#: ../install_steps_interactive.pm_.c:832 +#: ../install_steps_interactive.pm_.c:819 msgid "Do you have a laptop?" msgstr "" -#: ../install_steps_interactive.pm_.c:833 +#: ../install_steps_interactive.pm_.c:820 msgid "Use hard drive optimizations" msgstr "" -#: ../install_steps_interactive.pm_.c:834 +#: ../install_steps_interactive.pm_.c:821 msgid "Security level" msgstr "" -#: ../install_steps_interactive.pm_.c:835 +#: ../install_steps_interactive.pm_.c:822 msgid "HTTP proxy" msgstr "" -#: ../install_steps_interactive.pm_.c:836 +#: ../install_steps_interactive.pm_.c:823 msgid "FTP proxy" msgstr "" -#: ../install_steps_interactive.pm_.c:837 -msgid "Use kudzu" -msgstr "" - -#: ../install_steps_interactive.pm_.c:838 +#: ../install_steps_interactive.pm_.c:825 #, c-format msgid "Precise ram size (found %d MB)" msgstr "" -#: ../install_steps_interactive.pm_.c:841 +#: ../install_steps_interactive.pm_.c:828 msgid "(may cause disk problems)" msgstr "" -#: ../install_steps_interactive.pm_.c:849 +#: ../install_steps_interactive.pm_.c:836 msgid "Proxy should be http://..." msgstr "" -#: ../install_steps_interactive.pm_.c:850 +#: ../install_steps_interactive.pm_.c:837 msgid "Proxy should be ftp://..." msgstr "" -#: ../install_steps_interactive.pm_.c:851 +#: ../install_steps_interactive.pm_.c:838 msgid "Give the ram size in Mb" msgstr "" -#: ../install_steps_interactive.pm_.c:864 +#: ../install_steps_interactive.pm_.c:851 msgid "" "Some steps are not completed.\n" "\n" "Do you really want to quit now?" msgstr "" -#: ../install_steps_interactive.pm_.c:871 +#: ../install_steps_interactive.pm_.c:858 msgid "" "Congratulations, installation is complete.\n" "Remove the boot media and press return to reboot.\n" @@ -2166,22 +2182,22 @@ msgid "" "install chapter of the Official Linux-Mandrake User's Guide." msgstr "" -#: ../install_steps_interactive.pm_.c:890 +#: ../install_steps_interactive.pm_.c:877 #, c-format msgid "Installing driver for %s card %s" msgstr "" -#: ../install_steps_interactive.pm_.c:891 +#: ../install_steps_interactive.pm_.c:878 #, c-format msgid "(module %s)" msgstr "" -#: ../install_steps_interactive.pm_.c:901 +#: ../install_steps_interactive.pm_.c:888 #, c-format msgid "What %s card do you have?" msgstr "" -#: ../install_steps_interactive.pm_.c:908 +#: ../install_steps_interactive.pm_.c:895 #, c-format msgid "" "In some cases, the %s driver needs to have extra information to work\n" @@ -2193,20 +2209,20 @@ msgid "" "not cause any damage." msgstr "" -#: ../install_steps_interactive.pm_.c:913 +#: ../install_steps_interactive.pm_.c:900 msgid "Autoprobe" msgstr "" -#: ../install_steps_interactive.pm_.c:913 +#: ../install_steps_interactive.pm_.c:900 msgid "Specify options" msgstr "" -#: ../install_steps_interactive.pm_.c:917 +#: ../install_steps_interactive.pm_.c:904 #, c-format msgid "You may now provide its options to module %s." msgstr "" -#: ../install_steps_interactive.pm_.c:923 +#: ../install_steps_interactive.pm_.c:910 #, c-format msgid "" "You may now provide its options to module %s.\n" @@ -2214,59 +2230,59 @@ msgid "" "For instance, ``io=0x300 irq=7''" msgstr "" -#: ../install_steps_interactive.pm_.c:926 +#: ../install_steps_interactive.pm_.c:913 msgid "Module options:" msgstr "" -#: ../install_steps_interactive.pm_.c:936 +#: ../install_steps_interactive.pm_.c:923 #, c-format msgid "" "Loading module %s failed.\n" "Do you want to try again with other parameters?" msgstr "" -#: ../install_steps_interactive.pm_.c:949 +#: ../install_steps_interactive.pm_.c:936 #, c-format msgid "Skip %s PCMCIA probing" msgstr "" -#: ../install_steps_interactive.pm_.c:950 +#: ../install_steps_interactive.pm_.c:937 msgid "Configuring PCMCIA cards..." msgstr "" -#: ../install_steps_interactive.pm_.c:950 +#: ../install_steps_interactive.pm_.c:937 msgid "PCMCIA" msgstr "" -#: ../install_steps_interactive.pm_.c:957 +#: ../install_steps_interactive.pm_.c:944 msgid "Try to find PCI devices?" msgstr "" -#: ../install_steps_interactive.pm_.c:961 +#: ../install_steps_interactive.pm_.c:948 #, c-format msgid "Found %s %s interfaces" msgstr "" -#: ../install_steps_interactive.pm_.c:962 +#: ../install_steps_interactive.pm_.c:949 msgid "Do you have another one?" msgstr "" -#: ../install_steps_interactive.pm_.c:963 +#: ../install_steps_interactive.pm_.c:950 #, c-format msgid "Do you have an %s interface?" msgstr "" -#: ../install_steps_interactive.pm_.c:965 ../interactive.pm_.c:52 +#: ../install_steps_interactive.pm_.c:952 ../interactive.pm_.c:52 #: ../my_gtk.pm_.c:435 msgid "No" msgstr "" -#: ../install_steps_interactive.pm_.c:965 ../interactive.pm_.c:52 +#: ../install_steps_interactive.pm_.c:952 ../interactive.pm_.c:52 #: ../my_gtk.pm_.c:435 msgid "Yes" msgstr "" -#: ../install_steps_interactive.pm_.c:966 +#: ../install_steps_interactive.pm_.c:953 msgid "See hardware info" msgstr "" @@ -2275,7 +2291,7 @@ msgstr "" msgid "Cancel" msgstr "" -#: ../interactive.pm_.c:149 +#: ../interactive.pm_.c:159 msgid "Please wait" msgstr "" @@ -2540,6 +2556,14 @@ msgstr "" msgid "Logitech Bus Mouse" msgstr "" +#: ../mouse.pm_.c:48 +msgid "USB Mouse" +msgstr "" + +#: ../mouse.pm_.c:49 +msgid "USB Mouse (3 buttons or more)" +msgstr "" + #: ../partition_table.pm_.c:449 msgid "" "You have a hole in your partition table but I can't use it.\n" diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po index d269d1013..262ebcc6a 100644 --- a/perl-install/share/po/no.po +++ b/perl-install/share/po/no.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX VERSION\n" -"POT-Creation-Date: 1999-11-06 19:37+0100\n" +"POT-Creation-Date: 1999-11-08 02:57+0100\n" "PO-Revision-Date: 1999-08-25 11:07+0200\n" "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n" "Language-Team: norwegian\n" @@ -13,23 +13,23 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: ../Xconfigurator.pm_.c:159 +#: ../Xconfigurator.pm_.c:162 msgid "Select a graphic card" msgstr "Velg et grafikk-kort" -#: ../Xconfigurator.pm_.c:160 +#: ../Xconfigurator.pm_.c:163 msgid "Choose a X server" msgstr "Velg en X-tjener" -#: ../Xconfigurator.pm_.c:179 +#: ../Xconfigurator.pm_.c:182 msgid "Select the memory size of your graphic card" msgstr "Velg minnest�rrelsen til grafikk-kortet ditt" -#: ../Xconfigurator.pm_.c:200 +#: ../Xconfigurator.pm_.c:203 msgid "Choose a monitor" msgstr "Velg en monitor" -#: ../Xconfigurator.pm_.c:203 +#: ../Xconfigurator.pm_.c:206 msgid "" "The two critical parameters are the vertical refresh rate, which is the " "rate\n" @@ -53,39 +53,39 @@ msgstr "" "skjermen din.\n" "Hvis du er usikker, velg en konservativ innstilling." -#: ../Xconfigurator.pm_.c:210 +#: ../Xconfigurator.pm_.c:213 msgid "Horizontal refresh rate" msgstr "Horisontal oppfrisknings-rate" -#: ../Xconfigurator.pm_.c:210 +#: ../Xconfigurator.pm_.c:213 msgid "Vertical refresh rate" msgstr "Vertikal oppfrisknings-rate" -#: ../Xconfigurator.pm_.c:250 +#: ../Xconfigurator.pm_.c:254 msgid "Monitor not configured" msgstr "Monitor er ikke konfigurert" -#: ../Xconfigurator.pm_.c:253 +#: ../Xconfigurator.pm_.c:257 msgid "Graphic card not configured yet" msgstr "Grafikk-kort er ikke konfigurert enn�" -#: ../Xconfigurator.pm_.c:256 +#: ../Xconfigurator.pm_.c:260 msgid "Resolutions not chosen yet" msgstr "Oppl�sninger er ikke valgt enn�" -#: ../Xconfigurator.pm_.c:265 +#: ../Xconfigurator.pm_.c:269 msgid "Do you want to test the configuration?" msgstr "Vil du teste konfigurasjonen?" -#: ../Xconfigurator.pm_.c:265 +#: ../Xconfigurator.pm_.c:269 msgid "Test configuration" msgstr "Test konfigurasjon" -#: ../Xconfigurator.pm_.c:297 +#: ../Xconfigurator.pm_.c:301 msgid "An error occurred:" msgstr "En feil oppsto:" -#: ../Xconfigurator.pm_.c:299 +#: ../Xconfigurator.pm_.c:303 msgid "" "\n" "try changing some parameters" @@ -93,24 +93,24 @@ msgstr "" "\n" "pr�v � endre noen parametere" -#: ../Xconfigurator.pm_.c:320 +#: ../Xconfigurator.pm_.c:324 ../t2.pm_.c:15 #, c-format msgid "(leaving in %d seconds)" msgstr "(slutter om %d sekunder)" -#: ../Xconfigurator.pm_.c:324 ../my_gtk.pm_.c:436 +#: ../Xconfigurator.pm_.c:328 ../my_gtk.pm_.c:436 ../t2.pm_.c:19 msgid "Is this correct?" msgstr "Er dette riktig?" -#: ../Xconfigurator.pm_.c:332 +#: ../Xconfigurator.pm_.c:336 msgid "An error occurred, try changing some parameters" msgstr "En feil oppsto, pr�v � endre noen parametere" -#: ../Xconfigurator.pm_.c:340 ../Xconfigurator.pm_.c:505 +#: ../Xconfigurator.pm_.c:344 ../Xconfigurator.pm_.c:509 msgid "Automatic resolutions" msgstr "Automatiske oppl�sninger" -#: ../Xconfigurator.pm_.c:341 +#: ../Xconfigurator.pm_.c:345 msgid "" "To find the available resolutions I will try different ones.\n" "Your screen will blink...\n" @@ -120,19 +120,19 @@ msgstr "" "Skjermen din vil blinke...\n" "Du kan sl� av hvis du vil, du vil h�re et bipp n�r det er ferdig" -#: ../Xconfigurator.pm_.c:392 ../install_steps_interactive.pm_.c:540 +#: ../Xconfigurator.pm_.c:396 ../install_steps_interactive.pm_.c:535 msgid "Resolution" msgstr "Oppl�sning" -#: ../Xconfigurator.pm_.c:427 +#: ../Xconfigurator.pm_.c:431 msgid "Choose resolution and color depth" msgstr "Velg oppl�sning og fargedybde" -#: ../Xconfigurator.pm_.c:435 +#: ../Xconfigurator.pm_.c:439 msgid "Show all" msgstr "Vis alle" -#: ../Xconfigurator.pm_.c:506 +#: ../Xconfigurator.pm_.c:510 msgid "" "I can try to find the available resolutions (eg: 800x600).\n" "Sometimes, though, it may hang the machine.\n" @@ -142,7 +142,7 @@ msgstr "" "Noen ganger kan dette for�rsake at maskinen stopper opp.\n" "�nsker du � pr�ve?" -#: ../Xconfigurator.pm_.c:511 +#: ../Xconfigurator.pm_.c:515 msgid "" "No valid modes found\n" "Try with another video card or monitor" @@ -150,88 +150,88 @@ msgstr "" "Ingen gyldige modus funnet\n" "Pr�v med et annet skjermkort eller monitor" -#: ../Xconfigurator.pm_.c:699 +#: ../Xconfigurator.pm_.c:703 #, c-format msgid "Keyboard layout: %s\n" msgstr "Tastatur-oppsett: %s\n" -#: ../Xconfigurator.pm_.c:700 +#: ../Xconfigurator.pm_.c:704 #, c-format msgid "Mouse type: %s\n" msgstr "Type mus: %s\n" -#: ../Xconfigurator.pm_.c:701 +#: ../Xconfigurator.pm_.c:705 #, c-format msgid "Mouse device: %s\n" msgstr "Enhet mus: %s\n" -#: ../Xconfigurator.pm_.c:702 +#: ../Xconfigurator.pm_.c:706 #, c-format msgid "Monitor: %s\n" msgstr "Monitor: %s\n" -#: ../Xconfigurator.pm_.c:703 +#: ../Xconfigurator.pm_.c:707 #, c-format msgid "Monitor HorizSync: %s\n" msgstr "Monitor HorizSync: %s\n" -#: ../Xconfigurator.pm_.c:704 +#: ../Xconfigurator.pm_.c:708 #, c-format msgid "Monitor VertRefresh: %s\n" msgstr "Monitor VertRefresh: %s\n" -#: ../Xconfigurator.pm_.c:705 +#: ../Xconfigurator.pm_.c:709 #, c-format msgid "Graphic card: %s\n" msgstr "Grafikk-kort: %s\n" -#: ../Xconfigurator.pm_.c:706 +#: ../Xconfigurator.pm_.c:710 #, c-format msgid "Graphic memory: %s kB\n" msgstr "Minne grafikk: %s kB\n" -#: ../Xconfigurator.pm_.c:707 +#: ../Xconfigurator.pm_.c:711 #, c-format msgid "XFree86 server: %s\n" msgstr "XFree86-tjener: %s\n" -#: ../Xconfigurator.pm_.c:732 +#: ../Xconfigurator.pm_.c:736 msgid "Change Monitor" msgstr "Endre monitor" -#: ../Xconfigurator.pm_.c:733 +#: ../Xconfigurator.pm_.c:737 msgid "Change Graphic card" msgstr "Endre grafikk-kort" -#: ../Xconfigurator.pm_.c:734 +#: ../Xconfigurator.pm_.c:738 msgid "Change Resolution" msgstr "Endre oppl�sning" -#: ../Xconfigurator.pm_.c:735 +#: ../Xconfigurator.pm_.c:739 msgid "Automatical resolutions search" msgstr "Automatisk oppl�sningss�k" -#: ../Xconfigurator.pm_.c:739 +#: ../Xconfigurator.pm_.c:743 msgid "Show information" msgstr "Vis informasjon" -#: ../Xconfigurator.pm_.c:740 +#: ../Xconfigurator.pm_.c:744 msgid "Test again" msgstr "Test igjen" -#: ../Xconfigurator.pm_.c:741 +#: ../Xconfigurator.pm_.c:745 msgid "Quit" msgstr "Avslutt" -#: ../Xconfigurator.pm_.c:744 +#: ../Xconfigurator.pm_.c:748 msgid "What do you want to do?" msgstr "Hva vil du gj�re?" -#: ../Xconfigurator.pm_.c:749 +#: ../Xconfigurator.pm_.c:753 msgid "X at startup" msgstr "X ved oppstart" -#: ../Xconfigurator.pm_.c:750 +#: ../Xconfigurator.pm_.c:754 msgid "" "I can set up your computer to automatically start X upon booting.\n" "Would you like X to start when you reboot?" @@ -395,9 +395,9 @@ msgstr "Gjenopprett fra diskett" msgid "Save on floppy" msgstr "Lagre p� diskett" -#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:508 -#: ../install_steps_interactive.pm_.c:632 -#: ../install_steps_interactive.pm_.c:748 +#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:503 +#: ../install_steps_interactive.pm_.c:623 +#: ../install_steps_interactive.pm_.c:740 msgid "Done" msgstr "Ferdig" @@ -491,8 +491,8 @@ msgid "all data on this partition will be lost" msgstr "alle data p� denne partisjonen vil g� tapt" # #: ../install_steps_interactive.pm_.c:37 -#: ../diskdrake.pm_.c:146 ../install_any.pm_.c:174 ../install_steps.pm_.c:70 -#: ../install_steps_interactive.pm_.c:39 +#: ../diskdrake.pm_.c:146 ../install_any.pm_.c:175 ../install_steps.pm_.c:70 +#: ../install_steps_interactive.pm_.c:40 msgid "Error" msgstr "Feil" @@ -686,8 +686,9 @@ msgstr "endrer st�rrelse" msgid "Choose the new size" msgstr "Velg den nye st�rrelsen" -#: ../diskdrake.pm_.c:463 ../install_steps_graphical.pm_.c:284 -#: ../install_steps_graphical.pm_.c:331 +#: ../diskdrake.pm_.c:463 ../install_steps_graphical.pm_.c:286 +#: ../install_steps_graphical.pm_.c:333 +#: ../unused/install_steps_graphical.pm_.c:314 msgid "MB" msgstr "MB" @@ -950,7 +951,7 @@ msgstr "" "kalt \"Info\", som du finner mellom listen over pakker og de fem knappene\n" "\"Installer\", \"Velg flere/f�rre\" og \"Vis flere/f�rre\"." -#: ../help.pm_.c:122 ../help.pm_.c:357 +#: ../help.pm_.c:122 msgid "" "The packages selected are now being installed. This operation\n" "should only take a few minutes." @@ -958,7 +959,7 @@ msgstr "" "Pakkene som er valgt blir n� installert. Denne operasjonen burde\n" "bare ta noen f� minutter." -#: ../help.pm_.c:126 ../help.pm_.c:361 +#: ../help.pm_.c:126 ../help.pm_.c:363 msgid "" "If DrakX failed to find your mouse, or if you want to\n" "check what it has done, you will be presented the list of mice\n" @@ -985,7 +986,7 @@ msgstr "" "Hvis du har en seriell mus, m� du ogs� fortelle DrakX hvilken\n" "serie-port den er koblet til." -#: ../help.pm_.c:140 ../help.pm_.c:375 +#: ../help.pm_.c:140 ../help.pm_.c:377 msgid "" "This section is dedicated to configuring a local area network,\n" "or LAN. If you answer \"Yes\" here, DrakX will try to find an\n" @@ -1028,8 +1029,8 @@ msgstr "" "adresser " # #: ../help.pm_.c:376 ../help.pm_.c:463 ../install2.pm_.c:65 -#: ../help.pm_.c:162 ../help.pm_.c:165 ../help.pm_.c:253 ../help.pm_.c:397 -#: ../help.pm_.c:400 ../help.pm_.c:488 ../install2.pm_.c:66 +#: ../help.pm_.c:162 ../help.pm_.c:165 ../help.pm_.c:253 ../help.pm_.c:399 +#: ../help.pm_.c:402 ../help.pm_.c:490 ../install2.pm_.c:67 msgid "Help" msgstr "Hjelp" @@ -1080,7 +1081,7 @@ msgstr "" "en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n" "informasjon." -#: ../help.pm_.c:191 ../help.pm_.c:426 +#: ../help.pm_.c:191 ../help.pm_.c:428 msgid "" "You must now enter the root password for your Linux-Mandrake\n" "system. The password must be entered twice to verify that both\n" @@ -1111,7 +1112,7 @@ msgstr "" "bli skrevet ned. Ikke lag passordet for langt eller for komplisert:\n" "du m� kunne klare � huske det." -#: ../help.pm_.c:207 ../help.pm_.c:442 +#: ../help.pm_.c:207 ../help.pm_.c:444 msgid "" "You may now create one or more \"regular\" user account(s), as\n" "opposed to the \"priviledged\" user account, root. You can create\n" @@ -1154,7 +1155,7 @@ msgstr "" "du vil ha opprettet her, og logge inn som root bare for administrasjon-\n" "og vedlikeholdsform�l." -#: ../help.pm_.c:226 ../help.pm_.c:461 +#: ../help.pm_.c:226 ../help.pm_.c:463 msgid "" "Please, please, answer \"Yes\" here! Just for example, when you\n" "reinstall Windows, it will overwrite the boot sector. Unless you have\n" @@ -1166,7 +1167,7 @@ msgstr "" "ikke har opprettet oppstartsdisketten som foresl�tt, vil du ikke kunne\n" "starte Linux mer!" -#: ../help.pm_.c:232 ../help.pm_.c:467 +#: ../help.pm_.c:232 ../help.pm_.c:469 msgid "" "You need to indicate where you wish\n" "to place the information required to boot to Linux.\n" @@ -1182,7 +1183,7 @@ msgstr "" "Med mindre du vet akkurat hva du gj�r, velg \"F�rste sektor av\n" "disken (MBR)\"." -#: ../help.pm_.c:240 ../help.pm_.c:475 +#: ../help.pm_.c:240 ../help.pm_.c:477 msgid "" "Now it's time to configure the X Window System, which is the\n" "core of the Linux GUI (Graphical User Interface). For this purpose,\n" @@ -1285,7 +1286,18 @@ msgstr "" "som foresl�tt i installasjonsguiden. Dette er opsjonene du vil trenge �\n" "gi til driveren." -#: ../help.pm_.c:403 +#: ../help.pm_.c:357 +#, fuzzy +msgid "" +"The packages selected are now being installed.\n" +"\n" +"\n" +"This operation should take a few minutes." +msgstr "" +"Pakkene som er valgt blir n� installert. Denne operasjonen burde\n" +"bare ta noen f� minutter." + +#: ../help.pm_.c:405 msgid "" "Linux can deal with many types of printer. Each of these\n" "types require a different setup.\n" @@ -1332,113 +1344,113 @@ msgstr "" "en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n" "informasjon." -#: ../install2.pm_.c:39 +#: ../install2.pm_.c:40 msgid "Choose your language" msgstr "Velg spr�k" -#: ../install2.pm_.c:40 +#: ../install2.pm_.c:41 msgid "Select installation class" msgstr "Velg installasjonsklasse" -#: ../install2.pm_.c:41 +#: ../install2.pm_.c:42 msgid "Setup SCSI" msgstr "Oppsett SCSI" -#: ../install2.pm_.c:42 +#: ../install2.pm_.c:43 msgid "Choose install or upgrade" msgstr "Velg installering eller oppgradering" -#: ../install2.pm_.c:43 +#: ../install2.pm_.c:44 msgid "Configure mouse" msgstr "Konfigurer mus" -#: ../install2.pm_.c:44 +#: ../install2.pm_.c:45 msgid "Choose your keyboard" msgstr "Velg tastatur" -#: ../install2.pm_.c:45 +#: ../install2.pm_.c:46 msgid "Setup filesystems" msgstr "Oppsett filsystemer" -#: ../install2.pm_.c:46 +#: ../install2.pm_.c:47 msgid "Format partitions" msgstr "Formater partisjoner" -#: ../install2.pm_.c:47 +#: ../install2.pm_.c:48 msgid "Choose packages to install" msgstr "Velg pakker for installering" -#: ../install2.pm_.c:48 +#: ../install2.pm_.c:49 msgid "Install system" msgstr "Installer systemet" -#: ../install2.pm_.c:49 +#: ../install2.pm_.c:50 msgid "Miscellaneous" msgstr "Forskjellig" -#: ../install2.pm_.c:50 +#: ../install2.pm_.c:51 msgid "Configure networking" msgstr "Konfigurer nettverk" -#: ../install2.pm_.c:51 +#: ../install2.pm_.c:52 msgid "Configure timezone" msgstr "Konfigurer tidssone" -#: ../install2.pm_.c:53 +#: ../install2.pm_.c:54 msgid "Configure printer" msgstr "Konfigurer skriver" -#: ../install2.pm_.c:54 ../install_steps_interactive.pm_.c:592 -#: ../install_steps_interactive.pm_.c:593 +#: ../install2.pm_.c:55 ../install_steps_interactive.pm_.c:582 +#: ../install_steps_interactive.pm_.c:583 msgid "Set root password" msgstr "Sett root-passord" -#: ../install2.pm_.c:55 +#: ../install2.pm_.c:56 msgid "Add a user" msgstr "Legg til en bruker" -#: ../install2.pm_.c:56 +#: ../install2.pm_.c:57 msgid "Create a bootdisk" msgstr "Opprett en oppstartdiskett" -#: ../install2.pm_.c:57 +#: ../install2.pm_.c:58 msgid "Install bootloader" msgstr "Installer oppstartslaster" -#: ../install2.pm_.c:58 +#: ../install2.pm_.c:59 msgid "Configure X" msgstr "Konfigurer X" -#: ../install2.pm_.c:59 +#: ../install2.pm_.c:60 msgid "Exit install" msgstr "G� ut av installering" -#: ../install2.pm_.c:83 +#: ../install2.pm_.c:84 msgid "beginner" msgstr "nybegynner" -#: ../install2.pm_.c:83 +#: ../install2.pm_.c:84 msgid "developer" msgstr "utvikler" -#: ../install2.pm_.c:83 +#: ../install2.pm_.c:84 msgid "expert" msgstr "ekspert" -#: ../install2.pm_.c:83 +#: ../install2.pm_.c:84 msgid "server" msgstr "tjener" -#: ../install2.pm_.c:301 +#: ../install2.pm_.c:305 msgid "Partitioning failed: no root filesystem" msgstr "Partisjonering feilet: intet root-filsystem" -#: ../install2.pm_.c:314 +#: ../install2.pm_.c:318 msgid "Not enough swap to fulfill installation, please add some" msgstr "" "Ikke nok vekslingsplass til � fullf�re installasjonen, du m� legge til mer" -#: ../install_any.pm_.c:175 +#: ../install_any.pm_.c:176 msgid "" "I can't read your partition table, it's too corrupted for me :(\n" "I'll try to go on blanking bad partitions" @@ -1446,7 +1458,7 @@ msgstr "" "Jeg kan ikke lese partisjonstabellen din, den er for �delagt for meg :(\n" "Jeg vil f�rs�ke � blanke ut d�rlige partisjoner" -#: ../install_any.pm_.c:191 +#: ../install_any.pm_.c:192 msgid "" "DiskDrake failed to read correctly the partition table.\n" "Continue at your own risk!" @@ -1454,36 +1466,28 @@ msgstr "" "DiskDrake klarte ikke � lese partisjonstabellen korrekt.\n" "Fortsett p� egen risiko!" -#: ../install_any.pm_.c:230 +#: ../install_any.pm_.c:231 msgid "Information" msgstr "Informasjon" -#: ../install_any.pm_.c:231 +#: ../install_any.pm_.c:232 #, c-format msgid "%s: This is not a root partition, please select another one." msgstr "%s: Dette er ikke en root-partisjon, vennligst velg en annen." -#: ../install_any.pm_.c:233 +#: ../install_any.pm_.c:234 msgid "No root partition found" msgstr "Ingen root-partisjon funnet" -#: ../install_any.pm_.c:269 +#: ../install_any.pm_.c:270 msgid "Can't use broadcast with no NIS domain" msgstr "Kan ikke bruke broadcast uten NIS domene" -#: ../install_any.pm_.c:362 -msgid "" -"I can't access the kernel with frame buffer support.\n" -"Disabling automatic X11 startup if any." -msgstr "" -"Jeg f�r ikke tilgang til kjernen med frame-buffer st�tte.\n" -"Sl� av automatisk X11 oppstart hvis dette finnes." - -#: ../install_any.pm_.c:404 +#: ../install_any.pm_.c:414 msgid "Error reading file $f" msgstr "Feil ved lesing av fil $f" -#: ../install_any.pm_.c:409 +#: ../install_any.pm_.c:419 #, c-format msgid "Bad kickstart file %s (failed %s)" msgstr "D�rlig kickstart-fil %s (mislykket %s)" @@ -1497,12 +1501,12 @@ msgstr "" "pen m�te.\n" "Fortsett p� eget ansvar." -#: ../install_steps.pm_.c:127 +#: ../install_steps.pm_.c:135 #, c-format msgid "Duplicate mount point %s" msgstr "Dupliser monteringspunkt %s" -#: ../install_steps.pm_.c:366 +#: ../install_steps.pm_.c:377 msgid "No floppy drive available" msgstr "Ingen diskettstasjon tilgjengelig" @@ -1511,11 +1515,13 @@ msgstr "Ingen diskettstasjon tilgjengelig" msgid "Entering step `%s'\n" msgstr "Entrer trinn `%s'\n" -#: ../install_steps_graphical.pm_.c:257 +#: ../install_steps_graphical.pm_.c:258 +#: ../unused/install_steps_graphical.pm_.c:255 msgid "You must have a swap partition" msgstr "Du m� ha en vekslingspartisjon" -#: ../install_steps_graphical.pm_.c:260 +#: ../install_steps_graphical.pm_.c:261 +#: ../unused/install_steps_graphical.pm_.c:258 msgid "" "You don't have a swap partition\n" "\n" @@ -1525,269 +1531,277 @@ msgstr "" "\n" "Fortsette alikevel?" -#: ../install_steps_graphical.pm_.c:284 +#: ../install_steps_graphical.pm_.c:286 msgid "Choose the size you want to install" msgstr "Velg st�rrelsen du �nsker � installere" -#: ../install_steps_graphical.pm_.c:331 +#: ../install_steps_graphical.pm_.c:333 +#: ../unused/install_steps_graphical.pm_.c:314 msgid "Total size: " msgstr "Total st�rrelse: " -#: ../install_steps_graphical.pm_.c:343 +#: ../install_steps_graphical.pm_.c:345 +#: ../unused/install_steps_graphical.pm_.c:284 #, c-format msgid "Version: %s\n" msgstr "Versjon: %s\n" -#: ../install_steps_graphical.pm_.c:344 +#: ../install_steps_graphical.pm_.c:346 +#: ../unused/install_steps_graphical.pm_.c:285 #, c-format msgid "Size: %d KB\n" msgstr "St�rrelse: %d KB\n" -#: ../install_steps_graphical.pm_.c:459 +#: ../install_steps_graphical.pm_.c:461 +#: ../unused/install_steps_graphical.pm_.c:421 msgid "Choose the packages you want to install" msgstr "Velg pakkene du �nsker � installere" -#: ../install_steps_graphical.pm_.c:462 +#: ../install_steps_graphical.pm_.c:464 +#: ../unused/install_steps_graphical.pm_.c:424 msgid "Info" msgstr "Info" -#: ../install_steps_graphical.pm_.c:470 ../install_steps_interactive.pm_.c:83 +#: ../install_steps_graphical.pm_.c:472 ../install_steps_interactive.pm_.c:84 +#: ../unused/install_steps_graphical.pm_.c:432 msgid "Install" msgstr "Installer" -#: ../install_steps_graphical.pm_.c:471 +#: ../install_steps_graphical.pm_.c:473 +#: ../unused/install_steps_graphical.pm_.c:433 msgid "Show less" msgstr "Vis f�rre" -#: ../install_steps_graphical.pm_.c:472 +#: ../install_steps_graphical.pm_.c:474 +#: ../unused/install_steps_graphical.pm_.c:434 msgid "Show more" msgstr "Vis flere" -#: ../install_steps_graphical.pm_.c:489 +#: ../install_steps_graphical.pm_.c:491 +#: ../unused/install_steps_graphical.pm_.c:451 msgid "Installing" msgstr "Installerer" -#: ../install_steps_graphical.pm_.c:496 +#: ../install_steps_graphical.pm_.c:498 +#: ../unused/install_steps_graphical.pm_.c:457 msgid "Please wait, " msgstr "Vennligst vent, " -#: ../install_steps_graphical.pm_.c:498 +#: ../install_steps_graphical.pm_.c:500 +#: ../unused/install_steps_graphical.pm_.c:459 msgid "Time remaining " msgstr "Tid som gjenst�r " -#: ../install_steps_graphical.pm_.c:499 +#: ../install_steps_graphical.pm_.c:501 +#: ../unused/install_steps_graphical.pm_.c:460 msgid "Total time " msgstr "Total tid " -#: ../install_steps_graphical.pm_.c:504 +#: ../install_steps_graphical.pm_.c:506 +#: ../unused/install_steps_graphical.pm_.c:465 msgid "Preparing installation" msgstr "Forbereder installasjon" -#: ../install_steps_graphical.pm_.c:527 +#: ../install_steps_graphical.pm_.c:529 +#: ../unused/install_steps_graphical.pm_.c:486 #, c-format msgid "Installing package %s" msgstr "Installerer pakke %s" -#: ../install_steps_graphical.pm_.c:552 +#: ../install_steps_graphical.pm_.c:554 +#: ../unused/install_steps_graphical.pm_.c:511 msgid "Go on anyway?" msgstr "Fortsette uansett?" -#: ../install_steps_graphical.pm_.c:552 +#: ../install_steps_graphical.pm_.c:554 +#: ../unused/install_steps_graphical.pm_.c:511 msgid "There was an error ordering packages:" msgstr "Det var en feil ved endring av pakkenes rekkef�lge:" -#: ../install_steps_graphical.pm_.c:576 +#: ../install_steps_graphical.pm_.c:578 +#: ../unused/install_steps_graphical.pm_.c:535 msgid "Use existing configuration for X11?" msgstr "Bruke eksisterende konfigurasjon for X11?" -#: ../install_steps_interactive.pm_.c:39 +#: ../install_steps_interactive.pm_.c:40 msgid "An error occurred" msgstr "En feil oppsto" -#: ../install_steps_interactive.pm_.c:56 +#: ../install_steps_interactive.pm_.c:57 msgid "Which language do you want?" msgstr "Hvilket spr�k �nsker du?" -#: ../install_steps_interactive.pm_.c:71 +#: ../install_steps_interactive.pm_.c:72 msgid "What is your keyboard layout?" msgstr "Hva er tastatur-oppsettet ditt?" -#: ../install_steps_interactive.pm_.c:81 +#: ../install_steps_interactive.pm_.c:82 msgid "Install/Upgrade" msgstr "Installer/Oppgrader" -#: ../install_steps_interactive.pm_.c:82 +#: ../install_steps_interactive.pm_.c:83 msgid "Is this an install or an upgrade?" msgstr "Er dette en installasjon eller en oppgradering?" -#: ../install_steps_interactive.pm_.c:83 +#: ../install_steps_interactive.pm_.c:84 msgid "Upgrade" msgstr "Oppgrader" -#: ../install_steps_interactive.pm_.c:91 +#: ../install_steps_interactive.pm_.c:92 msgid "Root Partition" msgstr "Root-partisjon" -#: ../install_steps_interactive.pm_.c:92 +#: ../install_steps_interactive.pm_.c:93 msgid "What is the root partition (/) of your system?" msgstr "Hva er root-partisjonen (/) p� systemet ditt?" -#: ../install_steps_interactive.pm_.c:102 +#: ../install_steps_interactive.pm_.c:103 msgid "Recommended" msgstr "" -#: ../install_steps_interactive.pm_.c:103 +#: ../install_steps_interactive.pm_.c:104 msgid "Personalized" msgstr "" -#: ../install_steps_interactive.pm_.c:104 +#: ../install_steps_interactive.pm_.c:105 #, fuzzy msgid "Expert" msgstr "ekspert" -#: ../install_steps_interactive.pm_.c:106 -#: ../install_steps_interactive.pm_.c:120 +#: ../install_steps_interactive.pm_.c:107 +#: ../install_steps_interactive.pm_.c:121 msgid "Install Class" msgstr "Installeringsklasse" -#: ../install_steps_interactive.pm_.c:107 +#: ../install_steps_interactive.pm_.c:108 msgid "What installation class do you want?" msgstr "Hvilken installasjonsklasse �nsker du?" -#: ../install_steps_interactive.pm_.c:116 +#: ../install_steps_interactive.pm_.c:117 #, fuzzy msgid "Normal" msgstr "Normal DAC" -#: ../install_steps_interactive.pm_.c:117 +#: ../install_steps_interactive.pm_.c:118 #, fuzzy msgid "Developement" msgstr "utvikler" -#: ../install_steps_interactive.pm_.c:118 +#: ../install_steps_interactive.pm_.c:119 #, fuzzy msgid "Server" msgstr "tjener" -#: ../install_steps_interactive.pm_.c:121 +#: ../install_steps_interactive.pm_.c:122 #, fuzzy msgid "What usage do you want?" msgstr "Hvilket spr�k �nsker du?" -#: ../install_steps_interactive.pm_.c:134 +#: ../install_steps_interactive.pm_.c:135 msgid "What is the type of your mouse?" msgstr "Hva slags type er musen din?" -#: ../install_steps_interactive.pm_.c:138 +#: ../install_steps_interactive.pm_.c:139 msgid "Emulate third button?" msgstr "Emulere tredje knapp?" -#: ../install_steps_interactive.pm_.c:141 +#: ../install_steps_interactive.pm_.c:142 msgid "Mouse Port" msgstr "Museport" -#: ../install_steps_interactive.pm_.c:142 +#: ../install_steps_interactive.pm_.c:143 msgid "Which serial port is your mouse connected to?" msgstr "Hvilken serieport er musen din koblet til?" -#: ../install_steps_interactive.pm_.c:155 +#: ../install_steps_interactive.pm_.c:156 msgid "no available partitions" msgstr "ingen tilgjengelige partisjoner" -#: ../install_steps_interactive.pm_.c:157 +#: ../install_steps_interactive.pm_.c:158 #, c-format msgid "(%dMb)" msgstr "(%dMb)" -#: ../install_steps_interactive.pm_.c:164 +#: ../install_steps_interactive.pm_.c:165 msgid "Which partition do you want to use as your root partition" msgstr "Hvilken partisjon vil du bruke som din root-partisjon" -#: ../install_steps_interactive.pm_.c:171 +#: ../install_steps_interactive.pm_.c:172 msgid "Choose the mount points" msgstr "Velg monteringspunkter" -#: ../install_steps_interactive.pm_.c:183 +#: ../install_steps_interactive.pm_.c:184 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\n" "skal tre i kraft" -#: ../install_steps_interactive.pm_.c:199 +#: ../install_steps_interactive.pm_.c:202 msgid "Choose the partitions you want to format" msgstr "Velg de partisjonene du �nsker � formatere" -#: ../install_steps_interactive.pm_.c:209 +#: ../install_steps_interactive.pm_.c:212 #, c-format msgid "Formatting partition %s" msgstr "Formaterer partisjon %s" -#: ../install_steps_interactive.pm_.c:217 +#: ../install_steps_interactive.pm_.c:221 msgid "Looking for available packages" msgstr "Ser etter tilgjengelige pakker" -#: ../install_steps_interactive.pm_.c:223 +#: ../install_steps_interactive.pm_.c:227 msgid "Finding packages to upgrade" msgstr "Finner pakker � oppgradere" -#: ../install_steps_interactive.pm_.c:232 +#: ../install_steps_interactive.pm_.c:236 msgid "Package Group Selection" msgstr "Valg pakkegruppe" -#: ../install_steps_interactive.pm_.c:247 +#: ../install_steps_interactive.pm_.c:251 msgid "Keep the current IP configuration" msgstr "Behold n�v�rende IP-konfigurasjon" -#: ../install_steps_interactive.pm_.c:248 +#: ../install_steps_interactive.pm_.c:252 msgid "Reconfigure network now" msgstr "Rekonfigurer nettverket n�" -#: ../install_steps_interactive.pm_.c:249 -#: ../install_steps_interactive.pm_.c:262 +#: ../install_steps_interactive.pm_.c:253 +#: ../install_steps_interactive.pm_.c:265 msgid "Do not set up networking" msgstr "Ikke sett opp nettverk" -#: ../install_steps_interactive.pm_.c:251 -#: ../install_steps_interactive.pm_.c:260 +#: ../install_steps_interactive.pm_.c:255 +#: ../install_steps_interactive.pm_.c:263 msgid "Network Configuration" msgstr "Nettverks-konfigurasjon" -#: ../install_steps_interactive.pm_.c:252 +#: ../install_steps_interactive.pm_.c:256 msgid "Local networking has already been configured. Do you want to:" msgstr "Lokalt nettverk har allerede blitt konfigurert. Vil du:" -#: ../install_steps_interactive.pm_.c:261 +#: ../install_steps_interactive.pm_.c:264 #, fuzzy msgid "Do you want to configure networking for yout system?" msgstr "Vil du konfigurere LAN (ikke oppringt) nettverk for systemet ditt?" -#: ../install_steps_interactive.pm_.c:262 +#: ../install_steps_interactive.pm_.c:265 msgid "Dialup with modem" msgstr "" -#: ../install_steps_interactive.pm_.c:262 +#: ../install_steps_interactive.pm_.c:265 msgid "Local LAN" msgstr "" -#: ../install_steps_interactive.pm_.c:267 -msgid "Skip modem autodetection?" -msgstr "" - -#: ../install_steps_interactive.pm_.c:275 -#, fuzzy -msgid "Which serial port is your modem connected to?" -msgstr "Hvilken serieport er musen din koblet til?" - -#: ../install_steps_interactive.pm_.c:287 +#: ../install_steps_interactive.pm_.c:274 msgid "no network card found" msgstr "ingen nettverkskort funnet" -#: ../install_steps_interactive.pm_.c:317 +#: ../install_steps_interactive.pm_.c:303 #, c-format msgid "Configuring network device %s" msgstr "Konfigurerer nettverks-enhet %s" -#: ../install_steps_interactive.pm_.c:318 +#: ../install_steps_interactive.pm_.c:304 msgid "" "Please enter the IP configuration for this machine.\n" "Each item should be entered as an IP address in dotted-decimal\n" @@ -1797,32 +1811,32 @@ msgstr "" "Hvert element b�r entres som en IP-adresse i punkt-desimal\n" "notasjon (f.eks, 1.2.3.4)." -#: ../install_steps_interactive.pm_.c:321 +#: ../install_steps_interactive.pm_.c:307 msgid "Automatic IP" msgstr "Automatisk IP" -#: ../install_steps_interactive.pm_.c:321 +#: ../install_steps_interactive.pm_.c:307 msgid "IP address:" msgstr "IP-adresse:" -#: ../install_steps_interactive.pm_.c:321 +#: ../install_steps_interactive.pm_.c:307 msgid "Netmask:" msgstr "Nettmaske:" -#: ../install_steps_interactive.pm_.c:322 +#: ../install_steps_interactive.pm_.c:308 msgid "(bootp/dhcp)" msgstr "(bootp/dhcp)" -#: ../install_steps_interactive.pm_.c:328 -#: ../install_steps_interactive.pm_.c:483 +#: ../install_steps_interactive.pm_.c:314 +#: ../install_steps_interactive.pm_.c:478 msgid "IP address should be in format 1.2.3.4" msgstr "IP-adresse b�r v�re i format 1.2.3.4" -#: ../install_steps_interactive.pm_.c:347 +#: ../install_steps_interactive.pm_.c:333 msgid "Configuring network" msgstr "Konfigurerer nettverk" -#: ../install_steps_interactive.pm_.c:348 +#: ../install_steps_interactive.pm_.c:334 msgid "" "Please enter your host name.\n" "Your host name should be a fully-qualified host name,\n" @@ -1834,22 +1848,36 @@ msgstr "" "s� som ``minboks.mittlab.mittfirma.no''.\n" "Du kan ogs� entre IP-adressen til gateway'en hvis du har en" -#: ../install_steps_interactive.pm_.c:352 +#: ../install_steps_interactive.pm_.c:338 msgid "DNS server:" msgstr "DNS-tjener:" -#: ../install_steps_interactive.pm_.c:352 +#: ../install_steps_interactive.pm_.c:338 msgid "Gateway device:" msgstr "Gateway-enhet:" -#: ../install_steps_interactive.pm_.c:352 +#: ../install_steps_interactive.pm_.c:338 msgid "Gateway:" msgstr "Gateway:" -#: ../install_steps_interactive.pm_.c:352 +#: ../install_steps_interactive.pm_.c:338 msgid "Host name:" msgstr "Vertsnavn:" +#: ../install_steps_interactive.pm_.c:349 +msgid "Skip modem autodetection?" +msgstr "" + +#: ../install_steps_interactive.pm_.c:358 +#, fuzzy +msgid "Which serial port is your modem connected to?" +msgstr "Hvilken serieport er musen din koblet til?" + +#: ../install_steps_interactive.pm_.c:362 +#, fuzzy +msgid "Dialup options" +msgstr "LILO hovedopsjoner" + #: ../install_steps_interactive.pm_.c:363 msgid "Connection name" msgstr "" @@ -1863,8 +1891,9 @@ msgid "Login ID" msgstr "" #: ../install_steps_interactive.pm_.c:366 -#: ../install_steps_interactive.pm_.c:634 -#: ../install_steps_interactive.pm_.c:724 +#: ../install_steps_interactive.pm_.c:584 +#: ../install_steps_interactive.pm_.c:629 +#: ../install_steps_interactive.pm_.c:719 msgid "Password" msgstr "Passord" @@ -1903,32 +1932,27 @@ msgstr "NIS-tjener" msgid "Second DNS Server" msgstr "NIS-tjener" -#: ../install_steps_interactive.pm_.c:374 -#, fuzzy -msgid "Dialup options" -msgstr "LILO hovedopsjoner" - -#: ../install_steps_interactive.pm_.c:384 +#: ../install_steps_interactive.pm_.c:379 msgid "Which is your timezone?" msgstr "Hvilken er tidsonen din?" -#: ../install_steps_interactive.pm_.c:385 +#: ../install_steps_interactive.pm_.c:380 msgid "Is your hardware clock set to GMT?" msgstr "Er maskinvareklokken din satt til GMT?" -#: ../install_steps_interactive.pm_.c:395 +#: ../install_steps_interactive.pm_.c:390 msgid "Printer" msgstr "Skriver" -#: ../install_steps_interactive.pm_.c:396 +#: ../install_steps_interactive.pm_.c:391 msgid "Would you like to configure a printer?" msgstr "�nsker du � konfigurere en skriver?" -#: ../install_steps_interactive.pm_.c:408 +#: ../install_steps_interactive.pm_.c:403 msgid "Local Printer Options" msgstr "Opsjoner for lokal skriver" -#: ../install_steps_interactive.pm_.c:409 +#: ../install_steps_interactive.pm_.c:404 msgid "" "Every print queue (which print jobs are directed to) needs a\n" "name (often lp) and a spool directory associated with it. What\n" @@ -1938,40 +1962,40 @@ msgstr "" "(ofte lp) og en spolingskatalog assosiert til denne. Hvilket\n" "navn og katalog skal brukes for denne k�en?" -#: ../install_steps_interactive.pm_.c:412 +#: ../install_steps_interactive.pm_.c:407 msgid "Name of queue:" msgstr "K�ens navn:" -#: ../install_steps_interactive.pm_.c:412 +#: ../install_steps_interactive.pm_.c:407 msgid "Spool directory:" msgstr "Spolingskatalog:" -#: ../install_steps_interactive.pm_.c:423 +#: ../install_steps_interactive.pm_.c:418 msgid "Select Printer Connection" msgstr "Velg skrivertilkobling" -#: ../install_steps_interactive.pm_.c:424 +#: ../install_steps_interactive.pm_.c:419 msgid "How is the printer connected?" msgstr "Hvordan er skriveren tilkoblet?" -#: ../install_steps_interactive.pm_.c:432 +#: ../install_steps_interactive.pm_.c:427 msgid "Detecting devices..." msgstr "Finner enheter..." -#: ../install_steps_interactive.pm_.c:432 +#: ../install_steps_interactive.pm_.c:427 msgid "Test ports" msgstr "Test porter" -#: ../install_steps_interactive.pm_.c:445 +#: ../install_steps_interactive.pm_.c:440 #, c-format msgid "A printer, model \"%s\", has been detected on " msgstr "En skriver, modell \"%s\", ble funnet p� " -#: ../install_steps_interactive.pm_.c:452 +#: ../install_steps_interactive.pm_.c:447 msgid "Local Printer Device" msgstr "Lokal skriverenhet" -#: ../install_steps_interactive.pm_.c:453 +#: ../install_steps_interactive.pm_.c:448 msgid "" "What device is your printer connected to \n" "(note that /dev/lp0 is equivalent to LPT1:)?\n" @@ -1979,15 +2003,15 @@ msgstr "" "Hvilken enhet er skriveren din koblet til \n" "(merk at /dev/lp0 er det samme som LPT1:)?\n" -#: ../install_steps_interactive.pm_.c:454 +#: ../install_steps_interactive.pm_.c:449 msgid "Printer Device:" msgstr "Skriverenhet:" -#: ../install_steps_interactive.pm_.c:458 +#: ../install_steps_interactive.pm_.c:453 msgid "Remote lpd Printer Options" msgstr "Opsjoner for fjern-lpd skriver" -#: ../install_steps_interactive.pm_.c:459 +#: ../install_steps_interactive.pm_.c:454 msgid "" "To use a remote lpd print queue, you need to supply\n" "the hostname of the printer server and the queue name\n" @@ -1997,19 +2021,19 @@ msgstr "" "til skrivertjeneren og k�navnet til den tjeneren som\n" "jobbene skal plasseres i." -#: ../install_steps_interactive.pm_.c:462 +#: ../install_steps_interactive.pm_.c:457 msgid "Remote hostname:" msgstr "Fjern-vertnavn:" -#: ../install_steps_interactive.pm_.c:462 +#: ../install_steps_interactive.pm_.c:457 msgid "Remote queue" msgstr "Fjern-k�" -#: ../install_steps_interactive.pm_.c:468 +#: ../install_steps_interactive.pm_.c:463 msgid "SMB (Windows 9x/NT) Printer Options" msgstr "Opsjoner for SMB (Windows 9x/NT) skriver" -#: ../install_steps_interactive.pm_.c:469 +#: ../install_steps_interactive.pm_.c:464 msgid "" "To print to a SMB printer, you need to provide the\n" "SMB host name (Note! It may be different from its\n" @@ -2023,38 +2047,37 @@ msgstr "" "navnet til skriveren du �nsker tilgang til og anvendelige brukernavn,\n" "passord og arbeidsgruppeinformasjon." -#: ../install_steps_interactive.pm_.c:474 +#: ../install_steps_interactive.pm_.c:469 msgid "SMB server IP:" msgstr "SMB-tjener IP:" -#: ../install_steps_interactive.pm_.c:474 +#: ../install_steps_interactive.pm_.c:469 msgid "SMB server host:" msgstr "SMB-tjener vert:" -#: ../install_steps_interactive.pm_.c:475 -#: ../install_steps_interactive.pm_.c:496 -#: ../install_steps_interactive.pm_.c:594 +#: ../install_steps_interactive.pm_.c:470 +#: ../install_steps_interactive.pm_.c:491 msgid "Password:" msgstr "Passord:" -#: ../install_steps_interactive.pm_.c:475 +#: ../install_steps_interactive.pm_.c:470 msgid "Share name:" msgstr "Delt navn:" -#: ../install_steps_interactive.pm_.c:475 -#: ../install_steps_interactive.pm_.c:496 +#: ../install_steps_interactive.pm_.c:470 +#: ../install_steps_interactive.pm_.c:491 msgid "User name:" msgstr "Brukernavn:" -#: ../install_steps_interactive.pm_.c:476 +#: ../install_steps_interactive.pm_.c:471 msgid "Workgroup:" msgstr "Arbeidsgruppe:" -#: ../install_steps_interactive.pm_.c:490 +#: ../install_steps_interactive.pm_.c:485 msgid "NetWare Printer Options" msgstr "NetWare skriveropsjoner" -#: ../install_steps_interactive.pm_.c:491 +#: ../install_steps_interactive.pm_.c:486 msgid "" "To print to a NetWare printer, you need to provide the\n" "NetWare print server name (Note! it may be different from its\n" @@ -2066,142 +2089,144 @@ msgstr "" "vertsnavn!) s� vel som navnet p� skriverk�en til skriveren du �nsker\n" "adgang til og anvendelige brukernavn og passord." -#: ../install_steps_interactive.pm_.c:495 +#: ../install_steps_interactive.pm_.c:490 msgid "Print Queue Name:" msgstr "Skriverk�-navn:" -#: ../install_steps_interactive.pm_.c:495 +#: ../install_steps_interactive.pm_.c:490 msgid "Printer Server:" msgstr "Skrivertjener:" -#: ../install_steps_interactive.pm_.c:505 +#: ../install_steps_interactive.pm_.c:500 msgid "Print test ascii page" msgstr "" -#: ../install_steps_interactive.pm_.c:506 +#: ../install_steps_interactive.pm_.c:501 msgid "Print test postscript page" msgstr "" -#: ../install_steps_interactive.pm_.c:507 +#: ../install_steps_interactive.pm_.c:502 #, fuzzy msgid "Change printer" msgstr "Konfigurer skriver" -#: ../install_steps_interactive.pm_.c:514 +#: ../install_steps_interactive.pm_.c:509 msgid "Configure Printer" msgstr "Konfigurer skriver" -#: ../install_steps_interactive.pm_.c:515 +#: ../install_steps_interactive.pm_.c:510 msgid "What type of printer do you have?" msgstr "Hva slags type skriver har du?" -#: ../install_steps_interactive.pm_.c:538 +#: ../install_steps_interactive.pm_.c:532 +#, fuzzy +msgid "Printer options" +msgstr "Opsjoner for lokal skriver" + +#: ../install_steps_interactive.pm_.c:533 msgid "Paper Size" msgstr "Papirst�rrelse" -#: ../install_steps_interactive.pm_.c:541 +#: ../install_steps_interactive.pm_.c:536 msgid "Fix stair-stepping text?" msgstr "Fikse trappestegs-tekst?" -#: ../install_steps_interactive.pm_.c:544 +#: ../install_steps_interactive.pm_.c:539 #, fuzzy msgid "Uniprint driver options" msgstr "Bruk harddisk-optimisering" -#: ../install_steps_interactive.pm_.c:545 +#: ../install_steps_interactive.pm_.c:540 #, fuzzy msgid "Color depth options" msgstr "Modulopsjoner:" #: ../install_steps_interactive.pm_.c:549 #, fuzzy -msgid "Printer options" -msgstr "Opsjoner for lokal skriver" - -#: ../install_steps_interactive.pm_.c:559 -#, fuzzy msgid "What do you want to do" msgstr "Hva vil du gj�re?" -#: ../install_steps_interactive.pm_.c:592 +#: ../install_steps_interactive.pm_.c:582 msgid "No password" msgstr "Intet passord" -#: ../install_steps_interactive.pm_.c:592 ../interactive.pm_.c:47 +#: ../install_steps_interactive.pm_.c:582 ../interactive.pm_.c:47 #: ../interactive.pm_.c:57 ../interactive_newt.pm_.c:22 #: ../interactive_newt.pm_.c:54 ../my_gtk.pm_.c:199 ../my_gtk.pm_.c:436 -#: ../my_gtk.pm_.c:533 +#: ../my_gtk.pm_.c:533 ../unused/install_steps_graphical.pm_.c:608 msgid "Ok" msgstr "Ok" -#: ../install_steps_interactive.pm_.c:594 -msgid "Password (again):" -msgstr "Passord (igjen):" - -#: ../install_steps_interactive.pm_.c:594 -msgid "Use MD5 passwords" -msgstr "Bruk MD5 passord" - -#: ../install_steps_interactive.pm_.c:594 -msgid "Use NIS" -msgstr "Bruk NIS" +#: ../install_steps_interactive.pm_.c:585 +#: ../install_steps_interactive.pm_.c:630 +msgid "Password (again)" +msgstr "Passord (igjen)" -#: ../install_steps_interactive.pm_.c:594 +#: ../install_steps_interactive.pm_.c:587 msgid "Use shadow file" msgstr "Bruk skyggefil" -#: ../install_steps_interactive.pm_.c:597 +#: ../install_steps_interactive.pm_.c:587 msgid "shadow" msgstr "skygge" -#: ../install_steps_interactive.pm_.c:598 +#: ../install_steps_interactive.pm_.c:588 msgid "MD5" msgstr "MD5" -#: ../install_steps_interactive.pm_.c:599 +#: ../install_steps_interactive.pm_.c:588 +msgid "Use MD5 passwords" +msgstr "Bruk MD5 passord" + +#: ../install_steps_interactive.pm_.c:590 +msgid "Use NIS" +msgstr "Bruk NIS" + +#: ../install_steps_interactive.pm_.c:590 msgid "yellow pages" msgstr "gule sider" -#: ../install_steps_interactive.pm_.c:602 -#: ../install_steps_interactive.pm_.c:645 +#: ../install_steps_interactive.pm_.c:593 +#: ../install_steps_interactive.pm_.c:640 msgid "Please try again" msgstr "Vennligst pr�v igjen" -#: ../install_steps_interactive.pm_.c:602 -#: ../install_steps_interactive.pm_.c:645 +#: ../install_steps_interactive.pm_.c:593 +#: ../install_steps_interactive.pm_.c:640 msgid "The passwords do not match" msgstr "Passordene stemmer ikke overens" -#: ../install_steps_interactive.pm_.c:604 +#: ../install_steps_interactive.pm_.c:595 +#: ../install_steps_interactive.pm_.c:641 msgid "This password is too simple" msgstr "Dette passordet er for enkelt" -#: ../install_steps_interactive.pm_.c:611 +#: ../install_steps_interactive.pm_.c:602 msgid "TODO" msgstr "TODO" -#: ../install_steps_interactive.pm_.c:612 +#: ../install_steps_interactive.pm_.c:603 msgid "NIS Domain" msgstr "NIS-domene" -#: ../install_steps_interactive.pm_.c:612 +#: ../install_steps_interactive.pm_.c:603 msgid "NIS Server" msgstr "NIS-tjener" -#: ../install_steps_interactive.pm_.c:632 +#: ../install_steps_interactive.pm_.c:623 msgid "Accept user" msgstr "Godta bruker" -#: ../install_steps_interactive.pm_.c:632 +#: ../install_steps_interactive.pm_.c:623 msgid "Add user" msgstr "Legg til bruker" -#: ../install_steps_interactive.pm_.c:633 +#: ../install_steps_interactive.pm_.c:624 #, c-format msgid "(already added %s)" msgstr "(allerede lagt til %s)" -#: ../install_steps_interactive.pm_.c:633 +#: ../install_steps_interactive.pm_.c:624 #, c-format msgid "" "Enter a user\n" @@ -2210,36 +2235,32 @@ msgstr "" "Entre en bruker\n" "%s" -#: ../install_steps_interactive.pm_.c:634 -msgid "Password (again)" -msgstr "Passord (igjen)" - -#: ../install_steps_interactive.pm_.c:634 +#: ../install_steps_interactive.pm_.c:626 msgid "Real name" msgstr "Virkelig navn" -#: ../install_steps_interactive.pm_.c:634 -msgid "Shell" -msgstr "Skall" - -#: ../install_steps_interactive.pm_.c:634 +#: ../install_steps_interactive.pm_.c:627 msgid "User name" msgstr "Brukernavn" -#: ../install_steps_interactive.pm_.c:647 +#: ../install_steps_interactive.pm_.c:632 +msgid "Shell" +msgstr "Skall" + +#: ../install_steps_interactive.pm_.c:642 msgid "Please give a user name" msgstr "Vennligst oppgi et brukernavn" -#: ../install_steps_interactive.pm_.c:648 +#: ../install_steps_interactive.pm_.c:643 msgid "" "The user name must contain only lower cased letters, numbers, `-' and `_'" msgstr "Brukernavnet kan kun inneholde sm� bokstaver, tall, `-' og `_'" -#: ../install_steps_interactive.pm_.c:649 +#: ../install_steps_interactive.pm_.c:644 msgid "This user name is already added" msgstr "" -#: ../install_steps_interactive.pm_.c:670 +#: ../install_steps_interactive.pm_.c:665 msgid "" "A custom bootdisk provides a way of booting into your Linux system without\n" "depending on the normal bootloader. This is useful if you don't want to " @@ -2263,103 +2284,103 @@ msgstr "" "systemsvikt.\n" "�nsker du � opprette en oppstartsdiskett for systemet ditt?" -#: ../install_steps_interactive.pm_.c:679 +#: ../install_steps_interactive.pm_.c:674 msgid "Sorry, no floppy drive available" msgstr "Beklager, ingen diskettstasjon tilgjengelig" -#: ../install_steps_interactive.pm_.c:682 +#: ../install_steps_interactive.pm_.c:677 msgid "Choose the floppy drive you want to use to make the bootdisk" msgstr "Velg diskettstasjonen du �nsker � bruke for � lage oppstartsdisketten" -#: ../install_steps_interactive.pm_.c:683 +#: ../install_steps_interactive.pm_.c:678 msgid "Skip" msgstr "Dropp" -#: ../install_steps_interactive.pm_.c:687 +#: ../install_steps_interactive.pm_.c:682 #, c-format msgid "Insert a floppy in drive %s" msgstr "Sett inn en diskett i stasjon %s" -#: ../install_steps_interactive.pm_.c:688 +#: ../install_steps_interactive.pm_.c:683 msgid "Creating bootdisk" msgstr "Oppretter oppstartdiskett" -#: ../install_steps_interactive.pm_.c:695 +#: ../install_steps_interactive.pm_.c:690 msgid "Preparing bootloader" msgstr "Klargj�r oppstartslaster" -#: ../install_steps_interactive.pm_.c:707 +#: ../install_steps_interactive.pm_.c:702 msgid "First sector of boot partition" msgstr "F�rste sektor av oppstartspartisjon" -#: ../install_steps_interactive.pm_.c:707 +#: ../install_steps_interactive.pm_.c:702 msgid "First sector of drive (MBR)" msgstr "F�rste sektor av disk (MBR)" -#: ../install_steps_interactive.pm_.c:711 +#: ../install_steps_interactive.pm_.c:706 msgid "LILO Installation" msgstr "LILO-installasjon" -#: ../install_steps_interactive.pm_.c:712 +#: ../install_steps_interactive.pm_.c:707 msgid "Where do you want to install the bootloader?" msgstr "Hvor vil du installere oppstartslasteren?" -#: ../install_steps_interactive.pm_.c:715 +#: ../install_steps_interactive.pm_.c:710 msgid "Do you want to use LILO?" msgstr "�nsker du � bruke LILO?" -#: ../install_steps_interactive.pm_.c:718 +#: ../install_steps_interactive.pm_.c:713 msgid "Boot device" msgstr "Oppstartsenhet" -#: ../install_steps_interactive.pm_.c:719 +#: ../install_steps_interactive.pm_.c:714 msgid "Linear (needed for some SCSI drives)" msgstr "Line�r (beh�ves av noen SCSI-disker)" -#: ../install_steps_interactive.pm_.c:719 +#: ../install_steps_interactive.pm_.c:714 msgid "linear" msgstr "line�r" -#: ../install_steps_interactive.pm_.c:720 +#: ../install_steps_interactive.pm_.c:715 msgid "Compact" msgstr "Kompakt" -#: ../install_steps_interactive.pm_.c:720 +#: ../install_steps_interactive.pm_.c:715 msgid "compact" msgstr "kompakt" -#: ../install_steps_interactive.pm_.c:721 +#: ../install_steps_interactive.pm_.c:716 msgid "Delay before booting default image" msgstr "Forsinkelse f�r oppstart av standard bilde" -#: ../install_steps_interactive.pm_.c:722 +#: ../install_steps_interactive.pm_.c:717 msgid "Video mode" msgstr "Skjerm-modus" -#: ../install_steps_interactive.pm_.c:725 +#: ../install_steps_interactive.pm_.c:720 msgid "Restrict command line options" msgstr "Begrense kommandolinje-opsjoner" -#: ../install_steps_interactive.pm_.c:725 +#: ../install_steps_interactive.pm_.c:720 msgid "restrict" msgstr "begrense" -#: ../install_steps_interactive.pm_.c:732 +#: ../install_steps_interactive.pm_.c:726 msgid "LILO main options" msgstr "LILO hovedopsjoner" -#: ../install_steps_interactive.pm_.c:736 +#: ../install_steps_interactive.pm_.c:728 msgid "" "At this level of security, a password (and a good one) in lilo is requested" msgstr "P� dette sikkerhetsniv�et anmodes et passord (og et godt et) i lilo" -#: ../install_steps_interactive.pm_.c:737 +#: ../install_steps_interactive.pm_.c:729 msgid "" "Option ``Restrict command line options'' is of no use without a password" msgstr "" "Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord" -#: ../install_steps_interactive.pm_.c:746 +#: ../install_steps_interactive.pm_.c:738 msgid "" "Here are the following entries in LILO.\n" "You can add some more or change the existent ones." @@ -2367,125 +2388,121 @@ msgstr "" "Her er f�lgende oppf�ringer i LILO\n" "Du kan legge til noen flere eller endre de eksisterende." -#: ../install_steps_interactive.pm_.c:748 +#: ../install_steps_interactive.pm_.c:740 msgid "Add" msgstr "Legg til" -#: ../install_steps_interactive.pm_.c:766 +#: ../install_steps_interactive.pm_.c:758 msgid "Image" msgstr "Bilde" +#: ../install_steps_interactive.pm_.c:759 #: ../install_steps_interactive.pm_.c:767 -#: ../install_steps_interactive.pm_.c:775 msgid "Root" msgstr "Root" -#: ../install_steps_interactive.pm_.c:768 +#: ../install_steps_interactive.pm_.c:760 msgid "Append" msgstr "Tilf�ye" -#: ../install_steps_interactive.pm_.c:769 +#: ../install_steps_interactive.pm_.c:761 msgid "Initrd" msgstr "Initrd" -#: ../install_steps_interactive.pm_.c:770 +#: ../install_steps_interactive.pm_.c:762 msgid "Read-write" msgstr "Les-skriv" -#: ../install_steps_interactive.pm_.c:776 +#: ../install_steps_interactive.pm_.c:768 msgid "Table" msgstr "Tabell" -#: ../install_steps_interactive.pm_.c:777 +#: ../install_steps_interactive.pm_.c:769 msgid "Unsafe" msgstr "Usikker" -#: ../install_steps_interactive.pm_.c:782 +#: ../install_steps_interactive.pm_.c:774 msgid "Label" msgstr "Etikett" -#: ../install_steps_interactive.pm_.c:784 +#: ../install_steps_interactive.pm_.c:776 msgid "Default" msgstr "Standard" -#: ../install_steps_interactive.pm_.c:803 +#: ../install_steps_interactive.pm_.c:795 msgid "Installation of LILO failed. The following error occured:" msgstr "Installasjon av LILO mislykket. F�lgende feil oppsto:" -#: ../install_steps_interactive.pm_.c:813 +#: ../install_steps_interactive.pm_.c:805 msgid "Windows(TM)" msgstr "Windows(TM)" -#: ../install_steps_interactive.pm_.c:814 +#: ../install_steps_interactive.pm_.c:806 msgid "Poor" msgstr "" -#: ../install_steps_interactive.pm_.c:815 +#: ../install_steps_interactive.pm_.c:807 msgid "Low" msgstr "Lav" -#: ../install_steps_interactive.pm_.c:816 +#: ../install_steps_interactive.pm_.c:808 msgid "Medium" msgstr "Medium" -#: ../install_steps_interactive.pm_.c:817 +#: ../install_steps_interactive.pm_.c:809 msgid "High" msgstr "H�y" -#: ../install_steps_interactive.pm_.c:818 +#: ../install_steps_interactive.pm_.c:810 msgid "Paranoid" msgstr "Paranoid" -#: ../install_steps_interactive.pm_.c:831 +#: ../install_steps_interactive.pm_.c:818 msgid "Miscellaneous questions" msgstr "Forskjellige sp�rsm�l" -#: ../install_steps_interactive.pm_.c:832 +#: ../install_steps_interactive.pm_.c:819 msgid "Do you have a laptop?" msgstr "Har du en b�rbar maskin?" -#: ../install_steps_interactive.pm_.c:833 +#: ../install_steps_interactive.pm_.c:820 msgid "Use hard drive optimizations" msgstr "Bruk harddisk-optimisering" -#: ../install_steps_interactive.pm_.c:834 +#: ../install_steps_interactive.pm_.c:821 msgid "Security level" msgstr "Sikkerhetsniv�" -#: ../install_steps_interactive.pm_.c:835 +#: ../install_steps_interactive.pm_.c:822 msgid "HTTP proxy" msgstr "HTTP-proxy" -#: ../install_steps_interactive.pm_.c:836 +#: ../install_steps_interactive.pm_.c:823 msgid "FTP proxy" msgstr "FTP-proxy" -#: ../install_steps_interactive.pm_.c:837 -msgid "Use kudzu" -msgstr "Bruk kudzu" - -#: ../install_steps_interactive.pm_.c:838 +#: ../install_steps_interactive.pm_.c:825 #, c-format msgid "Precise ram size (found %d MB)" msgstr "N�yaktig ram-st�rrelse (funnet %d MB)" -#: ../install_steps_interactive.pm_.c:841 +#: ../install_steps_interactive.pm_.c:828 msgid "(may cause disk problems)" msgstr "(kan for�rsake diskproblemer)" -#: ../install_steps_interactive.pm_.c:849 +#: ../install_steps_interactive.pm_.c:836 msgid "Proxy should be http://..." msgstr "Proxy burde v�re http://..." -#: ../install_steps_interactive.pm_.c:850 +#: ../install_steps_interactive.pm_.c:837 msgid "Proxy should be ftp://..." msgstr "Proxy burde v�re ftp://..." -#: ../install_steps_interactive.pm_.c:851 +#: ../install_steps_interactive.pm_.c:838 msgid "Give the ram size in Mb" msgstr "" -#: ../install_steps_interactive.pm_.c:864 +#: ../install_steps_interactive.pm_.c:851 msgid "" "Some steps are not completed.\n" "\n" @@ -2495,7 +2512,7 @@ msgstr "" "\n" "�nsker du virkelig � slutte n�?" -#: ../install_steps_interactive.pm_.c:871 +#: ../install_steps_interactive.pm_.c:858 msgid "" "Congratulations, installation is complete.\n" "Remove the boot media and press return to reboot.\n" @@ -2517,22 +2534,22 @@ msgstr "" "Informasjon om konfigurering av systemet ditt finnes i post\n" "install-kapittelet i Official Linux Mandrake User's Guide." -#: ../install_steps_interactive.pm_.c:890 +#: ../install_steps_interactive.pm_.c:877 #, c-format msgid "Installing driver for %s card %s" msgstr "Installerer driver for %s kort %s" -#: ../install_steps_interactive.pm_.c:891 +#: ../install_steps_interactive.pm_.c:878 #, c-format msgid "(module %s)" msgstr "(modul %s)" -#: ../install_steps_interactive.pm_.c:901 +#: ../install_steps_interactive.pm_.c:888 #, c-format msgid "What %s card do you have?" msgstr "Hvilket %s kort har du?" -#: ../install_steps_interactive.pm_.c:908 +#: ../install_steps_interactive.pm_.c:895 #, c-format msgid "" "In some cases, the %s driver needs to have extra information to work\n" @@ -2552,20 +2569,20 @@ msgstr "" "for�rsake\n" "for�rsake noen skade." -#: ../install_steps_interactive.pm_.c:913 +#: ../install_steps_interactive.pm_.c:900 msgid "Autoprobe" msgstr "Automatisk sondering" -#: ../install_steps_interactive.pm_.c:913 +#: ../install_steps_interactive.pm_.c:900 msgid "Specify options" msgstr "Spesifiser opsjoner" -#: ../install_steps_interactive.pm_.c:917 +#: ../install_steps_interactive.pm_.c:904 #, c-format msgid "You may now provide its options to module %s." msgstr "Du kan n� gi dens opsjoner til modul %s." -#: ../install_steps_interactive.pm_.c:923 +#: ../install_steps_interactive.pm_.c:910 #, c-format msgid "" "You may now provide its options to module %s.\n" @@ -2576,11 +2593,11 @@ msgstr "" "Opsjonene er i format ``name=value name2=value2 ...''.\n" "F.eks., ``io=0x300 irq=7''" -#: ../install_steps_interactive.pm_.c:926 +#: ../install_steps_interactive.pm_.c:913 msgid "Module options:" msgstr "Modulopsjoner:" -#: ../install_steps_interactive.pm_.c:936 +#: ../install_steps_interactive.pm_.c:923 #, c-format msgid "" "Loading module %s failed.\n" @@ -2589,48 +2606,48 @@ msgstr "" "Lasting av modul %s feilet.\n" "�nsker du � pr�ve igjen med andre parametere?" -#: ../install_steps_interactive.pm_.c:949 +#: ../install_steps_interactive.pm_.c:936 #, c-format msgid "Skip %s PCMCIA probing" msgstr "Dropp %s PCMCIA-sondering" -#: ../install_steps_interactive.pm_.c:950 +#: ../install_steps_interactive.pm_.c:937 msgid "Configuring PCMCIA cards..." msgstr "Konfigurerer PCMCIA-kort..." -#: ../install_steps_interactive.pm_.c:950 +#: ../install_steps_interactive.pm_.c:937 msgid "PCMCIA" msgstr "PCMCIA" -#: ../install_steps_interactive.pm_.c:957 +#: ../install_steps_interactive.pm_.c:944 msgid "Try to find PCI devices?" msgstr "" -#: ../install_steps_interactive.pm_.c:961 +#: ../install_steps_interactive.pm_.c:948 #, c-format msgid "Found %s %s interfaces" msgstr "Fant %s %s grensesnitt" -#: ../install_steps_interactive.pm_.c:962 +#: ../install_steps_interactive.pm_.c:949 msgid "Do you have another one?" msgstr "Har du enda ett?" -#: ../install_steps_interactive.pm_.c:963 +#: ../install_steps_interactive.pm_.c:950 #, c-format msgid "Do you have an %s interface?" msgstr "Har du et %s grensesnitt?" -#: ../install_steps_interactive.pm_.c:965 ../interactive.pm_.c:52 +#: ../install_steps_interactive.pm_.c:952 ../interactive.pm_.c:52 #: ../my_gtk.pm_.c:435 msgid "No" msgstr "Nei" -#: ../install_steps_interactive.pm_.c:965 ../interactive.pm_.c:52 +#: ../install_steps_interactive.pm_.c:952 ../interactive.pm_.c:52 #: ../my_gtk.pm_.c:435 msgid "Yes" msgstr "Ja" -#: ../install_steps_interactive.pm_.c:966 +#: ../install_steps_interactive.pm_.c:953 msgid "See hardware info" msgstr "Se maskinvareinfo" @@ -2639,7 +2656,7 @@ msgstr "Se maskinvareinfo" msgid "Cancel" msgstr "Avbryt" -#: ../interactive.pm_.c:149 +#: ../interactive.pm_.c:159 msgid "Please wait" msgstr "Vennligst vent" @@ -2911,6 +2928,15 @@ msgstr "Microsoft Bus Mouse" msgid "Logitech Bus Mouse" msgstr "Logitech Bus Mouse" +#: ../mouse.pm_.c:48 +#, fuzzy +msgid "USB Mouse" +msgstr "Ingen mus" + +#: ../mouse.pm_.c:49 +msgid "USB Mouse (3 buttons or more)" +msgstr "" + #: ../partition_table.pm_.c:449 msgid "" "You have a hole in your partition table but I can't use it.\n" @@ -2956,6 +2982,19 @@ msgstr "SMB/Windows 95/98/NT" msgid "NetWare" msgstr "NetWare" +#~ msgid "" +#~ "I can't access the kernel with frame buffer support.\n" +#~ "Disabling automatic X11 startup if any." +#~ msgstr "" +#~ "Jeg f�r ikke tilgang til kjernen med frame-buffer st�tte.\n" +#~ "Sl� av automatisk X11 oppstart hvis dette finnes." + +#~ msgid "Password (again):" +#~ msgstr "Passord (igjen):" + +#~ msgid "Use kudzu" +#~ msgstr "Bruk kudzu" + #~ msgid "X successfully configured" #~ msgstr "Konfigurasjon av X vellykket" diff --git a/perl-install/share/themes-marble3d.rc b/perl-install/share/themes-marble3d.rc index 2199b2b75..dd6e5e283 100644 --- a/perl-install/share/themes-marble3d.rc +++ b/perl-install/share/themes-marble3d.rc @@ -82,12 +82,14 @@ style "window" style "any" { + text[NORMAL] = { 0.00, 0.00, 0.00 } fg[NORMAL] = { 0.00, 0.00, 0.00 } fg[PRELIGHT] = { 0.25, 0.25, 0.25 } fg[ACTIVE] = { 0.00, 0.00, 0.00 } fg[SELECTED] = { 0.00, 0.00, 0.00 } fg[INSENSITIVE] = { 0.50, 0.50, 0.50 } + base[NORMAL] = { 0.75, 0.75, 0.75 } bg[NORMAL] = { 0.80, 0.80, 0.80 } bg[PRELIGHT] = { 0.85, 0.85, 0.85 } bg[ACTIVE] = { 0.90, 0.90, 0.90 } |