diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install2.pm | 104 | ||||
| -rw-r--r-- | perl-install/share/po/no.po | 276 |
2 files changed, 205 insertions, 175 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 00a9710b7..0823b977a 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -5,9 +5,9 @@ use strict; use vars qw($o); -######################################################################################## -# misc imports -######################################################################################## +#-###################################################################################### +#- misc imports +#-###################################################################################### use common qw(:common :file :system :functional); use install_any qw(:all); use log; @@ -25,12 +25,10 @@ use printer; use run_program; use install_steps_graphical; -use Data::Dumper; - -######################################################################################## -# Steps table -######################################################################################## +#-###################################################################################### +#- Steps table +#-###################################################################################### my %stepsHelp = ( selectLanguage => @@ -220,16 +218,16 @@ for (my $i = 0; $i < @installSteps; $i += 2) { $installSteps{first} = $installSteps[0]; -######################################################################################## -# INTERN CONSTANT -######################################################################################## +#-##################################################################################### +#-INTERN CONSTANT +#-##################################################################################### my @install_classes = (__("beginner"), __("developer"), __("server"), __("expert")); -######################################################################################## -# Default value -######################################################################################## +#-##################################################################################### +#-Default value +#-##################################################################################### # partition layout for a server -#NOT YET USED +# NOT YET USED my @serverPartitioning = ( { mntpoint => "/boot", size => 16 << 11, type => 0x83 }, { mntpoint => "/", size => 256 << 11, type => 0x83 }, @@ -287,12 +285,12 @@ my $default = { # display => "192.168.1.9:0", }; -######################################################################################## -#$O -#the big struct which contain, well everything (globals + the interactive methods ...) -#if you want to do a kickstart file, you just have to add all the required fields (see for example -#the variable $default) -######################################################################################## +#-####################################################################################### +#-$O +#-the big struct which contain, well everything (globals + the interactive methods ...) +#-if you want to do a kickstart file, you just have to add all the required fields (see for example +#-the variable $default) +#-####################################################################################### $o = $::o = { default => $default, @@ -319,21 +317,19 @@ $o = $::o = { }; -######################################################################################## -# Steps Functions -# each step function are called with two arguments : clicked(because if you are a -# beginner you can force the the step) and the entered number -######################################################################################## +#-###################################################################################### +#- Steps Functions +#- each step function are called with two arguments : clicked(because if you are a +#- beginner you can force the the step) and the entered number +#-###################################################################################### #------------------------------------------------------------------------------ sub selectLanguage { - lang::set($o->{lang} = $o->chooseLanguage); - $o->{keyboard} = $o->default("keyboard") || keyboard::lang2keyboard($o->{lang}); - keyboard::setup($o->{keyboard}); + $o->selectLanguage; addToBeDone { unless ($o->{isUpgrade}) { - lang::write($o->{prefix}); + lang ::write($o->{prefix}); keyboard::write($o->{prefix}, $o->{keyboard}); } } 'doInstallStep'; @@ -344,9 +340,7 @@ sub selectKeyboard { my ($clicked) = $_[0]; return if $o->{installClass} eq "beginner" && !$clicked; - $o->{keyboard} = $o->chooseKeyboard; - keyboard::setup($o->{keyboard}); - + $o->selectKeyboard; #if we go back to the selectKeyboard, you must rewrite addToBeDone { keyboard::write($o->{prefix}, $o->{keyboard}) unless $o->{isUpgrade}; @@ -356,20 +350,28 @@ sub selectKeyboard { #------------------------------------------------------------------------------ sub selectPath { $o->{isUpgrade} = $o->selectInstallOrUpgrade; + $o->{steps} = $o->{isUpgrade} ? \%upgradeSteps : \%installSteps; $o->{orderedSteps} = $o->{isUpgrade} ? \@orderedUpgradeSteps : \@orderedInstallSteps; } +#------------------------------------------------------------------------------ sub selectInstallClass { $o->{installClass} = $o->selectInstallClass(@install_classes); + $::expert = $o->{installClass} eq "expert"; } +#------------------------------------------------------------------------------ sub setupSCSI { + my ($clicked) = $_[0]; $o->{autoSCSI} ||= $o->{installClass} eq "beginner"; - $o->setupSCSI($o->{autoSCSI} && !$_[0]); + + $o->setupSCSI($o->{autoSCSI} && !$clicked); } +#------------------------------------------------------------------------------ +#PADTODO sub partitionDisks { $o->{drives} = [ detect_devices::hds() ]; $o->{hds} = catch_cdie { fsedit::hds($o->{drives}, $o->{default}{partitioning}) } @@ -403,6 +405,7 @@ I'll try to go on blanking bad partitions")); } +#PADTODO sub formatPartitions { $o->choosePartitionsToFormat($o->{fstab}); @@ -414,12 +417,16 @@ sub formatPartitions { home mnt tmp var var/tmp var/lib var/lib/rpm); } +#------------------------------------------------------------------------------ +#PADTODO sub choosePackages { install_any::setPackages($o) if $_[1] == 1; $o->choosePackages($o->{packages}, $o->{compss}); $o->{packages}{$_}{selected} = 1 foreach @{$o->{base}}; } +#------------------------------------------------------------------------------ +#PADTODO sub doInstallStep { install_any::setPackages($o) unless $_[1]; # FIXME $o->beforeInstallPackages; @@ -427,38 +434,60 @@ sub doInstallStep { $o->afterInstallPackages; } +#------------------------------------------------------------------------------ sub configureMouse { $o->mouseConfig } -sub configureNetwork { $o->configureNetwork($_[1] == 1 && !$_[0]) } +#------------------------------------------------------------------------------ +sub configureNetwork { + my ($clicked, $entered) = @_; + $o->configureNetwork($entered == 1 && !$clicked) +} +#------------------------------------------------------------------------------ +#PADTODO sub configureTimezone { + my ($clicked) = $_[0]; my $f = "$o->{prefix}/etc/sysconfig/clock"; - return if ((-s $f) || 0) > 0 && $_[1] == 1 && !$_[0]; + return if ((-s $f) || 0) > 0 && $_[1] == 1 && !$clicked; $o->timeConfig($f); } +#------------------------------------------------------------------------------ sub configureServices { $o->servicesConfig } +#------------------------------------------------------------------------------ sub configurePrinter { $o->printerConfig } +#------------------------------------------------------------------------------ sub setRootPassword { $o->setRootPassword } +#------------------------------------------------------------------------------ sub addUser { $o->addUser; + addToBeDone { run_program::rooted($o->{prefix}, "pwconv") or log::l("pwconv failed"); # use shadow passwords } 'doInstallStep'; } +#------------------------------------------------------------------------------ +#PADTODO sub createBootdisk { fs::write($o->{prefix}, $o->{fstab}) unless $o->{isUpgrade}; modules::write_conf("$o->{prefix}/etc/conf.modules", 'append'); $o->createBootdisk($_[1] == 1); } +#------------------------------------------------------------------------------ sub setupBootloader { $o->setupBootloader; } +#------------------------------------------------------------------------------ sub configureX { - $o->setupXfree if $o->{packages}{XFree86}{installed} || $_[0]; + my ($clicked) = $_[0]; + $o->setupXfree if $o->{packages}{XFree86}{installed} || $clicked; } +#------------------------------------------------------------------------------ sub exitInstall { $o->exitInstall } +#-###################################################################################### +#- MAIN +#-###################################################################################### sub main { $SIG{__DIE__} = sub { chomp $_[0]; log::l("ERROR: $_[0]") }; @@ -516,6 +545,7 @@ sub main { } + #the main cycle my $clicked = 0; for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep()) { $o->enteringStep($o->{step}); diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po index 63e6c0703..4fc947206 100644 --- a/perl-install/share/po/no.po +++ b/perl-install/share/po/no.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: panoramix VERSION\n" -"POT-Creation-Date: 1999-09-03 23:57+0200\n" +"POT-Creation-Date: 1999-09-04 16:55+0200\n" "PO-Revision-Date: 1999-08-25 11:07+0200\n" "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n" "Language-Team: norwegian\n" @@ -64,8 +64,8 @@ msgstr "En feil oppsto, prøv å endre noen parametere" msgid "Automatic resolutions" msgstr "Automatiske oppløsninger" -#: ../Xconfigurator.pm_.c:333 ../install_steps_interactive.pm_.c:289 -#: ../install_steps_interactive.pm_.c:290 +#: ../Xconfigurator.pm_.c:333 ../install_steps_interactive.pm_.c:281 +#: ../install_steps_interactive.pm_.c:282 msgid "Resolution" msgstr "Oppløsning" @@ -515,7 +515,7 @@ msgstr "Les nøye!" msgid "all data on this partition will be lost" msgstr "alle data på denne partisjonen vil gå tapt" -#: ../diskdrake.pm_.c:136 ../install2.pm_.c:356 ../install_steps.pm_.c:71 +#: ../diskdrake.pm_.c:136 ../install2.pm_.c:377 ../install_steps.pm_.c:72 #: ../install_steps_interactive.pm_.c:26 msgid "Error" msgstr "Feil" @@ -670,7 +670,7 @@ msgstr "Du må starte maskinen på nytt for at modifiseringene skal tre i kraft" msgid "Computing fat filesystem bounds" msgstr "Beregner fat filsystemgrense" -#: ../diskdrake.pm_.c:425 ../diskdrake.pm_.c:461 ../interactive_gtk.pm_.c:106 +#: ../diskdrake.pm_.c:425 ../diskdrake.pm_.c:461 ../interactive_gtk.pm_.c:129 msgid "Resizing" msgstr "Endrer størrelse" @@ -756,15 +756,15 @@ msgstr "Det finnes allerede en partisjon med monteringspunkt %s" msgid "Error opening %s for writing: %s" msgstr "Feil ved åpning av %s for skriving: %s" -#: ../install2.pm_.c:29 +#: ../install2.pm_.c:37 msgid "Choose preferred language for install and system usage." msgstr "" -#: ../install2.pm_.c:32 +#: ../install2.pm_.c:40 msgid "Choose on the list of keyboards, the one corresponding to yours" msgstr "" -#: ../install2.pm_.c:35 +#: ../install2.pm_.c:43 #, fuzzy msgid "" "Choose \"Installation\" if there are no previous versions of Linux\n" @@ -781,7 +781,7 @@ msgstr "" "(Venice), 5.2 (Leeloo), 5.3 (Festen) eller\n" " 6.0 (Venus)." -#: ../install2.pm_.c:42 +#: ../install2.pm_.c:50 msgid "" "Select:\n" " - Beginner: If you have not installed Linux before, or wish to install\n" @@ -808,7 +808,7 @@ msgstr "" "opprettholde\n" "kontrollen over installasjonen så er dette valget for deg." -#: ../install2.pm_.c:55 +#: ../install2.pm_.c:63 #, fuzzy msgid "" "The system did not detect a SCSI card. If you have one (or several)\n" @@ -831,7 +831,7 @@ msgstr "" "under \"System\"\n" " i \"Kontrollpanelet\"." -#: ../install2.pm_.c:65 +#: ../install2.pm_.c:73 msgid "" "At this point, hard drive partitions must be defined. (Unless you\n" "are overwriting a previous install of Linux and have already defined\n" @@ -846,7 +846,7 @@ msgid "" "be. Consult the documentation and take your time before proceeding." msgstr "" -#: ../install2.pm_.c:78 +#: ../install2.pm_.c:86 msgid "" "Any partitions that have been newly defined must be formatted for\n" "use. At this time, you may wish to re-format some pre-existing\n" @@ -861,7 +861,7 @@ msgstr "" "hvis de inneholder data som\n" "du ønsker å beholde (typiske tilfeller: / home and / usr/local)." -#: ../install2.pm_.c:85 +#: ../install2.pm_.c:93 msgid "" "You may now select the packages you wish to install.\n" "\n" @@ -888,7 +888,7 @@ msgstr "" "sone \"Infos\"\n" "funnet over knappene til bekreftelse/valg/fjern valg." -#: ../install2.pm_.c:98 +#: ../install2.pm_.c:106 msgid "" "The packages selected are now being installed. This operation\n" "should only take a few minutes." @@ -896,13 +896,13 @@ msgstr "" "Pakkene som er valgt blir nå installert på systemet ditt. Dette tar bare " "noen få minutter." -#: ../install2.pm_.c:102 ../install2.pm_.c:105 ../install2.pm_.c:108 -#: ../install2.pm_.c:111 ../install2.pm_.c:114 ../install2.pm_.c:146 -#: ../install2.pm_.c:161 ../install2.pm_.c:192 +#: ../install2.pm_.c:110 ../install2.pm_.c:113 ../install2.pm_.c:116 +#: ../install2.pm_.c:119 ../install2.pm_.c:122 ../install2.pm_.c:154 +#: ../install2.pm_.c:169 ../install2.pm_.c:201 msgid "Help" msgstr "Hjelp" -#: ../install2.pm_.c:117 +#: ../install2.pm_.c:125 msgid "" "An administrator password for your Linux system must now be\n" "assigned. The password must be entered twice to verify that both\n" @@ -921,7 +921,7 @@ msgid "" "\"password\", type the password that was created here." msgstr "" -#: ../install2.pm_.c:134 +#: ../install2.pm_.c:142 msgid "" "You can now authorize one or more people to use your Linux\n" "system. Each user account will have their own customizable environment.\n" @@ -935,7 +935,7 @@ msgid "" "accomplished from a regular user account." msgstr "" -#: ../install2.pm_.c:149 +#: ../install2.pm_.c:157 #, fuzzy msgid "" "You need to indicate where you wish\n" @@ -949,7 +949,7 @@ msgstr "" "Med mindre du vet akkurat hva du gjør, velg alltid \"Første sektor av " "disken\"." -#: ../install2.pm_.c:156 +#: ../install2.pm_.c:164 msgid "" "It is now time to configure the video card and monitor\n" "configuration for the X windows Graphic User Interface (GUI). First\n" @@ -957,103 +957,103 @@ msgid "" "your selections if necessary." msgstr "" -#: ../install2.pm_.c:167 +#: ../install2.pm_.c:175 msgid "Choose your language" msgstr "Velg språk" -#: ../install2.pm_.c:168 +#: ../install2.pm_.c:176 msgid "Choose install or upgrade" msgstr "Velg installering eller oppgradering" -#: ../install2.pm_.c:169 +#: ../install2.pm_.c:177 msgid "Select installation class" msgstr "Velg installasjonsklasse" -#: ../install2.pm_.c:170 +#: ../install2.pm_.c:178 #, fuzzy msgid "Choose your keyboard" msgstr "Velg språk" -#: ../install2.pm_.c:171 +#: ../install2.pm_.c:179 msgid "Setup SCSI" msgstr "Oppsett SCSI" -#: ../install2.pm_.c:172 +#: ../install2.pm_.c:180 msgid "Setup filesystems" msgstr "Oppsett filsystemer" -#: ../install2.pm_.c:173 +#: ../install2.pm_.c:181 msgid "Format partitions" msgstr "Formater partisjoner" -#: ../install2.pm_.c:174 +#: ../install2.pm_.c:182 msgid "Choose packages to install" msgstr "Velg pakker for installering" -#: ../install2.pm_.c:175 +#: ../install2.pm_.c:183 msgid "Install system" msgstr "Installer systemet" -#: ../install2.pm_.c:176 +#: ../install2.pm_.c:184 #, fuzzy msgid "Configure mouse" msgstr "Konfigurer X" -#: ../install2.pm_.c:177 +#: ../install2.pm_.c:185 msgid "Configure networking" msgstr "Konfigurer nettverk" -#: ../install2.pm_.c:178 +#: ../install2.pm_.c:186 #, fuzzy msgid "Configure timezone" msgstr "Konfigurer X" -#: ../install2.pm_.c:180 +#: ../install2.pm_.c:188 #, fuzzy msgid "Configure printer" msgstr "Konfigurer X" -#: ../install2.pm_.c:181 ../install_steps_graphical.pm_.c:445 +#: ../install2.pm_.c:189 ../install_steps_graphical.pm_.c:444 msgid "Set root password" msgstr "Sett root passord" -#: ../install2.pm_.c:182 +#: ../install2.pm_.c:190 msgid "Add a user" msgstr "Legg til en bruker" -#: ../install2.pm_.c:183 +#: ../install2.pm_.c:191 msgid "Create bootdisk" msgstr "Opprett oppstartdiskett" -#: ../install2.pm_.c:184 +#: ../install2.pm_.c:192 msgid "Install bootloader" msgstr "Installer oppstartslaster" -#: ../install2.pm_.c:185 +#: ../install2.pm_.c:193 msgid "Configure X" msgstr "Konfigurer X" -#: ../install2.pm_.c:186 +#: ../install2.pm_.c:194 msgid "Exit install" msgstr "Gå ut av installering" -#: ../install2.pm_.c:215 +#: ../install2.pm_.c:226 msgid "beginner" msgstr "nybegynner" -#: ../install2.pm_.c:215 +#: ../install2.pm_.c:226 msgid "developer" msgstr "utvikler" -#: ../install2.pm_.c:215 +#: ../install2.pm_.c:226 msgid "expert" msgstr "ekspert" -#: ../install2.pm_.c:215 +#: ../install2.pm_.c:226 msgid "server" msgstr "tjener" -#: ../install2.pm_.c:366 +#: ../install2.pm_.c:387 msgid "" "An error has occurred - no valid devices were found on which to create new " "filesystems. Please check your hardware for the cause of this problem" @@ -1061,152 +1061,152 @@ msgstr "" "En feil har oppstått - ingen gyldige enheter ble funnet for å opprette nye " "filsystemer. Vennligst sjekk maskinvaren din for årsaken til dette problemet" -#: ../install2.pm_.c:381 +#: ../install2.pm_.c:402 msgid "partitioning failed: no root filesystem" msgstr "partisjonering feilet: intet root filsystem" -#: ../install_steps.pm_.c:256 +#: ../install_steps.pm_.c:257 msgid "no floppy available" msgstr "" -#: ../install_steps_graphical.pm_.c:204 +#: ../install_steps_graphical.pm_.c:206 msgid "Hide" msgstr "Gjem" -#: ../install_steps_graphical.pm_.c:204 +#: ../install_steps_graphical.pm_.c:206 msgid "Show All" msgstr "Vis alle" -#: ../install_steps_graphical.pm_.c:208 +#: ../install_steps_graphical.pm_.c:210 msgid "Select All" msgstr "Velg alle" -#: ../install_steps_graphical.pm_.c:208 +#: ../install_steps_graphical.pm_.c:210 msgid "Unselect All" msgstr "Fjern alle" -#: ../install_steps_graphical.pm_.c:275 +#: ../install_steps_graphical.pm_.c:277 msgid "Choose the packages you want to install" msgstr "Velg pakker du ønsker å installere" -#: ../install_steps_graphical.pm_.c:286 +#: ../install_steps_graphical.pm_.c:288 msgid " Mb" msgstr "Mb" -#: ../install_steps_graphical.pm_.c:286 +#: ../install_steps_graphical.pm_.c:288 msgid "Total size: " msgstr "Total størrelse: " -#: ../install_steps_graphical.pm_.c:287 +#: ../install_steps_graphical.pm_.c:289 msgid "Info" msgstr "" -#: ../install_steps_graphical.pm_.c:315 +#: ../install_steps_graphical.pm_.c:314 msgid "Installing" msgstr "Installerer" -#: ../install_steps_graphical.pm_.c:321 +#: ../install_steps_graphical.pm_.c:320 msgid "Please wait, " msgstr "Vennligst vent, " -#: ../install_steps_graphical.pm_.c:323 +#: ../install_steps_graphical.pm_.c:322 msgid "Time remaining " msgstr "Tid som gjenstår " -#: ../install_steps_graphical.pm_.c:324 +#: ../install_steps_graphical.pm_.c:323 msgid "Total time " msgstr "Total tid " -#: ../install_steps_graphical.pm_.c:329 +#: ../install_steps_graphical.pm_.c:328 msgid "preparing installation" msgstr "forbereder installasjon" -#: ../install_steps_graphical.pm_.c:350 +#: ../install_steps_graphical.pm_.c:349 #, c-format msgid "installing package %s" msgstr "installerer pakke %s" -#: ../install_steps_graphical.pm_.c:381 +#: ../install_steps_graphical.pm_.c:380 #, c-format msgid "Configuring network device %s" msgstr "Konfigurerer nettverks-enhet %s" -#: ../install_steps_graphical.pm_.c:389 +#: ../install_steps_graphical.pm_.c:388 msgid "IP address:" msgstr "IP adresse:" -#: ../install_steps_graphical.pm_.c:390 +#: ../install_steps_graphical.pm_.c:389 msgid "Netmask:" msgstr "Nettmaske:" -#: ../install_steps_graphical.pm_.c:399 +#: ../install_steps_graphical.pm_.c:398 msgid "IP address should be in format 1.2.3.4" msgstr "" -#: ../install_steps_graphical.pm_.c:412 +#: ../install_steps_graphical.pm_.c:411 #, fuzzy msgid "Configuring network" msgstr "Konfigurer nettverk" -#: ../install_steps_graphical.pm_.c:420 +#: ../install_steps_graphical.pm_.c:419 #, fuzzy msgid "Host name:" msgstr "Brukernavn" -#: ../install_steps_graphical.pm_.c:421 +#: ../install_steps_graphical.pm_.c:420 #, fuzzy msgid "DNS server:" msgstr "tjener" -#: ../install_steps_graphical.pm_.c:422 +#: ../install_steps_graphical.pm_.c:421 msgid "Gateway:" msgstr "" -#: ../install_steps_graphical.pm_.c:423 +#: ../install_steps_graphical.pm_.c:422 msgid "Gateway device:" msgstr "" -#: ../install_steps_graphical.pm_.c:448 ../install_steps_graphical.pm_.c:475 +#: ../install_steps_graphical.pm_.c:447 ../install_steps_graphical.pm_.c:474 msgid "Password" msgstr "Passord" -#: ../install_steps_graphical.pm_.c:449 ../install_steps_graphical.pm_.c:476 +#: ../install_steps_graphical.pm_.c:448 ../install_steps_graphical.pm_.c:475 msgid "Password (again)" msgstr "Passord (igjen)" -#: ../install_steps_graphical.pm_.c:458 ../install_steps_graphical.pm_.c:491 +#: ../install_steps_graphical.pm_.c:457 ../install_steps_graphical.pm_.c:490 msgid "Please try again" msgstr "Vennligst prøv igjen" -#: ../install_steps_graphical.pm_.c:458 ../install_steps_graphical.pm_.c:491 +#: ../install_steps_graphical.pm_.c:457 ../install_steps_graphical.pm_.c:490 msgid "You must enter the same password" msgstr "Du må skrive inn det samme passordet" -#: ../install_steps_graphical.pm_.c:459 +#: ../install_steps_graphical.pm_.c:458 msgid "This password is too simple" msgstr "Dette passordet er for enkelt" -#: ../install_steps_graphical.pm_.c:470 +#: ../install_steps_graphical.pm_.c:469 msgid "Add user" msgstr "Legg til bruker" -#: ../install_steps_graphical.pm_.c:474 +#: ../install_steps_graphical.pm_.c:473 msgid "User name" msgstr "Brukernavn" -#: ../install_steps_graphical.pm_.c:477 +#: ../install_steps_graphical.pm_.c:476 msgid "Real name" msgstr "Virkelig navn" -#: ../install_steps_graphical.pm_.c:478 +#: ../install_steps_graphical.pm_.c:477 msgid "Shell" msgstr "Skall" -#: ../install_steps_graphical.pm_.c:493 +#: ../install_steps_graphical.pm_.c:492 msgid "Please give a user name" msgstr "Vennligst oppgi et brukernavn" -#: ../install_steps_graphical.pm_.c:494 +#: ../install_steps_graphical.pm_.c:493 #, fuzzy msgid "" "The user name must contain only lower cased letters, numbers, `-' and `_'" @@ -1292,77 +1292,77 @@ msgid "" "system?" msgstr "" -#: ../install_steps_interactive.pm_.c:158 +#: ../install_steps_interactive.pm_.c:163 msgid "Standard Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:159 +#: ../install_steps_interactive.pm_.c:164 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?" +"\t\t\t name (often lp) and a spool directory associated with it. What \n" +"\t\t\t name and directory should be used for this queue?" msgstr "" -#: ../install_steps_interactive.pm_.c:162 +#: ../install_steps_interactive.pm_.c:167 msgid "Name of queue:" msgstr "" -#: ../install_steps_interactive.pm_.c:162 +#: ../install_steps_interactive.pm_.c:167 msgid "Spool directory:" msgstr "" -#: ../install_steps_interactive.pm_.c:167 +#: ../install_steps_interactive.pm_.c:178 msgid "Select Printer Connection" msgstr "" -#: ../install_steps_interactive.pm_.c:168 +#: ../install_steps_interactive.pm_.c:179 msgid "How is the printer connected?" msgstr "" -#: ../install_steps_interactive.pm_.c:183 +#: ../install_steps_interactive.pm_.c:194 msgid "" "What device is your printer connected to \n" "(note that /dev/lp0 is equivalent to LPT1:)?\n" msgstr "" -#: ../install_steps_interactive.pm_.c:185 +#: ../install_steps_interactive.pm_.c:196 msgid "I detect :" msgstr "" -#: ../install_steps_interactive.pm_.c:191 +#: ../install_steps_interactive.pm_.c:202 msgid "Local Printer Device" msgstr "" -#: ../install_steps_interactive.pm_.c:193 +#: ../install_steps_interactive.pm_.c:204 #, fuzzy msgid "Printer Device:" msgstr "Enhet: " -#: ../install_steps_interactive.pm_.c:200 +#: ../install_steps_interactive.pm_.c:210 msgid "Remote lpd Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:201 +#: ../install_steps_interactive.pm_.c:211 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:204 +#: ../install_steps_interactive.pm_.c:214 #, fuzzy msgid "Remote hostname:" msgstr "Brukernavn" -#: ../install_steps_interactive.pm_.c:204 +#: ../install_steps_interactive.pm_.c:214 msgid "Remote queue:" msgstr "" -#: ../install_steps_interactive.pm_.c:217 +#: ../install_steps_interactive.pm_.c:219 msgid "SMB/Windows 95/NT Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:218 +#: ../install_steps_interactive.pm_.c:220 msgid "" "To print to a SMB printer, you need to provide the \n" "SMB host name (this is not always the same as the machines \n" @@ -1371,42 +1371,42 @@ msgid "" "applicable user name, password, and workgroup information." msgstr "" -#: ../install_steps_interactive.pm_.c:223 +#: ../install_steps_interactive.pm_.c:225 #, fuzzy msgid "SMB server IP:" msgstr "tjener" -#: ../install_steps_interactive.pm_.c:223 +#: ../install_steps_interactive.pm_.c:225 #, fuzzy msgid "SMB server host:" msgstr "tjener" -#: ../install_steps_interactive.pm_.c:224 -#: ../install_steps_interactive.pm_.c:247 +#: ../install_steps_interactive.pm_.c:226 +#: ../install_steps_interactive.pm_.c:240 #, fuzzy msgid "Password:" msgstr "Passord" -#: ../install_steps_interactive.pm_.c:224 +#: ../install_steps_interactive.pm_.c:226 #, fuzzy msgid "Share name:" msgstr "Brukernavn" -#: ../install_steps_interactive.pm_.c:224 -#: ../install_steps_interactive.pm_.c:247 +#: ../install_steps_interactive.pm_.c:226 +#: ../install_steps_interactive.pm_.c:240 #, fuzzy msgid "User name:" msgstr "Brukernavn" -#: ../install_steps_interactive.pm_.c:225 +#: ../install_steps_interactive.pm_.c:227 msgid "Workgroup:" msgstr "" -#: ../install_steps_interactive.pm_.c:241 +#: ../install_steps_interactive.pm_.c:234 msgid "NetWare Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:242 +#: ../install_steps_interactive.pm_.c:235 msgid "" "To print to a NetWare printer, you need to provide the \n" "NetWare print server name (this is not always the same as the machines \n" @@ -1414,56 +1414,56 @@ msgid "" "wish to access and any applicable user name and password." msgstr "" -#: ../install_steps_interactive.pm_.c:246 +#: ../install_steps_interactive.pm_.c:239 msgid "Print Queue Name:" msgstr "" -#: ../install_steps_interactive.pm_.c:246 +#: ../install_steps_interactive.pm_.c:239 msgid "Printer Server:" msgstr "" -#: ../install_steps_interactive.pm_.c:264 +#: ../install_steps_interactive.pm_.c:259 #, fuzzy msgid "Configure Printer" msgstr "Konfigurer X" -#: ../install_steps_interactive.pm_.c:265 +#: ../install_steps_interactive.pm_.c:260 #, fuzzy msgid "What type of printer do you have?" msgstr "Hva slags brukertype vil du ha?" -#: ../install_steps_interactive.pm_.c:277 -#: ../install_steps_interactive.pm_.c:278 +#: ../install_steps_interactive.pm_.c:271 +#: ../install_steps_interactive.pm_.c:272 msgid "Paper Size" msgstr "" -#: ../install_steps_interactive.pm_.c:305 +#: ../install_steps_interactive.pm_.c:295 msgid "CRLF" msgstr "" -#: ../install_steps_interactive.pm_.c:306 +#: ../install_steps_interactive.pm_.c:296 msgid "Fix stair-stepping of text?" msgstr "" -#: ../install_steps_interactive.pm_.c:321 +#: ../install_steps_interactive.pm_.c:310 #, fuzzy msgid "Configure Uniprint Driver" msgstr "Konfigurer X" -#: ../install_steps_interactive.pm_.c:322 +#: ../install_steps_interactive.pm_.c:311 msgid "You may now configure the uniprint options for this printer." msgstr "" -#: ../install_steps_interactive.pm_.c:330 +#: ../install_steps_interactive.pm_.c:319 #, fuzzy msgid "Configure Color Depth" msgstr "Konfigurer X" -#: ../install_steps_interactive.pm_.c:331 +#: ../install_steps_interactive.pm_.c:320 msgid "You may now configure the color options for this printer." msgstr "" -#: ../install_steps_interactive.pm_.c:358 +#: ../install_steps_interactive.pm_.c:339 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 " @@ -1477,75 +1477,75 @@ msgid "" "failures. Would you like to create a bootdisk for your system?" msgstr "" -#: ../install_steps_interactive.pm_.c:367 +#: ../install_steps_interactive.pm_.c:348 msgid "Sorry, no floppy drive available" msgstr "" -#: ../install_steps_interactive.pm_.c:374 +#: ../install_steps_interactive.pm_.c:355 #, c-format msgid "Insert a floppy in drive %s" msgstr "" -#: ../install_steps_interactive.pm_.c:375 +#: ../install_steps_interactive.pm_.c:356 #, fuzzy msgid "Creating bootdisk" msgstr "Opprett oppstartdiskett" -#: ../install_steps_interactive.pm_.c:381 +#: ../install_steps_interactive.pm_.c:362 msgid "First sector of boot partition" msgstr "" -#: ../install_steps_interactive.pm_.c:381 +#: ../install_steps_interactive.pm_.c:362 msgid "First sector of drive" msgstr "" -#: ../install_steps_interactive.pm_.c:384 +#: ../install_steps_interactive.pm_.c:365 #, fuzzy msgid "Lilo Installation" msgstr "Installerer" -#: ../install_steps_interactive.pm_.c:385 +#: ../install_steps_interactive.pm_.c:366 #, fuzzy msgid "Where do you want to install the bootloader?" msgstr "Hvor vil du montere %s enheten?" -#: ../install_steps_interactive.pm_.c:408 +#: ../install_steps_interactive.pm_.c:389 #, fuzzy, c-format msgid "What %s card have you?" msgstr "Hva slags scsi-kort har du?" -#: ../install_steps_interactive.pm_.c:417 +#: ../install_steps_interactive.pm_.c:398 msgid "Autoprobe" msgstr "" -#: ../install_steps_interactive.pm_.c:417 +#: ../install_steps_interactive.pm_.c:398 msgid "Specify options" msgstr "" -#: ../install_steps_interactive.pm_.c:423 +#: ../install_steps_interactive.pm_.c:404 msgid "Module options:" msgstr "" -#: ../install_steps_interactive.pm_.c:435 +#: ../install_steps_interactive.pm_.c:416 #, fuzzy, c-format msgid "Installing driver for %s card %s" msgstr "Installerer driver for scsi-kort %s" -#: ../install_steps_interactive.pm_.c:436 +#: ../install_steps_interactive.pm_.c:417 #, c-format msgid "(module %s)" msgstr "(modul %s)" -#: ../install_steps_interactive.pm_.c:449 +#: ../install_steps_interactive.pm_.c:430 #, fuzzy, c-format msgid "Found %s %s interfaces" msgstr " scsi grensesnitt" -#: ../install_steps_interactive.pm_.c:450 +#: ../install_steps_interactive.pm_.c:431 msgid "Do you have another one?" msgstr "Har du enda ett?" -#: ../install_steps_interactive.pm_.c:451 +#: ../install_steps_interactive.pm_.c:432 #, fuzzy, c-format msgid "Do you have an %s interface?" msgstr "Har du et scsi grensesnitt" |