update-po

1 files changed, 165 insertions, 143 deletions

diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 2a4884cc5..38a8aa311 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-05-02 15:36+0200\n"
+"POT-Creation-Date: 2000-05-03 21:19+0200\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -93,19 +93,19 @@ msgstr "Grafikk-kort er ikke konfigurert ennå"
 msgid "Resolutions not chosen yet"
 msgstr "Oppløsninger er ikke valgt ennå"
 
-#: ../../Xconfigurator.pm_.c:303
+#: ../../Xconfigurator.pm_.c:304
 msgid "Do you want to test the configuration?"
 msgstr "Vil du teste konfigurasjonen?"
 
-#: ../../Xconfigurator.pm_.c:307
+#: ../../Xconfigurator.pm_.c:308
 msgid "Warning: testing is dangerous on this graphic card"
 msgstr "Advarsel: testing er farlig med dette grafikk-kortet"
 
-#: ../../Xconfigurator.pm_.c:310
+#: ../../Xconfigurator.pm_.c:311
 msgid "Test of the configuration"
 msgstr "Test konfigurasjon"
 
-#: ../../Xconfigurator.pm_.c:349
+#: ../../Xconfigurator.pm_.c:350
 msgid ""
 "\n"
 "try to change some parameters"
@@ -113,28 +113,28 @@ msgstr ""
 "\n"
 "prøv å endre noen parametere"
 
-#: ../../Xconfigurator.pm_.c:349
+#: ../../Xconfigurator.pm_.c:350
 msgid "An error has occurred:"
 msgstr "En feil oppsto:"
 
-#: ../../Xconfigurator.pm_.c:372
+#: ../../Xconfigurator.pm_.c:373
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Slutter om %d sekunder"
 
-#: ../../Xconfigurator.pm_.c:376
+#: ../../Xconfigurator.pm_.c:377
 msgid "Is this the correct setting?"
 msgstr "Er dette den riktige innstillingen?"
 
-#: ../../Xconfigurator.pm_.c:384
+#: ../../Xconfigurator.pm_.c:385
 msgid "An error has occurred, try to change some parameters"
 msgstr "En feil oppsto, prøv å endre noen parametere"
 
-#: ../../Xconfigurator.pm_.c:392 ../../Xconfigurator.pm_.c:565
+#: ../../Xconfigurator.pm_.c:393 ../../Xconfigurator.pm_.c:566
 msgid "Automatic resolutions"
 msgstr "Automatiske oppløsninger"
 
-#: ../../Xconfigurator.pm_.c:393
+#: ../../Xconfigurator.pm_.c:394
 msgid ""
 "To find the available resolutions I will try different ones.\n"
 "Your screen will blink...\n"
@@ -144,33 +144,33 @@ msgstr ""
 "Skjermen din vil blinke...\n"
 "Du kan slå av hvis du vil, du vil høre et bipp når det er ferdig"
 
-#: ../../Xconfigurator.pm_.c:448 ../../printerdrake.pm_.c:165
+#: ../../Xconfigurator.pm_.c:449 ../../printerdrake.pm_.c:165
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: ../../Xconfigurator.pm_.c:483
+#: ../../Xconfigurator.pm_.c:484
 msgid "Choose the resolution and the color depth"
 msgstr "Velg oppløsning og fargedybde"
 
-#: ../../Xconfigurator.pm_.c:485
+#: ../../Xconfigurator.pm_.c:486
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafikk-kort: %s"
 
-#: ../../Xconfigurator.pm_.c:486
+#: ../../Xconfigurator.pm_.c:487
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86-tjener: %s"
 
-#: ../../Xconfigurator.pm_.c:495
+#: ../../Xconfigurator.pm_.c:496
 msgid "Show all"
 msgstr "Vis alle"
 
-#: ../../Xconfigurator.pm_.c:519
+#: ../../Xconfigurator.pm_.c:520
 msgid "Resolutions"
 msgstr "Oppløsninger"
 
-#: ../../Xconfigurator.pm_.c:566
+#: ../../Xconfigurator.pm_.c:567
 msgid ""
 "I can try to find the available resolutions (eg: 800x600).\n"
 "Sometimes, though, it may hang the machine.\n"
@@ -180,7 +180,7 @@ msgstr ""
 "Noen ganger kan dette forårsake at maskinen stopper opp.\n"
 "Ønsker du å prøve?"
 
-#: ../../Xconfigurator.pm_.c:571
+#: ../../Xconfigurator.pm_.c:572
 msgid ""
 "No valid modes found\n"
 "Try with another video card or monitor"
