diff options
| -rw-r--r-- | docs/TODO | 2 | ||||
| -rw-r--r-- | perl-install/fsedit.pm | 3 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 1 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/lang.pm | 1 | ||||
| -rw-r--r-- | perl-install/share/po/no.po | 95 |
6 files changed, 53 insertions, 51 deletions
@@ -3,6 +3,8 @@ clock is not set. dd the different xmodmaps for every languages (maybe gnome-core xmodmaps can help) xmodmap needed even for english as the backspace is not what it should +suggested partition tables must be found foreach installClass + timezone using a picture (pb: how to delimit zones) merge the install(1) of redhat diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 67df5da48..6d07796d6 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -29,7 +29,8 @@ my @suggestions_mntpoints = qw(/mnt/dos); sub suggestions_mntpoint($) { my ($hds) = @_; - sort @suggestions_mntpoints, grep { !/swap/ && !has_mntpoint($_, $hds) } map { $_->{mntpoint} } @suggestions; + sort grep { !/swap/ && !has_mntpoint($_, $hds) } + (@suggestions_mntpoints, map { $_->{mntpoint} } @suggestions); } sub hds($$) { diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index ce96047e6..2377c6e4f 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -13,7 +13,6 @@ use lilo; use lang; use keyboard; use pkgs; -use cpio; use log; use fsedit; use commands; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 2a37a4f0d..9620d0be1 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -140,7 +140,7 @@ sub configureNetwork($) { my @l = network::getNet() or return die _("no network card found"); my $last; foreach ($::expert ? @l : $l[0]) { - my $intf = network::findIntf($o->{intf}, $_); + my $intf = network::findIntf($o->{intf} ||= [], $_); add2hash($intf, $last); add2hash($intf, { NETMASK => '255.255.255.0' }); $o->configureNetworkIntf($intf); diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 6a73c6a0a..fca3d223c 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -5,7 +5,6 @@ use strict; use common qw(:file); use commands; -use cpio; use log; # key (to be used in $LC_ALL), [0] = english name, [1] = charset encoding, diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po index 428f37cae..8df6dd699 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-08-31 18:02+0200\n" +"POT-Creation-Date: 1999-09-01 00:33+0200\n" "PO-Revision-Date: 1999-08-25 11:07+0200\n" "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n" "Language-Team: norwegian\n" @@ -514,7 +514,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 ../install_steps.pm_.c:74 +#: ../diskdrake.pm_.c:136 ../install_steps.pm_.c:73 #: ../install_steps_interactive.pm_.c:26 msgid "Error" msgstr "Feil" @@ -993,6 +993,11 @@ msgstr "Velg pakker for installering" msgid "Install system" msgstr "Installer systemet" +#: ../install2.pm_.c:174 +#, fuzzy +msgid "Configure mouse" +msgstr "Konfigurer X" + #: ../install2.pm_.c:175 msgid "Configure networking" msgstr "Konfigurer nettverk" @@ -1007,7 +1012,7 @@ msgstr "Konfigurer X" msgid "Configure printer" msgstr "Konfigurer X" -#: ../install2.pm_.c:179 ../install_steps_graphical.pm_.c:434 +#: ../install2.pm_.c:179 ../install_steps_graphical.pm_.c:442 msgid "Set root password" msgstr "Sett root passord" @@ -1059,148 +1064,148 @@ msgstr "" msgid "partitioning failed: no root filesystem" msgstr "partisjonering feilet: intet root filsystem" -#: ../install_steps.pm_.c:246 +#: ../install_steps.pm_.c:245 msgid "no floppy available" msgstr "" -#: ../install_steps_graphical.pm_.c:196 +#: ../install_steps_graphical.pm_.c:204 msgid "Hide" msgstr "Gjem" -#: ../install_steps_graphical.pm_.c:196 +#: ../install_steps_graphical.pm_.c:204 msgid "Show All" msgstr "Vis alle" -#: ../install_steps_graphical.pm_.c:200 +#: ../install_steps_graphical.pm_.c:208 msgid "Select All" msgstr "Velg alle" -#: ../install_steps_graphical.pm_.c:200 +#: ../install_steps_graphical.pm_.c:208 msgid "Unselect All" msgstr "Fjern alle" -#: ../install_steps_graphical.pm_.c:264 +#: ../install_steps_graphical.pm_.c:272 msgid "Choose the packages you want to install" msgstr "Velg pakker du ønsker å installere" -#: ../install_steps_graphical.pm_.c:275 +#: ../install_steps_graphical.pm_.c:283 msgid " Mb" msgstr "Mb" -#: ../install_steps_graphical.pm_.c:275 +#: ../install_steps_graphical.pm_.c:283 msgid "Total size: " msgstr "Total størrelse: " -#: ../install_steps_graphical.pm_.c:276 +#: ../install_steps_graphical.pm_.c:284 msgid "Info" msgstr "" -#: ../install_steps_graphical.pm_.c:304 +#: ../install_steps_graphical.pm_.c:312 msgid "Installing" msgstr "Installerer" -#: ../install_steps_graphical.pm_.c:310 +#: ../install_steps_graphical.pm_.c:318 msgid "Please wait, " msgstr "Vennligst vent, " -#: ../install_steps_graphical.pm_.c:312 +#: ../install_steps_graphical.pm_.c:320 msgid "Time remaining " msgstr "Tid som gjenstår " -#: ../install_steps_graphical.pm_.c:313 +#: ../install_steps_graphical.pm_.c:321 msgid "Total time " msgstr "Total tid " -#: ../install_steps_graphical.pm_.c:318 +#: ../install_steps_graphical.pm_.c:326 msgid "preparing installation" msgstr "forbereder installasjon" -#: ../install_steps_graphical.pm_.c:339 +#: ../install_steps_graphical.pm_.c:347 #, c-format msgid "installing package %s" msgstr "installerer pakke %s" -#: ../install_steps_graphical.pm_.c:370 +#: ../install_steps_graphical.pm_.c:378 #, c-format msgid "Configuring network device %s" msgstr "Konfigurerer nettverks-enhet %s" -#: ../install_steps_graphical.pm_.c:378 +#: ../install_steps_graphical.pm_.c:386 msgid "IP address:" msgstr "IP adresse:" -#: ../install_steps_graphical.pm_.c:379 +#: ../install_steps_graphical.pm_.c:387 msgid "Netmask:" msgstr "Nettmaske:" -#: ../install_steps_graphical.pm_.c:388 +#: ../install_steps_graphical.pm_.c:396 msgid "IP address should but in format 1.2.3.4" msgstr "" -#: ../install_steps_graphical.pm_.c:401 +#: ../install_steps_graphical.pm_.c:409 #, fuzzy msgid "Configuring network" msgstr "Konfigurer nettverk" -#: ../install_steps_graphical.pm_.c:409 +#: ../install_steps_graphical.pm_.c:417 #, fuzzy msgid "Host name:" msgstr "Brukernavn" -#: ../install_steps_graphical.pm_.c:410 +#: ../install_steps_graphical.pm_.c:418 #, fuzzy msgid "DNS server:" msgstr "tjener" -#: ../install_steps_graphical.pm_.c:411 +#: ../install_steps_graphical.pm_.c:419 msgid "Gateway:" msgstr "" -#: ../install_steps_graphical.pm_.c:412 +#: ../install_steps_graphical.pm_.c:420 msgid "Gateway device:" msgstr "" -#: ../install_steps_graphical.pm_.c:437 ../install_steps_graphical.pm_.c:464 +#: ../install_steps_graphical.pm_.c:445 ../install_steps_graphical.pm_.c:472 msgid "Password" msgstr "Passord" -#: ../install_steps_graphical.pm_.c:438 ../install_steps_graphical.pm_.c:465 +#: ../install_steps_graphical.pm_.c:446 ../install_steps_graphical.pm_.c:473 msgid "Password (again)" msgstr "Passord (igjen)" -#: ../install_steps_graphical.pm_.c:447 ../install_steps_graphical.pm_.c:480 +#: ../install_steps_graphical.pm_.c:455 ../install_steps_graphical.pm_.c:488 msgid "Please try again" msgstr "Vennligst prøv igjen" -#: ../install_steps_graphical.pm_.c:447 ../install_steps_graphical.pm_.c:480 +#: ../install_steps_graphical.pm_.c:455 ../install_steps_graphical.pm_.c:488 msgid "You must enter the same password" msgstr "Du må skrive inn det samme passordet" -#: ../install_steps_graphical.pm_.c:448 +#: ../install_steps_graphical.pm_.c:456 msgid "This password is too simple" msgstr "Dette passordet er for enkelt" -#: ../install_steps_graphical.pm_.c:459 +#: ../install_steps_graphical.pm_.c:467 msgid "Add user" msgstr "Legg til bruker" -#: ../install_steps_graphical.pm_.c:463 +#: ../install_steps_graphical.pm_.c:471 msgid "User name" msgstr "Brukernavn" -#: ../install_steps_graphical.pm_.c:466 +#: ../install_steps_graphical.pm_.c:474 msgid "Real name" msgstr "Virkelig navn" -#: ../install_steps_graphical.pm_.c:467 +#: ../install_steps_graphical.pm_.c:475 msgid "Shell" msgstr "Skall" -#: ../install_steps_graphical.pm_.c:482 +#: ../install_steps_graphical.pm_.c:490 msgid "Please give a user name" msgstr "Vennligst oppgi et brukernavn" -#: ../install_steps_graphical.pm_.c:483 +#: ../install_steps_graphical.pm_.c:491 #, fuzzy msgid "" "The user name must contain only lower cased letters, numbers, `-' and `_'" @@ -1321,24 +1326,24 @@ msgstr "" msgid "Starting step `%s'\n" msgstr "Starter steg `%s'\n" -#: ../interactive.pm_.c:39 ../interactive.pm_.c:47 ../my_gtk.pm_.c:174 +#: ../interactive.pm_.c:40 ../interactive.pm_.c:48 ../my_gtk.pm_.c:174 #: ../my_gtk.pm_.c:316 ../my_gtk.pm_.c:390 msgid "Ok" msgstr "Ok" -#: ../interactive.pm_.c:43 ../my_gtk.pm_.c:315 +#: ../interactive.pm_.c:44 ../my_gtk.pm_.c:315 msgid "No" msgstr "Nei" -#: ../interactive.pm_.c:43 ../my_gtk.pm_.c:315 +#: ../interactive.pm_.c:44 ../my_gtk.pm_.c:315 msgid "Yes" msgstr "Ja" -#: ../interactive.pm_.c:47 ../my_gtk.pm_.c:175 ../my_gtk.pm_.c:316 +#: ../interactive.pm_.c:48 ../my_gtk.pm_.c:175 ../my_gtk.pm_.c:316 msgid "Cancel" msgstr "Avbryt" -#: ../interactive.pm_.c:93 +#: ../interactive.pm_.c:94 msgid "Please wait" msgstr "Vennligst vent" @@ -1527,10 +1532,6 @@ msgstr "Feil ved skriving til fil %s" #~ "en /boot partisjon." #, fuzzy -#~ msgid "Configure mouse" -#~ msgstr "Konfigurer X" - -#, fuzzy #~ msgid "Configure services" #~ msgstr "Konfigurer X" |