diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/help.pm | 37 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/keyboard.pm | 3 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 | ||||
| -rw-r--r-- | perl-install/share/po/no.po | 122 |
5 files changed, 96 insertions, 70 deletions
diff --git a/perl-install/help.pm b/perl-install/help.pm index af8b15632..614fa833c 100644 --- a/perl-install/help.pm +++ b/perl-install/help.pm @@ -35,15 +35,19 @@ this. customized installation, this Install Class is for you."), setupSCSI => - __("The system did not detect a SCSI card. If you have one (or several) -click on \"Yes\" and choose the module(s) to be tested. Otherwise, -select \"No\". + __("Panoramix will attempt at first to look for one or more PCI +SCSI adapter(s). If it finds it (or them) and knows which driver(s) +to use, it will insert it (them) automatically. +If your SCSI adapter is ISA, or is PCI but Panoramix doesn't know +which driver to use for this card, or if you have no SCSI adapters +at all, you will then be prompted on whether you have one or not. +If you have none, answer \"No\". If you have one or more, answer +\"Yes\". You will then be asked which driver to try. -If you don't know if your computer has SCSI interfaces, consult the -original documentation delivered with the computer, or if you use -Microsoft Windows 95/98, inspect the information available via the \"Control -panel\", \"System's icon, \"Device Manager\" tab."), +In this case, you will be prompted on options to pass to the dri- +ver (namely, I/O port and IRQ). Don't forget the information you +could get from Windows, as suggested by the installation guide!"), partitionDisks => __("At this point, hard drive partitions must be defined. (Unless you @@ -185,15 +189,20 @@ this. customized installation, this Install Class is for you."), setupSCSI => - __("The system did not detect a SCSI card. If you have one (or several) -click on \"Yes\" and choose the module(s) to be tested. Otherwise, -select \"No\". +__("Panoramix will attempt at first to look for one or more PCI +SCSI adapter(s). If it finds it (or them) and knows which driver(s) +to use, it will insert it (them) automatically. +If your SCSI adapter is ISA, or is PCI but Panoramix doesn't know +which driver to use for this card, or if you have no SCSI adapters +at all, you will then be prompted on whether you have one or not. +If you have none, answer \"No\". If you have one or more, answer +\"Yes\". You will then be asked which driver to try. + +In this case, you will be prompted on options to pass to the dri- +ver (namely, I/O port and IRQ). Don't forget the information you +could get from Windows, as suggested by the installation guide!"), -If you don't know if your computer has SCSI interfaces, consult the -original documentation delivered with the computer, or if you use -Microsoft Windows 95/98, inspect the information available via the \"Control -panel\", \"System's icon, \"Device Manager\" tab."), partitionDisks => __("At this point, hard drive partitions must be defined. (Unless you diff --git a/perl-install/install2.pm b/perl-install/install2.pm index a6d673358..2cf475a53 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -172,7 +172,7 @@ $o = $::o = { #- user => { name => 'foo', password => 'bar', home => '/home/foo', shell => '/bin/bash', realname => 'really, it is foo' }, #- keyboard => 'de', -#- display => "192.168.1.9:0", +# display => "192.168.1.19:1", steps => \%installSteps, orderedSteps => \@orderedInstallSteps, diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 7ee6a3728..27ba9690e 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -75,8 +75,9 @@ my %keyboards = ( #- Functions #-###################################################################################### sub list { map { $_->[0] } values %keyboards } -sub xmodmaps { map { $_ } values %keyboards } +sub xmodmaps { keys %keyboards } sub keyboard2text { $keyboards{$_[0]} && $keyboards{$_[0]}[0] } +sub keyboard2xkb { $keyboards{$_[0]} && $keyboards{$_[0]}[2] } sub text2keyboard { my ($t) = @_; while (my ($k, $v) = each %keyboards) { diff --git a/perl-install/modules.pm b/perl-install/modules.pm index a938705d8..caff2f2a5 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -138,7 +138,7 @@ while (my ($k, $v) = each %drivers) { 1; - +sub drivers { %drivers } sub text_of_type($) { my ($type) = @_; diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po index 63ddb731b..067913734 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-30 20:27+0200\n" +"POT-Creation-Date: 1999-09-30 21:37+0200\n" "PO-Revision-Date: 1999-08-25 11:07+0200\n" "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n" "Language-Team: norwegian\n" @@ -639,7 +639,7 @@ msgstr "endrer størrelse" msgid "Choose the new size" msgstr "Velg ny størrelse" -#: ../diskdrake.pm_.c:436 ../install_steps_graphical.pm_.c:270 +#: ../diskdrake.pm_.c:436 ../install_steps_graphical.pm_.c:271 msgid "MB" msgstr "MB" @@ -730,15 +730,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" -#: ../help.pm_.c:7 ../help.pm_.c:157 +#: ../help.pm_.c:7 ../help.pm_.c:161 msgid "Choose preferred language for install and system usage." msgstr "Velg ønsket språk for installering og systembruk." -#: ../help.pm_.c:10 ../help.pm_.c:160 +#: ../help.pm_.c:10 ../help.pm_.c:164 msgid "Choose on the list of keyboards, the one corresponding to yours" msgstr "Velg på listen over tastatur det som stemmer overens med ditt" -#: ../help.pm_.c:13 ../help.pm_.c:163 +#: ../help.pm_.c:13 ../help.pm_.c:167 msgid "" "Choose \"Installation\" if there are no previous versions of Linux\n" "installed, or if you wish use to multiple distributions or versions.\n" @@ -756,7 +756,7 @@ msgstr "" "Mandrake\n" "Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) eller 6.0 (Venus)." -#: ../help.pm_.c:21 ../help.pm_.c:171 +#: ../help.pm_.c:21 ../help.pm_.c:175 msgid "" "Select:\n" "\n" @@ -788,29 +788,24 @@ 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:38 ../help.pm_.c:188 +#: ../help.pm_.c:38 ../help.pm_.c:192 msgid "" -"The system did not detect a SCSI card. If you have one (or several)\n" -"click on \"Yes\" and choose the module(s) to be tested. Otherwise,\n" -"select \"No\".\n" +"Panoramix 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" +"to use, it will insert it (them) automatically.\n" "\n" +"If your SCSI adapter is ISA, or is PCI but Panoramix doesn't know\n" +"which driver to use for this card, or if you have no SCSI adapters\n" +"at all, you will then be prompted on whether you have one or not.\n" +"If you have none, answer \"No\". If you have one or more, answer\n" +"\"Yes\". You will then be asked which driver to try.\n" "\n" -"If you don't know if your computer has SCSI interfaces, consult the\n" -"original documentation delivered with the computer, or if you use\n" -"Microsoft Windows 95/98, inspect the information available via the " -"\"Control\n" -"panel\", \"System's icon, \"Device Manager\" tab." -msgstr "" -"Systemet fant ikke noen SCSI-kort. Hvis du har ett (eller flere) klikk på\n" -"\"Ja\" og velg modul(er) som skal testes. Hvis ikke, velg \"Nei\".\n" -"\n" -"\n" -"Hvis du ikke vet om maskinen din har SCSI-grensesnitt, se i dokumentasjonen\n" -"levert med datamaskinen din, eller hvis du bruker Windows 95/98, sjekk\n" -"informasjonen tilgjengelig under \"Kontrollpanel\", \"System\", \"Enhets-\n" -"behandling\"." +"In this case, you will be prompted on options to pass to the dri-\n" +"ver (namely, I/O port and IRQ). Don't forget the information you\n" +"could get from Windows, as suggested by the installation guide!" +msgstr "" -#: ../help.pm_.c:49 ../help.pm_.c:199 +#: ../help.pm_.c:53 ../help.pm_.c:208 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" @@ -836,7 +831,7 @@ msgstr "" "DiskDrake forenkler prosessen så den ikke trenger å være det. Les\n" "dokumentasjonen og ta deg god tid før du begynner." -#: ../help.pm_.c:62 ../help.pm_.c:212 +#: ../help.pm_.c:66 ../help.pm_.c:221 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" @@ -851,7 +846,7 @@ msgstr "" "eksisterende partisjoner, især hvis de inneholder filer eller data som du\n" "ønsker å beholde. Typiske å beholde: /home og /usr/local." -#: ../help.pm_.c:69 ../help.pm_.c:219 +#: ../help.pm_.c:73 ../help.pm_.c:228 msgid "" "You may now select the packages you wish to install.\n" "\n" @@ -880,7 +875,7 @@ msgstr "" "Informasjon om hver kategori og spesifikke pakker er tilgjengelig i området\n" "kalt \"Info\" over knappene: [bekreftelse] [valg] [fjern valg]." -#: ../help.pm_.c:84 ../help.pm_.c:234 +#: ../help.pm_.c:88 ../help.pm_.c:243 msgid "" "The packages selected are now being installed. This operation\n" "should only take a few minutes." @@ -888,14 +883,14 @@ msgstr "" "Pakkene som er valgt blir nå installert. Denne operasjonen burde bare ta\n" "noen få minutter." -#: ../help.pm_.c:88 ../help.pm_.c:91 ../help.pm_.c:94 ../help.pm_.c:97 -#: ../help.pm_.c:100 ../help.pm_.c:135 ../help.pm_.c:151 ../help.pm_.c:238 -#: ../help.pm_.c:241 ../help.pm_.c:244 ../help.pm_.c:247 ../help.pm_.c:250 -#: ../help.pm_.c:285 ../help.pm_.c:301 ../install2.pm_.c:65 +#: ../help.pm_.c:92 ../help.pm_.c:95 ../help.pm_.c:98 ../help.pm_.c:101 +#: ../help.pm_.c:104 ../help.pm_.c:139 ../help.pm_.c:155 ../help.pm_.c:247 +#: ../help.pm_.c:250 ../help.pm_.c:253 ../help.pm_.c:256 ../help.pm_.c:259 +#: ../help.pm_.c:294 ../help.pm_.c:310 ../install2.pm_.c:65 msgid "Help" msgstr "Hjelp" -#: ../help.pm_.c:103 ../help.pm_.c:253 +#: ../help.pm_.c:107 ../help.pm_.c:262 msgid "" "An administrator password for your Linux system must now be\n" "assigned. The password must be entered twice to verify that both\n" @@ -933,7 +928,7 @@ msgstr "" "Når du logger inn som administrator, ved \"login\" skriv \"root\" og ved\n" "\"password\", skriv passordet som ble opprettet her." -#: ../help.pm_.c:122 ../help.pm_.c:272 +#: ../help.pm_.c:126 ../help.pm_.c:281 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" @@ -958,7 +953,7 @@ msgstr "" "mot deg selv. Root-kontoen bør kun brukes til administrering og vedlikehold\n" "som ikke kan utføres fra en vanlig brukerkonto." -#: ../help.pm_.c:138 ../help.pm_.c:288 +#: ../help.pm_.c:142 ../help.pm_.c:297 msgid "" "You need to indicate where you wish\n" "to place the information required to boot to Linux.\n" @@ -974,7 +969,7 @@ msgstr "" "Med mindre du vet akkurat hva du gjør, velg \"Første sektor av\n" "disken\"." -#: ../help.pm_.c:146 ../help.pm_.c:296 +#: ../help.pm_.c:150 ../help.pm_.c:305 msgid "" "It is now time to configure the video card and monitor\n" "configuration for the X Window Graphic User Interface (GUI). First\n" @@ -1135,75 +1130,75 @@ msgstr "" msgid "no floppy available" msgstr "ingen diskett tilgjengelig" -#: ../install_steps_graphical.pm_.c:270 +#: ../install_steps_graphical.pm_.c:271 msgid "Total size: " msgstr "Total størrelse: " -#: ../install_steps_graphical.pm_.c:368 +#: ../install_steps_graphical.pm_.c:369 msgid "Choose the packages you want to install" msgstr "Velg pakkene du ønsker å installere" -#: ../install_steps_graphical.pm_.c:380 +#: ../install_steps_graphical.pm_.c:381 msgid "Info" msgstr "Info" -#: ../install_steps_graphical.pm_.c:386 +#: ../install_steps_graphical.pm_.c:387 msgid "Go" msgstr "" -#: ../install_steps_graphical.pm_.c:387 +#: ../install_steps_graphical.pm_.c:388 #, fuzzy msgid "Select less" msgstr "Velg fil" -#: ../install_steps_graphical.pm_.c:388 +#: ../install_steps_graphical.pm_.c:389 #, fuzzy msgid "Select more" msgstr "Velg fil" -#: ../install_steps_graphical.pm_.c:389 +#: ../install_steps_graphical.pm_.c:390 #, fuzzy msgid "Show less" msgstr "Vis alle" -#: ../install_steps_graphical.pm_.c:390 +#: ../install_steps_graphical.pm_.c:391 msgid "Show more" msgstr "" -#: ../install_steps_graphical.pm_.c:408 +#: ../install_steps_graphical.pm_.c:409 msgid "Installing" msgstr "Installerer" -#: ../install_steps_graphical.pm_.c:414 +#: ../install_steps_graphical.pm_.c:415 msgid "Please wait, " msgstr "Vennligst vent, " -#: ../install_steps_graphical.pm_.c:416 +#: ../install_steps_graphical.pm_.c:417 msgid "Time remaining " msgstr "Tid som gjenstår " -#: ../install_steps_graphical.pm_.c:417 +#: ../install_steps_graphical.pm_.c:418 msgid "Total time " msgstr "Total tid " -#: ../install_steps_graphical.pm_.c:422 +#: ../install_steps_graphical.pm_.c:423 msgid "preparing installation" msgstr "forbereder installasjon" -#: ../install_steps_graphical.pm_.c:443 +#: ../install_steps_graphical.pm_.c:444 #, c-format msgid "installing package %s" msgstr "installerer pakke %s" -#: ../install_steps_graphical.pm_.c:468 +#: ../install_steps_graphical.pm_.c:469 msgid "Go on anyway?" msgstr "" -#: ../install_steps_graphical.pm_.c:468 +#: ../install_steps_graphical.pm_.c:469 msgid "There was an error ordering packages:" msgstr "" -#: ../install_steps_graphical.pm_.c:560 ../interactive.pm_.c:47 +#: ../install_steps_graphical.pm_.c:561 ../interactive.pm_.c:47 #: ../interactive.pm_.c:57 ../my_gtk.pm_.c:192 ../my_gtk.pm_.c:346 #: ../my_gtk.pm_.c:430 msgid "Ok" @@ -2174,6 +2169,27 @@ msgstr "Dårlig sikkerhetskopi-fil" msgid "Error writing to file %s" msgstr "Feil ved skriving til fil %s" +#~ msgid "" +#~ "The system did not detect a SCSI card. If you have one (or several)\n" +#~ "click on \"Yes\" and choose the module(s) to be tested. Otherwise,\n" +#~ "select \"No\".\n" +#~ "\n" +#~ "\n" +#~ "If you don't know if your computer has SCSI interfaces, consult the\n" +#~ "original documentation delivered with the computer, or if you use\n" +#~ "Microsoft Windows 95/98, inspect the information available via the " +#~ "\"Control\n" +#~ "panel\", \"System's icon, \"Device Manager\" tab." +#~ msgstr "" +#~ "Systemet fant ikke noen SCSI-kort. Hvis du har ett (eller flere) klikk på\n" +#~ "\"Ja\" og velg modul(er) som skal testes. Hvis ikke, velg \"Nei\".\n" +#~ "\n" +#~ "\n" +#~ "Hvis du ikke vet om maskinen din har SCSI-grensesnitt, se i dokumentasjonen\n" +#~ "levert med datamaskinen din, eller hvis du bruker Windows 95/98, sjekk\n" +#~ "informasjonen tilgjengelig under \"Kontrollpanel\", \"System\", \"Enhets-\n" +#~ "behandling\"." + #~ msgid "No RAMDAC Setting (recommended)" #~ msgstr "Ingen RAMDAC-innstilling (anbefalt)" |