@@ -188,109 +188,109 @@ msgstr ""
 "Ingen gyldige modus funnet\n"
 "Prøv med et annet skjermkort eller monitor"
 
-#: ../../Xconfigurator.pm_.c:911
+#: ../../Xconfigurator.pm_.c:912
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastatur-oppsett: %s\n"
 
-#: ../../Xconfigurator.pm_.c:912
+#: ../../Xconfigurator.pm_.c:913
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Type mus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:913
+#: ../../Xconfigurator.pm_.c:914
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Enhet mus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:914
+#: ../../Xconfigurator.pm_.c:915
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:915
+#: ../../Xconfigurator.pm_.c:916
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HorizSync: %s\n"
 
-#: ../../Xconfigurator.pm_.c:916
+#: ../../Xconfigurator.pm_.c:917
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertRefresh: %s\n"
 
-#: ../../Xconfigurator.pm_.c:917
+#: ../../Xconfigurator.pm_.c:918
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafikk-kort: %s\n"
 
-#: ../../Xconfigurator.pm_.c:918
+#: ../../Xconfigurator.pm_.c:919
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Minne grafikk: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:919
+#: ../../Xconfigurator.pm_.c:920
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86-tjener: %s\n"
 
-#: ../../Xconfigurator.pm_.c:934
+#: ../../Xconfigurator.pm_.c:935
 msgid "Preparing X-Window configuration"
 msgstr "Forbereder X-Window konfigurasjon"
 
-#: ../../Xconfigurator.pm_.c:948
+#: ../../Xconfigurator.pm_.c:949
 msgid "Change Monitor"
 msgstr "Endre monitor"
 
-#: ../../Xconfigurator.pm_.c:949
+#: ../../Xconfigurator.pm_.c:950
 msgid "Change Graphic card"
 msgstr "Endre grafikk-kort"
 
-#: ../../Xconfigurator.pm_.c:950
+#: ../../Xconfigurator.pm_.c:951
 msgid "Change Server options"
 msgstr "Endre opsjoner for tjener"
 
-#: ../../Xconfigurator.pm_.c:951
+#: ../../Xconfigurator.pm_.c:952
 msgid "Change Resolution"
 msgstr "Endre oppløsning"
 
-#: ../../Xconfigurator.pm_.c:952
+#: ../../Xconfigurator.pm_.c:953
 msgid "Automatical resolutions search"
 msgstr "Automatisk oppløsningssøk"
 
-#: ../../Xconfigurator.pm_.c:956
+#: ../../Xconfigurator.pm_.c:957
 msgid "Show information"
 msgstr "Vis informasjon"
 
-#: ../../Xconfigurator.pm_.c:957
+#: ../../Xconfigurator.pm_.c:958
 msgid "Test again"
 msgstr "Test igjen"
 
-#: ../../Xconfigurator.pm_.c:958 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:959 ../../standalone/rpmdrake_.c:46
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../../Xconfigurator.pm_.c:962 ../../standalone/drakboot_.c:30
+#: ../../Xconfigurator.pm_.c:963 ../../standalone/drakboot_.c:36
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../../Xconfigurator.pm_.c:969
+#: ../../Xconfigurator.pm_.c:970
 msgid "Forget the changes?"
 msgstr "Glem endringene?"
 
-#: ../../Xconfigurator.pm_.c:987
+#: ../../Xconfigurator.pm_.c:988
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Vennligst logg inn i %s på nytt for å aktivere endringene"
 
-#: ../../Xconfigurator.pm_.c:1003
+#: ../../Xconfigurator.pm_.c:1004
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Vennligst logg ut og bruk så Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1006
+#: ../../Xconfigurator.pm_.c:1007
 msgid "X at startup"
 msgstr "X ved oppstart"
 
-#: ../../Xconfigurator.pm_.c:1007
+#: ../../Xconfigurator.pm_.c:1008
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -443,31 +443,31 @@ msgstr "Hvor ønsker du installere oppstartslasteren?"
 msgid "Which bootloader(s) do you want to use?"
 msgstr "Hvilken oppstartslaster(e) vil du bruke?"
 
-#: ../../any.pm_.c:79
+#: ../../any.pm_.c:82
 msgid "Boot device"
 msgstr "Oppstartsenhet"
 
