updated pot file

1 files changed, 239 insertions, 222 deletions

diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 44b6d7e56..9a2e0106b 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2002-04-25 12:39+0200\n"
+"POT-Creation-Date: 2002-06-13 15:54+0200\n"
 "PO-Revision-Date: 2002-03-10 11:04GMT\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: Norsk\n"
@@ -16,24 +16,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../../Xconfigurator.pm_.c:242
+#: ../../Xconfigurator.pm_.c:243
 msgid "Configure all heads independently"
 msgstr "Konfigurere all hoder uavhengig"
 
-#: ../../Xconfigurator.pm_.c:243
+#: ../../Xconfigurator.pm_.c:244
 msgid "Use Xinerama extension"
 msgstr "Bruk Xinerama utvidelse"
 
-#: ../../Xconfigurator.pm_.c:246
+#: ../../Xconfigurator.pm_.c:247
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "Konfigurer bare kort \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:250
 msgid "Multi-head configuration"
 msgstr "Multi-hode konfigurasjon"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:251
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
@@ -41,41 +41,41 @@ msgstr ""
 "Systemet ditt støtter konfigurasjon for flere hoder.\n"
 "Hva ønsker du å gjøre?"
 
-#: ../../Xconfigurator.pm_.c:261
+#: ../../Xconfigurator.pm_.c:262
 msgid "Graphics card"
 msgstr "Grafikk-kort"
 
-#: ../../Xconfigurator.pm_.c:262
+#: ../../Xconfigurator.pm_.c:263
 msgid "Select a graphics card"
 msgstr "Velg et grafikk-kort"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:287
 msgid "Choose a X server"
 msgstr "Velg en X-tjener"
 
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:287
 msgid "X server"
 msgstr "X-tjener"
 
-#: ../../Xconfigurator.pm_.c:293
+#: ../../Xconfigurator.pm_.c:294
 msgid "Choose a X driver"
 msgstr "Velg en X driver"
 
-#: ../../Xconfigurator.pm_.c:293
+#: ../../Xconfigurator.pm_.c:294
 msgid "X driver"
 msgstr "X driver"
 
-#: ../../Xconfigurator.pm_.c:360 ../../Xconfigurator.pm_.c:366
-#: ../../Xconfigurator.pm_.c:416 ../../Xconfigurator.pm_.c:1507
+#: ../../Xconfigurator.pm_.c:361 ../../Xconfigurator.pm_.c:367
+#: ../../Xconfigurator.pm_.c:417 ../../Xconfigurator.pm_.c:1510
 #, c-format
 msgid "XFree %s"
 msgstr "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:363
+#: ../../Xconfigurator.pm_.c:364
 msgid "Which configuration of XFree do you want to have?"
 msgstr "Hvilken konfigurasjon av XFree vil du ha?"
 
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfigurator.pm_.c:375
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -85,18 +85,18 @@ msgstr ""
 "%s.\n"
 "Kortet ditt er støttet av XFree %s som kan ha bedre støtte i 2D."
 
-#: ../../Xconfigurator.pm_.c:376 ../../Xconfigurator.pm_.c:409
+#: ../../Xconfigurator.pm_.c:377 ../../Xconfigurator.pm_.c:410
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr "Kortet ditt kan ha støtte for maskinvare 3D akselerasjon med XFree %s."
 
-#: ../../Xconfigurator.pm_.c:378 ../../Xconfigurator.pm_.c:411
-#: ../../Xconfigurator.pm_.c:1507
+#: ../../Xconfigurator.pm_.c:379 ../../Xconfigurator.pm_.c:412
+#: ../../Xconfigurator.pm_.c:1510
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s med maskinvare 3D akselerasjon"
 
-#: ../../Xconfigurator.pm_.c:386 ../../Xconfigurator.pm_.c:400
+#: ../../Xconfigurator.pm_.c:387 ../../Xconfigurator.pm_.c:401
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -105,12 +105,12 @@ msgstr ""
 "Kortet ditt kan ha støtte for maskinvare 3D akselerasjon med XFree %s,\n"
 "MERK AT DETTE ER EKSPERIMENTELL STØTTE OG KAN 'FRYSE' MASKINEN DIN."
 
-#: ../../Xconfigurator.pm_.c:388 ../../Xconfigurator.pm_.c:402
+#: ../../Xconfigurator.pm_.c:389 ../../Xconfigurator.pm_.c:403
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s med EKSPERIMENTELL maskinvare 3D akselerasjon"
 
-#: ../../Xconfigurator.pm_.c:397
+#: ../../Xconfigurator.pm_.c:398
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -122,31 +122,31 @@ msgstr ""
 "MERK AT DETTE ER EKSPERIMENTELL STØTTE OG KAN 'FRYSE' MASKINEN DIN.\n"
 "Kortet ditt er støttet av XFree %s som kan ha bedre støtte i 2D."
 
-#: ../../Xconfigurator.pm_.c:417
+#: ../../Xconfigurator.pm_.c:418
 msgid "Xpmac (installation display driver)"
 msgstr "Xpmac (installasjons skjermdriver)"
 
-#: ../../Xconfigurator.pm_.c:421
+#: ../../Xconfigurator.pm_.c:422
 msgid "XFree configuration"
 msgstr "XFree konfigurasjon"
 
-#: ../../Xconfigurator.pm_.c:496
+#: ../../Xconfigurator.pm_.c:497
 msgid "Select the memory size of your graphics card"
 msgstr "Velg minnestørrelsen til grafikk-kortet ditt"
 
-#: ../../Xconfigurator.pm_.c:550
+#: ../../Xconfigurator.pm_.c:551
 msgid "Choose options for server"
 msgstr "Velg opsjoner for tjener"
 
