From 7a9d795053d1bab93c5cca346234d47d1b2b6932 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sat, 28 Aug 1999 17:43:10 +0000 Subject: no_comment --- perl-install/install2.pm | 21 ++++++++++++++-- perl-install/install_steps.pm | 18 +++++++++++++- perl-install/my_gtk.pm | 4 +-- perl-install/share/list | 1 - perl-install/share/po/no.po | 58 +++++++++++++++++++++---------------------- 5 files changed, 67 insertions(+), 35 deletions(-) diff --git a/perl-install/install2.pm b/perl-install/install2.pm index fed37c341..9d069a7e4 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -78,6 +78,16 @@ Information on each category of packages and each one of them is available in th located above buttons of confirmation/selection/deselection."), doInstallStep => __("Selected packages are now getting installed on your system. This operation take only a few minutes."), +configureMouse => + __("Help"), +configureNetwork => + __("Help"), +configureTimezone => + __("Help"), +configureServices => + __("Help"), +configurePrinter => + __("Help"), setRootPassword => __("The system now requires an administrator password for your Linux system. This passwd is required of you by twice in order to being certain of its spelling. @@ -101,11 +111,18 @@ that is essential."), doInstallStep => __("The system being now copied on your disk, he is now time to indicate to it from where it will have to start. Unless you know exactly what you do, always choose \"First sector of drive\"."), - +createBootdisk => + __("Help"), +setupBootloader => + __("Help"), +configureX => + __("Help"), configureX => __("It is now time to configure the graphic server. First of all, choose your monitor. You have then the possibility of testing your configuration and of reconsidering your choices if the latter are not appropriate to you."), +exitInstall => + __("Help"), ); @@ -160,7 +177,7 @@ my $default = { bootloader => { onmbr => 1, linear => 0 }, autoSCSI => 0, - mkbootdisk => 0, + mkbootdisk => "fd0", # no mkbootdisk if 0 or undef, find a floppy with 1 packages => [ qw() ], partitionning => { clearall => $::testing, eraseBadPartitions => 0, auto_allocate => 0, autoformat => 0 }, partitions => [ diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index a7720e692..38523e20f 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -221,7 +221,23 @@ sub addUser($) { } sub createBootdisk($) { - lilo::mkbootdisk($o->{prefix}, versionString()) if $o->default("mkbootdisk") && !$::testing; + my $dev = $o->default("mkbootdisk") or return; + + my @l = detect_devices::floppies(); + + $dev = shift @l if $dev eq "1"; # special case to specify autochoose + + return if $::testing; + + + unshift @l, $ + + $o->{mkbootdisk} = shift @l || die _("no floppy available") if $o->{mkbootdisk} eq "1"; + + eval { + lilo::mkbootdisk($o->{prefix}, versionString(), "/dev/" . $o->{mkbootdisk}) + }; + $o->{mkbootdisk} = 1; } sub setupBootloader($) { diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index 55cf17094..b79014440 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -371,14 +371,14 @@ sub _ask_from_list($$$$) { } 1; }); - push @::ask_from_list_widgets, $w; # hack!! to not get SIGSEGV +# push @::ask_from_list_widgets, $w; # hack!! to not get SIGSEGV push @widgets, $w; } @$l; gtkadd($list, @widgets); gtkadd($o->{window}, gtkpack($o->create_box_with_title(@$messages), @widgets > 15 ? - gtkset_usize(createScrolledWindow($list), 200, 300) : + gtkset_usize(createScrolledWindow($list), 200, 280) : $list)); $widgets[$def]->grab_focus; } diff --git a/perl-install/share/list b/perl-install/share/list index 4cc1dcdf3..315d7012e 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -25,7 +25,6 @@ /usr/lib/perl5/5.00503/i386-linux/Config.pm /usr/lib/perl5/5.00503/i386-linux/DynaLoader.pm /usr/lib/perl5/5.00503/i386-linux/Fcntl.pm -/usr/lib/perl5/5.00503/i386-linux/auto/Fcntl /usr/lib/perl5/5.00503/i386-linux/auto/Fcntl/Fcntl.bs /usr/lib/perl5/5.00503/i386-linux/auto/Fcntl/Fcntl.so /usr/lib/perl5/5.00503/i386-linux/IO/File.pm diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po index dd1805004..de4ce7015 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-28 17:40+0200\n" +"POT-Creation-Date: 1999-08-28 18:45+0200\n" "PO-Revision-Date: 1999-08-25 11:07+0200\n" "Last-Translator: Terje Bjerkelia \n" "Language-Team: norwegian\n" @@ -1041,7 +1041,7 @@ msgstr "Konfigurer X" msgid "Configure networking" msgstr "Konfigurer nettverk" -#: ../install2.pm_.c:127 ../install_steps_graphical.pm_.c:404 +#: ../install2.pm_.c:127 ../install_steps_graphical.pm_.c:407 msgid "Set root password" msgstr "Sett root passord" @@ -1097,113 +1097,113 @@ msgstr "" msgid "partitionning failed: no root filesystem" msgstr "partisjonering feilet: intet root filsystem" -#: ../install_steps_graphical.pm_.c:202 +#: ../install_steps_graphical.pm_.c:205 msgid "Hide" msgstr "Gjem" -#: ../install_steps_graphical.pm_.c:202 +#: ../install_steps_graphical.pm_.c:205 msgid "Show All" msgstr "Vis alle" -#: ../install_steps_graphical.pm_.c:206 +#: ../install_steps_graphical.pm_.c:209 msgid "Select All" msgstr "Velg alle" -#: ../install_steps_graphical.pm_.c:206 +#: ../install_steps_graphical.pm_.c:209 msgid "Unselect All" msgstr "Fjern alle" -#: ../install_steps_graphical.pm_.c:270 +#: ../install_steps_graphical.pm_.c:273 msgid "Choose the packages you want to install" msgstr "Velg pakker du ønsker å installere" -#: ../install_steps_graphical.pm_.c:281 +#: ../install_steps_graphical.pm_.c:284 msgid " Mb" msgstr "Mb" -#: ../install_steps_graphical.pm_.c:281 +#: ../install_steps_graphical.pm_.c:284 msgid "Total size: " msgstr "Total størrelse: " -#: ../install_steps_graphical.pm_.c:310 +#: ../install_steps_graphical.pm_.c:313 msgid "Installing" msgstr "Installerer" -#: ../install_steps_graphical.pm_.c:316 +#: ../install_steps_graphical.pm_.c:319 msgid "Please wait, " msgstr "Vennligst vent, " -#: ../install_steps_graphical.pm_.c:318 +#: ../install_steps_graphical.pm_.c:321 msgid "Time remaining " msgstr "Tid som gjenstår " -#: ../install_steps_graphical.pm_.c:319 +#: ../install_steps_graphical.pm_.c:322 msgid "Total time " msgstr "Total tid " -#: ../install_steps_graphical.pm_.c:324 +#: ../install_steps_graphical.pm_.c:327 msgid "preparing installation" msgstr "forbereder installasjon" -#: ../install_steps_graphical.pm_.c:345 +#: ../install_steps_graphical.pm_.c:348 #, c-format msgid "installing package %s" msgstr "installerer pakke %s" -#: ../install_steps_graphical.pm_.c:375 +#: ../install_steps_graphical.pm_.c:378 #, c-format msgid "Configuring network device %s" msgstr "Konfigurerer nettverks-enhet %s" -#: ../install_steps_graphical.pm_.c:383 +#: ../install_steps_graphical.pm_.c:386 msgid "IP address:" msgstr "IP adresse:" -#: ../install_steps_graphical.pm_.c:384 +#: ../install_steps_graphical.pm_.c:387 msgid "Netmask:" msgstr "Nettmaske:" -#: ../install_steps_graphical.pm_.c:408 ../install_steps_graphical.pm_.c:434 +#: ../install_steps_graphical.pm_.c:411 ../install_steps_graphical.pm_.c:437 msgid "Password" msgstr "Passord" -#: ../install_steps_graphical.pm_.c:409 ../install_steps_graphical.pm_.c:435 +#: ../install_steps_graphical.pm_.c:412 ../install_steps_graphical.pm_.c:438 msgid "Password (again)" msgstr "Passord (igjen)" -#: ../install_steps_graphical.pm_.c:417 ../install_steps_graphical.pm_.c:450 +#: ../install_steps_graphical.pm_.c:420 ../install_steps_graphical.pm_.c:453 msgid "Please try again" msgstr "Vennligst prøv igjen" -#: ../install_steps_graphical.pm_.c:417 ../install_steps_graphical.pm_.c:450 +#: ../install_steps_graphical.pm_.c:420 ../install_steps_graphical.pm_.c:453 msgid "You must enter the same password" msgstr "Du må skrive inn det samme passordet" -#: ../install_steps_graphical.pm_.c:418 +#: ../install_steps_graphical.pm_.c:421 msgid "This password is too simple" msgstr "Dette passordet er for enkelt" -#: ../install_steps_graphical.pm_.c:429 +#: ../install_steps_graphical.pm_.c:432 msgid "Add user" msgstr "Legg til bruker" -#: ../install_steps_graphical.pm_.c:433 +#: ../install_steps_graphical.pm_.c:436 msgid "User name" msgstr "Brukernavn" -#: ../install_steps_graphical.pm_.c:436 +#: ../install_steps_graphical.pm_.c:439 msgid "Real name" msgstr "Virkelig navn" -#: ../install_steps_graphical.pm_.c:437 +#: ../install_steps_graphical.pm_.c:440 msgid "Shell" msgstr "Skall" -#: ../install_steps_graphical.pm_.c:452 +#: ../install_steps_graphical.pm_.c:455 msgid "Please give a user name" msgstr "Vennligst oppgi et brukernavn" -#: ../install_steps_graphical.pm_.c:453 +#: ../install_steps_graphical.pm_.c:456 msgid "The user name must contain only letters, numbers, `-' and `_'" msgstr "Brukernavnet kan kun inneholde bokstaver, tall, `-' og `_'" -- cgit v1.2.1