diff options
Diffstat (limited to 'perl-install')
-rw-r--r-- | perl-install/Xconfigurator.pm | 2 | ||||
-rw-r--r-- | perl-install/commands.pm | 9 | ||||
-rw-r--r-- | perl-install/common.pm | 37 | ||||
-rw-r--r-- | perl-install/detect_devices.pm | 6 | ||||
-rw-r--r-- | perl-install/install_any.pm | 20 | ||||
-rw-r--r-- | perl-install/install_steps.pm | 4 | ||||
-rw-r--r-- | perl-install/printer.pm | 4 | ||||
-rw-r--r-- | perl-install/share/po/DrakX.pot | 2 | ||||
-rw-r--r-- | perl-install/share/po/no.po | 1018 |
9 files changed, 625 insertions, 477 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 14aa8ac28..d4cdc55ad 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -451,6 +451,8 @@ sub chooseResolutionsGtk($$;$) { } sub chooseResolutions($$;$) { + goto &chooseResolutionsGtk if ref($in) =~ /gtk/; + my ($card, $chosen_depth, $chosen_w) = @_; my $best_w; diff --git a/perl-install/commands.pm b/perl-install/commands.pm index a739452b0..f4ed2d870 100644 --- a/perl-install/commands.pm +++ b/perl-install/commands.pm @@ -492,9 +492,12 @@ sub lspci { } sub dmesg { print cat_("/tmp/syslog"); } +my %cached_failed_install_cpio; +#- double space between sub and install_cpio cuz install_cpio is not a shell command sub install_cpio($$) { my ($dir, $name) = @_; + return if $cached_failed_install_cpio{"$dir $name"}; return "$dir/$name" if -e "$dir/$name"; my $cpio = "$dir.cpio.bz2"; @@ -503,8 +506,10 @@ sub install_cpio($$) { eval { rm("-r", $dir) }; mkdir $dir, 0755; require 'run_program.pm'; - run_program::run("cd $dir ; bzip2 -cd $cpio | cpio -id $name $name/*"); - "$dir/$name"; + run_program::run("cd $dir ; bzip2 -cd $cpio | cpio -id $name $name/*") and return "$dir/$name"; + + #- not found, cache result + $cached_failed_install_cpio{"$dir $name"} = 1; } #-###################################################################################### diff --git a/perl-install/common.pm b/perl-install/common.pm index 59e32bd61..b1133b4ca 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -9,7 +9,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $printable_chars $sizeof_int $bitof_int common => [ qw(__ even odd min max sqr sum sign product bool invbool listlength bool2text text2bool to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX formatLines) ], functional => [ qw(fold_left compose map_index grep_index map_each grep_each map_tab_hash mapn mapn_ difference2 before_leaving catch_cdie cdie) ], file => [ qw(dirname basename touch all glob_ cat_ symlinkf chop_ mode typeFromMagic) ], - system => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ salt getVarsFromSh setVarsInSh setVarsInCsh substInFile availableRam availableMemory removeXiBSuffix) ], + system => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ salt getVarsFromSh setVarsInSh setVarsInCsh substInFile availableRam availableMemory removeXiBSuffix template2file) ], constant => [ qw($printable_chars $sizeof_int $bitof_int $SECTORSIZE) ], ); @EXPORT_OK = map { @$_ } values %EXPORT_TAGS; @@ -237,17 +237,13 @@ sub unmakedev { $_[0] >> 8, $_[0] & 0xff } sub translate { my ($s) = @_; - my ($lang) = substr($ENV{LC_ALL} || $ENV{LANGUAGE} || $ENV{LC_MESSAGES} || $ENV{LANG} || '', 0, 2); - - if ($lang) { - require 'lang.pm'; - lang::load_po ($lang) unless defined $po::I18N::{$lang}; #- the space if needed to mislead perl2fcalls (as lang is not included here) - $po::I18N::{$lang} or return $s; - my $l = *{$po::I18N::{$lang}}; - $l->{$s} || $s; - } else { - $s; #- should avoid some strange behaviour if no lang defined. - } + my ($lang) = substr($ENV{LC_ALL} || $ENV{LANGUAGE} || $ENV{LC_MESSAGES} || $ENV{LANG} || 'us', 0, 2); + + require 'lang.pm'; + lang::load_po ($lang) unless defined $po::I18N::{$lang}; #- the space if needed to mislead perl2fcalls (as lang is not included here) + $po::I18N::{$lang} or return $s; + my $l = *{$po::I18N::{$lang}}; + $l->{$s} || $s; } sub untranslate($@) { @@ -344,6 +340,23 @@ sub setVarsInCsh { $l->{$_} and print F "setenv $_ $l->{$_}\n" foreach @fields; } +sub template2file($$%) { + my ($inputfile, $outputfile, %toreplace) = @_; + local *OUT; local *IN; + + open IN , $inputfile or die "Can't open $inputfile $!"; + if ($::testing) { + *OUT = *STDOUT; + } else { + open OUT, ">$outputfile" or die "Can't open $outputfile $!"; + } + + while (<IN>) { + s/@@@(.*?)@@@/$toreplace{$1}/g; + print OUT; + } +} + sub substInFile(&@) { my $f = shift; local @ARGV = @_ or return; diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index d932b4922..8bee5e612 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -218,6 +218,12 @@ sub hasModem($) { $probe{CLASS} =~ /Modem/i && $probe{DESCRIPTION}; } +sub hasMousePS2() { + my $f = detect_devices::tryOpen("psaux"); + my $t; sysread($f, $t, 256) or return; + $t eq "\xFE"; +} + #-###################################################################################### #- Wonderful perl :( #-###################################################################################### diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 633e9d6c6..654e703b3 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -422,23 +422,3 @@ sub fsck_option() { my $y = $::o->{security} < 3 && $::beginner && "-y "; substInFile { s/^(\s*fsckoptions=)(-y )?/$1$y/ } "$::o->{prefix}/etc/rc.d/rc.sysinit"; } - -sub translate_file($$%) { - my ($inputfile, $outputfile, %toreplace) = @_; - local *OUT; local *IN; - - open IN , $inputfile or die "Can't open $inputfile $!"; - if ($::testing) { - *OUT = *STDOUT; - } else { - open OUT, ">$outputfile" or die "Can't open $outputfile $!"; - } - - while (<IN>) { - if (/@@@(.*)@@@/) { - my $r = $toreplace{$1}; - s/@@@(.*)@@@/$r/g; - } - print OUT; - } -} diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 3e14faa07..6bcdf4d69 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -259,8 +259,8 @@ sub pppConfig { $toreplace{phone} =~ s/[^\d]//g; $toreplace{dnsserver} = ($o->{modem}{dns1} && "$o->{modem}{dns1},") . ($o->{modem}{dns2} && "$o->{modem}{dns2},"); $toreplace{exdnsdisabled} = $o->{modem}{exdnsdisabled} ? 1 : 0; - install_any::translate_file("/usr/share/kppprc.in" ,"$o->{prefix}/root/.kde/share/config/kppprc", %toreplace); - install_any::translate_file("/usr/share/kppprc.in" ,"$o->{prefix}/etc/skel/.kde/share/config/kppprc", %toreplace); + template2file("/usr/share/kppprc.in" ,"$o->{prefix}/root/.kde/share/config/kppprc", %toreplace); + template2file("/usr/share/kppprc.in" ,"$o->{prefix}/etc/skel/.kde/share/config/kppprc", %toreplace); } #------------------------------------------------------------------------------ diff --git a/perl-install/printer.pm b/perl-install/printer.pm index cf7d52cbb..abc97e526 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -44,7 +44,7 @@ use Data::Dumper; =cut -use common qw(:common); +use common qw(:common :system); use commands; #-##################################################################################### @@ -355,7 +355,7 @@ sub create_spool_dir($) { #------------------------------------------------------------------------------ sub create_config_file($$%) { my ($inputfile, $outputfile, %toreplace) = @_; - install_any::translate_file("$prefix/$inputfile", "$prefix/$outputfile", %toreplace); + template2file("$prefix/$inputfile", "$prefix/$outputfile", %toreplace); } diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index f780fa477..2cef255d0 100644 --- a/perl-install/share/po/DrakX.pot +++ b/perl-install/share/po/DrakX.pot @@ -111,7 +111,7 @@ msgstr "" msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-11-06 10:58+0100\n" +"POT-Creation-Date: 1999-11-06 11:41+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" diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po index c7025871c..64dd3c361 100644 --- a/perl-install/share/po/no.po +++ b/perl-install/share/po/no.po @@ -1,35 +1,20 @@ -# Translation file of Mandrake graphic install -# Copyright (C) 1999 Mandrakesoft -# Terje Bjerkelia <terje@bjerkelia.com>, 1999 -# -msgid "" -msgstr "" -"Project-Id-Version: DrakX VERSION\n" -"POT-Creation-Date: 1999-11-02 20:54+0100\n" -"PO-Revision-Date: 1999-08-25 11:07+0200\n" -"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n" -"Language-Team: norwegian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../Xconfigurator.pm_.c:158 +#: ../Xconfigurator.pm_.c:159 msgid "Select a graphic card" msgstr "Velg et grafikk-kort" -#: ../Xconfigurator.pm_.c:159 +#: ../Xconfigurator.pm_.c:160 msgid "Choose a X server" msgstr "Velg en X-tjener" -#: ../Xconfigurator.pm_.c:178 +#: ../Xconfigurator.pm_.c:179 msgid "Select the memory size of your graphic card" msgstr "Velg minnest�rrelsen til grafikk-kortet ditt" -#: ../Xconfigurator.pm_.c:199 +#: ../Xconfigurator.pm_.c:200 msgid "Choose a monitor" msgstr "Velg en monitor" -#: ../Xconfigurator.pm_.c:202 +#: ../Xconfigurator.pm_.c:203 msgid "" "The two critical parameters are the vertical refresh rate, which is the " "rate\n" @@ -53,39 +38,39 @@ msgstr "" "skjermen din.\n" "Hvis du er usikker, velg en konservativ innstilling." -#: ../Xconfigurator.pm_.c:209 +#: ../Xconfigurator.pm_.c:210 msgid "Horizontal refresh rate" msgstr "Horisontal oppfrisknings-rate" -#: ../Xconfigurator.pm_.c:209 +#: ../Xconfigurator.pm_.c:210 msgid "Vertical refresh rate" msgstr "Vertikal oppfrisknings-rate" -#: ../Xconfigurator.pm_.c:249 +#: ../Xconfigurator.pm_.c:250 msgid "Monitor not configured" msgstr "Monitor er ikke konfigurert" -#: ../Xconfigurator.pm_.c:252 +#: ../Xconfigurator.pm_.c:253 msgid "Graphic card not configured yet" msgstr "Grafikk-kort er ikke konfigurert enn�" -#: ../Xconfigurator.pm_.c:255 +#: ../Xconfigurator.pm_.c:256 msgid "Resolutions not chosen yet" msgstr "Oppl�sninger er ikke valgt enn�" -#: ../Xconfigurator.pm_.c:264 +#: ../Xconfigurator.pm_.c:265 msgid "Do you want to test the configuration?" msgstr "Vil du teste konfigurasjonen?" -#: ../Xconfigurator.pm_.c:264 +#: ../Xconfigurator.pm_.c:265 msgid "Test configuration" msgstr "Test konfigurasjon" -#: ../Xconfigurator.pm_.c:294 +#: ../Xconfigurator.pm_.c:295 msgid "An error occurred:" msgstr "En feil oppsto:" -#: ../Xconfigurator.pm_.c:296 +#: ../Xconfigurator.pm_.c:297 msgid "" "\n" "try changing some parameters" @@ -93,24 +78,24 @@ msgstr "" "\n" "pr�v � endre noen parametere" -#: ../Xconfigurator.pm_.c:317 ../t2.pm_.c:15 +#: ../Xconfigurator.pm_.c:318 ../t2.pm_.c:15 #, c-format msgid "(leaving in %d seconds)" msgstr "(slutter om %d sekunder)" -#: ../Xconfigurator.pm_.c:321 ../my_gtk.pm_.c:431 ../t2.pm_.c:19 +#: ../Xconfigurator.pm_.c:322 ../my_gtk.pm_.c:436 ../t2.pm_.c:19 msgid "Is this correct?" msgstr "Er dette riktig?" -#: ../Xconfigurator.pm_.c:329 +#: ../Xconfigurator.pm_.c:330 msgid "An error occurred, try changing some parameters" msgstr "En feil oppsto, pr�v � endre noen parametere" -#: ../Xconfigurator.pm_.c:337 ../Xconfigurator.pm_.c:492 +#: ../Xconfigurator.pm_.c:338 ../Xconfigurator.pm_.c:505 msgid "Automatic resolutions" msgstr "Automatiske oppl�sninger" -#: ../Xconfigurator.pm_.c:338 +#: ../Xconfigurator.pm_.c:339 msgid "" "To find the available resolutions I will try different ones.\n" "Your screen will blink...\n" @@ -120,20 +105,35 @@ 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:391 ../install_steps_interactive.pm_.c:469 -#: ../install_steps_interactive.pm_.c:470 +#: ../Xconfigurator.pm_.c:392 ../install_steps_interactive.pm_.c:545 msgid "Resolution" msgstr "Oppl�sning" -#: ../Xconfigurator.pm_.c:425 +#: ../Xconfigurator.pm_.c:427 msgid "Choose resolution and color depth" msgstr "Velg oppl�sning og fargedybde" -#: ../Xconfigurator.pm_.c:433 +#: ../Xconfigurator.pm_.c:435 msgid "Show all" msgstr "Vis alle" -#: ../Xconfigurator.pm_.c:493 +# Translation file of Mandrake graphic install +# Copyright (C) 1999 Mandrakesoft +# Terje Bjerkelia <terje@bjerkelia.com>, 1999 +# +#: ../Xconfigurator.pm_.c:459 +msgid "" +msgstr "" +"Project-Id-Version: DrakX VERSION\n" +"POT-Creation-Date: 1999-11-06 11:41+0100\n" +"PO-Revision-Date: 1999-08-25 11:07+0200\n" +"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n" +"Language-Team: norwegian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../Xconfigurator.pm_.c:506 msgid "" "I can try to find the available resolutions (eg: 800x600).\n" "Sometimes, though, it may hang the machine.\n" @@ -143,7 +143,7 @@ msgstr "" "Noen ganger kan dette for�rsake at maskinen stopper opp.\n" "�nsker du � pr�ve?" -#: ../Xconfigurator.pm_.c:498 +#: ../Xconfigurator.pm_.c:511 msgid "" "No valid modes found\n" "Try with another video card or monitor" @@ -151,88 +151,88 @@ msgstr "" "Ingen gyldige modus funnet\n" "Pr�v med et annet skjermkort eller monitor" -#: ../Xconfigurator.pm_.c:686 +#: ../Xconfigurator.pm_.c:699 #, c-format msgid "Keyboard layout: %s\n" msgstr "Tastatur-oppsett: %s\n" -#: ../Xconfigurator.pm_.c:687 +#: ../Xconfigurator.pm_.c:700 #, c-format msgid "Mouse type: %s\n" msgstr "Type mus: %s\n" -#: ../Xconfigurator.pm_.c:688 +#: ../Xconfigurator.pm_.c:701 #, c-format msgid "Mouse device: %s\n" msgstr "Enhet mus: %s\n" -#: ../Xconfigurator.pm_.c:689 +#: ../Xconfigurator.pm_.c:702 #, c-format msgid "Monitor: %s\n" msgstr "Monitor: %s\n" -#: ../Xconfigurator.pm_.c:690 +#: ../Xconfigurator.pm_.c:703 #, c-format msgid "Monitor HorizSync: %s\n" msgstr "Monitor HorizSync: %s\n" -#: ../Xconfigurator.pm_.c:691 +#: ../Xconfigurator.pm_.c:704 #, c-format msgid "Monitor VertRefresh: %s\n" msgstr "Monitor VertRefresh: %s\n" -#: ../Xconfigurator.pm_.c:692 +#: ../Xconfigurator.pm_.c:705 #, c-format msgid "Graphic card: %s\n" msgstr "Grafikk-kort: %s\n" -#: ../Xconfigurator.pm_.c:693 +#: ../Xconfigurator.pm_.c:706 #, c-format msgid "Graphic memory: %s kB\n" msgstr "Minne grafikk: %s kB\n" -#: ../Xconfigurator.pm_.c:694 +#: ../Xconfigurator.pm_.c:707 #, c-format msgid "XFree86 server: %s\n" msgstr "XFree86-tjener: %s\n" -#: ../Xconfigurator.pm_.c:719 +#: ../Xconfigurator.pm_.c:732 msgid "Change Monitor" msgstr "Endre monitor" -#: ../Xconfigurator.pm_.c:720 +#: ../Xconfigurator.pm_.c:733 msgid "Change Graphic card" msgstr "Endre grafikk-kort" -#: ../Xconfigurator.pm_.c:721 +#: ../Xconfigurator.pm_.c:734 msgid "Change Resolution" msgstr "Endre oppl�sning" -#: ../Xconfigurator.pm_.c:722 +#: ../Xconfigurator.pm_.c:735 msgid "Automatical resolutions search" msgstr "Automatisk oppl�sningss�k" -#: ../Xconfigurator.pm_.c:726 +#: ../Xconfigurator.pm_.c:739 msgid "Show information" msgstr "Vis informasjon" -#: ../Xconfigurator.pm_.c:727 +#: ../Xconfigurator.pm_.c:740 msgid "Test again" msgstr "Test igjen" -#: ../Xconfigurator.pm_.c:728 +#: ../Xconfigurator.pm_.c:741 msgid "Quit" msgstr "Avslutt" -#: ../Xconfigurator.pm_.c:731 +#: ../Xconfigurator.pm_.c:744 msgid "What do you want to do?" msgstr "Hva vil du gj�re?" -#: ../Xconfigurator.pm_.c:736 +#: ../Xconfigurator.pm_.c:749 msgid "X at startup" msgstr "X ved oppstart" -#: ../Xconfigurator.pm_.c:737 +#: ../Xconfigurator.pm_.c:750 msgid "" "I can set up your computer to automatically start X upon booting.\n" "Would you like X to start when you reboot?" @@ -240,36 +240,6 @@ msgstr "" "Jeg kan sette opp maskinen din til � automatisk starte X ved oppstart.\n" "Vil du at X skal starte n�r du starter maskinen p� nytt?" -#: ../Xconfigurator.pm_.c:742 -msgid "X successfully configured" -msgstr "Konfigurasjon av X vellykket" - -#: ../Xconfigurator.pm_.c:743 -msgid "" -"Configuration file has been written. Take a look at it before running " -"'startx'.\n" -"\n" -"Within the server, press Ctrl, Alt and '+' simultaneously to cycle through " -"video resolutions.\n" -"\n" -"Pressing Ctrl, Alt and Backspace simultaneously immediately exits the " -"server\n" -"\n" -"For further configuration, refer to /usr/X11R6/lib/X11/doc/README.Config.\n" -"\n" -msgstr "" -"Konfigurasjonsfil har blitt skrevet. Ta en kikk p� den f�r du kj�rer " -"'startx'.\n" -"\n" -"Inne i tjeneren trykk Ctrl, Alt og '+' samtidig for � g� igjennom " -"forskjellige oppl�sninger.\n" -"\n" -"Ved � trykke Ctrl, Alt og Backspace samtidig vil tjeneren avslutte " -"umiddelbart\n" -"\n" -"For ytterligere konfigurasjon, se /usr/X11R6/lib/X11/doc/README.Config.\n" -"\n" - #: ../Xconfigurator_consts.pm_.c:4 msgid "256 colors" msgstr "256 farger" @@ -382,15 +352,15 @@ msgstr "Slett" msgid "Format" msgstr "Formater" -#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:388 +#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:398 msgid "Move" msgstr "Flytt" -#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:446 +#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:456 msgid "Resize" msgstr "Endre st�rrelse" -#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:335 +#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:345 msgid "Type" msgstr "Type" @@ -426,8 +396,9 @@ msgstr "Gjenopprett fra diskett" msgid "Save on floppy" msgstr "Lagre p� diskett" -#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:569 -#: ../install_steps_interactive.pm_.c:684 +#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:513 +#: ../install_steps_interactive.pm_.c:636 +#: ../install_steps_interactive.pm_.c:752 msgid "Done" msgstr "Ferdig" @@ -512,7 +483,7 @@ msgstr "Detaljer" msgid "After %s partition %s," msgstr "Etter %s partisjon %s," -#: ../diskdrake.pm_.c:127 ../diskdrake.pm_.c:378 ../diskdrake.pm_.c:406 +#: ../diskdrake.pm_.c:127 ../diskdrake.pm_.c:388 ../diskdrake.pm_.c:416 msgid "Read carefully!" msgstr "Les n�ye!" @@ -521,12 +492,12 @@ 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:170 ../install_steps.pm_.c:70 -#: ../install_steps_interactive.pm_.c:38 +#: ../diskdrake.pm_.c:146 ../install_any.pm_.c:174 ../install_steps.pm_.c:70 +#: ../install_steps_interactive.pm_.c:39 msgid "Error" msgstr "Feil" -#: ../diskdrake.pm_.c:170 ../diskdrake.pm_.c:523 +#: ../diskdrake.pm_.c:170 ../diskdrake.pm_.c:533 msgid "Mount point: " msgstr "Monteringspunkt: " @@ -605,7 +576,7 @@ msgstr "Monter" msgid "Active" msgstr "Aktiv" -#: ../diskdrake.pm_.c:297 +#: ../diskdrake.pm_.c:307 msgid "" "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > " "1024).\n" @@ -617,7 +588,7 @@ msgstr "" "Enten bruker du LILO og denne ikke virker, eller du bruker ikke LILO og du " "trenger ikke /boot" -#: ../diskdrake.pm_.c:301 +#: ../diskdrake.pm_.c:311 msgid "" "The partition you've selected to add as root (/) is physically located " "beyond\n" @@ -630,123 +601,123 @@ msgstr "" "Hvis du skal bruke oppstartsh�ndtereren LILO, v�r n�ye med � legge til en\n" "/boot partisjon" -#: ../diskdrake.pm_.c:315 +#: ../diskdrake.pm_.c:325 msgid "Quit without saving" msgstr "Avslutt uten � lagre" -#: ../diskdrake.pm_.c:315 +#: ../diskdrake.pm_.c:325 msgid "Quit without writing the partition table?" msgstr "Avslutt uten � skrive partisjonstabellen?" -#: ../diskdrake.pm_.c:330 +#: ../diskdrake.pm_.c:340 msgid "changing type of" msgstr "endrer type av" -#: ../diskdrake.pm_.c:333 +#: ../diskdrake.pm_.c:343 msgid "Change partition type" msgstr "Endre partisjonstype" -#: ../diskdrake.pm_.c:334 +#: ../diskdrake.pm_.c:344 msgid "Which partition type do you want?" msgstr "Hvilken partisjonstype �nsker du?" -#: ../diskdrake.pm_.c:350 +#: ../diskdrake.pm_.c:360 #, c-format msgid "Where do you want to mount device %s?" msgstr "Hvor vil du montere %s enheten?" -#: ../diskdrake.pm_.c:351 +#: ../diskdrake.pm_.c:361 msgid "Mount point" msgstr "Monteringspunkt" -#: ../diskdrake.pm_.c:372 +#: ../diskdrake.pm_.c:382 msgid "formatting" msgstr "formatering" -#: ../diskdrake.pm_.c:378 +#: ../diskdrake.pm_.c:388 msgid "After formatting all partitions," msgstr "Etter formatering av alle partisjonene," -#: ../diskdrake.pm_.c:378 +#: ../diskdrake.pm_.c:388 msgid "all data on these partitions will be lost" msgstr "alle data p� disse partisjonene vil g� tapt" -#: ../diskdrake.pm_.c:389 +#: ../diskdrake.pm_.c:399 msgid "Which disk do you want to move to?" msgstr "Hvilken disk vil du flytte til?" -#: ../diskdrake.pm_.c:393 +#: ../diskdrake.pm_.c:403 msgid "Sector" msgstr "Sektor" -#: ../diskdrake.pm_.c:394 +#: ../diskdrake.pm_.c:404 msgid "Which sector do you want to move to?" msgstr "Hvilken sektor vil du flytte til?" -#: ../diskdrake.pm_.c:397 +#: ../diskdrake.pm_.c:407 msgid "Moving" msgstr "Flytter" -#: ../diskdrake.pm_.c:397 +#: ../diskdrake.pm_.c:407 msgid "Moving partition..." msgstr "Flytter partisjon..." -#: ../diskdrake.pm_.c:406 +#: ../diskdrake.pm_.c:416 #, c-format msgid "Partition table of drive %s is going to be written to disk!" msgstr "Partisjonstabellen p� disk %s blir n� skrevet til disk!" -#: ../diskdrake.pm_.c:408 +#: ../diskdrake.pm_.c:418 msgid "You'll need to reboot before the modification can take place" msgstr "Du m� starte maskinen p� nytt for at modifiseringene skal tre i kraft" -#: ../diskdrake.pm_.c:429 +#: ../diskdrake.pm_.c:439 msgid "Computing fat filesystem bounds" msgstr "Beregner fat filsystemgrense" -#: ../diskdrake.pm_.c:429 ../diskdrake.pm_.c:474 +#: ../diskdrake.pm_.c:439 ../diskdrake.pm_.c:484 msgid "Resizing" msgstr "Endrer st�rrelse" -#: ../diskdrake.pm_.c:443 +#: ../diskdrake.pm_.c:453 msgid "resizing" msgstr "endrer st�rrelse" -#: ../diskdrake.pm_.c:453 +#: ../diskdrake.pm_.c:463 msgid "Choose the new size" msgstr "Velg den nye st�rrelsen" -#: ../diskdrake.pm_.c:453 ../install_steps_graphical.pm_.c:283 -#: ../install_steps_graphical.pm_.c:329 -#: ../unused/install_steps_graphical.pm_.c:313 +#: ../diskdrake.pm_.c:463 ../install_steps_graphical.pm_.c:283 +#: ../install_steps_graphical.pm_.c:330 +#: ../unused/install_steps_graphical.pm_.c:314 msgid "MB" msgstr "MB" -#: ../diskdrake.pm_.c:500 +#: ../diskdrake.pm_.c:510 msgid "Create a new partition" msgstr "Opprette en ny partisjon" -#: ../diskdrake.pm_.c:516 +#: ../diskdrake.pm_.c:526 msgid "Start sector: " msgstr "Start sektor: " -#: ../diskdrake.pm_.c:519 +#: ../diskdrake.pm_.c:529 msgid "Size in MB: " msgstr "St�rrelse i MB: " -#: ../diskdrake.pm_.c:522 +#: ../diskdrake.pm_.c:532 msgid "Filesystem type: " msgstr "Filsystemtype: " -#: ../diskdrake.pm_.c:524 +#: ../diskdrake.pm_.c:534 msgid "Preference: " msgstr "Valg: " -#: ../diskdrake.pm_.c:566 ../diskdrake.pm_.c:582 +#: ../diskdrake.pm_.c:576 ../diskdrake.pm_.c:592 msgid "Select file" msgstr "Velg fil" -#: ../diskdrake.pm_.c:575 +#: ../diskdrake.pm_.c:585 msgid "" "The backup partition table has not the same size\n" "Still continue?" @@ -754,11 +725,11 @@ msgstr "" "Sikkerhetskopien av partisjonstabellen har ikke samme st�rrelse\n" "Fortsette for det?" -#: ../diskdrake.pm_.c:583 +#: ../diskdrake.pm_.c:593 msgid "Warning" msgstr "Advarsel" -#: ../diskdrake.pm_.c:584 +#: ../diskdrake.pm_.c:594 msgid "" "Insert a floppy in drive\n" "All data on this floppy will be lost" @@ -766,7 +737,7 @@ msgstr "" "Sett inn en diskett i stasjonen\n" "Alle data p� denne disketten vil g� tapt" -#: ../diskdrake.pm_.c:598 +#: ../diskdrake.pm_.c:608 msgid "Trying to rescue partition table" msgstr "Pr�ver � redde partisjonstabell" @@ -820,6 +791,7 @@ msgid "You don't have any partitions!" msgstr "Du har ingen partisjoner!" #: ../help.pm_.c:7 +#, fuzzy msgid "" "\n" " <h1>Pixel's links</h1>\n" @@ -833,7 +805,6 @@ msgid "" " <a href=\"http://www.infoseek.com\">infoseek</a>,\n" " <a href=\"http://www.altavista.com\">altavista</a>,\n" " <a href=\"http://www.excite.com\">excite</a>\n" -" <img src=\"t.xpm\">\n" "\n" "\n" "Choose preferred language for install and system usage." @@ -855,11 +826,11 @@ msgstr "" "\n" "Velg �nsket spr�k for installering og systembruk." -#: ../help.pm_.c:25 ../help.pm_.c:263 +#: ../help.pm_.c:24 ../help.pm_.c:262 msgid "Choose the layout corresponding to your keyboard from the list above" msgstr "Velg oppsettet som stemmer med tastaturet ditt fra listen ovenfor" -#: ../help.pm_.c:28 ../help.pm_.c:266 +#: ../help.pm_.c:27 ../help.pm_.c:265 msgid "" "Choose \"Installation\" if there are no previous versions of Linux\n" "installed, or if you wish use to multiple distributions or versions.\n" @@ -876,7 +847,7 @@ msgstr "" "Velg \"Oppdater\" hvis du �nsker � oppdatere en tidligere versjon av\n" "Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) eller 6.0 (Venus)." -#: ../help.pm_.c:36 +#: ../help.pm_.c:35 msgid "" "Select:\n" "\n" @@ -911,7 +882,7 @@ msgstr "" " - Ekspert: Hvis du allerede kjenner GNU/Linux og �nsker � gj�re en\n" "egendefinert installasjon s� er dette installasjonsvalget for deg." -#: ../help.pm_.c:54 +#: ../help.pm_.c:53 msgid "" "DrakX will attempt at first to look for one or more PCI\n" "SCSI adapter(s). If it finds it (or them) and knows which driver(s)\n" @@ -959,7 +930,7 @@ msgstr "" "som foresl�tt i installasjonsguiden. Dette er opsjonene du vil trenge �\n" "gi til driveren." -#: ../help.pm_.c:78 ../help.pm_.c:313 +#: ../help.pm_.c:77 ../help.pm_.c:312 msgid "" "In this stage, you may choose what partition(s) use to install your\n" "Linux-Mandrake system." @@ -967,7 +938,7 @@ msgstr "" "P� dette punktet kan du velge hvilken partisjon(er) som skal brukes til\n" "� installere Linux-Mandrake systemet ditt." -#: ../help.pm_.c:100 ../help.pm_.c:335 +#: ../help.pm_.c:99 ../help.pm_.c:334 msgid "" "Any partitions that have been newly defined must be formatted for\n" "use (formatting meaning creating a filesystem). At this time, you may\n" @@ -983,7 +954,7 @@ msgstr "" "eksisterende partisjoner, is�r hvis de inneholder filer eller data som du\n" "�nsker � beholde. Typiske � beholde er: /home og /usr/local." -#: ../help.pm_.c:108 ../help.pm_.c:343 +#: ../help.pm_.c:107 ../help.pm_.c:342 msgid "" "You may now select the packages you wish to install.\n" "\n" @@ -1013,7 +984,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:123 ../help.pm_.c:358 +#: ../help.pm_.c:122 ../help.pm_.c:357 msgid "" "The packages selected are now being installed. This operation\n" "should only take a few minutes." @@ -1021,7 +992,7 @@ msgstr "" "Pakkene som er valgt blir n� installert. Denne operasjonen burde\n" "bare ta noen f� minutter." -#: ../help.pm_.c:127 ../help.pm_.c:362 +#: ../help.pm_.c:126 ../help.pm_.c:361 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" @@ -1048,7 +1019,7 @@ msgstr "" "Hvis du har en seriell mus, m� du ogs� fortelle DrakX hvilken\n" "serie-port den er koblet til." -#: ../help.pm_.c:141 ../help.pm_.c:376 +#: ../help.pm_.c:140 ../help.pm_.c:375 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" @@ -1091,12 +1062,12 @@ msgstr "" "adresser " # #: ../help.pm_.c:376 ../help.pm_.c:463 ../install2.pm_.c:65 -#: ../help.pm_.c:163 ../help.pm_.c:166 ../help.pm_.c:254 ../help.pm_.c:398 -#: ../help.pm_.c:401 ../help.pm_.c:489 ../install2.pm_.c:66 +#: ../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:67 msgid "Help" msgstr "Hjelp" -#: ../help.pm_.c:169 +#: ../help.pm_.c:168 msgid "" "Linux can deal with many types of printer. Each of these\n" "types require a different setup.\n" @@ -1143,7 +1114,7 @@ msgstr "" "en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n" "informasjon." -#: ../help.pm_.c:192 ../help.pm_.c:427 +#: ../help.pm_.c:191 ../help.pm_.c:426 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" @@ -1174,7 +1145,7 @@ msgstr "" "bli skrevet ned. Ikke lag passordet for langt eller for komplisert:\n" "du m� kunne klare � huske det." -#: ../help.pm_.c:208 ../help.pm_.c:443 +#: ../help.pm_.c:207 ../help.pm_.c:442 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" @@ -1217,7 +1188,7 @@ msgstr "" "du vil ha opprettet her, og logge inn som root bare for administrasjon-\n" "og vedlikeholdsform�l." -#: ../help.pm_.c:227 ../help.pm_.c:462 +#: ../help.pm_.c:226 ../help.pm_.c:461 msgid "" "Please, please, answer \"Yes\" here! Just for example, when you\n" "reinstall Windows, it will overwrite the boot sector. Unless you have\n" @@ -1229,7 +1200,7 @@ msgstr "" "ikke har opprettet oppstartsdisketten som foresl�tt, vil du ikke kunne\n" "starte Linux mer!" -#: ../help.pm_.c:233 ../help.pm_.c:468 +#: ../help.pm_.c:232 ../help.pm_.c:467 msgid "" "You need to indicate where you wish\n" "to place the information required to boot to Linux.\n" @@ -1245,7 +1216,7 @@ msgstr "" "Med mindre du vet akkurat hva du gj�r, velg \"F�rste sektor av\n" "disken (MBR)\"." -#: ../help.pm_.c:241 ../help.pm_.c:476 +#: ../help.pm_.c:240 ../help.pm_.c:475 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" @@ -1271,11 +1242,11 @@ msgstr "" "passer deg. Hvis de ikke gj�r det, kan du komme tilbake og endre\n" "disse s� mange ganger som det m�tte beh�ves." -#: ../help.pm_.c:260 +#: ../help.pm_.c:259 msgid "Choose preferred language for install and system usage." msgstr "Velg �nsket spr�k for installering og systembruk." -#: ../help.pm_.c:274 +#: ../help.pm_.c:273 msgid "" "Select:\n" "\n" @@ -1309,7 +1280,7 @@ msgstr "" " - Ekspert: Hvis du allerede kjenner GNU/Linux og �nsker � gj�re en\n" "egendefinert installasjon, s� er dette installasjonsvalget for deg." -#: ../help.pm_.c:292 +#: ../help.pm_.c:291 msgid "" "DrakX will attempt at first to look for one or more PCI\n" "SCSI adapter(s). If it finds it (or them) and knows which driver(s)\n" @@ -1352,7 +1323,7 @@ msgstr "" "som foresl�tt i installasjonsguiden. Dette er opsjonene du vil trenge �\n" "gi til driveren." -#: ../help.pm_.c:404 +#: ../help.pm_.c:403 msgid "" "Linux can deal with many types of printer. Each of these\n" "types require a different setup.\n" @@ -1447,65 +1418,65 @@ msgstr "Forskjellig" 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:530 -#: ../install_steps_interactive.pm_.c:531 +#: ../install2.pm_.c:55 ../install_steps_interactive.pm_.c:597 +#: ../install_steps_interactive.pm_.c:598 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:302 +#: ../install2.pm_.c:299 msgid "Partitioning failed: no root filesystem" msgstr "Partisjonering feilet: intet root-filsystem" -#: ../install2.pm_.c:315 +#: ../install2.pm_.c:312 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:171 +#: ../install_any.pm_.c:175 msgid "" "I can't read your partition table, it's too corrupted for me :(\n" "I'll try to go on blanking bad partitions" @@ -1513,7 +1484,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:187 +#: ../install_any.pm_.c:191 msgid "" "DiskDrake failed to read correctly the partition table.\n" "Continue at your own risk!" @@ -1521,24 +1492,24 @@ msgstr "" "DiskDrake klarte ikke � lese partisjonstabellen korrekt.\n" "Fortsett p� egen risiko!" -#: ../install_any.pm_.c:226 +#: ../install_any.pm_.c:230 msgid "Information" msgstr "Informasjon" -#: ../install_any.pm_.c:227 +#: ../install_any.pm_.c:231 #, 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:229 +#: ../install_any.pm_.c:233 msgid "No root partition found" msgstr "Ingen root-partisjon funnet" -#: ../install_any.pm_.c:265 +#: ../install_any.pm_.c:269 msgid "Can't use broadcast with no NIS domain" msgstr "Kan ikke bruke broadcast uten NIS domene" -#: ../install_any.pm_.c:358 +#: ../install_any.pm_.c:362 msgid "" "I can't access the kernel with frame buffer support.\n" "Disabling automatic X11 startup if any." @@ -1546,11 +1517,11 @@ 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:400 +#: ../install_any.pm_.c:404 msgid "Error reading file $f" msgstr "Feil ved lesing av fil $f" -#: ../install_any.pm_.c:405 +#: ../install_any.pm_.c:409 #, c-format msgid "Bad kickstart file %s (failed %s)" msgstr "D�rlig kickstart-fil %s (mislykket %s)" @@ -1569,7 +1540,7 @@ msgstr "" msgid "Duplicate mount point %s" msgstr "Dupliser monteringspunkt %s" -#: ../install_steps.pm_.c:345 +#: ../install_steps.pm_.c:366 msgid "No floppy drive available" msgstr "Ingen diskettstasjon tilgjengelig" @@ -1578,13 +1549,13 @@ msgstr "Ingen diskettstasjon tilgjengelig" msgid "Entering step `%s'\n" msgstr "Entrer trinn `%s'\n" -#: ../install_steps_graphical.pm_.c:255 -#: ../unused/install_steps_graphical.pm_.c:254 +#: ../install_steps_graphical.pm_.c:256 +#: ../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:258 -#: ../unused/install_steps_graphical.pm_.c:257 +#: ../install_steps_graphical.pm_.c:259 +#: ../unused/install_steps_graphical.pm_.c:258 msgid "" "You don't have a swap partition\n" "\n" @@ -1598,236 +1569,266 @@ msgstr "" msgid "Choose the size you want to install" msgstr "Velg st�rrelsen du �nsker � installere" -#: ../install_steps_graphical.pm_.c:329 -#: ../unused/install_steps_graphical.pm_.c:313 +#: ../install_steps_graphical.pm_.c:330 +#: ../unused/install_steps_graphical.pm_.c:314 msgid "Total size: " msgstr "Total st�rrelse: " -#: ../install_steps_graphical.pm_.c:341 -#: ../unused/install_steps_graphical.pm_.c:283 +#: ../install_steps_graphical.pm_.c:342 +#: ../unused/install_steps_graphical.pm_.c:284 #, c-format msgid "Version: %s\n" msgstr "Versjon: %s\n" -#: ../install_steps_graphical.pm_.c:342 -#: ../unused/install_steps_graphical.pm_.c:284 +#: ../install_steps_graphical.pm_.c:343 +#: ../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:457 -#: ../unused/install_steps_graphical.pm_.c:420 +#: ../install_steps_graphical.pm_.c:458 +#: ../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:460 -#: ../unused/install_steps_graphical.pm_.c:423 +#: ../install_steps_graphical.pm_.c:461 +#: ../unused/install_steps_graphical.pm_.c:424 msgid "Info" msgstr "Info" -#: ../install_steps_graphical.pm_.c:468 ../install_steps_interactive.pm_.c:82 -#: ../unused/install_steps_graphical.pm_.c:431 +#: ../install_steps_graphical.pm_.c:469 ../install_steps_interactive.pm_.c:83 +#: ../unused/install_steps_graphical.pm_.c:432 msgid "Install" msgstr "Installer" -#: ../install_steps_graphical.pm_.c:469 -#: ../unused/install_steps_graphical.pm_.c:432 +#: ../install_steps_graphical.pm_.c:470 +#: ../unused/install_steps_graphical.pm_.c:433 msgid "Show less" msgstr "Vis f�rre" -#: ../install_steps_graphical.pm_.c:470 -#: ../unused/install_steps_graphical.pm_.c:433 +#: ../install_steps_graphical.pm_.c:471 +#: ../unused/install_steps_graphical.pm_.c:434 msgid "Show more" msgstr "Vis flere" -#: ../install_steps_graphical.pm_.c:487 -#: ../unused/install_steps_graphical.pm_.c:450 +#: ../install_steps_graphical.pm_.c:488 +#: ../unused/install_steps_graphical.pm_.c:451 msgid "Installing" msgstr "Installerer" -#: ../install_steps_graphical.pm_.c:493 -#: ../unused/install_steps_graphical.pm_.c:456 +#: ../install_steps_graphical.pm_.c:495 +#: ../unused/install_steps_graphical.pm_.c:457 msgid "Please wait, " msgstr "Vennligst vent, " -#: ../install_steps_graphical.pm_.c:495 -#: ../unused/install_steps_graphical.pm_.c:458 +#: ../install_steps_graphical.pm_.c:497 +#: ../unused/install_steps_graphical.pm_.c:459 msgid "Time remaining " msgstr "Tid som gjenst�r " -#: ../install_steps_graphical.pm_.c:496 -#: ../unused/install_steps_graphical.pm_.c:459 +#: ../install_steps_graphical.pm_.c:498 +#: ../unused/install_steps_graphical.pm_.c:460 msgid "Total time " msgstr "Total tid " -#: ../install_steps_graphical.pm_.c:501 -#: ../unused/install_steps_graphical.pm_.c:464 +#: ../install_steps_graphical.pm_.c:503 +#: ../unused/install_steps_graphical.pm_.c:465 msgid "Preparing installation" msgstr "Forbereder installasjon" -#: ../install_steps_graphical.pm_.c:522 -#: ../unused/install_steps_graphical.pm_.c:485 +#: ../install_steps_graphical.pm_.c:526 +#: ../unused/install_steps_graphical.pm_.c:486 #, c-format msgid "Installing package %s" msgstr "Installerer pakke %s" -#: ../install_steps_graphical.pm_.c:547 -#: ../unused/install_steps_graphical.pm_.c:510 +#: ../install_steps_graphical.pm_.c:551 +#: ../unused/install_steps_graphical.pm_.c:511 msgid "Go on anyway?" msgstr "Fortsette uansett?" -#: ../install_steps_graphical.pm_.c:547 -#: ../unused/install_steps_graphical.pm_.c:510 +#: ../install_steps_graphical.pm_.c:551 +#: ../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:571 -#: ../unused/install_steps_graphical.pm_.c:534 +#: ../install_steps_graphical.pm_.c:575 +#: ../unused/install_steps_graphical.pm_.c:535 msgid "Use existing configuration for X11?" msgstr "Bruke eksisterende konfigurasjon for X11?" -#: ../install_steps_graphical.pm_.c:647 ../install_steps_interactive.pm_.c:530 -#: ../interactive.pm_.c:47 ../interactive.pm_.c:57 ../my_gtk.pm_.c:194 -#: ../my_gtk.pm_.c:431 ../my_gtk.pm_.c:527 -#: ../unused/install_steps_graphical.pm_.c:607 +#: ../install_steps_graphical.pm_.c:650 ../install_steps_interactive.pm_.c:597 +#: ../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 +#: ../unused/install_steps_graphical.pm_.c:608 msgid "Ok" msgstr "Ok" -#: ../install_steps_interactive.pm_.c:38 +#: ../install_steps_interactive.pm_.c:39 msgid "An error occurred" msgstr "En feil oppsto" -#: ../install_steps_interactive.pm_.c:55 +#: ../install_steps_interactive.pm_.c:56 msgid "Which language do you want?" msgstr "Hvilket spr�k �nsker du?" -#: ../install_steps_interactive.pm_.c:70 +#: ../install_steps_interactive.pm_.c:71 msgid "What is your keyboard layout?" msgstr "Hva er tastatur-oppsettet ditt?" -#: ../install_steps_interactive.pm_.c:80 +#: ../install_steps_interactive.pm_.c:81 msgid "Install/Upgrade" msgstr "Installer/Oppgrader" -#: ../install_steps_interactive.pm_.c:81 +#: ../install_steps_interactive.pm_.c:82 msgid "Is this an install or an upgrade?" msgstr "Er dette en installasjon eller en oppgradering?" -#: ../install_steps_interactive.pm_.c:82 +#: ../install_steps_interactive.pm_.c:83 msgid "Upgrade" msgstr "Oppgrader" -#: ../install_steps_interactive.pm_.c:90 +#: ../install_steps_interactive.pm_.c:91 msgid "Root Partition" msgstr "Root-partisjon" -#: ../install_steps_interactive.pm_.c:91 +#: ../install_steps_interactive.pm_.c:92 msgid "What is the root partition (/) of your system?" msgstr "Hva er root-partisjonen (/) p� systemet ditt?" -#: ../install_steps_interactive.pm_.c:101 +#: ../install_steps_interactive.pm_.c:102 +msgid "Recommended" +msgstr "" + +#: ../install_steps_interactive.pm_.c:103 +msgid "Personalized" +msgstr "" + +#: ../install_steps_interactive.pm_.c:104 +#, fuzzy +msgid "Expert" +msgstr "ekspert" + +#: ../install_steps_interactive.pm_.c:106 +#: ../install_steps_interactive.pm_.c:119 msgid "Install Class" msgstr "Installeringsklasse" -#: ../install_steps_interactive.pm_.c:102 +#: ../install_steps_interactive.pm_.c:107 msgid "What installation class do you want?" msgstr "Hvilken installasjonsklasse �nsker du?" -#: ../install_steps_interactive.pm_.c:114 +#: ../install_steps_interactive.pm_.c:116 +#, fuzzy +msgid "Developement" +msgstr "utvikler" + +#: ../install_steps_interactive.pm_.c:117 +#, fuzzy +msgid "Server" +msgstr "tjener" + +#: ../install_steps_interactive.pm_.c:120 +#, fuzzy +msgid "What usage do you want?" +msgstr "Hvilket spr�k �nsker du?" + +#: ../install_steps_interactive.pm_.c:133 msgid "What is the type of your mouse?" msgstr "Hva slags type er musen din?" -#: ../install_steps_interactive.pm_.c:118 +#: ../install_steps_interactive.pm_.c:137 msgid "Emulate third button?" msgstr "Emulere tredje knapp?" -#: ../install_steps_interactive.pm_.c:121 +#: ../install_steps_interactive.pm_.c:140 msgid "Mouse Port" msgstr "Museport" -#: ../install_steps_interactive.pm_.c:122 +#: ../install_steps_interactive.pm_.c:141 msgid "Which serial port is your mouse connected to?" msgstr "Hvilken serieport er musen din koblet til?" -#: ../install_steps_interactive.pm_.c:135 +#: ../install_steps_interactive.pm_.c:154 msgid "no available partitions" msgstr "ingen tilgjengelige partisjoner" -#: ../install_steps_interactive.pm_.c:137 +#: ../install_steps_interactive.pm_.c:156 #, c-format msgid "(%dMb)" msgstr "(%dMb)" -#: ../install_steps_interactive.pm_.c:144 +#: ../install_steps_interactive.pm_.c:163 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:151 +#: ../install_steps_interactive.pm_.c:170 msgid "Choose the mount points" msgstr "Velg monteringspunkter" -#: ../install_steps_interactive.pm_.c:163 +#: ../install_steps_interactive.pm_.c:182 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:179 +#: ../install_steps_interactive.pm_.c:198 msgid "Choose the partitions you want to format" msgstr "Velg de partisjonene du �nsker � formatere" -#: ../install_steps_interactive.pm_.c:189 +#: ../install_steps_interactive.pm_.c:208 #, c-format msgid "Formatting partition %s" msgstr "Formaterer partisjon %s" -#: ../install_steps_interactive.pm_.c:197 +#: ../install_steps_interactive.pm_.c:216 msgid "Looking for available packages" msgstr "Ser etter tilgjengelige pakker" -#: ../install_steps_interactive.pm_.c:203 +#: ../install_steps_interactive.pm_.c:222 msgid "Finding packages to upgrade" msgstr "Finner pakker � oppgradere" -#: ../install_steps_interactive.pm_.c:212 +#: ../install_steps_interactive.pm_.c:231 msgid "Package Group Selection" msgstr "Valg pakkegruppe" -#: ../install_steps_interactive.pm_.c:227 +#: ../install_steps_interactive.pm_.c:246 msgid "Keep the current IP configuration" msgstr "Behold n�v�rende IP-konfigurasjon" -#: ../install_steps_interactive.pm_.c:228 +#: ../install_steps_interactive.pm_.c:247 msgid "Reconfigure network now" msgstr "Rekonfigurer nettverket n�" -#: ../install_steps_interactive.pm_.c:229 +#: ../install_steps_interactive.pm_.c:248 msgid "Do not set up networking" msgstr "Ikke sett opp nettverk" -#: ../install_steps_interactive.pm_.c:231 -#: ../install_steps_interactive.pm_.c:237 +#: ../install_steps_interactive.pm_.c:250 +#: ../install_steps_interactive.pm_.c:257 msgid "Network Configuration" msgstr "Nettverks-konfigurasjon" -#: ../install_steps_interactive.pm_.c:232 +#: ../install_steps_interactive.pm_.c:251 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:238 +#: ../install_steps_interactive.pm_.c:258 msgid "Do you want to configure LAN (not dialup) networking for your system?" msgstr "Vil du konfigurere LAN (ikke oppringt) nettverk for systemet ditt?" -#: ../install_steps_interactive.pm_.c:245 +#: ../install_steps_interactive.pm_.c:265 msgid "no network card found" msgstr "ingen nettverkskort funnet" -#: ../install_steps_interactive.pm_.c:274 +#: ../install_steps_interactive.pm_.c:294 #, c-format msgid "Configuring network device %s" msgstr "Konfigurerer nettverks-enhet %s" -#: ../install_steps_interactive.pm_.c:275 +#: ../install_steps_interactive.pm_.c:295 msgid "" "Please enter the IP configuration for this machine.\n" "Each item should be entered as an IP address in dotted-decimal\n" @@ -1837,32 +1838,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:278 +#: ../install_steps_interactive.pm_.c:298 msgid "Automatic IP" msgstr "Automatisk IP" -#: ../install_steps_interactive.pm_.c:278 +#: ../install_steps_interactive.pm_.c:298 msgid "IP address:" msgstr "IP-adresse:" -#: ../install_steps_interactive.pm_.c:278 +#: ../install_steps_interactive.pm_.c:298 msgid "Netmask:" msgstr "Nettmaske:" -#: ../install_steps_interactive.pm_.c:279 +#: ../install_steps_interactive.pm_.c:299 msgid "(bootp/dhcp)" msgstr "(bootp/dhcp)" -#: ../install_steps_interactive.pm_.c:285 -#: ../install_steps_interactive.pm_.c:423 +#: ../install_steps_interactive.pm_.c:305 +#: ../install_steps_interactive.pm_.c:488 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:304 +#: ../install_steps_interactive.pm_.c:324 msgid "Configuring network" msgstr "Konfigurerer nettverk" -#: ../install_steps_interactive.pm_.c:305 +#: ../install_steps_interactive.pm_.c:325 msgid "" "Please enter your host name.\n" "Your host name should be a fully-qualified host name,\n" @@ -1874,43 +1875,119 @@ 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:309 +#: ../install_steps_interactive.pm_.c:329 msgid "DNS server:" msgstr "DNS-tjener:" -#: ../install_steps_interactive.pm_.c:309 +#: ../install_steps_interactive.pm_.c:329 msgid "Gateway device:" msgstr "Gateway-enhet:" -#: ../install_steps_interactive.pm_.c:309 +#: ../install_steps_interactive.pm_.c:329 msgid "Gateway:" msgstr "Gateway:" -#: ../install_steps_interactive.pm_.c:309 +#: ../install_steps_interactive.pm_.c:329 msgid "Host name:" msgstr "Vertsnavn:" -#: ../install_steps_interactive.pm_.c:320 +#: ../install_steps_interactive.pm_.c:340 +#, fuzzy +msgid "Do you have a modem?" +msgstr "Har du en b�rbar maskin?" + +#: ../install_steps_interactive.pm_.c:342 +msgid "Skip modem autodetection?" +msgstr "" + +#: ../install_steps_interactive.pm_.c:350 +#, fuzzy +msgid "Which serial port is your modem connected to?" +msgstr "Hvilken serieport er musen din koblet til?" + +#: ../install_steps_interactive.pm_.c:367 +msgid "Connection name" +msgstr "" + +#: ../install_steps_interactive.pm_.c:368 +msgid "Phone number" +msgstr "" + +#: ../install_steps_interactive.pm_.c:369 +msgid "Login ID" +msgstr "" + +#: ../install_steps_interactive.pm_.c:370 +#: ../install_steps_interactive.pm_.c:638 +#: ../install_steps_interactive.pm_.c:728 +msgid "Password" +msgstr "Passord" + +#: ../install_steps_interactive.pm_.c:371 +msgid "Authentication" +msgstr "" + +#: ../install_steps_interactive.pm_.c:371 +msgid "CHAP" +msgstr "" + +#: ../install_steps_interactive.pm_.c:371 +msgid "PAP" +msgstr "" + +#: ../install_steps_interactive.pm_.c:371 +msgid "Script-based" +msgstr "" + +#: ../install_steps_interactive.pm_.c:371 +msgid "Terminal-based" +msgstr "" + +#: ../install_steps_interactive.pm_.c:372 +#, fuzzy +msgid "Domain name" +msgstr "Virkelig navn" + +#: ../install_steps_interactive.pm_.c:373 +#, fuzzy +msgid "First DNS Server" +msgstr "NIS-tjener" + +#: ../install_steps_interactive.pm_.c:374 +#, fuzzy +msgid "Second DNS Server" +msgstr "NIS-tjener" + +#: ../install_steps_interactive.pm_.c:375 +msgid "Disable existing DNS servers during connection" +msgstr "" + +#: ../install_steps_interactive.pm_.c:379 +#, fuzzy +msgid "Dial-in options" +msgstr "LILO hovedopsjoner" + +#: ../install_steps_interactive.pm_.c:389 msgid "Which is your timezone?" msgstr "Hvilken er tidsonen din?" -#: ../install_steps_interactive.pm_.c:321 +#: ../install_steps_interactive.pm_.c:390 msgid "Is your hardware clock set to GMT?" msgstr "Er maskinvareklokken din satt til GMT?" -#: ../install_steps_interactive.pm_.c:331 +#: ../install_steps_interactive.pm_.c:400 msgid "Printer" msgstr "Skriver" -#: ../install_steps_interactive.pm_.c:332 +#: ../install_steps_interactive.pm_.c:401 msgid "Would you like to configure a printer?" msgstr "�nsker du � konfigurere en skriver?" -#: ../install_steps_interactive.pm_.c:346 +#: ../install_steps_interactive.pm_.c:413 msgid "Local Printer Options" msgstr "Opsjoner for lokal skriver" -#: ../install_steps_interactive.pm_.c:347 +#: ../install_steps_interactive.pm_.c:414 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" @@ -1920,40 +1997,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:350 +#: ../install_steps_interactive.pm_.c:417 msgid "Name of queue:" msgstr "K�ens navn:" -#: ../install_steps_interactive.pm_.c:350 +#: ../install_steps_interactive.pm_.c:417 msgid "Spool directory:" msgstr "Spolingskatalog:" -#: ../install_steps_interactive.pm_.c:361 +#: ../install_steps_interactive.pm_.c:428 msgid "Select Printer Connection" msgstr "Velg skrivertilkobling" -#: ../install_steps_interactive.pm_.c:362 +#: ../install_steps_interactive.pm_.c:429 msgid "How is the printer connected?" msgstr "Hvordan er skriveren tilkoblet?" -#: ../install_steps_interactive.pm_.c:370 +#: ../install_steps_interactive.pm_.c:437 msgid "Detecting devices..." msgstr "Finner enheter..." -#: ../install_steps_interactive.pm_.c:370 +#: ../install_steps_interactive.pm_.c:437 msgid "Test ports" msgstr "Test porter" -#: ../install_steps_interactive.pm_.c:383 +#: ../install_steps_interactive.pm_.c:450 #, c-format msgid "A printer, model \"%s\", has been detected on " msgstr "En skriver, modell \"%s\", ble funnet p� " -#: ../install_steps_interactive.pm_.c:390 +#: ../install_steps_interactive.pm_.c:457 msgid "Local Printer Device" msgstr "Lokal skriverenhet" -#: ../install_steps_interactive.pm_.c:391 +#: ../install_steps_interactive.pm_.c:458 msgid "" "What device is your printer connected to \n" "(note that /dev/lp0 is equivalent to LPT1:)?\n" @@ -1961,15 +2038,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:392 +#: ../install_steps_interactive.pm_.c:459 msgid "Printer Device:" msgstr "Skriverenhet:" -#: ../install_steps_interactive.pm_.c:398 +#: ../install_steps_interactive.pm_.c:463 msgid "Remote lpd Printer Options" msgstr "Opsjoner for fjern-lpd skriver" -#: ../install_steps_interactive.pm_.c:399 +#: ../install_steps_interactive.pm_.c:464 msgid "" "To use a remote lpd print queue, you need to supply\n" "the hostname of the printer server and the queue name\n" @@ -1979,19 +2056,19 @@ msgstr "" "til skrivertjeneren og k�navnet til den tjeneren som\n" "jobbene skal plasseres i." -#: ../install_steps_interactive.pm_.c:402 +#: ../install_steps_interactive.pm_.c:467 msgid "Remote hostname:" msgstr "Fjern-vertnavn:" -#: ../install_steps_interactive.pm_.c:402 +#: ../install_steps_interactive.pm_.c:467 msgid "Remote queue" msgstr "Fjern-k�" -#: ../install_steps_interactive.pm_.c:408 +#: ../install_steps_interactive.pm_.c:473 msgid "SMB (Windows 9x/NT) Printer Options" msgstr "Opsjoner for SMB (Windows 9x/NT) skriver" -#: ../install_steps_interactive.pm_.c:409 +#: ../install_steps_interactive.pm_.c:474 msgid "" "To print to a SMB printer, you need to provide the\n" "SMB host name (Note! It may be different from its\n" @@ -2005,38 +2082,38 @@ msgstr "" "navnet til skriveren du �nsker tilgang til og anvendelige brukernavn,\n" "passord og arbeidsgruppeinformasjon." -#: ../install_steps_interactive.pm_.c:414 +#: ../install_steps_interactive.pm_.c:479 msgid "SMB server IP:" msgstr "SMB-tjener IP:" -#: ../install_steps_interactive.pm_.c:414 +#: ../install_steps_interactive.pm_.c:479 msgid "SMB server host:" msgstr "SMB-tjener vert:" -#: ../install_steps_interactive.pm_.c:415 -#: ../install_steps_interactive.pm_.c:437 -#: ../install_steps_interactive.pm_.c:532 +#: ../install_steps_interactive.pm_.c:480 +#: ../install_steps_interactive.pm_.c:501 +#: ../install_steps_interactive.pm_.c:599 msgid "Password:" msgstr "Passord:" -#: ../install_steps_interactive.pm_.c:415 +#: ../install_steps_interactive.pm_.c:480 msgid "Share name:" msgstr "Delt navn:" -#: ../install_steps_interactive.pm_.c:415 -#: ../install_steps_interactive.pm_.c:437 +#: ../install_steps_interactive.pm_.c:480 +#: ../install_steps_interactive.pm_.c:501 msgid "User name:" msgstr "Brukernavn:" -#: ../install_steps_interactive.pm_.c:416 +#: ../install_steps_interactive.pm_.c:481 msgid "Workgroup:" msgstr "Arbeidsgruppe:" -#: ../install_steps_interactive.pm_.c:431 +#: ../install_steps_interactive.pm_.c:495 msgid "NetWare Printer Options" msgstr "NetWare skriveropsjoner" -#: ../install_steps_interactive.pm_.c:432 +#: ../install_steps_interactive.pm_.c:496 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" @@ -2048,123 +2125,135 @@ 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:436 +#: ../install_steps_interactive.pm_.c:500 msgid "Print Queue Name:" msgstr "Skriverk�-navn:" -#: ../install_steps_interactive.pm_.c:436 +#: ../install_steps_interactive.pm_.c:500 msgid "Printer Server:" msgstr "Skrivertjener:" -#: ../install_steps_interactive.pm_.c:447 +#: ../install_steps_interactive.pm_.c:510 +msgid "Print test ascii page" +msgstr "" + +#: ../install_steps_interactive.pm_.c:511 +msgid "Print test postscript page" +msgstr "" + +#: ../install_steps_interactive.pm_.c:512 +#, fuzzy +msgid "Change printer" +msgstr "Konfigurer skriver" + +#: ../install_steps_interactive.pm_.c:519 msgid "Configure Printer" msgstr "Konfigurer skriver" -#: ../install_steps_interactive.pm_.c:448 +#: ../install_steps_interactive.pm_.c:520 msgid "What type of printer do you have?" msgstr "Hva slags type skriver har du?" -#: ../install_steps_interactive.pm_.c:459 -#: ../install_steps_interactive.pm_.c:460 +#: ../install_steps_interactive.pm_.c:543 msgid "Paper Size" msgstr "Papirst�rrelse" -#: ../install_steps_interactive.pm_.c:479 -msgid "CRLF" -msgstr "CRLF" - -#: ../install_steps_interactive.pm_.c:480 +#: ../install_steps_interactive.pm_.c:546 msgid "Fix stair-stepping text?" msgstr "Fikse trappestegs-tekst?" -#: ../install_steps_interactive.pm_.c:496 -msgid "Configure Uniprint Driver" -msgstr "Konfigurer Uniprint-driver" +#: ../install_steps_interactive.pm_.c:549 +#, fuzzy +msgid "Uniprint driver options" +msgstr "Bruk harddisk-optimisering" -#: ../install_steps_interactive.pm_.c:497 -msgid "You may now set the Uniprint driver options for this printer." -msgstr "Du kan n� sette opp Uniprint-driver-opsjonene for denne skriveren." +#: ../install_steps_interactive.pm_.c:550 +#, fuzzy +msgid "Color depth options" +msgstr "Modulopsjoner:" -#: ../install_steps_interactive.pm_.c:505 -msgid "Configure Color Depth" -msgstr "Konfigurer fargedybde" +#: ../install_steps_interactive.pm_.c:554 +#, fuzzy +msgid "Printer options" +msgstr "Opsjoner for lokal skriver" -#: ../install_steps_interactive.pm_.c:506 -msgid "You may now configure the color options for this printer." -msgstr "Du kan n� konfigurere fargeopsjonene for denne skriveren." +#: ../install_steps_interactive.pm_.c:564 +#, fuzzy +msgid "What do you want to do" +msgstr "Hva vil du gj�re?" -#: ../install_steps_interactive.pm_.c:530 +#: ../install_steps_interactive.pm_.c:597 msgid "No password" msgstr "Intet passord" -#: ../install_steps_interactive.pm_.c:532 +#: ../install_steps_interactive.pm_.c:599 msgid "Password (again):" msgstr "Passord (igjen):" -#: ../install_steps_interactive.pm_.c:532 +#: ../install_steps_interactive.pm_.c:599 msgid "Use MD5 passwords" msgstr "Bruk MD5 passord" -#: ../install_steps_interactive.pm_.c:532 +#: ../install_steps_interactive.pm_.c:599 msgid "Use NIS" msgstr "Bruk NIS" -#: ../install_steps_interactive.pm_.c:532 +#: ../install_steps_interactive.pm_.c:599 msgid "Use shadow file" msgstr "Bruk skyggefil" -#: ../install_steps_interactive.pm_.c:535 +#: ../install_steps_interactive.pm_.c:602 msgid "shadow" msgstr "skygge" -#: ../install_steps_interactive.pm_.c:536 +#: ../install_steps_interactive.pm_.c:603 msgid "MD5" msgstr "MD5" -#: ../install_steps_interactive.pm_.c:537 +#: ../install_steps_interactive.pm_.c:604 msgid "yellow pages" msgstr "gule sider" -#: ../install_steps_interactive.pm_.c:540 -#: ../install_steps_interactive.pm_.c:582 +#: ../install_steps_interactive.pm_.c:607 +#: ../install_steps_interactive.pm_.c:649 msgid "Please try again" msgstr "Vennligst pr�v igjen" -#: ../install_steps_interactive.pm_.c:540 -#: ../install_steps_interactive.pm_.c:582 +#: ../install_steps_interactive.pm_.c:607 +#: ../install_steps_interactive.pm_.c:649 msgid "The passwords do not match" msgstr "Passordene stemmer ikke overens" -#: ../install_steps_interactive.pm_.c:542 +#: ../install_steps_interactive.pm_.c:609 msgid "This password is too simple" msgstr "Dette passordet er for enkelt" -#: ../install_steps_interactive.pm_.c:549 +#: ../install_steps_interactive.pm_.c:616 msgid "TODO" msgstr "TODO" -#: ../install_steps_interactive.pm_.c:550 +#: ../install_steps_interactive.pm_.c:617 msgid "NIS Domain" msgstr "NIS-domene" -#: ../install_steps_interactive.pm_.c:550 +#: ../install_steps_interactive.pm_.c:617 msgid "NIS Server" msgstr "NIS-tjener" -#: ../install_steps_interactive.pm_.c:569 +#: ../install_steps_interactive.pm_.c:636 msgid "Accept user" msgstr "Godta bruker" -#: ../install_steps_interactive.pm_.c:569 +#: ../install_steps_interactive.pm_.c:636 msgid "Add user" msgstr "Legg til bruker" -#: ../install_steps_interactive.pm_.c:570 +#: ../install_steps_interactive.pm_.c:637 #, c-format msgid "(already added %s)" msgstr "(allerede lagt til %s)" -#: ../install_steps_interactive.pm_.c:570 +#: ../install_steps_interactive.pm_.c:637 #, c-format msgid "" "Enter a user\n" @@ -2173,37 +2262,36 @@ msgstr "" "Entre en bruker\n" "%s" -#: ../install_steps_interactive.pm_.c:571 -#: ../install_steps_interactive.pm_.c:660 -msgid "Password" -msgstr "Passord" - -#: ../install_steps_interactive.pm_.c:571 +#: ../install_steps_interactive.pm_.c:638 msgid "Password (again)" msgstr "Passord (igjen)" -#: ../install_steps_interactive.pm_.c:571 +#: ../install_steps_interactive.pm_.c:638 msgid "Real name" msgstr "Virkelig navn" -#: ../install_steps_interactive.pm_.c:571 +#: ../install_steps_interactive.pm_.c:638 msgid "Shell" msgstr "Skall" -#: ../install_steps_interactive.pm_.c:571 +#: ../install_steps_interactive.pm_.c:638 msgid "User name" msgstr "Brukernavn" -#: ../install_steps_interactive.pm_.c:584 +#: ../install_steps_interactive.pm_.c:651 msgid "Please give a user name" msgstr "Vennligst oppgi et brukernavn" -#: ../install_steps_interactive.pm_.c:585 +#: ../install_steps_interactive.pm_.c:652 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:606 +#: ../install_steps_interactive.pm_.c:653 +msgid "This user name is already added" +msgstr "" + +#: ../install_steps_interactive.pm_.c:674 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 " @@ -2227,103 +2315,103 @@ msgstr "" "systemsvikt.\n" "�nsker du � opprette en oppstartsdiskett for systemet ditt?" -#: ../install_steps_interactive.pm_.c:615 +#: ../install_steps_interactive.pm_.c:683 msgid "Sorry, no floppy drive available" msgstr "Beklager, ingen diskettstasjon tilgjengelig" -#: ../install_steps_interactive.pm_.c:618 +#: ../install_steps_interactive.pm_.c:686 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:619 +#: ../install_steps_interactive.pm_.c:687 msgid "Skip" msgstr "Dropp" -#: ../install_steps_interactive.pm_.c:623 +#: ../install_steps_interactive.pm_.c:691 #, c-format msgid "Insert a floppy in drive %s" msgstr "Sett inn en diskett i stasjon %s" -#: ../install_steps_interactive.pm_.c:624 +#: ../install_steps_interactive.pm_.c:692 msgid "Creating bootdisk" msgstr "Oppretter oppstartdiskett" -#: ../install_steps_interactive.pm_.c:631 +#: ../install_steps_interactive.pm_.c:699 msgid "Preparing bootloader" msgstr "Klargj�r oppstartslaster" -#: ../install_steps_interactive.pm_.c:643 +#: ../install_steps_interactive.pm_.c:711 msgid "First sector of boot partition" msgstr "F�rste sektor av oppstartspartisjon" -#: ../install_steps_interactive.pm_.c:643 +#: ../install_steps_interactive.pm_.c:711 msgid "First sector of drive (MBR)" msgstr "F�rste sektor av disk (MBR)" -#: ../install_steps_interactive.pm_.c:647 +#: ../install_steps_interactive.pm_.c:715 msgid "LILO Installation" msgstr "LILO-installasjon" -#: ../install_steps_interactive.pm_.c:648 +#: ../install_steps_interactive.pm_.c:716 msgid "Where do you want to install the bootloader?" msgstr "Hvor vil du installere oppstartslasteren?" -#: ../install_steps_interactive.pm_.c:651 +#: ../install_steps_interactive.pm_.c:719 msgid "Do you want to use LILO?" msgstr "�nsker du � bruke LILO?" -#: ../install_steps_interactive.pm_.c:654 +#: ../install_steps_interactive.pm_.c:722 msgid "Boot device" msgstr "Oppstartsenhet" -#: ../install_steps_interactive.pm_.c:655 +#: ../install_steps_interactive.pm_.c:723 msgid "Linear (needed for some SCSI drives)" msgstr "Line�r (beh�ves av noen SCSI-disker)" -#: ../install_steps_interactive.pm_.c:655 +#: ../install_steps_interactive.pm_.c:723 msgid "linear" msgstr "line�r" -#: ../install_steps_interactive.pm_.c:656 +#: ../install_steps_interactive.pm_.c:724 msgid "Compact" msgstr "Kompakt" -#: ../install_steps_interactive.pm_.c:656 +#: ../install_steps_interactive.pm_.c:724 msgid "compact" msgstr "kompakt" -#: ../install_steps_interactive.pm_.c:657 +#: ../install_steps_interactive.pm_.c:725 msgid "Delay before booting default image" msgstr "Forsinkelse f�r oppstart av standard bilde" -#: ../install_steps_interactive.pm_.c:658 +#: ../install_steps_interactive.pm_.c:726 msgid "Video mode" msgstr "Skjerm-modus" -#: ../install_steps_interactive.pm_.c:661 +#: ../install_steps_interactive.pm_.c:729 msgid "Restrict command line options" msgstr "Begrense kommandolinje-opsjoner" -#: ../install_steps_interactive.pm_.c:661 +#: ../install_steps_interactive.pm_.c:729 msgid "restrict" msgstr "begrense" -#: ../install_steps_interactive.pm_.c:668 +#: ../install_steps_interactive.pm_.c:736 msgid "LILO main options" msgstr "LILO hovedopsjoner" -#: ../install_steps_interactive.pm_.c:672 +#: ../install_steps_interactive.pm_.c:740 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:673 +#: ../install_steps_interactive.pm_.c:741 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:682 +#: ../install_steps_interactive.pm_.c:750 msgid "" "Here are the following entries in LILO.\n" "You can add some more or change the existent ones." @@ -2331,117 +2419,125 @@ 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:684 +#: ../install_steps_interactive.pm_.c:752 msgid "Add" msgstr "Legg til" -#: ../install_steps_interactive.pm_.c:702 +#: ../install_steps_interactive.pm_.c:770 msgid "Image" msgstr "Bilde" -#: ../install_steps_interactive.pm_.c:703 -#: ../install_steps_interactive.pm_.c:711 +#: ../install_steps_interactive.pm_.c:771 +#: ../install_steps_interactive.pm_.c:779 msgid "Root" msgstr "Root" -#: ../install_steps_interactive.pm_.c:704 +#: ../install_steps_interactive.pm_.c:772 msgid "Append" msgstr "Tilf�ye" -#: ../install_steps_interactive.pm_.c:705 +#: ../install_steps_interactive.pm_.c:773 msgid "Initrd" msgstr "Initrd" -#: ../install_steps_interactive.pm_.c:706 +#: ../install_steps_interactive.pm_.c:774 msgid "Read-write" msgstr "Les-skriv" -#: ../install_steps_interactive.pm_.c:712 +#: ../install_steps_interactive.pm_.c:780 msgid "Table" msgstr "Tabell" -#: ../install_steps_interactive.pm_.c:713 +#: ../install_steps_interactive.pm_.c:781 msgid "Unsafe" msgstr "Usikker" -#: ../install_steps_interactive.pm_.c:718 +#: ../install_steps_interactive.pm_.c:786 msgid "Label" msgstr "Etikett" -#: ../install_steps_interactive.pm_.c:720 +#: ../install_steps_interactive.pm_.c:788 msgid "Default" msgstr "Standard" -#: ../install_steps_interactive.pm_.c:739 +#: ../install_steps_interactive.pm_.c:807 msgid "Installation of LILO failed. The following error occured:" msgstr "Installasjon av LILO mislykket. F�lgende feil oppsto:" -#: ../install_steps_interactive.pm_.c:749 +#: ../install_steps_interactive.pm_.c:817 msgid "Windows(TM)" msgstr "Windows(TM)" -#: ../install_steps_interactive.pm_.c:750 +#: ../install_steps_interactive.pm_.c:818 +msgid "Poor" +msgstr "" + +#: ../install_steps_interactive.pm_.c:819 msgid "Low" msgstr "Lav" -#: ../install_steps_interactive.pm_.c:751 +#: ../install_steps_interactive.pm_.c:820 msgid "Medium" msgstr "Medium" -#: ../install_steps_interactive.pm_.c:752 +#: ../install_steps_interactive.pm_.c:821 msgid "High" msgstr "H�y" -#: ../install_steps_interactive.pm_.c:753 +#: ../install_steps_interactive.pm_.c:822 msgid "Paranoid" msgstr "Paranoid" -#: ../install_steps_interactive.pm_.c:766 +#: ../install_steps_interactive.pm_.c:835 msgid "Miscellaneous questions" msgstr "Forskjellige sp�rsm�l" -#: ../install_steps_interactive.pm_.c:767 +#: ../install_steps_interactive.pm_.c:836 msgid "Do you have a laptop?" msgstr "Har du en b�rbar maskin?" -#: ../install_steps_interactive.pm_.c:768 +#: ../install_steps_interactive.pm_.c:837 msgid "Use hard drive optimizations" msgstr "Bruk harddisk-optimisering" -#: ../install_steps_interactive.pm_.c:769 +#: ../install_steps_interactive.pm_.c:838 msgid "Security level" msgstr "Sikkerhetsniv�" -#: ../install_steps_interactive.pm_.c:770 +#: ../install_steps_interactive.pm_.c:839 msgid "HTTP proxy" msgstr "HTTP-proxy" -#: ../install_steps_interactive.pm_.c:771 +#: ../install_steps_interactive.pm_.c:840 msgid "FTP proxy" msgstr "FTP-proxy" -#: ../install_steps_interactive.pm_.c:772 +#: ../install_steps_interactive.pm_.c:841 msgid "Use kudzu" msgstr "Bruk kudzu" -#: ../install_steps_interactive.pm_.c:773 +#: ../install_steps_interactive.pm_.c:842 #, c-format msgid "Precise ram size (found %d MB)" msgstr "N�yaktig ram-st�rrelse (funnet %d MB)" -#: ../install_steps_interactive.pm_.c:776 +#: ../install_steps_interactive.pm_.c:845 msgid "(may cause disk problems)" msgstr "(kan for�rsake diskproblemer)" -#: ../install_steps_interactive.pm_.c:784 +#: ../install_steps_interactive.pm_.c:853 msgid "Proxy should be http://..." msgstr "Proxy burde v�re http://..." -#: ../install_steps_interactive.pm_.c:785 +#: ../install_steps_interactive.pm_.c:854 msgid "Proxy should be ftp://..." msgstr "Proxy burde v�re ftp://..." -#: ../install_steps_interactive.pm_.c:798 +#: ../install_steps_interactive.pm_.c:855 +msgid "Give the ram size in Mb" +msgstr "" + +#: ../install_steps_interactive.pm_.c:868 msgid "" "Some steps are not completed.\n" "\n" @@ -2451,7 +2547,7 @@ msgstr "" "\n" "�nsker du virkelig � slutte n�?" -#: ../install_steps_interactive.pm_.c:805 +#: ../install_steps_interactive.pm_.c:875 msgid "" "Congratulations, installation is complete.\n" "Remove the boot media and press return to reboot.\n" @@ -2473,22 +2569,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:824 +#: ../install_steps_interactive.pm_.c:894 #, c-format msgid "Installing driver for %s card %s" msgstr "Installerer driver for %s kort %s" -#: ../install_steps_interactive.pm_.c:825 +#: ../install_steps_interactive.pm_.c:895 #, c-format msgid "(module %s)" msgstr "(modul %s)" -#: ../install_steps_interactive.pm_.c:835 +#: ../install_steps_interactive.pm_.c:905 #, c-format msgid "What %s card do you have?" msgstr "Hvilket %s kort har du?" -#: ../install_steps_interactive.pm_.c:842 +#: ../install_steps_interactive.pm_.c:912 #, c-format msgid "" "In some cases, the %s driver needs to have extra information to work\n" @@ -2508,20 +2604,20 @@ msgstr "" "for�rsake\n" "for�rsake noen skade." -#: ../install_steps_interactive.pm_.c:847 +#: ../install_steps_interactive.pm_.c:917 msgid "Autoprobe" msgstr "Automatisk sondering" -#: ../install_steps_interactive.pm_.c:847 +#: ../install_steps_interactive.pm_.c:917 msgid "Specify options" msgstr "Spesifiser opsjoner" -#: ../install_steps_interactive.pm_.c:851 +#: ../install_steps_interactive.pm_.c:921 #, 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:857 +#: ../install_steps_interactive.pm_.c:927 #, c-format msgid "" "You may now provide its options to module %s.\n" @@ -2532,11 +2628,11 @@ msgstr "" "Opsjonene er i format ``name=value name2=value2 ...''.\n" "F.eks., ``io=0x300 irq=7''" -#: ../install_steps_interactive.pm_.c:860 +#: ../install_steps_interactive.pm_.c:930 msgid "Module options:" msgstr "Modulopsjoner:" -#: ../install_steps_interactive.pm_.c:870 +#: ../install_steps_interactive.pm_.c:940 #, c-format msgid "" "Loading module %s failed.\n" @@ -2545,53 +2641,53 @@ msgstr "" "Lasting av modul %s feilet.\n" "�nsker du � pr�ve igjen med andre parametere?" -#: ../install_steps_interactive.pm_.c:883 +#: ../install_steps_interactive.pm_.c:953 #, c-format msgid "Skip %s PCMCIA probing" msgstr "Dropp %s PCMCIA-sondering" -#: ../install_steps_interactive.pm_.c:884 +#: ../install_steps_interactive.pm_.c:954 msgid "Configuring PCMCIA cards..." msgstr "Konfigurerer PCMCIA-kort..." -#: ../install_steps_interactive.pm_.c:884 +#: ../install_steps_interactive.pm_.c:954 msgid "PCMCIA" msgstr "PCMCIA" -#: ../install_steps_interactive.pm_.c:891 -#, c-format -msgid "Skip %s PCI probing" -msgstr "Dropp %s PCI-sondering" +#: ../install_steps_interactive.pm_.c:961 +msgid "Try to find PCI devices?" +msgstr "" -#: ../install_steps_interactive.pm_.c:895 +#: ../install_steps_interactive.pm_.c:965 #, c-format msgid "Found %s %s interfaces" msgstr "Fant %s %s grensesnitt" -#: ../install_steps_interactive.pm_.c:896 +#: ../install_steps_interactive.pm_.c:966 msgid "Do you have another one?" msgstr "Har du enda ett?" -#: ../install_steps_interactive.pm_.c:897 +#: ../install_steps_interactive.pm_.c:967 #, c-format msgid "Do you have an %s interface?" msgstr "Har du et %s grensesnitt?" -#: ../install_steps_interactive.pm_.c:899 ../interactive.pm_.c:52 -#: ../my_gtk.pm_.c:430 +#: ../install_steps_interactive.pm_.c:969 ../interactive.pm_.c:52 +#: ../my_gtk.pm_.c:435 msgid "No" msgstr "Nei" -#: ../install_steps_interactive.pm_.c:899 ../interactive.pm_.c:52 -#: ../my_gtk.pm_.c:430 +#: ../install_steps_interactive.pm_.c:969 ../interactive.pm_.c:52 +#: ../my_gtk.pm_.c:435 msgid "Yes" msgstr "Ja" -#: ../install_steps_interactive.pm_.c:900 +#: ../install_steps_interactive.pm_.c:970 msgid "See hardware info" msgstr "Se maskinvareinfo" -#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:195 ../my_gtk.pm_.c:431 +#: ../interactive.pm_.c:57 ../interactive_newt.pm_.c:22 +#: ../interactive_newt.pm_.c:55 ../my_gtk.pm_.c:200 ../my_gtk.pm_.c:436 msgid "Cancel" msgstr "Avbryt" @@ -2912,6 +3008,52 @@ msgstr "SMB/Windows 95/98/NT" msgid "NetWare" msgstr "NetWare" +#~ msgid "X successfully configured" +#~ msgstr "Konfigurasjon av X vellykket" + +#~ msgid "" +#~ "Configuration file has been written. Take a look at it before running " +#~ "'startx'.\n" +#~ "\n" +#~ "Within the server, press Ctrl, Alt and '+' simultaneously to cycle through " +#~ "video resolutions.\n" +#~ "\n" +#~ "Pressing Ctrl, Alt and Backspace simultaneously immediately exits the " +#~ "server\n" +#~ "\n" +#~ "For further configuration, refer to /usr/X11R6/lib/X11/doc/README.Config.\n" +#~ "\n" +#~ msgstr "" +#~ "Konfigurasjonsfil har blitt skrevet. Ta en kikk p� den f�r du kj�rer " +#~ "'startx'.\n" +#~ "\n" +#~ "Inne i tjeneren trykk Ctrl, Alt og '+' samtidig for � g� igjennom " +#~ "forskjellige oppl�sninger.\n" +#~ "\n" +#~ "Ved � trykke Ctrl, Alt og Backspace samtidig vil tjeneren avslutte " +#~ "umiddelbart\n" +#~ "\n" +#~ "For ytterligere konfigurasjon, se /usr/X11R6/lib/X11/doc/README.Config.\n" +#~ "\n" + +#~ msgid "CRLF" +#~ msgstr "CRLF" + +#~ msgid "Configure Uniprint Driver" +#~ msgstr "Konfigurer Uniprint-driver" + +#~ msgid "You may now set the Uniprint driver options for this printer." +#~ msgstr "Du kan n� sette opp Uniprint-driver-opsjonene for denne skriveren." + +#~ msgid "Configure Color Depth" +#~ msgstr "Konfigurer fargedybde" + +#~ msgid "You may now configure the color options for this printer." +#~ msgstr "Du kan n� konfigurere fargeopsjonene for denne skriveren." + +#~ msgid "Skip %s PCI probing" +#~ msgstr "Dropp %s PCI-sondering" + #~ msgid "" #~ "Summary: %s\n" #~ "\n" |