-#: ../../Xconfigurator.pm_.c:574
+#: ../../Xconfigurator.pm_.c:575
 msgid "Choose a monitor"
 msgstr "Velg en monitor"
 
-#: ../../Xconfigurator.pm_.c:574
+#: ../../Xconfigurator.pm_.c:575
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:577
+#: ../../Xconfigurator.pm_.c:578
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -170,39 +170,39 @@ msgstr ""
 "skjermen din.\n"
 "Hvis du er usikker, velg en konservativ innstilling."
 
-#: ../../Xconfigurator.pm_.c:584
+#: ../../Xconfigurator.pm_.c:585
 msgid "Horizontal refresh rate"
 msgstr "Horisontal oppfrisknings-rate"
 
-#: ../../Xconfigurator.pm_.c:585
+#: ../../Xconfigurator.pm_.c:586
 msgid "Vertical refresh rate"
 msgstr "Vertikal oppfrisknings-rate"
 
-#: ../../Xconfigurator.pm_.c:622
+#: ../../Xconfigurator.pm_.c:623
 msgid "Monitor not configured"
 msgstr "Monitor er ikke konfigurert"
 
-#: ../../Xconfigurator.pm_.c:625
+#: ../../Xconfigurator.pm_.c:626
 msgid "Graphics card not configured yet"
 msgstr "Grafikk-kort er ikke konfigurert ennå"
 
-#: ../../Xconfigurator.pm_.c:628
+#: ../../Xconfigurator.pm_.c:629
 msgid "Resolutions not chosen yet"
 msgstr "Oppløsninger er ikke valgt ennå"
 
-#: ../../Xconfigurator.pm_.c:646
+#: ../../Xconfigurator.pm_.c:647
 msgid "Do you want to test the configuration?"
 msgstr "Vil du teste konfigurasjonen?"
 
-#: ../../Xconfigurator.pm_.c:650
+#: ../../Xconfigurator.pm_.c:651
 msgid "Warning: testing this graphics card may freeze your computer"
 msgstr "Advarsel: testing av dette grafikk-kortet kan `fryse' maskinen din"
 
-#: ../../Xconfigurator.pm_.c:653
+#: ../../Xconfigurator.pm_.c:654
 msgid "Test of the configuration"
 msgstr "Test konfigurasjon"
 
-#: ../../Xconfigurator.pm_.c:692 ../../Xconfigurator.pm_.c:704
+#: ../../Xconfigurator.pm_.c:693 ../../Xconfigurator.pm_.c:705
 msgid ""
 "\n"
 "try to change some parameters"
@@ -210,47 +210,47 @@ msgstr ""
 "\n"
 "prøv å endre noen parametere"
 
-#: ../../Xconfigurator.pm_.c:692 ../../Xconfigurator.pm_.c:704
+#: ../../Xconfigurator.pm_.c:693 ../../Xconfigurator.pm_.c:705
 msgid "An error occurred:"
 msgstr "En feil oppsto:"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:734
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Slutter om %d sekunder"
 
-#: ../../Xconfigurator.pm_.c:742
+#: ../../Xconfigurator.pm_.c:745
 msgid "Is this the correct setting?"
 msgstr "Er dette den riktige innstillingen?"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:754
 msgid "An error occurred, try to change some parameters"
 msgstr "En feil oppsto, prøv å endre noen parametere"
 
-#: ../../Xconfigurator.pm_.c:822
+#: ../../Xconfigurator.pm_.c:825
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: ../../Xconfigurator.pm_.c:874
+#: ../../Xconfigurator.pm_.c:877
 msgid "Choose the resolution and the color depth"
 msgstr "Velg oppløsning og fargedybde"
 
-#: ../../Xconfigurator.pm_.c:876
+#: ../../Xconfigurator.pm_.c:879
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafikk-kort: %s"
 
-#: ../../Xconfigurator.pm_.c:877
+#: ../../Xconfigurator.pm_.c:880
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86-tjener: %s"
 
-#: ../../Xconfigurator.pm_.c:891 ../../diskdrake/interactive.pm_.c:259
+#: ../../Xconfigurator.pm_.c:894 ../../diskdrake/interactive.pm_.c:259
 #: ../../install_steps_interactive.pm_.c:208
 msgid "More"
 msgstr "Mer"
 
-#: ../../Xconfigurator.pm_.c:891 ../../install_gtk.pm_.c:84
+#: ../../Xconfigurator.pm_.c:894 ../../install_gtk.pm_.c:84
 #: ../../install_steps_gtk.pm_.c:328 ../../interactive.pm_.c:127
 #: ../../interactive.pm_.c:142 ../../interactive.pm_.c:317
 #: ../../interactive.pm_.c:349 ../../interactive_http.pm_.c:104
@@ -262,123 +262,123 @@ msgstr "Mer"
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../Xconfigurator.pm_.c:893 ../../network/netconnect.pm_.c:173
+#: ../../Xconfigurator.pm_.c:896 ../../network/netconnect.pm_.c:173
 #: ../../printerdrake.pm_.c:2473 ../../standalone/drakfloppy_.c:146
 #: ../../standalone/draknet_.c:275 ../../standalone/draknet_.c:278
 msgid "Expert Mode"
 msgstr "Ekspertmodus"
 
-#: ../../Xconfigurator.pm_.c:894
+#: ../../Xconfigurator.pm_.c:897
 msgid "Show all"
 msgstr "Vis alle"
 
-#: ../../Xconfigurator.pm_.c:939
+#: ../../Xconfigurator.pm_.c:942
 msgid "Resolutions"
 msgstr "Oppløsninger"
 
