From b3ffb3107e701cec95b5eca11f18bea3291f626f Mon Sep 17 00:00:00 2001
From: Pablo Saratxaga <pablo@mandriva.com>
Date: Sat, 28 Aug 1999 23:17:47 +0000
Subject: various english spelling errors corrected (ispell panoramix.pot :) )

---
 perl-install/Xconfigurator.pm             |   4 +-
 perl-install/install2.pm                  |  12 +-
 perl-install/install_steps.pm             |   4 +-
 perl-install/install_steps_interactive.pm |   4 +-
 perl-install/share/po/no.po               | 409 +++++++++++++++++-------------
 5 files changed, 244 insertions(+), 189 deletions(-)

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index dab54bda3..d8609fcc2 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -278,7 +278,7 @@ sub testFinalConfig($;$) {
     unlink "/tmp/.X11-unix/X9" if $prefix;
     kill 2, $pid;
 
-    $rc || $err == 222 << 8 or $in->ask_warn('', _("An error occured, try changing some parameters"));
+    $rc || $err == 222 << 8 or $in->ask_warn('', _("An error occurred, try changing some parameters"));
     $rc;
 }
 
@@ -644,7 +644,7 @@ sub main {
 	   __("Change Monitor") => sub { $o->{monitor} = monitorConfiguration() },
            __("Change Graphic card") => sub { $o->{card} = cardConfiguration('', 'noauto') },
 	   __("Change Resolution") => sub { resolutionsConfiguration($o, 'noauto') },
-	   __("Automaticall resolutions search") => sub { 
+	   __("Automatical resolutions search") => sub { 
 	       delete $o->{card}{depth};
 	       resolutionsConfiguration($o, 'nowarning');
 	   },
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index dbe71e300..35b6c52fe 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -59,7 +59,7 @@ panel\", \"System\", \"Peripheral manager\"."),
 partitionDisks => 
  __("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
+your hard drives partitions 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
@@ -87,7 +87,7 @@ without installing all of its dependencies.
 
 Information on each category and specific package is available in the
 area titled \"Info\". This is located above the buttons: [confirmation]
-[selection] [deselection]."),
+[selection] [unselection]."),
 
 doInstallStep => 
  __("The packages selected are now being installed. This operation
@@ -212,7 +212,7 @@ my $default = {
     autoSCSI => 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 },
+    partitioning => { clearall => $::testing, eraseBadPartitions => 0, auto_allocate => 0, autoformat => 0 },
     partitions => [
 		   { mntpoint => "/boot", size =>  16 << 11, type => 0x83 }, 
 		   { mntpoint => "/",     size => 300 << 11, type => 0x83 }, 
@@ -269,7 +269,7 @@ sub setupSCSI {
 
 sub partitionDisks {
     $o->{drives} = [ detect_devices::hds() ];
-    $o->{hds} = fsedit::hds($o->{drives}, $o->{default}{partitionning});
+    $o->{hds} = fsedit::hds($o->{drives}, $o->{default}{partitioning});
     unless (@{$o->{hds}} > 0) {
 	$o->setupSCSI if $o->{autoSCSI}; # ask for an unautodetected scsi card
     }
@@ -278,7 +278,7 @@ sub partitionDisks {
     }
 
     unless ($o->{isUpgrade}) {
-	eval { fsedit::auto_allocate($o->{hds}, $o->{partitions}) } if $o->{default}{partitionning}{auto_allocate};
+	eval { fsedit::auto_allocate($o->{hds}, $o->{partitions}) } if $o->{default}{partitioning}{auto_allocate};
 	$o->doPartitionDisks($o->{hds});
 
 	unless ($::testing) {
@@ -289,7 +289,7 @@ sub partitionDisks {
     $o->{fstab} = [ fsedit::get_fstab(@{$o->{hds}}) ];
 
     my $root_fs; map { $_->{mntpoint} eq '/' and $root_fs = $_ } @{$o->{fstab}};
-    $root_fs or die _("partitionning failed: no root filesystem");
+    $root_fs or die _("partitioning failed: no root filesystem");
 
 }
 
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 033d92f8e..87a43f815 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -72,7 +72,7 @@ sub leavingStep($$) {
     while (my $f = shift @{$o->{steps}{$step}{toBeDone} || []}) {
 	eval { &$f() };
 	$o->ask_warn(_("Error"), [ 
-_("An error occured, i don't know how to handle it nicely,
+_("An error occurred, i don't know how to handle it nicely,
 so continue at your own risk :("), $@ ]) if $@;
     }
 }
@@ -107,7 +107,7 @@ sub choosePartitionsToFormat($$) {
 
     foreach (@$fstab) { 
 	$_->{toFormat} = ($_->{mntpoint} && isExt2($_) || isSwap($_)) &&
-	  ($_->{notFormatted} || $o->{default}{partitionning}{autoformat});
+	  ($_->{notFormatted} || $o->{default}{partitioning}{autoformat});
     }
 }
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 248cd3afb..ca46629a7 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -21,7 +21,7 @@ use log;
 
 sub errorInStep($$) {
     my ($o, $err) = @_;
-    $o->ask_warn(_("Error"), [ _("An error occured"), $err ]);
+    $o->ask_warn(_("Error"), [ _("An error occurred"), $err ]);
 }
 
 
@@ -35,7 +35,7 @@ sub chooseLanguage($) {
 sub selectInstallOrUpgrade($) {
     my ($o) = @_;
     $o->ask_from_list_(_("Install/Upgrade"), 
-		       _("Is it an install or an updgrade?"),
+		       _("Is it an install or an upgrade?"),
 		       [ __("Install"), __("Upgrade") ], 
 		       $o->default("isUpgrade") ? "Upgrade" : "Install") eq "Upgrade";
 }
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 94667ff15..467bdd528 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 22:05+0200\n"
+"POT-Creation-Date: 1999-08-29 00:52+0200\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -55,7 +55,7 @@ msgid "Is this ok?"
 msgstr "Er dette ok?"
 
 #: ../Xconfigurator.pm_.c:281
-msgid "An error occured, try changing some parameters"
+msgid "An error occurred, try changing some parameters"
 msgstr "En feil oppsto, prøv å endre noen parametere"
 
 #: ../Xconfigurator.pm_.c:289 ../Xconfigurator.pm_.c:429
@@ -128,7 +128,7 @@ msgid "Change Resolution"
 msgstr "Endre oppløsning"
 
 #: ../Xconfigurator.pm_.c:647
-msgid "Automaticall resolutions search"
+msgid "Automatical resolutions search"
 msgstr "Automatisk oppløsningssøk"
 
 #: ../Xconfigurator.pm_.c:651
@@ -404,7 +404,7 @@ msgid "Create"
 msgstr "Opprett"
 
 #: ../diskdrake.pm_.c:16
-msgid "Umount"
+msgid "Unmount"
 msgstr "Demonter"
 
 #: ../diskdrake.pm_.c:17
@@ -601,7 +601,7 @@ msgid ""
 "You're adding a root partition far on the drive (on a cylinder > 1024),\n"
 "and you have no /boot partition. So if you plan to use lilo (the boot "
 "manager),\n"
-"be carefull to add a /boot partition"
+"be careful to add a /boot partition"
 msgstr ""
 "Du er i ferd med å legge til en rotpartisjon langt ute på disken (på en\n"
 "sylinder > 1024), og du har ingen /boot partisjon. Så hvis du planlegger å "
@@ -764,21 +764,18 @@ 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:25
-msgid ""
-"Choose the language which you approved. This one govern the language's "
-"system."
-msgstr "Velg språket som du godkjente. Dette bestemmer språket på systemet."
-
 #: ../install2.pm_.c:27
+msgid "Choose preferred language for install and system usage."
+msgstr ""
+
+#: ../install2.pm_.c:30
+#, fuzzy
 msgid ""
-"Choose \"Installation\" if you never have installed Linux system on this "
-"computer or if you wish\n"
-"to install several of them on this machine.\n"
+"Choose \"Installation\" if there are no previous versions of Linux\n"
+"installed, or if you wish use to multiple distributions or versions.\n"
 "\n"
-"Choose \"Update\" if you wish to update a Linux system Mandrake 5.1 "
-"(Venice), 5.2 (Leeloo), 5.3 (Festen) or\n"
-" 6.0 (Venus)."
+"Choose \"Update\" if you wish to update a previous version of Mandrake\n"
+"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."
 msgstr ""
 "Velg \"Installasjon\" hvis du aldri har installert Linux-systemet på denne "
 "maskinen eller du ønsker\n"
@@ -788,20 +785,19 @@ msgstr ""
 "(Venice), 5.2 (Leeloo), 5.3 (Festen) eller\n"
 " 6.0 (Venus)."
 
-#: ../install2.pm_.c:33
+#: ../install2.pm_.c:37
 msgid ""
 "Select:\n"
-"  - Beginer: if you have never installed Linux system and wish to install "
-"the system elected \n"
-"\"Product of the year\" for 1999, click here.\n"
-"  - Developer: if wish to use your Linux system to build software, you will "
-"find your happiness here.\n"
-"  - Server: if you wish to install the operating system elected "
-"\"Distribution/Server\" for 1999,\n"
-"choose this installation class.\n"
-"  - Expert: if you alway know very fine GNU/Linux and that you wish to "
-"preserve the whole\n"
-"control of the installation, this class is for you."
+"  - Beginner: If you have not installed Linux before, or wish to install\n"
+"the distribution elected \"Product of the year\" for 1999, click here.\n"
+"  - Developer: If you are familiar with Linux and will be using the\n"
+"computer primarily for software development, you will find happiness\n"
+"here.\n"
+"  - Server: If you wish to install a general purpose server, or the\n"
+"Linux distribution elected \"Distribution/Server\" for 1999, select\n"
+"this.\n"
+"  - Expert: If you know GNU/Linux and want to perform a highly\n"
+"customized installation, this Install Class is for you."
 msgstr ""
 "Velg:\n"
 "  - Nybegynner: hvis du aldri har installert Linux-systemet før og ønsker å "
@@ -816,17 +812,16 @@ msgstr ""
 "opprettholde\n"
 "kontrollen over installasjonen så er dette valget for deg."
 
-#: ../install2.pm_.c:42
+#: ../install2.pm_.c:50
 msgid ""
-"The system did not detect a SCSI card. If you have one (or several) click on "
-"\"Yes\" and choose the module\n"
-"to be tested. In the contrary case, cliquez on \"Not\".\n"
+"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"
-"If you don't know if you have interfaces SCSI, consult the documentation "
-"delivered with your computer\n"
-"or, if you use Microsoft Windows 95/98, consult the file \"Peripheral "
-"manager\" of the item \"System\"\n"
-" of the \"Control panel\"."
+"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 \"Control\n"
+"panel\", \"System\", \"Peripheral manager\"."
 msgstr ""
 "Systemet fant ikke noen SCSI-kort. Hvis du har ett (eller flere) klikk på "
 "\"Ja\" og velg modul\n"
@@ -838,35 +833,28 @@ msgstr ""
 "under \"System\"\n"
 " i \"Kontrollpanelet\"."
 
-#: ../install2.pm_.c:49
+#: ../install2.pm_.c:60
 msgid ""
-"In this stage, you will must partion your hard disk. It consists in cutting "
-"your disk in several zones\n"
-"(which are not equal). This operation, for spectacular and intimidating that "
-"it is,\n"
-" is not hardly if you be carrefull so that you do. \n"
-"Also, take your time, are sure you before click on \"Finishing\" and READ "
-"the handbook of DiskDrake\n"
-"before use them."
+"At this point, hard drive partitions must be defined. (Unless you\n"
+"are overwriting a previous install of Linux and have already defined\n"
+"your hard drives partitions as desired.) This operation consists of\n"
+"logically dividing the computer's hard drive capacity into separate\n"
+"areas for use. Two common partition are: \"root\" which is the point at\n"
+"which the filesystem's directory structure starts, and \"boot\", which\n"
+"contains those files necessary to start the operating system when the\n"
+"computer is first turned on. Because the effects of this process are\n"
+"usually irreversible, partitioning can be intimidating and stressful to\n"
+"the inexperienced. DiskDrake simplifies the process so that it need not\n"
+"be. Consult the documentation and take your time before proceeding."
 msgstr ""
-"På dette punktet må du partisjonere hard-disken din. Det består av å dele "
-"opp disken din i flere soner\n"
-"(som ikke er like). Denne operasjonen, uansett hvor spektakulært "
-"ogskremmende det måtte være,\n"
-"så er det ikke vanskelig hvis du er forsiktig med det du gjør. \n"
-"Ta deg god tid, og vær sikker før du klikker på \"Ferdig\" og LES "
-"DiskDrake-håndboken\n"
-"før du begynner."
-
-#: ../install2.pm_.c:66
+
+#: ../install2.pm_.c:73
 msgid ""
-"The partitions lately created must be formatted so that the system can use "
-"them.\n"
-"You can also format partitions previously created and used if you wish to "
-"remove all the data they\n"
-"contain. Note that it is not necessary to format the partitions already "
-"created and in use\n"
-"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\n"
+"use. At this time, you may wish to re-format some pre-existing\n"
+"partitions to erase the data they contain. Note: it is not necessary to\n"
+"re-format pre-existing partitions, particularly if they contain files or\n"
+"data you wish to keep. Typically retained are: /home and /usr/local."
 msgstr ""
 "Partisjonene som er opprettet må formateres så systemet kan bruke dem.\n"
 "Du kan også formatere partisjoner er opprettet og brukt før hvis du ønsker å "
@@ -875,21 +863,19 @@ msgstr ""
 "hvis de inneholder data som\n"
 "du ønsker å beholde (typiske tilfeller: / home and / usr/local)."
 
-#: ../install2.pm_.c:71
+#: ../install2.pm_.c:80
 msgid ""
-"You now have the possibility of choosing the software that you wish to "
-"install.\n"
+"You may now select the packages you wish to install.\n"
 "\n"
-"Please note that packages manage the dependences: that means that if you "
-"wish to install\n"
-"a software requiring the presence of another software, the latter will be "
-"automatically selected\n"
-"and that it will be impossible for you to install the former without "
-"installing the latter.\n"
+"Please note that some packages require the installation of others. These\n"
+"are referred to as package dependencies. The packages you select, and\n"
+"the packages they require will automatically be added to the\n"
+"installation configuration. It is impossible to install a package\n"
+"without installing all of its dependencies.\n"
 "\n"
-"Information on each category of packages and each one of them is available "
-"in the zone \"Infos\"\n"
-"located above buttons of confirmation/selection/deselection."
+"Information on each category and specific package is available in the\n"
+"area titled \"Info\". This is located above the buttons: [confirmation]\n"
+"[selection] [unselection]."
 msgstr ""
 "Du har nå muligheten til å velge programvaren som du ønsker å installere.\n"
 "\n"
@@ -904,191 +890,158 @@ msgstr ""
 "sone \"Infos\"\n"
 "funnet over knappene til bekreftelse/valg/fjern valg."
 
-#: ../install2.pm_.c:80
+#: ../install2.pm_.c:93
 msgid ""
-"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\n"
+"should only take a few minutes."
 msgstr ""
 "Pakkene som er valgt blir nå installert på systemet ditt. Dette tar bare "
 "noen få minutter."
 
-#: ../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
+#: ../install2.pm_.c:97 ../install2.pm_.c:100 ../install2.pm_.c:103
+#: ../install2.pm_.c:106 ../install2.pm_.c:109 ../install2.pm_.c:141
+#: ../install2.pm_.c:158 ../install2.pm_.c:187
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../install2.pm_.c:92
+#: ../install2.pm_.c:112
 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 "
-"spelling.\n"
+"An administrator password for your Linux system must now be\n"
+"assigned. The password must be entered twice to verify that both\n"
+"password entries are identical.\n"
 "\n"
-"Choose it carefully because it mainly conditions the good functioning of "
-"your system.\n"
-"Indeed, only the administrator (also named \"root\") is able to configure "
-"the computer.\n"
-"The password should not be too simple so that whoever cannot be connected "
-"under this account.\n"
-"It should not be either too sophisticated under penalty of being difficult "
-"to retain and, finally, forgotten.\n"
+"Choose this password carefully. Only persons with access to an\n"
+"administrator account can maintain and administer the system.\n"
+"Alternatively, unauthorized use of an administrator account can be\n"
+"extremely dangerous to the integrity of the system, the data upon it,\n"
+"and other systems with which it is interfaced. The password should be a\n"
+"mixture of alphanumeric characters and a least 8 characters long. It\n"
+"should never be written down. Do not make the password too long or\n"
+"complicated that it will be difficult to remember.\n"
 "\n"
-"When you wish to connect yourselves on your Linux system as an "
-"administrator, the \"login\" \n"
-"is \"root\" and the \"password\", this one which you now will indicate."
+"When you login as Administrator, at \"login\" type \"root\" and at\n"
+"\"password\", type the password that was created here."
 msgstr ""
-"Systemet krever nå et administrator-passord for Linux-systemet ditt.\n"
-"Passordet må oppgis to ganger for å bekrefte at stavingen er riktig.\n"
-"\n"
-"Velg det med omhu fordi det i hovedsak bestemmer for godt systemet vil "
-"fungere.\n"
-"Også fordi bare administratoren (også kalt \"root\") er i stand til å "
-"konfigurere datamaskinen din.\n"
-"Passordet burde ikke være for enkelt så andre ikke kan logge seg på denne "
-"kontoen.\n"
-"Det burde heller ikke være for innviklet så det er vanskelig å huske, eller "
-"i verste fall bli glemt.\n"
-"\n"
-"Ønsker du å logge deg på Linux-systemet ditt som administrator, så er \"logg "
-"inn\" \n"
-"\"root\" og \"passord\", som du nå vil opprette."
 
-#: ../install2.pm_.c:103
+#: ../install2.pm_.c:129
 msgid ""
-"You can now authorize one or more people to be connected on your Linux "
-"system. Each one of\n"
-"them will profit from his own environment will be able to configure.\n"
+"You can now authorize one or more people to be use your Linux\n"
+"system. Each user account will have their own customizable environment.\n"
 "\n"
-"It is very important that you create at least one user even if you are the "
-"only person who will connect\n"
-"herself on this machine. Indeed, if runnig the system as \"root\" is "
-"attractive, that \n"
-"is a very bad idea. This last having all the rights it is certain that at "
-"one time you will broke all.\n"
-"This is highly preferable you connect as simple user and that you use the "
-"account \"root\" only when\n"
-"that is essential."
+"It is very important that you create a regular user account, even if \n"
+"there will only be one principle user of the system. The administrative\n"
+"\"root\" account should not be used for day to day operation of the\n"
+"computer.  It is a security risk.  The use of a regular user account\n"
+"protects you and the system from yourself. The root account should only\n"
+"be used for administrative and maintenance tasks that can not be\n"
+"accomplished from a regular user account."
 msgstr ""
-"Du kan nå gi autorisasjon til å la en eller brukere logge seg på Linux- "
-"systemet ditt. Være av dem\n"
-"vil være i stand til å konfigurere sitt eget miljø.\n"
-"\n"
-"Det er veldig viktig at du oppretter minst en bruker selv om du er den "
-"eneste personen som vil\n"
-"bruke denne maskinen. Selv om det å kjøre systemet som \"root\" er "
-"attraktivt, så er det en \n"
-"veldig dårlig ide. Da denne har alle rettigheter er det sikkert at før eller "
-"senere vil du ødelegge alt.\n"
-"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:112
+#: ../install2.pm_.c:144
+#, fuzzy
 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"
-"Unless you know exactly what you do, always choose \"First sector of drive\"."
+"You need to indicate where you wish\n"
+"to place the information required to boot to Linux.\n"
+"\n"
+"Unless you know exactly what you are doing, choose \"First sector of\n"
+"drive\"."
 msgstr ""
 "Systemet blir nå kopiert til disken din, det er nå på tide å indikere hvor "
 "starten skal være.\n"
 "Med mindre du vet akkurat hva du gjør, velg alltid \"Første sektor av "
 "disken\"."
 
-#: ../install2.pm_.c:121
+#: ../install2.pm_.c:151
 msgid ""
-"It is now time to configure the graphic server. First of all, choose your "
-"monitor. You have then\n"
-"the possibility of testing your configuration and of reconsidering your "
-"choices if the latter are not\n"
-"appropriate to you."
+"It is now time to configure the video card and monitor\n"
+"configuration for the X windows Graphic User Interface (GUI). First\n"
+"select your monitor. Next, you may test the configuration and change\n"
+"your\n"
+"selections if necessary."
 msgstr ""
-"Det er nå tid for å konfigurere grafikk-tjeneren. Først, velg monitor. Du "
-"har så muligheten\n"
-"til å teste konfigurasjonen din og endre dine valg hvis disse valgene ikke "
-"passet for deg."
 
-#: ../install2.pm_.c:131
+#: ../install2.pm_.c:164
 msgid "Choose your language"
 msgstr "Velg språk"
 
-#: ../install2.pm_.c:132
+#: ../install2.pm_.c:165
 msgid "Choose install or upgrade"
 msgstr "Velg installering eller oppgradering"
 
-#: ../install2.pm_.c:133
+#: ../install2.pm_.c:166
 msgid "Select installation class"
 msgstr "Velg installasjonsklasse"
 
-#: ../install2.pm_.c:134
+#: ../install2.pm_.c:167
 msgid "Setup SCSI"
 msgstr "Oppsett SCSI"
 
-#: ../install2.pm_.c:135
+#: ../install2.pm_.c:168
 msgid "Setup filesystems"
 msgstr "Oppsett filsystemer"
 
-#: ../install2.pm_.c:136
+#: ../install2.pm_.c:169
 msgid "Format partitions"
 msgstr "Formater partisjoner"
 
-#: ../install2.pm_.c:137
+#: ../install2.pm_.c:170
 msgid "Choose packages to install"
 msgstr "Velg pakker for installering"
 
-#: ../install2.pm_.c:138
+#: ../install2.pm_.c:171
 msgid "Install system"
 msgstr "Installer systemet"
 
-#: ../install2.pm_.c:139
+#: ../install2.pm_.c:172
 #, fuzzy
 msgid "Configure mouse"
 msgstr "Konfigurer X"
 
-#: ../install2.pm_.c:140
+#: ../install2.pm_.c:173
 msgid "Configure networking"
 msgstr "Konfigurer nettverk"
 
-#: ../install2.pm_.c:144 ../install_steps_graphical.pm_.c:407
+#: ../install2.pm_.c:177 ../install_steps_graphical.pm_.c:407
 msgid "Set root password"
 msgstr "Sett root passord"
 
-#: ../install2.pm_.c:145
+#: ../install2.pm_.c:178
 msgid "Add a user"
 msgstr "Legg til en bruker"
 
-#: ../install2.pm_.c:146
+#: ../install2.pm_.c:179
 msgid "Create bootdisk"
 msgstr "Opprett oppstartdiskett"
 
-#: ../install2.pm_.c:147
+#: ../install2.pm_.c:180
 msgid "Install bootloader"
 msgstr "Installer oppstartslaster"
 
-#: ../install2.pm_.c:148
+#: ../install2.pm_.c:181
 msgid "Configure X"
 msgstr "Konfigurer X"
 
-#: ../install2.pm_.c:149
+#: ../install2.pm_.c:182
 msgid "Exit install"
 msgstr "Gå ut av installering"
 
-#: ../install2.pm_.c:163
+#: ../install2.pm_.c:196
 msgid "beginner"
 msgstr "nybegynner"
 
-#: ../install2.pm_.c:163
+#: ../install2.pm_.c:196
 msgid "developer"
 msgstr "utvikler"
 
-#: ../install2.pm_.c:163
+#: ../install2.pm_.c:196
 msgid "expert"
 msgstr "ekspert"
 
-#: ../install2.pm_.c:163
+#: ../install2.pm_.c:196
 msgid "server"
 msgstr "tjener"
 
-#: ../install2.pm_.c:244
+#: ../install2.pm_.c:277
 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"
@@ -1096,8 +1049,8 @@ 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:259
-msgid "partitionning failed: no root filesystem"
+#: ../install2.pm_.c:292
+msgid "partitioning failed: no root filesystem"
 msgstr "partisjonering feilet: intet root filsystem"
 
 #: ../install_steps.pm_.c:229
@@ -1132,6 +1085,10 @@ msgstr "Mb"
 msgid "Total size: "
 msgstr "Total størrelse: "
 
+#: ../install_steps_graphical.pm_.c:285
+msgid "Info"
+msgstr ""
+
 #: ../install_steps_graphical.pm_.c:313
 msgid "Installing"
 msgstr "Installerer"
@@ -1215,7 +1172,7 @@ msgid "The user name must contain only letters, numbers, `-' and `_'"
 msgstr "Brukernavnet kan kun inneholde bokstaver, tall, `-' og `_'"
 
 #: ../install_steps_interactive.pm_.c:24
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "En feil oppsto"
 
 #: ../install_steps_interactive.pm_.c:31
@@ -1227,7 +1184,7 @@ msgid "Install/Upgrade"
 msgstr "Installer/Oppgrader"
 
 #: ../install_steps_interactive.pm_.c:38
-msgid "Is it an install or an updgrade?"
+msgid "Is it an install or an upgrade?"
 msgstr "Er det en installasjon eller en oppgradering?"
 
 #: ../install_steps_interactive.pm_.c:39
@@ -1384,3 +1341,101 @@ msgstr "D
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Feil ved skriving til fil %s"
+
+#~ msgid ""
+#~ "Choose the language which you approved. This one govern the language's "
+#~ "system."
+#~ msgstr "Velg språket som du godkjente. Dette bestemmer språket på systemet."
+
+#~ msgid ""
+#~ "In this stage, you will must partion your hard disk. It consists in cutting "
+#~ "your disk in several zones\n"
+#~ "(which are not equal). This operation, for spectacular and intimidating that "
+#~ "it is,\n"
+#~ " is not hardly if you be carrefull so that you do. \n"
+#~ "Also, take your time, are sure you before click on \"Finishing\" and READ "
+#~ "the handbook of DiskDrake\n"
+#~ "before use them."
+#~ msgstr ""
+#~ "På dette punktet må du partisjonere hard-disken din. Det består av å dele "
+#~ "opp disken din i flere soner\n"
+#~ "(som ikke er like). Denne operasjonen, uansett hvor spektakulært "
+#~ "ogskremmende det måtte være,\n"
+#~ "så er det ikke vanskelig hvis du er forsiktig med det du gjør. \n"
+#~ "Ta deg god tid, og vær sikker før du klikker på \"Ferdig\" og LES "
+#~ "DiskDrake-håndboken\n"
+#~ "før du begynner."
+
+#~ 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 "
+#~ "spelling.\n"
+#~ "\n"
+#~ "Choose it carefully because it mainly conditions the good functioning of "
+#~ "your system.\n"
+#~ "Indeed, only the administrator (also named \"root\") is able to configure "
+#~ "the computer.\n"
+#~ "The password should not be too simple so that whoever cannot be connected "
+#~ "under this account.\n"
+#~ "It should not be either too sophisticated under penalty of being difficult "
+#~ "to retain and, finally, forgotten.\n"
+#~ "\n"
+#~ "When you wish to connect yourselves on your Linux system as an "
+#~ "administrator, the \"login\" \n"
+#~ "is \"root\" and the \"password\", this one which you now will indicate."
+#~ msgstr ""
+#~ "Systemet krever nå et administrator-passord for Linux-systemet ditt.\n"
+#~ "Passordet må oppgis to ganger for å bekrefte at stavingen er riktig.\n"
+#~ "\n"
+#~ "Velg det med omhu fordi det i hovedsak bestemmer for godt systemet vil "
+#~ "fungere.\n"
+#~ "Også fordi bare administratoren (også kalt \"root\") er i stand til å "
+#~ "konfigurere datamaskinen din.\n"
+#~ "Passordet burde ikke være for enkelt så andre ikke kan logge seg på denne "
+#~ "kontoen.\n"
+#~ "Det burde heller ikke være for innviklet så det er vanskelig å huske, eller "
+#~ "i verste fall bli glemt.\n"
+#~ "\n"
+#~ "Ønsker du å logge deg på Linux-systemet ditt som administrator, så er \"logg "
+#~ "inn\" \n"
+#~ "\"root\" og \"passord\", som du nå vil opprette."
+
+#~ msgid ""
+#~ "You can now authorize one or more people to be connected on your Linux "
+#~ "system. Each one of\n"
+#~ "them will profit from his own environment will be able to configure.\n"
+#~ "\n"
+#~ "It is very important that you create at least one user even if you are the "
+#~ "only person who will connect\n"
+#~ "herself on this machine. Indeed, if runnig the system as \"root\" is "
+#~ "attractive, that \n"
+#~ "is a very bad idea. This last having all the rights it is certain that at "
+#~ "one time you will broke all.\n"
+#~ "This is highly preferable you connect as simple user and that you use the "
+#~ "account \"root\" only when\n"
+#~ "that is essential."
+#~ msgstr ""
+#~ "Du kan nå gi autorisasjon til å la en eller brukere logge seg på Linux- "
+#~ "systemet ditt. Være av dem\n"
+#~ "vil være i stand til å konfigurere sitt eget miljø.\n"
+#~ "\n"
+#~ "Det er veldig viktig at du oppretter minst en bruker selv om du er den "
+#~ "eneste personen som vil\n"
+#~ "bruke denne maskinen. Selv om det å kjøre systemet som \"root\" er "
+#~ "attraktivt, så er det en \n"
+#~ "veldig dårlig ide. Da denne har alle rettigheter er det sikkert at før eller "
+#~ "senere vil du ødelegge alt.\n"
+#~ "Det her høyt anbefalt at du logger deg på som vanlig bruker og kun bruker "
+#~ "kontoen \"root\" når det er nødvendig."
+
+#~ msgid ""
+#~ "It is now time to configure the graphic server. First of all, choose your "
+#~ "monitor. You have then\n"
+#~ "the possibility of testing your configuration and of reconsidering your "
+#~ "choices if the latter are not\n"
+#~ "appropriate to you."
+#~ msgstr ""
+#~ "Det er nå tid for å konfigurere grafikk-tjeneren. Først, velg monitor. Du "
+#~ "har så muligheten\n"
+#~ "til å teste konfigurasjonen din og endre dine valg hvis disse valgene ikke "
+#~ "passet for deg."
-- 
cgit v1.2.1