-#: ../../any.pm_.c:80
+#: ../../any.pm_.c:83
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (virker ikke på gamle BIOS'er)"
 
-#: ../../any.pm_.c:81
+#: ../../any.pm_.c:84
 msgid "Compact"
 msgstr "Kompakt"
 
-#: ../../any.pm_.c:81
+#: ../../any.pm_.c:84
 msgid "compact"
 msgstr "kompakt"
 
-#: ../../any.pm_.c:82 ../../install_steps_interactive.pm_.c:790
+#: ../../any.pm_.c:85 ../../install_steps_interactive.pm_.c:790
 msgid "Delay before booting default image"
 msgstr "Forsinkelse før oppstart av standard bilde"
 
-#: ../../any.pm_.c:83
+#: ../../any.pm_.c:86
 msgid "Video mode"
 msgstr "Skjermmodus"
 
-#: ../../any.pm_.c:85 ../../install_steps_interactive.pm_.c:514
+#: ../../any.pm_.c:88 ../../install_steps_interactive.pm_.c:514
 #: ../../install_steps_interactive.pm_.c:636
 #: ../../install_steps_interactive.pm_.c:686
 #: ../../install_steps_interactive.pm_.c:792 ../../printerdrake.pm_.c:84
@@ -475,46 +475,46 @@ msgstr "Skjermmodus"
 msgid "Password"
 msgstr "Passord"
 
-#: ../../any.pm_.c:86 ../../install_steps_interactive.pm_.c:637
+#: ../../any.pm_.c:89 ../../install_steps_interactive.pm_.c:637
 #: ../../install_steps_interactive.pm_.c:687
 #: ../../install_steps_interactive.pm_.c:793
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Passord (igjen)"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:794
+#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:794
 msgid "Restrict command line options"
 msgstr "Begrense kommandolinje-opsjoner"
 
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:794
+#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:794
 msgid "restrict"
 msgstr "begrense"
 
-#: ../../any.pm_.c:93
+#: ../../any.pm_.c:96
 msgid "Bootloader main options"
 msgstr "Hovedopsjoner for oppstartslaster"
 
-#: ../../any.pm_.c:96 ../../install_steps_interactive.pm_.c:801
+#: ../../any.pm_.c:99 ../../install_steps_interactive.pm_.c:801
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
 
-#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:646
+#: ../../any.pm_.c:100 ../../install_steps_interactive.pm_.c:646
 #: ../../install_steps_interactive.pm_.c:700
 #: ../../install_steps_interactive.pm_.c:802
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Vennligst prøv igjen"
 
-#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:646
+#: ../../any.pm_.c:100 ../../install_steps_interactive.pm_.c:646
 #: ../../install_steps_interactive.pm_.c:700
 #: ../../install_steps_interactive.pm_.c:802
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Passordene stemmer ikke overens"
 
-#: ../../any.pm_.c:107
+#: ../../any.pm_.c:110
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -522,86 +522,86 @@ msgstr ""
 "Her er de følgende oppføringingene.\n"
 "Du kan legge til flere eller endre de eksisterende."
 
-#: ../../any.pm_.c:109 ../../install_steps_interactive.pm_.c:813
+#: ../../any.pm_.c:112 ../../install_steps_interactive.pm_.c:813
 #: ../../printerdrake.pm_.c:242 ../../standalone/rpmdrake_.c:302
 msgid "Add"
 msgstr "Legg til"
 
-#: ../../any.pm_.c:109 ../../diskdrake.pm_.c:42
+#: ../../any.pm_.c:112 ../../diskdrake.pm_.c:42
 #: ../../install_steps_interactive.pm_.c:680
 #: ../../install_steps_interactive.pm_.c:813 ../../printerdrake.pm_.c:242
 #: ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../../any.pm_.c:118
+#: ../../any.pm_.c:121
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:118
+#: ../../any.pm_.c:121
 msgid "Other OS (windows...)"
 msgstr "Andre OS (windows...)"
 
-#: ../../any.pm_.c:118
+#: ../../any.pm_.c:121
 msgid "Which type of entry do you want to add?"
 msgstr "Hvilken inngangstype vil du legge til"
 
-#: ../../any.pm_.c:137 ../../install_steps_interactive.pm_.c:838
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:838
 msgid "Image"
 msgstr "Bilde"
 
-#: ../../any.pm_.c:138 ../../any.pm_.c:146
+#: ../../any.pm_.c:141 ../../any.pm_.c:149
 #: ../../install_steps_interactive.pm_.c:840
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:139 ../../install_steps_interactive.pm_.c:841
+#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:841
 msgid "Append"
 msgstr "Tilføye"
 
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:842
+#: ../../any.pm_.c:143 ../../install_steps_interactive.pm_.c:842
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:141 ../../install_steps_interactive.pm_.c:843
+#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:843
 msgid "Read-write"
 msgstr "Les-skriv"
 
-#: ../../any.pm_.c:147
+#: ../../any.pm_.c:150
 msgid "Table"
 msgstr "Tabell"
 
-#: ../../any.pm_.c:148
+#: ../../any.pm_.c:151
 msgid "Unsafe"
 msgstr "Usikker"
 
-#: ../../any.pm_.c:153 ../../install_steps_interactive.pm_.c:850
+#: ../../any.pm_.c:156 ../../install_steps_interactive.pm_.c:850
 msgid "Label"
 msgstr "Etikett"
 
-#: ../../any.pm_.c:155 ../../install_steps_interactive.pm_.c:852
+#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:852
 msgid "Default"
 msgstr "Standard"
 
-#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:664
+#: ../../any.pm_.c:161 ../../install_steps_gtk.pm_.c:664
 #: ../../install_steps_interactive.pm_.c:634
 #: ../../install_steps_interactive.pm_.c:855 ../../interactive.pm_.c:74
 #: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
 #: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:199
-#: ../../my_gtk.pm_.c:458 ../../my_gtk.pm_.c:633 ../../printerdrake.pm_.c:269
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
+#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:634 ../../printerdrake.pm_.c:269
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:855
+#: ../../any.pm_.c:161 ../../install_steps_interactive.pm_.c:855
 msgid "Remove entry"
 msgstr "Fjern inngang"
 
-#: ../../any.pm_.c:161 ../../install_steps_interactive.pm_.c:858
+#: ../../any.pm_.c:164 ../../install_steps_interactive.pm_.c:858
 msgid "Empty label not allowed"
 msgstr "Tom etikett er ikke tillatt"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:165
 msgid "This label is already used"
 msgstr "Denne etiketten er allerede i bruk"
 
@@ -776,7 +776,7 @@ msgstr "Vær forsiktig: denne operasjonen er farlig."
 
 # #: ../install_steps_interactive.pm_.c:37
 #: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:312
-#: ../../install_steps.pm_.c:75 ../../install_steps_interactive.pm_.c:40
+#: ../../install_steps.pm_.c:79 ../../install_steps_interactive.pm_.c:40
 #: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
 #: ../../standalone/rpmdrake_.c:304
 msgid "Error"
@@ -1113,7 +1113,7 @@ msgstr "Filsystemtype: "
 msgid "Preference: "
 msgstr "Valg: "
 
-#: ../../diskdrake.pm_.c:721 ../../install_steps.pm_.c:131
+#: ../../diskdrake.pm_.c:721 ../../install_steps.pm_.c:135
 msgid "This partition can't be used for loopback"
 msgstr "Denne partisjonen kan ikke brukes for loopback"
 
@@ -1248,24 +1248,13 @@ msgid ""
 "Choose \"Install\" if there are no previous versions of Linux\n"
 "installed, or if you wish to use multiple distributions or versions.\n"
 "\n"
-"\n"
 "Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
 "Linux:\n"
 "5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
 "2000\n"
-"or 7.0 (Air)."
-msgstr ""
-"Velg \"Installasjon\" hvis det ikke er installert noen tidligere versjoner\n"
-"av Linux, eller hvis du ønsker å bruke flere distribusjoner eller\n"
-"versjoner.\n"
+"or 7.0 (Air).\n"
 "\n"
 "\n"
-"Velg \"Oppdater\" hvis du ønsker å oppdatere en tidligere versjon av\n"
-"Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios), Gold 2000 eller 7.0 (Air)."
-
-#: ../../help.pm_.c:22
-msgid ""
 "Select:\n"
 "\n"
 "  - Recommended: If you have never installed Linux before, choose this. "
@@ -1285,6 +1274,15 @@ msgid ""
 "    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
 "DOING!\n"
 msgstr ""
+"Velg \"Installasjon\" hvis det ikke er installert noen tidligere versjoner\n"
+"av Linux, eller hvis du ønsker å bruke flere distribusjoner eller\n"
+"versjoner.\n"
+"\n"
+"Velg \"Oppdater\" hvis du ønsker å oppdatere en tidligere versjon av\n"
+"Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
+"6.1 (Helios), Gold 2000 eller 7.0 (Air).\n"
+"\n"
+"\n"
 "Velg:\n"
 "\n"
 "  - Anbefalt: Hvis du ikke aldri har installert Linux før, velg denne. "
@@ -1301,7 +1299,7 @@ msgstr ""
 "    installasjonsklasse, vil du kunne velge bruk for systemet ditt.\n"
 "    Men vær så snill, IKKE VELG DETTE HVIS DU IKKE VET HVA DU GJØR!\n"
 
-#: ../../help.pm_.c:38
+#: ../../help.pm_.c:37
 msgid ""
 "Select:\n"
 "\n"
@@ -1326,7 +1324,7 @@ msgstr ""
 "    installasjonsklasse, vil du kunne velge bruk for systemet ditt.\n"
 "    Men vær så snill, IKKE VELG DETTE HVIS DU IKKE VET HVA DU GJØR!\n"
 
-#: ../../help.pm_.c:50
+#: ../../help.pm_.c:49
 msgid ""
 "The different choices for your machine's usage (provided, hence, that you "
 "have\n"
@@ -1373,7 +1371,7 @@ msgstr ""
 "    utskrift), en autentifikasjonstjener (NIS), en databasetjener osv. Som\n"
 "    så, ikke forvent at noe spesielt (KDE, GNOME...) vil bli installert.\n"
 
-#: ../../help.pm_.c:71
+#: ../../help.pm_.c:70
 msgid ""
 "DrakX 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"
@@ -1421,7 +1419,7 @@ msgstr ""
 "som foreslått i installasjonsguiden. Dette er opsjonene du vil trenge å\n"
 "gi til driveren."
 
-#: ../../help.pm_.c:95
+#: ../../help.pm_.c:94
 msgid ""
 "At this point, you may choose what partition(s) to use to install\n"
 "your Linux-Mandrake system if they have been already defined (from a\n"
@@ -1498,7 +1496,7 @@ msgstr ""
 "\n"
 "- Ctrl-m for å sette monteringspunktet\n"
 
-#: ../../help.pm_.c:132
+#: ../../help.pm_.c:131
 msgid ""
 "Any partitions that have been newly defined must be formatted for\n"
 "use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -1514,7 +1512,7 @@ msgstr ""
 "eksisterende partisjoner, især hvis de inneholder filer eller data som du\n"
 "ønsker å beholde. Typiske å beholde er: /home og /usr/local."
 
-#: ../../help.pm_.c:140
+#: ../../help.pm_.c:139
 msgid ""
 "You may now select the group of packages you wish to\n"
 "install or upgrade.\n"
@@ -1541,7 +1539,7 @@ msgstr ""
 "\"Individuelt pakkevalg\"; i så tilfelle må du lete gjennom mer enn 1000\n"
 "pakker..."
 
-#: ../../help.pm_.c:151
+#: ../../help.pm_.c:150
 msgid ""
 "If you have all the CDs in the list above, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -1551,7 +1549,7 @@ msgstr ""
 "Hvis du ikke har noen av disse CDene, klikk Avbryt.\n"
 "Hvis bare noen av CDene mangler, fjern disse, klikk så Ok."
 
-#: ../../help.pm_.c:156
+#: ../../help.pm_.c:155
 msgid ""
 "The packages selected are now being installed. This operation\n"
 "should take a few minutes unless you have chosen to upgrade an\n"
@@ -1563,7 +1561,7 @@ msgstr ""
 "eksisterende system. I så tilfelle kan det ta lengre tid også før\n"
 "oppgraderingen starter."
 
-#: ../../help.pm_.c:162
+#: ../../help.pm_.c:161
 msgid ""
 "If DrakX failed to find your mouse, or if you want to\n"
 "check what it has done, you will be presented the list of mice\n"
@@ -1592,7 +1590,7 @@ msgstr ""
 "Hvis du har en seriell mus, må du også fortelle DrakX hvilken\n"
 "serie-port den er koblet til."
 
-#: ../../help.pm_.c:177
+#: ../../help.pm_.c:176
 msgid ""
 "Please select the correct port. For example, the COM1 port under MS Windows\n"
 "is named ttyS0 under Linux."
@@ -1600,7 +1598,7 @@ msgstr ""
 "Vennligst velg den riktige porten. F.eks., COM1 porten i MS Windows blir\n"
 "kalt ttyS0 i Linux."
 
-#: ../../help.pm_.c:181
+#: ../../help.pm_.c:180
 msgid ""
 "This section is dedicated to configuring a local area\n"
 "network (LAN) or a modem.\n"
@@ -1658,7 +1656,7 @@ msgstr ""
 "mislykkes må du velge den riktige serieporten hvor modemet ditt er\n"
 "tilkoblet."
 
-#: ../../help.pm_.c:211
+#: ../../help.pm_.c:210
 msgid ""
 "Enter:\n"
 "\n"
@@ -1691,7 +1689,7 @@ msgstr ""
 "du\n"
 "ikke er sikker, spør nettverksadministratoren eller ISP'en din.\n"
 
-#: ../../help.pm_.c:226
+#: ../../help.pm_.c:225
 msgid ""
 "You may now enter dialup options. If you're not sure what to enter, the\n"
 "correct information can be obtained from your ISP."
@@ -1700,7 +1698,7 @@ msgstr ""
 "skal\n"
 "entre, så kan korrekt informasjon fåes fra din ISP."
 
-#: ../../help.pm_.c:230
+#: ../../help.pm_.c:229
 msgid ""
 "If you will use proxies, please configure them now. If you don't know if\n"
 "you should use proxies, ask your network administrator or your ISP."
@@ -1708,7 +1706,7 @@ msgstr ""
 "Hvis du skal bruke proxier, vennligst konfigurer disse nå. Hvis du ikke vet\n"
 "om du skal bruke proxier, spør nettverksadministratoren din eller din ISP."
 
-#: ../../help.pm_.c:234
+#: ../../help.pm_.c:233
 msgid ""
 "You can install cryptographic package if your internet connection has been\n"
 "set up correctly. First choose a mirror where you wish to download packages "
@@ -1725,7 +1723,7 @@ msgstr ""
 "\n"
 "Mer at du må velge speil og kryptografisk pakke ihht. lovgivning i ditt land."
 
-#: ../../help.pm_.c:242
+#: ../../help.pm_.c:241
 msgid ""
 "You can now select your timezone according to where you live.\n"
 "\n"
@@ -1739,7 +1737,7 @@ msgstr ""
 "Linux håndterer tid i GMT eller \"Greenwich Mean Time\" og oversetter\n"
 "den til lokal tid ihht. den tidssonen du har valgt."
 
-#: ../../help.pm_.c:249
+#: ../../help.pm_.c:248
 msgid ""
 "You may now choose which services you want to see started at boot time.\n"
 "When your mouse comes over an item, a small balloon help will popup which\n"
@@ -1757,7 +1755,7 @@ msgstr ""
 "Vær spesielt forsiktig i dette trinnet hvis du skal bruke maskinen din som\n"
 "tjener: du vil antageligvis ikke starte noen tjenester som du ikke trenger."
 
-#: ../../help.pm_.c:258
+#: ../../help.pm_.c:257
 msgid ""
 "Linux can deal with many types of printer. Each of these\n"
 "types require a different setup. Note however that the print\n"
@@ -1815,7 +1813,7 @@ msgstr ""
 "en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n"
 "informasjon."
 
-#: ../../help.pm_.c:287
+#: ../../help.pm_.c:286
 msgid ""
 "You can now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
@@ -1846,7 +1844,7 @@ msgstr ""
 "bli skrevet ned. Ikke lag passordet for langt eller for komplisert:\n"
 "du må kunne klare å huske det."
 
-#: ../../help.pm_.c:303
+#: ../../help.pm_.c:302
 msgid ""
 "To enable a more secure system, you should select \"Use shadow file\" and\n"
 "\"Use MD5 passwords\"."
@@ -1854,7 +1852,7 @@ msgstr ""
 "For et mer sikkert system, burde du velge \"Bruk skyggefil\" og\n"
 "\"Bruk MD5 passord\"."
 
-#: ../../help.pm_.c:307
+#: ../../help.pm_.c:306
 msgid ""
 "If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
 "network administrator."
@@ -1862,7 +1860,7 @@ msgstr ""
 "Hvis nettverket ditt bruker NIS, velg \"Bruk NIS\". Hvis du ikke vet dette,\n"
 "spør nettverksadministratoren din."
 
-#: ../../help.pm_.c:311
+#: ../../help.pm_.c:310
 msgid ""
 "You may now create one or more \"regular\" user account(s), as\n"
 "opposed to the \"privileged\" user account, root. You can create\n"
@@ -1905,7 +1903,7 @@ msgstr ""
 "du vil ha opprettet her, og bare logge inn som root for administrasjon-\n"
 "og vedlikeholdsformål."
 
-#: ../../help.pm_.c:330
+#: ../../help.pm_.c:329
 msgid ""
 "It is strongly recommended that you answer \"Yes\" here. If you install\n"
 "Microsoft Windows at a later date it will overwrite the boot sector.\n"
@@ -1918,7 +1916,7 @@ msgstr ""
 "Hvis du ikke har opprettet en oppstartsdiskett som foreslått, vil du ikke\n"
 "kunne starte Linux mer."
 
-#: ../../help.pm_.c:336
+#: ../../help.pm_.c:335
 msgid ""
 "You need to indicate where you wish\n"
 "to place the information required to boot to Linux.\n"
@@ -1934,7 +1932,7 @@ msgstr ""
 "Med mindre du vet akkurat hva du gjør, velg \"Første sektor av\n"
 "disken (MBR)\"."
 
-#: ../../help.pm_.c:344
+#: ../../help.pm_.c:343
 msgid ""
 "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
 " (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1942,7 +1940,7 @@ msgstr ""
 "Hvis du ikke spesifikt vet en annen måte, så er det vanlige valget\n"
 "\"/dev/hda\" (primær IDE-disk) eller \"/dev/sda\" (første SCSI-disk)."
 
-#: ../../help.pm_.c:348
+#: ../../help.pm_.c:347
 msgid ""
 "LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
 "either Linux or any other operating system present on your computer.\n"
@@ -1966,7 +1964,7 @@ msgstr ""
 "andre kan du fjerne linjene for disse. Men i så tilfelle trenger du\n"
 "en oppstartsdiskett for å starte disse!"
 
-#: ../../help.pm_.c:360
+#: ../../help.pm_.c:359
 msgid ""
 "LILO and grub main options are:\n"
 "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -2004,7 +2002,7 @@ msgstr ""
 "    * normal: velg normal 80x25 tekstmodus.\n"
 "    * <nummer>:  bruk tilsvarende tekstmodus."
 
-#: ../../help.pm_.c:379
+#: ../../help.pm_.c:378
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
 "core of the Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -2030,7 +2028,7 @@ msgstr ""
 "passer deg. Hvis de ikke gjør det, kan du komme tilbake og endre\n"
 "disse så mange ganger som det måtte behøves."
 
-#: ../../help.pm_.c:392
+#: ../../help.pm_.c:391
 msgid ""
 "If something is wrong in X configuration, use these options to correctly\n"
 "configure the X Window System."
@@ -2038,7 +2036,7 @@ msgstr ""
 "Hvis noe er galt i X konfigurasjonen, bruk disse opsjonene til å\n"
 "konfigurere X Window systemet riktig."
 
-#: ../../help.pm_.c:396
+#: ../../help.pm_.c:395
 msgid ""
 "If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
 "\"No\"."
@@ -2046,7 +2044,7 @@ msgstr ""
 "Hvis du velger å bruke grafisk login, velg \"Ja\". Ellers, velg\n"
 "\"Nei\"."
 
-#: ../../help.pm_.c:400
+#: ../../help.pm_.c:399
 msgid ""
 "You can now select some miscellaneous options for your system.\n"
 "\n"
@@ -2120,7 +2118,7 @@ msgstr ""
 "virke\n"
 "    under X)."
 
-#: ../../help.pm_.c:429
+#: ../../help.pm_.c:428
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
@@ -2274,7 +2272,7 @@ msgstr "Kan ikke bruke broadcast uten NIS-domene"
 msgid "Error reading file $f"
 msgstr "Feil ved lesing av fil $f"
 
-#: ../../install_steps.pm_.c:76
+#: ../../install_steps.pm_.c:80
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
@@ -2283,17 +2281,17 @@ msgstr ""
 "pen måte.\n"
 "Fortsett på eget ansvar."
 
-#: ../../install_steps.pm_.c:173
+#: ../../install_steps.pm_.c:177
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Dupliser monteringspunkt %s"
 
-#: ../../install_steps.pm_.c:378
+#: ../../install_steps.pm_.c:382
 #, c-format
 msgid "Welcome to %s"
 msgstr "Velkommen til %s"
 
-#: ../../install_steps.pm_.c:720
+#: ../../install_steps.pm_.c:731
 msgid "No floppy drive available"
 msgstr "Ingen diskettstasjon tilgjengelig"
 
@@ -2558,7 +2556,7 @@ msgstr "Beregner"
 #: ../../install_steps_gtk.pm_.c:541 ../../interactive.pm_.c:84
 #: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
 #: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:200 ../../my_gtk.pm_.c:458
+#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -2640,6 +2638,10 @@ msgstr "Er dette en installering eller en oppgradering?"
 msgid "Recommended"
 msgstr "Anbefalt"
 
+#, fuzzy
+msgid "Automated"
+msgstr "Automatisk IP"
+
 #: ../../install_steps_interactive.pm_.c:111
 #: ../../install_steps_interactive.pm_.c:123
 msgid "Customized"
@@ -3212,7 +3214,7 @@ msgstr "Sett inn en diskett i stasjon %s"
 msgid "Creating bootdisk"
 msgstr "Oppretter oppstartdiskett"
 
-#: ../../install_steps_interactive.pm_.c:766 ../../standalone/drakboot_.c:49
+#: ../../install_steps_interactive.pm_.c:766 ../../standalone/drakboot_.c:55
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "Installasjon av LILO mislykket. Følgende feil oppsto:"
 
@@ -3495,39 +3497,39 @@ msgstr "Konfigurerer PCMCIA kort..."
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:1159
+#: ../../install_steps_interactive.pm_.c:1156
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Fant %s %s grensesnitt"
 
-#: ../../install_steps_interactive.pm_.c:1160
+#: ../../install_steps_interactive.pm_.c:1157
 msgid "Do you have another one?"
 msgstr "Har du enda ett?"
 
-#: ../../install_steps_interactive.pm_.c:1161
+#: ../../install_steps_interactive.pm_.c:1158
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Har du noen %s grensesnitt?"
 
-#: ../../install_steps_interactive.pm_.c:1163 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:457 ../../printerdrake.pm_.c:123
+#: ../../install_steps_interactive.pm_.c:1160 ../../interactive.pm_.c:79
+#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:123
 msgid "No"
 msgstr "Nei"
 
-#: ../../install_steps_interactive.pm_.c:1163 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:457
+#: ../../install_steps_interactive.pm_.c:1160 ../../interactive.pm_.c:79
+#: ../../my_gtk.pm_.c:458
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../install_steps_interactive.pm_.c:1164
+#: ../../install_steps_interactive.pm_.c:1161
 msgid "See hardware info"
 msgstr "Se maskinvareinfo"
 
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1177
 msgid "Bringing up the network"
 msgstr "Henter opp nettverket"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Bringing down the network"
 msgstr "Tar ned nettverket"
 
@@ -3998,7 +4000,7 @@ msgstr "Generic 3-knappers mus (seriell)"
 msgid "Mouse Systems (serial)"
 msgstr "Mouse Systems (seriell)"
 
-#: ../../my_gtk.pm_.c:458
+#: ../../my_gtk.pm_.c:459
 msgid "Is this correct?"
 msgstr "Er dette riktig?"
 
@@ -4387,7 +4389,7 @@ msgstr "mkraid mislykket"
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid mislykket (kanskje raidtool mangler?)"
 
-#: ../../raid.pm_.c:145
+#: ../../raid.pm_.c:147
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ikke nok partisjoner for RAID nivå %d\n"
@@ -4651,7 +4653,7 @@ msgstr "Opprett en oppstartdiskett"
 msgid "Format floppy"
 msgstr "Formater diskett"
 
-#: ../../standalone/drakboot_.c:30
+#: ../../standalone/drakboot_.c:36
 msgid "Choice"
 msgstr "Valg"
 
@@ -4945,6 +4947,26 @@ msgstr "Finner tillatelser"
 msgid "Finding leaves takes some time"
 msgstr "Finne tillatelser vil ta litt tid"
 
+#~ msgid ""
+#~ "Choose \"Install\" if there are no previous versions of Linux\n"
+#~ "installed, or if you wish to use multiple distributions or versions.\n"
+#~ "\n"
+#~ "\n"
+#~ "Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
+#~ "Linux:\n"
+#~ "5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
+#~ "2000\n"
+#~ "or 7.0 (Air)."
+#~ msgstr ""
+#~ "Velg \"Installasjon\" hvis det ikke er installert noen tidligere versjoner\n"
+#~ "av Linux, eller hvis du ønsker å bruke flere distribusjoner eller\n"
+#~ "versjoner.\n"
+#~ "\n"
+#~ "\n"
+#~ "Velg \"Oppdater\" hvis du ønsker å oppdatere en tidligere versjon av\n"
+#~ "Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
+#~ "6.1 (Helios), Gold 2000 eller 7.0 (Air)."
+
 #~ msgid "Do you want to use LILO?"
 #~ msgstr "Ønsker du å bruke LILO?"