-#: ../../Xconfigurator.pm_.c:1509
+#: ../../Xconfigurator.pm_.c:1512
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastatur-oppsett: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1510
+#: ../../Xconfigurator.pm_.c:1513
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Type mus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1511
+#: ../../Xconfigurator.pm_.c:1514
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Enhet mus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1512
+#: ../../Xconfigurator.pm_.c:1515
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1513
+#: ../../Xconfigurator.pm_.c:1516
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HorizSync: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1514
+#: ../../Xconfigurator.pm_.c:1517
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertRefresh: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1515
+#: ../../Xconfigurator.pm_.c:1518
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafikk-kort: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1516
+#: ../../Xconfigurator.pm_.c:1519
 #, c-format
 msgid "Graphics card identification: %s\n"
 msgstr "Grafikk-kort identifisering: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1517
+#: ../../Xconfigurator.pm_.c:1520
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Minne grafikk: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1519
+#: ../../Xconfigurator.pm_.c:1522
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Fargedybde: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1520
+#: ../../Xconfigurator.pm_.c:1523
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Oppløsning: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1522
+#: ../../Xconfigurator.pm_.c:1525
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86-tjener: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1523
+#: ../../Xconfigurator.pm_.c:1526
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "XFree86 driver: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1541
+#: ../../Xconfigurator.pm_.c:1544
 msgid "Preparing X-Window configuration"
 msgstr "Forbereder X-Window konfigurasjon"
 
-#: ../../Xconfigurator.pm_.c:1561
+#: ../../Xconfigurator.pm_.c:1564
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../../Xconfigurator.pm_.c:1566
+#: ../../Xconfigurator.pm_.c:1569
 msgid "Change Monitor"
 msgstr "Endre monitor"
 
-#: ../../Xconfigurator.pm_.c:1567
+#: ../../Xconfigurator.pm_.c:1570
 msgid "Change Graphics card"
 msgstr "Endre grafikk-kort"
 
-#: ../../Xconfigurator.pm_.c:1570
+#: ../../Xconfigurator.pm_.c:1573
 msgid "Change Server options"
 msgstr "Endre opsjoner for tjener"
 
-#: ../../Xconfigurator.pm_.c:1571
+#: ../../Xconfigurator.pm_.c:1574
 msgid "Change Resolution"
 msgstr "Endre oppløsning"
 
-#: ../../Xconfigurator.pm_.c:1572
+#: ../../Xconfigurator.pm_.c:1575
 msgid "Show information"
 msgstr "Vis informasjon"
 
-#: ../../Xconfigurator.pm_.c:1573
+#: ../../Xconfigurator.pm_.c:1576
 msgid "Test again"
 msgstr "Test igjen"
 
-#: ../../Xconfigurator.pm_.c:1574 ../../printerdrake.pm_.c:2476
+#: ../../Xconfigurator.pm_.c:1577 ../../printerdrake.pm_.c:2476
 #: ../../standalone/logdrake_.c:225
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../../Xconfigurator.pm_.c:1582
+#: ../../Xconfigurator.pm_.c:1585
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -391,11 +391,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1603
+#: ../../Xconfigurator.pm_.c:1606
 msgid "Graphical interface at startup"
 msgstr "X ved oppstart"
 
-#: ../../Xconfigurator.pm_.c:1604
+#: ../../Xconfigurator.pm_.c:1607
 msgid ""
 "I can setup your computer to automatically start the graphical interface "
 "(XFree) upon booting.\n"
@@ -404,12 +404,12 @@ msgstr ""
 "Jeg kan sette opp maskinen din til å automatisk starte X ved oppstart.\n"
 "Vil du at X skal starte når du starter maskinen på nytt?"
 
-#: ../../Xconfigurator.pm_.c:1610
+#: ../../Xconfigurator.pm_.c:1613
 #, 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:1625
+#: ../../Xconfigurator.pm_.c:1628
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Vennligst logg ut og bruk så Ctrl-Alt-BackSpace"
 
@@ -598,14 +598,14 @@ msgid "Delay before booting default image"
 msgstr "Forsinkelse før oppstart av standard bilde"
 
 #: ../../any.pm_.c:178 ../../any.pm_.c:796
-#: ../../install_steps_interactive.pm_.c:1085 ../../network/modem.pm_.c:48
+#: ../../install_steps_interactive.pm_.c:1087 ../../network/modem.pm_.c:48
 #: ../../printerdrake.pm_.c:710 ../../printerdrake.pm_.c:808
 #: ../../standalone/draknet_.c:625
 msgid "Password"
 msgstr "Passord"
 
 #: ../../any.pm_.c:179 ../../any.pm_.c:797
-#: ../../install_steps_interactive.pm_.c:1086
+#: ../../install_steps_interactive.pm_.c:1088
 msgid "Password (again)"
 msgstr "Passord (igjen)"
 
@@ -642,12 +642,12 @@ msgstr ""
 
 #: ../../any.pm_.c:192 ../../any.pm_.c:773
 #: ../../diskdrake/interactive.pm_.c:1143
-#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1082
 msgid "Please try again"
 msgstr "Vennligst prøv igjen"
 
 #: ../../any.pm_.c:192 ../../any.pm_.c:773
-#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1082
 msgid "The passwords do not match"
 msgstr "Passordene stemmer ikke overens"
 
@@ -871,7 +871,7 @@ msgid "Specify options"
 msgstr "Spesifiser opsjoner"
 
 #: ../../any.pm_.c:725
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
 "Note that any address should be entered with the prefix 0x like '0x123'"
@@ -882,7 +882,7 @@ msgstr ""
 #: ../../any.pm_.c:731
 #, c-format
 msgid ""
