diff options
| -rw-r--r-- | perl-install/install2.pm | 172 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 15 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 27 | ||||
| -rw-r--r-- | perl-install/share/po/no.po | 119 |
4 files changed, 189 insertions, 144 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 9d069a7e4..e62df278f 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -20,107 +20,139 @@ use smp; use lang; use run_program; + my %stepsHelp = ( + selectLanguage => - __("Choose the language which you approved. This one govern the language's system."), + __("Choose preferred language for install and system usage."), + selectPath => - __("Choose \"Installation\" if you never have installed Linux system on this computer or if you wish -to install several of them on this machine. + __("Choose \"Installation\" if there are no previous versions of Linux +installed, or if you wish use to multiple distributions or versions. + +Choose \"Update\" if you wish to update a previous version of Mandrake +Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."), -Choose \"Update\" if you wish to update a Linux system Mandrake 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or - 6.0 (Venus)."), selectInstallClass => __("Select: - - Beginer: if you have never installed Linux system and wish to install the system elected -\"Product of the year\" for 1999, click here. - - Developer: if wish to use your Linux system to build software, you will find your happiness here. - - Server: if you wish to install the operating system elected \"Distribution/Server\" for 1999, -choose this installation class. - - Expert: if you alway know very fine GNU/Linux and that you wish to preserve the whole -control of the installation, this class is for you."), + - Beginner: If you have not installed Linux before, or wish to install +the distribution elected \"Product of the year\" for 1999, click here. + - Developer: If you are familiar with Linux and will be using the +computer primarily for software development, you will find happiness +here. + - Server: If you wish to install a general purpose server, or the +Linux distribution elected \"Distribution/Server\" for 1999, select +this. + - Expert: If you know GNU/Linux and want to perform a highly +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 -to be tested. In the contrary case, cliquez on \"Not\". + __("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 \"Not\". + +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 \"Control +panel\", \"System\", \"Peripheral manager\"."), -If you don't know if you have interfaces SCSI, consult the documentation delivered with your computer -or, if you use Microsoft Windows 95/98, consult the file \"Peripheral manager\" of the item \"System\" - of the \"Control panel\"."), partitionDisks => - __("In this stage, you will must partion your hard disk. It consists in cutting your disk in several zones -(which are not equal). This operation, for spectacular and intimidating that it is, - is not hardly if you be carrefull so that you do. -Also, take your time, are sure you before click on \"Finishing\" and READ the handbook of DiskDrake -before use them."), - -#"In this stage, you must partition your hard disk. Partitioning is the -#division of space on the hard disk into zones (which need not be equal) and -#certain types of software are installed in certain partitions. This -#operation, while both spectacular and intimidating, is not difficult to do -#if you understand what your system needs and what you need to do in the -#process. If you are uncertain, read the DiskDrake handbook and the -#Partitioning HOWTO before you proceed. Be cautious during this step. If you -#make an error, consult the DiskDrake handbook as to how to go about -#correcting it." + __("At this point, hard drive partitions must be defined. (Unless you +are overwriting a previous install of Linux and have already defined +your hard drives partions as desired.) This operation consists of +logically dividing the computer's hard drive capacity into separate +areas for use. Two common partition are: \"root\" which is the point at +which the filesystem's directory structure starts, and \"boot\", which +contains those files necessary to start the operating system when the +computer is first turned on. Because the effects of this process are +usually irreversible, partitioning can be intimidating and stressful to +the inexperienced. DiskDrake simplifies the process so that it need not +be. Consult the documentation and take your time before proceeding."), formatPartitions => - __("The partitions lately created must be formatted so that the system can use them. -You can also format partitions previously created and used if you wish to remove all the data they -contain. Note that it is not necessary to format the partitions already created and in use -if they contain data you want to keep (typical cases: /home and /usr/local)."), + __("Any partitions that have been newly defined must be formatted for +use. At this time, you may wish to re-format some pre-existing +partitions to erase the data they contain. Note: it is not necessary to +re-format pre-existing partitions, particularly if they contain files or +data you wish to keep. Typical examples: /home and /usr/local."), + choosePackages => - __("You now have the possibility of choosing the software that you wish to install. + __("You may now select the packages you wish to install. + +Please note that some packages require the installation of others. These +are referred to as package dependencies. The packages you select, and +the packages they require will automatically be added to the +installation configuration. It is impossible to install a package +without installing all of its dependencies. -Please note that packages manage the dependences: that means that if you wish to install -a software requiring the presence of another software, the latter will be automatically selected -and that it will be impossible for you to install the former without installing the latter. +Information on each category and specific package is available in the +area titled \"Info\". This is located above buttons: [confirmation] +[selection] [deselection]."), -Information on each category of packages and each one of them is available in the zone \"Infos\" -located above buttons of confirmation/selection/deselection."), doInstallStep => - __("Selected packages are now getting installed on your system. This operation take only a few minutes."), + __("The packages selected are now being installed. This operation +should only take 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. -Choose it carefully because it mainly conditions the good functioning of your system. -Indeed, only the administrator (also named \"root\") is able to configure the computer. -The password should not be too simple so that whoever cannot be connected under this account. -It should not be either too sophisticated under penalty of being difficult to retain and, finally, forgotten. +setRootPassword => + __("An administrator password for your Linux system must now be +assigned. The password must be entered twice to verify that both +password entries are identical. + +Choose this password carefully. Only persons with access to an +administrator account can maintain and administer the system. +Alternatively, unauthorized use of an administrator account can be +extremely dangerous to the integrity of the system, the data upon it, +and other systems with which it is interfaced. The password should be a +mixture of alphanumeric characters and a least 8 characters long. It +should never be written down. Do not make the password too long or +complicated that it will be difficult to remember. + +When you login as Administrator, at \"login\" type \"root\" and at +\"password\", type the password that was created here."), -When you wish to connect yourselves on your Linux system as an administrator, the \"login\" -is \"root\" and the \"password\", this one which you now will indicate."), addUser => - __("You can now authorize one or more people to be connected on your Linux system. Each one of -them will profit from his own environment will be able to configure. - -It is very important that you create at least one user even if you are the only person who will connect -herself on this machine. Indeed, if runnig the system as \"root\" is attractive, that -is a very bad idea. This last having all the rights it is certain that at one time you will broke all. -This is highly preferable you connect as simple user and that you use the account \"root\" only when -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\"."), + __("You can now authorize one or more people to be use your Linux +system. Each user account will have their own customizable environment. + +It is very important that you create at least one user, even if there +will only be one principle user of the system. The administrative +\"root\" account should not be used for day to day operation of the +computer. It is a security risk. The use of a regular user account +protects you and the system from yourself. The root account should only +be used for administrative and maintenance tasks that can not be +accomplished from a regular user account."), + createBootdisk => __("Help"), + setupBootloader => - __("Help"), -configureX => - __("Help"), + __("You need to indicate where you wish +to place the information required to boot to Linux. + +Unless you know exactly what you are doing, choose \"First sector of +drive\"."), + 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."), + __("It is now time to configure the video card and monitor +configuration for the X windows Graphic User Interface (GUI). First +select you monitor. Next, you may test the configuration and change your +selections if necessary."), + exitInstall => __("Help"), ); @@ -299,7 +331,7 @@ sub addUser { sub createBootdisk { fs::write($o->{prefix}, $o->{fstab}) unless $o->{isUpgrade}; modules::write_conf("$o->{prefix}/etc/conf.modules", 'append'); - $o->createBootdisk; + $o->createBootdisk($o->{steps}{$o->{step}}{entered} == 1); } sub setupBootloader { diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 38523e20f..033d92f8e 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -6,6 +6,7 @@ use strict; use common qw(:file :system :common); use install_any qw(:all); use partition_table qw(:types); +use detect_devices; use modules; use run_program; use lilo; @@ -225,19 +226,13 @@ sub createBootdisk($) { my @l = detect_devices::floppies(); - $dev = shift @l if $dev eq "1"; # special case to specify autochoose + $dev = shift @l || die _("no floppy available") + if $dev eq "1"; # special case meaning 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; + lilo::mkbootdisk($o->{prefix}, versionString(), "/dev/$dev"); + $o->{mkbootdisk} = $dev; } sub setupBootloader($) { diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 96f2712f0..248cd3afb 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -10,6 +10,7 @@ use vars qw(@ISA); use common qw(:common); use partition_table qw(:types); use install_steps; +use detect_devices; use network; use modules; use lang; @@ -134,21 +135,31 @@ sub configureNetwork($) { -sub createBootdisk($) { - my ($o) = @_; - - if ($o->{mkbootdisk} = $o->ask_yesorno('', +sub createBootdisk { + my ($o, $first_time) = @_; + my @l = detect_devices::floppies(); + + if ($first_time || @l == 1) { + $o->ask_yesorno('', _("A custom bootdisk provides a way of booting into your Linux system without depending on the normal bootloader. This is useful if you don't want to install lilo on your system, or another operating system removes lilo, or lilo doesn't work with your hardware configuration. A custom bootdisk can also be used with the Mandrake rescue image, making it much easier to recover from severe system -failures. Would you like to create a bootdisk for your system?"), !$o->default("mkbootdisk"))) { +failures. Would you like to create a bootdisk for your system?"), !$o->default("mkbootdisk")) or return; - $o->ask_warn('', _("Insert a floppy in drive fd0 (aka A:)")); - my $w = $o->wait_message('', _("Creating bootdisk")); - $o->SUPER::createBootdisk; + $o->{mkbootdisk} = $o->default("mkbootdisk") || 1; + } else { + @l or die _("Sorry, no floppy drive available"); + + $o->{mkbootdisk} = $o->ask_from_list('', +_("Choose the floppy drive you want to use to make the bootdisk"), + \@l, $o->default("mkbootdisk")); } + + $o->ask_warn('', _("Insert a floppy in floppy drive %s", $o->{mkbootdisk})); + my $w = $o->wait_message('', _("Creating bootdisk")); + $o->SUPER::createBootdisk; } sub setupBootloader($) { diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po index de4ce7015..94667ff15 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 18:45+0200\n" +"POT-Creation-Date: 1999-08-28 22:05+0200\n" "PO-Revision-Date: 1999-08-25 11:07+0200\n" "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n" "Language-Team: norwegian\n" @@ -512,8 +512,8 @@ 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:73 -#: ../install_steps_interactive.pm_.c:23 +#: ../diskdrake.pm_.c:136 ../install_steps.pm_.c:74 +#: ../install_steps_interactive.pm_.c:24 msgid "Error" msgstr "Feil" @@ -912,7 +912,14 @@ msgstr "" "Pakkene som er valgt blir nå installert på systemet ditt. Dette tar bare " "noen få minutter." -#: ../install2.pm_.c:82 +#: ../install2.pm_.c:82 ../install2.pm_.c:84 ../install2.pm_.c:86 +#: ../install2.pm_.c:88 ../install2.pm_.c:90 ../install2.pm_.c:115 +#: ../install2.pm_.c:117 ../install2.pm_.c:119 ../install2.pm_.c:125 +#: ../install2.pm_.c:154 +msgid "Help" +msgstr "Hjelp" + +#: ../install2.pm_.c:92 msgid "" "The system now requires an administrator password for your Linux system.\n" "This passwd is required of you by twice in order to being certain of its " @@ -947,7 +954,7 @@ msgstr "" "inn\" \n" "\"root\" og \"passord\", som du nå vil opprette." -#: ../install2.pm_.c:93 +#: ../install2.pm_.c:103 msgid "" "You can now authorize one or more people to be connected on your Linux " "system. Each one of\n" @@ -976,7 +983,7 @@ msgstr "" "Det her høyt anbefalt at du logger deg på som vanlig bruker og kun bruker " "kontoen \"root\" når det er nødvendig." -#: ../install2.pm_.c:102 +#: ../install2.pm_.c:112 msgid "" "The system being now copied on your disk, he is now time to indicate to it " "from where it will have to start.\n" @@ -987,7 +994,7 @@ msgstr "" "Med mindre du vet akkurat hva du gjør, velg alltid \"Første sektor av " "disken\"." -#: ../install2.pm_.c:106 +#: ../install2.pm_.c:121 msgid "" "It is now time to configure the graphic server. First of all, choose your " "monitor. You have then\n" @@ -1000,92 +1007,88 @@ msgstr "" "til å teste konfigurasjonen din og endre dine valg hvis disse valgene ikke " "passet for deg." -#: ../install2.pm_.c:114 +#: ../install2.pm_.c:131 msgid "Choose your language" msgstr "Velg språk" -#: ../install2.pm_.c:115 +#: ../install2.pm_.c:132 msgid "Choose install or upgrade" msgstr "Velg installering eller oppgradering" -#: ../install2.pm_.c:116 +#: ../install2.pm_.c:133 msgid "Select installation class" msgstr "Velg installasjonsklasse" -#: ../install2.pm_.c:117 +#: ../install2.pm_.c:134 msgid "Setup SCSI" msgstr "Oppsett SCSI" -#: ../install2.pm_.c:118 +#: ../install2.pm_.c:135 msgid "Setup filesystems" msgstr "Oppsett filsystemer" -#: ../install2.pm_.c:119 +#: ../install2.pm_.c:136 msgid "Format partitions" msgstr "Formater partisjoner" -#: ../install2.pm_.c:120 +#: ../install2.pm_.c:137 msgid "Choose packages to install" msgstr "Velg pakker for installering" -#: ../install2.pm_.c:121 +#: ../install2.pm_.c:138 msgid "Install system" msgstr "Installer systemet" -#: ../install2.pm_.c:122 +#: ../install2.pm_.c:139 #, fuzzy msgid "Configure mouse" msgstr "Konfigurer X" -#: ../install2.pm_.c:123 +#: ../install2.pm_.c:140 msgid "Configure networking" msgstr "Konfigurer nettverk" -#: ../install2.pm_.c:127 ../install_steps_graphical.pm_.c:407 +#: ../install2.pm_.c:144 ../install_steps_graphical.pm_.c:407 msgid "Set root password" msgstr "Sett root passord" -#: ../install2.pm_.c:128 +#: ../install2.pm_.c:145 msgid "Add a user" msgstr "Legg til en bruker" -#: ../install2.pm_.c:129 +#: ../install2.pm_.c:146 msgid "Create bootdisk" msgstr "Opprett oppstartdiskett" -#: ../install2.pm_.c:130 +#: ../install2.pm_.c:147 msgid "Install bootloader" msgstr "Installer oppstartslaster" -#: ../install2.pm_.c:131 +#: ../install2.pm_.c:148 msgid "Configure X" msgstr "Konfigurer X" -#: ../install2.pm_.c:132 +#: ../install2.pm_.c:149 msgid "Exit install" msgstr "Gå ut av installering" -#: ../install2.pm_.c:137 -msgid "Help" -msgstr "Hjelp" - -#: ../install2.pm_.c:146 +#: ../install2.pm_.c:163 msgid "beginner" msgstr "nybegynner" -#: ../install2.pm_.c:146 +#: ../install2.pm_.c:163 msgid "developer" msgstr "utvikler" -#: ../install2.pm_.c:146 +#: ../install2.pm_.c:163 msgid "expert" msgstr "ekspert" -#: ../install2.pm_.c:146 +#: ../install2.pm_.c:163 msgid "server" msgstr "tjener" -#: ../install2.pm_.c:227 +#: ../install2.pm_.c:244 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" @@ -1093,10 +1096,14 @@ 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:242 +#: ../install2.pm_.c:259 msgid "partitionning failed: no root filesystem" msgstr "partisjonering feilet: intet root filsystem" +#: ../install_steps.pm_.c:229 +msgid "no floppy available" +msgstr "" + #: ../install_steps_graphical.pm_.c:205 msgid "Hide" msgstr "Gjem" @@ -1207,100 +1214,100 @@ msgstr "Vennligst oppgi et brukernavn" msgid "The user name must contain only letters, numbers, `-' and `_'" msgstr "Brukernavnet kan kun inneholde bokstaver, tall, `-' og `_'" -#: ../install_steps_interactive.pm_.c:23 +#: ../install_steps_interactive.pm_.c:24 msgid "An error occured" msgstr "En feil oppsto" -#: ../install_steps_interactive.pm_.c:30 +#: ../install_steps_interactive.pm_.c:31 msgid "Which language do you want?" msgstr "Hvilket språk ønsker du?" -#: ../install_steps_interactive.pm_.c:36 +#: ../install_steps_interactive.pm_.c:37 msgid "Install/Upgrade" msgstr "Installer/Oppgrader" -#: ../install_steps_interactive.pm_.c:37 +#: ../install_steps_interactive.pm_.c:38 msgid "Is it an install or an updgrade?" msgstr "Er det en installasjon eller en oppgradering?" -#: ../install_steps_interactive.pm_.c:38 +#: ../install_steps_interactive.pm_.c:39 msgid "Install" msgstr "Installer" -#: ../install_steps_interactive.pm_.c:38 +#: ../install_steps_interactive.pm_.c:39 msgid "Upgrade" msgstr "Oppgrader" -#: ../install_steps_interactive.pm_.c:44 +#: ../install_steps_interactive.pm_.c:45 msgid "Install Class" msgstr "Installeringsklasse" -#: ../install_steps_interactive.pm_.c:45 +#: ../install_steps_interactive.pm_.c:46 msgid "What type of user will you have?" msgstr "Hva slags brukertype vil du ha?" -#: ../install_steps_interactive.pm_.c:54 +#: ../install_steps_interactive.pm_.c:55 #, c-format msgid "Installing driver for scsi card %s" msgstr "Installerer driver for scsi-kort %s" -#: ../install_steps_interactive.pm_.c:55 +#: ../install_steps_interactive.pm_.c:56 #, c-format msgid "(module %s)" msgstr "(modul %s)" -#: ../install_steps_interactive.pm_.c:64 +#: ../install_steps_interactive.pm_.c:65 msgid " scsi interfaces" msgstr " scsi grensesnitt" -#: ../install_steps_interactive.pm_.c:64 +#: ../install_steps_interactive.pm_.c:65 msgid "Found " msgstr "Funnet " -#: ../install_steps_interactive.pm_.c:65 +#: ../install_steps_interactive.pm_.c:66 msgid "Do you have another one?" msgstr "Har du enda ett?" -#: ../install_steps_interactive.pm_.c:66 +#: ../install_steps_interactive.pm_.c:67 msgid "Do you have an scsi interface?" msgstr "Har du et scsi grensesnitt" -#: ../install_steps_interactive.pm_.c:68 +#: ../install_steps_interactive.pm_.c:69 msgid "What scsi card have you?" msgstr "Hva slags scsi-kort har du?" -#: ../install_steps_interactive.pm_.c:77 +#: ../install_steps_interactive.pm_.c:78 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 " "skal tre i kraft" -#: ../install_steps_interactive.pm_.c:87 +#: ../install_steps_interactive.pm_.c:88 msgid "Choose the partitions you want to format" msgstr "Velg de partisjonene du ønsker å formatere" -#: ../install_steps_interactive.pm_.c:98 +#: ../install_steps_interactive.pm_.c:99 #, c-format msgid "Formatting partition %s" msgstr "Formaterer partisjon %s" -#: ../install_steps_interactive.pm_.c:111 +#: ../install_steps_interactive.pm_.c:112 msgid "Keep the current IP configuration" msgstr "Behold nåværende IP-konfigurasjon" -#: ../install_steps_interactive.pm_.c:112 +#: ../install_steps_interactive.pm_.c:113 msgid "Reconfigure network now" msgstr "Rekonfigurer nettverket nå" -#: ../install_steps_interactive.pm_.c:113 +#: ../install_steps_interactive.pm_.c:114 msgid "Don't set up networking" msgstr "Ikke sett opp nettverk" -#: ../install_steps_interactive.pm_.c:115 +#: ../install_steps_interactive.pm_.c:116 msgid "Network Configuration" msgstr "Nettverks-konfigurasjon" -#: ../install_steps_interactive.pm_.c:116 +#: ../install_steps_interactive.pm_.c:117 msgid "LAN networking has already been configured. Do you want to:" msgstr "LAN nettverket har allerede blitt konfigurert. Vil du:" |