-"You may now provide its options to module %s.\n"
+"You may now provide options to module %s.\n"
 "Options are in format ``name=value name2=value2 ...''.\n"
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
@@ -1162,7 +1162,7 @@ msgstr ""
 "Sikkerhetsfunksjonene er nå på maksimum."
 
 #: ../../any.pm_.c:1059
-msgid "Choose security level"
+msgid "Please choose the desired security level."
 msgstr "Velg sikkerhetsnivå"
 
 #: ../../any.pm_.c:1062
@@ -1179,8 +1179,12 @@ msgid ""
 msgstr ""
 "Ett bibliotek som beskytter mot buffer overflow og strengformateringsangrep."
 
+#: ../../any.pm_.c:1067
+msgid "Security user (login or email)"
+msgstr ""
+
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:355
+#: ../../bootloader.pm_.c:354
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -1197,52 +1201,52 @@ msgstr ""
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:928
+#: ../../bootloader.pm_.c:910
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Velkommen til GRUB, operativsystem-velgeren!"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:931
+#: ../../bootloader.pm_.c:913
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr "Bruk %c og %c tastene for å velge hvilken inngang som er markert."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:934
+#: ../../bootloader.pm_.c:916
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr "Trykk enter for † starte opp valgt OS, 'e' for † redigere"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:937
+#: ../../bootloader.pm_.c:919
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "kommandoer for oppstart, eller 'c' for en kommandolinje."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:940
+#: ../../bootloader.pm_.c:922
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "Den markerte inngangen vil bli startet automatisk om %d sekunder."
 
-#: ../../bootloader.pm_.c:944
+#: ../../bootloader.pm_.c:926
 msgid "not enough room in /boot"
 msgstr "ikke nok plass i /boot"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
 #. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:1044
+#: ../../bootloader.pm_.c:1026
 msgid "Desktop"
 msgstr "Skrivebord"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:1046
+#: ../../bootloader.pm_.c:1028
 msgid "Start Menu"
 msgstr "Startmeny"
 
-#: ../../bootloader.pm_.c:1065
+#: ../../bootloader.pm_.c:1047
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "Du kan ikke installere oppstartslasteren på en %s partisjon\n"
@@ -1385,7 +1389,7 @@ msgstr "Jeg kan ikke ta skjembilder før partisjonering."
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjermbilder vil være tilgjengelig etter installasjon i %s"
 
-#: ../../crypto.pm_.c:12 ../../crypto.pm_.c:26
+#: ../../crypto.pm_.c:12 ../../crypto.pm_.c:26 ../../network/tools.pm_.c:113
 msgid "France"
 msgstr "Frankrike"
 
@@ -1393,7 +1397,7 @@ msgstr "Frankrike"
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../crypto.pm_.c:14 ../../crypto.pm_.c:27
+#: ../../crypto.pm_.c:14 ../../crypto.pm_.c:27 ../../network/tools.pm_.c:116
 msgid "Belgium"
 msgstr "Belgia"
 
@@ -1417,11 +1421,12 @@ msgstr "Norge"
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../../crypto.pm_.c:20 ../../crypto.pm_.c:34
+#: ../../crypto.pm_.c:20 ../../crypto.pm_.c:34 ../../network/tools.pm_.c:114
 msgid "Netherlands"
 msgstr "Netherlands"
 
-#: ../../crypto.pm_.c:21 ../../crypto.pm_.c:35 ../../standalone/drakxtv_.c:74
+#: ../../crypto.pm_.c:21 ../../crypto.pm_.c:35 ../../network/tools.pm_.c:115
+#: ../../standalone/drakxtv_.c:74
 msgid "Italy"
 msgstr "Italia"
 
@@ -1429,7 +1434,7 @@ msgstr "Italia"
 msgid "Austria"
 msgstr "Østerrike"
 
-#: ../../crypto.pm_.c:33 ../../crypto.pm_.c:67
+#: ../../crypto.pm_.c:33 ../../crypto.pm_.c:67 ../../network/tools.pm_.c:117
 msgid "United States"
 msgstr "USA"
 
@@ -4045,7 +4050,7 @@ msgstr "Entrer trinn `%s'\n"
 
 #: ../../install_steps_gtk.pm_.c:148
 msgid ""
-"Your system is low on resource. You may have some problem installing\n"
+"Your system is low on resources. You may have some problem installing\n"
 "Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
@@ -4363,7 +4368,7 @@ msgid ""
 "\n"
 "1. License Agreement\n"
 "\n"
-"Please read carefully this document. This document is a license agreement "
+"Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "MandrakeSoft S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
@@ -4481,7 +4486,7 @@ msgstr ""
 "\n"
 "1. License Agreement\n"
 "\n"
-"Please read carefully this document. This document is a license agreement "
+"Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "MandrakeSoft S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
@@ -4587,7 +4592,7 @@ msgstr ""
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 
 #: ../../install_steps_interactive.pm_.c:205
-#: ../../install_steps_interactive.pm_.c:1015
+#: ../../install_steps_interactive.pm_.c:1017
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "Tastatur"
@@ -4687,8 +4692,8 @@ msgstr "Velg monteringspunktene"
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
-"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
-"The other solution is to disallow DrakX to modify the partition table.\n"
+"I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to not allow DrakX to modify the partition table.\n"
 "(the error is %s)\n"
 "\n"
 "Do you agree to loose all the partitions?\n"
@@ -4750,7 +4755,7 @@ msgid "Creating and formatting file %s"
 msgstr "Lager of formaterer fila %s"
 
 #: ../../install_steps_interactive.pm_.c:467
-msgid "Not enough swap to fulfill installation, please add some"
+msgid "Not enough swap space to fulfill installation, please add some"
 msgstr ""
 "Det er ikke nok SWAP til å fullføre installasjonen, vennligst legg til litt "
 "mer"
@@ -4766,7 +4771,8 @@ msgstr "Finner pakker som skal oppgraderes"
 #: ../../install_steps_interactive.pm_.c:496
 #, c-format
 msgid ""
-"Your system has not enough space left for installation or upgrade (%d > %d)"
+"Your system does not have enough space left for installation or upgrade (%d "
+"> %d)"
 msgstr ""
 "Ditt system har ikke nok plass igjen for installasjon eller oppgradering (%d "
 "> %d)"
@@ -4871,7 +4877,7 @@ msgstr "Sett inn oppdater moduler disketten i stasjon %s"
 
 #: ../../install_steps_interactive.pm_.c:844
 msgid ""
-"You have now the possibility to download software aimed for encryption.\n"
+"You now have the opportunity to download encryption software.\n"
 "\n"
 "WARNING:\n"
 "\n"
@@ -4943,13 +4949,15 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:882
+#: ../../install_steps_interactive.pm_.c:883
+#, fuzzy
 msgid ""
-"You have now the possibility to download updated packages that have\n"
-"been released after the distribution has been made available.\n"
+"You now have the opportunity to download updated packages. These packages\n"
+"have been released after the distribution was released. They may\n"
+"contain security or bug fixes.\n"
 "\n"
-"You will get security fixes or bug fixes, but you need to have an\n"
-"Internet connection configured to proceed.\n"
+"To download these packages, you will need to have a working Internet \n"
+"connection.\n"
 "\n"
 "Do you want to install the updates ?"
 msgstr ""
@@ -4961,149 +4969,149 @@ msgstr ""
 "\n"
 "Ønsker du å installere oppdateringene?"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:898
 msgid ""
 "Contacting Mandrake Linux web site to get the list of available mirrors..."
 msgstr ""
 "Kontakter Mandrake Linux web-sted for å få en liste over tilgjengelige speil"
 
-#: ../../install_steps_interactive.pm_.c:901
+#: ../../install_steps_interactive.pm_.c:903
 msgid "Choose a mirror from which to get the packages"
 msgstr "Velg et speil som pakkene kan hentes fra"
 
-#: ../../install_steps_interactive.pm_.c:910
+#: ../../install_steps_interactive.pm_.c:912
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "Kontakter speilet for å få en liste over tilgjengelige pakker"
 
-#: ../../install_steps_interactive.pm_.c:937
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Which is your timezone?"
 msgstr "Hva er din tidsone?"
 
-#: ../../install_steps_interactive.pm_.c:942
+#: ../../install_steps_interactive.pm_.c:944
 msgid "Hardware clock set to GMT"
 msgstr "Maskinvareklokken din satt til GMT"
 
-#: ../../install_steps_interactive.pm_.c:943
+#: ../../install_steps_interactive.pm_.c:945
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Automatisk tidssynkronisering (ved hjelp av NTP)"
 
-#: ../../install_steps_interactive.pm_.c:950
+#: ../../install_steps_interactive.pm_.c:952
 msgid "NTP Server"
 msgstr "NTP-tjener"
 
-#: ../../install_steps_interactive.pm_.c:984
-#: ../../install_steps_interactive.pm_.c:992
+#: ../../install_steps_interactive.pm_.c:986
+#: ../../install_steps_interactive.pm_.c:994
 msgid "Remote CUPS server"
 msgstr "Fjern-CUPS tjener"
 
-#: ../../install_steps_interactive.pm_.c:985
+#: ../../install_steps_interactive.pm_.c:987
 msgid "No printer"
 msgstr "Ingen skriver"
 
-#: ../../install_steps_interactive.pm_.c:1002
+#: ../../install_steps_interactive.pm_.c:1004
 msgid "Do you have an ISA sound card?"
 msgstr "Har du et ISA lydkort?"
 
-#: ../../install_steps_interactive.pm_.c:1004
+#: ../../install_steps_interactive.pm_.c:1006
 msgid "Run \"sndconfig\" after installation to configure your sound card"
 msgstr ""
 "Kjør \"sndconfig\" etter installasjonen for å konfigurere lydkortet ditt"
 
-#: ../../install_steps_interactive.pm_.c:1006
+#: ../../install_steps_interactive.pm_.c:1008
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Lydkort ikke oppdaget. Prøv \"harddrake\" etter installasjonen"
 
-#: ../../install_steps_interactive.pm_.c:1011 ../../steps.pm_.c:27
+#: ../../install_steps_interactive.pm_.c:1013 ../../steps.pm_.c:27
 msgid "Summary"
 msgstr "Oppsummering"
 
-#: ../../install_steps_interactive.pm_.c:1014
+#: ../../install_steps_interactive.pm_.c:1016
 msgid "Mouse"
 msgstr "Mus"
 
-#: ../../install_steps_interactive.pm_.c:1016
+#: ../../install_steps_interactive.pm_.c:1018
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../../install_steps_interactive.pm_.c:1017 ../../printerdrake.pm_.c:2279
+#: ../../install_steps_interactive.pm_.c:1019 ../../printerdrake.pm_.c:2279
 #: ../../printerdrake.pm_.c:2357
 msgid "Printer"
 msgstr "Skriver"
 
-#: ../../install_steps_interactive.pm_.c:1019
+#: ../../install_steps_interactive.pm_.c:1021
 msgid "ISDN card"
 msgstr "ISDN-kort"
 
-#: ../../install_steps_interactive.pm_.c:1022
 #: ../../install_steps_interactive.pm_.c:1024
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: ../../install_steps_interactive.pm_.c:1026
+#: ../../install_steps_interactive.pm_.c:1028
 msgid "TV card"
 msgstr "TV-kort"
 
-#: ../../install_steps_interactive.pm_.c:1064
-#: ../../install_steps_interactive.pm_.c:1088
-#: ../../install_steps_interactive.pm_.c:1092
+#: ../../install_steps_interactive.pm_.c:1066
+#: ../../install_steps_interactive.pm_.c:1090
+#: ../../install_steps_interactive.pm_.c:1094
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../../install_steps_interactive.pm_.c:1065
-#: ../../install_steps_interactive.pm_.c:1088
-#: ../../install_steps_interactive.pm_.c:1101
+#: ../../install_steps_interactive.pm_.c:1067
+#: ../../install_steps_interactive.pm_.c:1090
+#: ../../install_steps_interactive.pm_.c:1103
 msgid "NIS"
 msgstr "NIS"
 
-#: ../../install_steps_interactive.pm_.c:1066
-#: ../../install_steps_interactive.pm_.c:1088
+#: ../../install_steps_interactive.pm_.c:1068
+#: ../../install_steps_interactive.pm_.c:1090
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../../install_steps_interactive.pm_.c:1075
-#: ../../install_steps_interactive.pm_.c:1076 ../../steps.pm_.c:24
+#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1078 ../../steps.pm_.c:24
 msgid "Set root password"
 msgstr "Sett root-passord"
 
-#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1079
 msgid "No password"
 msgstr "Intet passord"
 
-#: ../../install_steps_interactive.pm_.c:1082
+#: ../../install_steps_interactive.pm_.c:1084
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "Dette passordet er for enkelt (må være minst %d tegn langt)"
 
-#: ../../install_steps_interactive.pm_.c:1088 ../../network/modem.pm_.c:49
+#: ../../install_steps_interactive.pm_.c:1090 ../../network/modem.pm_.c:49
 #: ../../standalone/draknet_.c:626 ../../standalone/logdrake_.c:172
 msgid "Authentication"
 msgstr "Autentifikasjon"
 
-#: ../../install_steps_interactive.pm_.c:1096
+#: ../../install_steps_interactive.pm_.c:1098
 msgid "Authentication LDAP"
 msgstr "Autentisering LDAP"
 
-#: ../../install_steps_interactive.pm_.c:1097
+#: ../../install_steps_interactive.pm_.c:1099
 msgid "LDAP Base dn"
 msgstr "LDAP grunnleggende dn"
 
-#: ../../install_steps_interactive.pm_.c:1098
+#: ../../install_steps_interactive.pm_.c:1100
 msgid "LDAP Server"
 msgstr "LDAP-tjener"
 
-#: ../../install_steps_interactive.pm_.c:1104
+#: ../../install_steps_interactive.pm_.c:1106
 msgid "Authentication NIS"
 msgstr "Autentisering NIS"
 
-#: ../../install_steps_interactive.pm_.c:1105
+#: ../../install_steps_interactive.pm_.c:1107
 msgid "NIS Domain"
 msgstr "NIS-domene"
 
-#: ../../install_steps_interactive.pm_.c:1106
+#: ../../install_steps_interactive.pm_.c:1108
 msgid "NIS Server"
 msgstr "NIS-tjener"
 
-#: ../../install_steps_interactive.pm_.c:1141
+#: ../../install_steps_interactive.pm_.c:1143
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -5134,19 +5142,19 @@ msgstr ""
 "en diskett\n"
 "i den første stasjonen og trykk \"Ok\"."
 
-#: ../../install_steps_interactive.pm_.c:1157
+#: ../../install_steps_interactive.pm_.c:1159
 msgid "First floppy drive"
 msgstr "Første diskettstasjon"
 
-#: ../../install_steps_interactive.pm_.c:1158
+#: ../../install_steps_interactive.pm_.c:1160
 msgid "Second floppy drive"
 msgstr "Andre diskettstasjon"
 
-#: ../../install_steps_interactive.pm_.c:1159 ../../printerdrake.pm_.c:1851
+#: ../../install_steps_interactive.pm_.c:1161 ../../printerdrake.pm_.c:1851
 msgid "Skip"
 msgstr "Dropp"
 
-#: ../../install_steps_interactive.pm_.c:1164
+#: ../../install_steps_interactive.pm_.c:1166
 #, c-format
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
@@ -5174,7 +5182,7 @@ msgstr ""
 "ditt?\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:1170
+#: ../../install_steps_interactive.pm_.c:1172
 msgid ""
 "\n"
 "\n"
@@ -5188,28 +5196,28 @@ msgstr ""
 "det å lage en oppstartsdiskett på en 1,44 Mb diskett vil\n"
 "antageligvis ikke gå, dan XFS trenger en veldig stor driver)."
 
-#: ../../install_steps_interactive.pm_.c:1178
+#: ../../install_steps_interactive.pm_.c:1180
 msgid "Sorry, no floppy drive available"
 msgstr "Beklager, ingen diskettstasjon tilgjengelig"
 
-#: ../../install_steps_interactive.pm_.c:1182
+#: ../../install_steps_interactive.pm_.c:1184
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Velg diskettstasjonen du ønsker å bruke for å lage oppstartsdisketten"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1188
 #, c-format
 msgid "Insert a floppy in %s"
 msgstr "Sett inn en diskett i %s"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1191
 msgid "Creating bootdisk..."
 msgstr "Oppretter oppstartdiskett"
 
-#: ../../install_steps_interactive.pm_.c:1196
+#: ../../install_steps_interactive.pm_.c:1198
 msgid "Preparing bootloader..."
 msgstr "Klargjør oppstartslaster"
 
-#: ../../install_steps_interactive.pm_.c:1207
+#: ../../install_steps_interactive.pm_.c:1209
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
 " machine, the yaboot bootloader will not work for you.\n"
@@ -5221,11 +5229,11 @@ msgstr ""
 "Installasjonen vil fortsette, men du må\n"
 "bruke BootX for å starte din maskin."
 
-#: ../../install_steps_interactive.pm_.c:1213
+#: ../../install_steps_interactive.pm_.c:1215
 msgid "Do you want to use aboot?"
 msgstr "Ønsker du å bruke aboot?"
 
-#: ../../install_steps_interactive.pm_.c:1216
+#: ../../install_steps_interactive.pm_.c:1218
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -5233,15 +5241,15 @@ msgstr ""
 "Feil ved installasjon av aboot, \n"
 "prøve å installere selv om det ødelegger den første partisjonen?"
 
-#: ../../install_steps_interactive.pm_.c:1223
+#: ../../install_steps_interactive.pm_.c:1225
 msgid "Installing bootloader"
 msgstr "Installer oppstartslaster"
 
-#: ../../install_steps_interactive.pm_.c:1229
+#: ../../install_steps_interactive.pm_.c:1231
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Installasjon av oppstartslaster mislykket. Følgende feil oppsto:"
 
-#: ../../install_steps_interactive.pm_.c:1237
+#: ../../install_steps_interactive.pm_.c:1239
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -5258,17 +5266,17 @@ msgstr ""
 " Skriv så: shut-down\n"
 "Ved din neste oppstart burde du se oppstartslasteren."
 
-#: ../../install_steps_interactive.pm_.c:1281
+#: ../../install_steps_interactive.pm_.c:1283
 #: ../../standalone/drakautoinst_.c:81
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sett inn en tom diskett i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:1285
+#: ../../install_steps_interactive.pm_.c:1287
 msgid "Creating auto install floppy..."
 msgstr "Oppretter diskett for autoinstallasjon"
 
-#: ../../install_steps_interactive.pm_.c:1296
+#: ../../install_steps_interactive.pm_.c:1298
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5278,7 +5286,7 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å avslutte nå?"
 
-#: ../../install_steps_interactive.pm_.c:1307
+#: ../../install_steps_interactive.pm_.c:1309
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -5310,11 +5318,11 @@ msgstr ""
 "Informasjon om konfigurering av systemet ditt finnes i post\n"
 "install-kapittelet i Official Mandrake Linux User's Guide."
 
-#: ../../install_steps_interactive.pm_.c:1324
+#: ../../install_steps_interactive.pm_.c:1326
 msgid "Generate auto install floppy"
 msgstr "Oppretter diskett for autoinstallasjon"
 
-#: ../../install_steps_interactive.pm_.c:1326
+#: ../../install_steps_interactive.pm_.c:1328
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5328,15 +5336,15 @@ msgstr ""
 "\n"
 "Du kanskje ønske å kjøre installasjonen omigjen.\n"
 
-#: ../../install_steps_interactive.pm_.c:1331
+#: ../../install_steps_interactive.pm_.c:1333
 msgid "Automated"
 msgstr "Automatisert"
 
-#: ../../install_steps_interactive.pm_.c:1331
+#: ../../install_steps_interactive.pm_.c:1333
 msgid "Replay"
 msgstr "Gjør igjen"
 
-#: ../../install_steps_interactive.pm_.c:1334
+#: ../../install_steps_interactive.pm_.c:1336
 msgid "Save packages selection"
 msgstr "Lagre pakkevalg"
 
@@ -5375,22 +5383,6 @@ msgstr "Grunnleggende"
 msgid "Please wait"
 msgstr "Vennligst vent"
 
-#: ../../interactive_gtk.pm_.c:605 ../../services.pm_.c:222
-msgid "Info"
-msgstr "Info"
-
-#: ../../interactive_gtk.pm_.c:715
-msgid "Expand Tree"
-msgstr "Utvid tre"
-
-#: ../../interactive_gtk.pm_.c:716
-msgid "Collapse Tree"
-msgstr "Trekk sammen tre"
-
-#: ../../interactive_gtk.pm_.c:717
-msgid "Toggle between flat and group sorted"
-msgstr "Skift mellom flat og gruppesortert"
-
 #: ../../interactive_stdio.pm_.c:29 ../../interactive_stdio.pm_.c:147
 msgid "Bad choice, try again\n"
 msgstr "Dårlig valg, prøv igjen\n"
@@ -5789,7 +5781,7 @@ msgstr "Rund monterer %s\n"
 msgid "Remove the logical volumes first\n"
 msgstr "Fjern de logiske partisjoner først\n"
 
-#: ../../modules.pm_.c:826
+#: ../../modules.pm_.c:832
 msgid ""
 "PCMCIA support no longer exist for 2.2 kernels. Please use a 2.4 kernel."
 msgstr ""
@@ -5932,6 +5924,22 @@ msgstr "<- Forrige"
 msgid "Is this correct?"
 msgstr "Er dette riktig?"
 
+#: ../../my_gtk.pm_.c:1098 ../../services.pm_.c:222
+msgid "Info"
+msgstr "Info"
+
+#: ../../my_gtk.pm_.c:1119
+msgid "Expand Tree"
+msgstr "Utvid tre"
+
+#: ../../my_gtk.pm_.c:1120
+msgid "Collapse Tree"
+msgstr "Trekk sammen tre"
+
+#: ../../my_gtk.pm_.c:1121
+msgid "Toggle between flat and group sorted"
+msgstr "Skift mellom flat og gruppesortert"
+
 #: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
 msgid "Connect to the Internet"
 msgstr "Koble opp mot Internett"
@@ -6277,7 +6285,7 @@ msgstr ""
 "Trykk OK for å begynne."
 
 #: ../../network/netconnect.pm_.c:138 ../../network/netconnect.pm_.c:256
-#: ../../network/netconnect.pm_.c:276 ../../network/tools.pm_.c:62
+#: ../../network/netconnect.pm_.c:276 ../../network/tools.pm_.c:63
 msgid "Network Configuration"
 msgstr "Nettverkskonfigurasjon"
 
@@ -6537,27 +6545,27 @@ msgstr "Proxy burde være http://..."
 msgid "Proxy should be ftp://..."
 msgstr "Proxy burde være ftp://..."
 
-#: ../../network/tools.pm_.c:40
+#: ../../network/tools.pm_.c:41
 msgid "Internet configuration"
 msgstr "Internett-konfigurasjon"
 
-#: ../../network/tools.pm_.c:41
+#: ../../network/tools.pm_.c:42
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Vil du prøve å koble opp mot Internett nå?"
 
-#: ../../network/tools.pm_.c:45 ../../standalone/draknet_.c:197
+#: ../../network/tools.pm_.c:46 ../../standalone/draknet_.c:197
 msgid "Testing your connection..."
 msgstr "Tester tilkoblingen din..."
 
-#: ../../network/tools.pm_.c:55
+#: ../../network/tools.pm_.c:56
 msgid "The system is now connected to Internet."
 msgstr "Systemet er nå koblet opp mot Internett."
 
-#: ../../network/tools.pm_.c:56
+#: ../../network/tools.pm_.c:57
 msgid "For security reason, it will be disconnected now."
 msgstr "Av sikkerhetsgrunner vil den bli frakoblet nå."
 
-#: ../../network/tools.pm_.c:57
+#: ../../network/tools.pm_.c:58
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
@@ -6565,78 +6573,82 @@ msgstr ""
 "Det ser ikke ut til at systemet er koblet til Internett.\n"
 "Prøv å rekonfigurere tilkoblingen din."
 
-#: ../../network/tools.pm_.c:81
+#: ../../network/tools.pm_.c:82
 msgid "Connection Configuration"
 msgstr "Konfigurasjon tilknytning."
 
-#: ../../network/tools.pm_.c:82
+#: ../../network/tools.pm_.c:83
 msgid "Please fill or check the field below"
 msgstr "Vennnligst fyll eller merk feltet under"
 
-#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:608
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:608
 msgid "Card IRQ"
 msgstr "Kort IRQ"
 
-#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:609
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:609
 msgid "Card mem (DMA)"
 msgstr "Kort mem (DMA)"
 
-#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:610
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:610
 msgid "Card IO"
 msgstr "Kort IO"
 
-#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:611
+#: ../../network/tools.pm_.c:88 ../../standalone/draknet_.c:611
 msgid "Card IO_0"
 msgstr "Kort IO_0"
 
-#: ../../network/tools.pm_.c:88 ../../standalone/draknet_.c:612
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:612
 msgid "Card IO_1"
 msgstr "Kort IO_1"
 
-#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:613
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:613
 msgid "Your personal phone number"
 msgstr "Ditt telefonnummer"
 
-#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:614
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:614
 msgid "Provider name (ex provider.net)"
 msgstr "Navn tilbyder (f.eks. tilbyder.net)"
 
-#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:615
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:615
 msgid "Provider phone number"
 msgstr "Telefonnummer tilbyder"
 
-#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:616
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:616
 msgid "Provider dns 1 (optional)"
 msgstr "Tilbyder dns 1 (valgfri)"
 
-#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:617
+#: ../../network/tools.pm_.c:94 ../../standalone/draknet_.c:617
 msgid "Provider dns 2 (optional)"
 msgstr "Tilbyder dns 2 (valgfri)"
 
-#: ../../network/tools.pm_.c:94
+#: ../../network/tools.pm_.c:95
 msgid "Choose your country"
 msgstr "Velg land"
 
-#: ../../network/tools.pm_.c:95 ../../standalone/draknet_.c:620
+#: ../../network/tools.pm_.c:96 ../../standalone/draknet_.c:620
 msgid "Dialing mode"
 msgstr "Oppringningsmodus"
 
-#: ../../network/tools.pm_.c:96 ../../standalone/draknet_.c:632
+#: ../../network/tools.pm_.c:97 ../../standalone/draknet_.c:632
 msgid "Connection speed"
 msgstr "Oppkoblingshastighet"
 
-#: ../../network/tools.pm_.c:97 ../../standalone/draknet_.c:633
+#: ../../network/tools.pm_.c:98 ../../standalone/draknet_.c:633
 msgid "Connection timeout (in sec)"
 msgstr "Oppkoblingens timout (i sekunder)"
 
-#: ../../network/tools.pm_.c:98 ../../standalone/draknet_.c:618
+#: ../../network/tools.pm_.c:99 ../../standalone/draknet_.c:618
 msgid "Account Login (user name)"
 msgstr "Logg inn (brukernavn)"
 
-#: ../../network/tools.pm_.c:99 ../../standalone/draknet_.c:619
+#: ../../network/tools.pm_.c:100 ../../standalone/draknet_.c:619
 msgid "Account Password"
 msgstr "Passord"
 
+#: ../../network/tools.pm_.c:118
+msgid "United Kingdom"
+msgstr ""
+
 #: ../../partition_table.pm_.c:600
 msgid "mount failed: "
 msgstr "montering mislykket: "
@@ -10699,10 +10711,15 @@ msgstr "Ethernettkort"
 msgid "DHCP Client"
 msgstr "DHCP-klient"
 
-#: ../../standalone/draksec_.c:31
+#: ../../standalone/draksec_.c:51
 msgid "Setting security level"
 msgstr "Setter sikkerhetsnivå"
 
+#: ../../standalone/draksec_.c:57
+#, fuzzy
+msgid "Setting security user"
+msgstr "Setter sikkerhetsnivå"
+
 #: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Kontrollpanel"