merge

1 files changed, 111 insertions, 92 deletions

diff --git a/po/nb.po b/po/nb.po
index c8a414fe..693ab2bf 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-nb\n"
-"POT-Creation-Date: 2004-01-12 10:26+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-16 14:38+0000\n"
 "PO-Revision-Date: 2004-01-12 22:40+0100\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 1.3\n"
 
 #: ../contributors.pl_.c:11
@@ -185,8 +185,9 @@ msgid "Backups"
 msgstr "Backups"
 
 #: ../control-center_.c:107
-msgid "Bootstrapping"
-msgstr "Oppstartssekvens"
+#, fuzzy
+msgid "Boot loader"
+msgstr "Oppstartsdiskett"
 
 #: ../control-center_.c:108
 msgid "Boot theme"
@@ -244,7 +245,7 @@ msgstr "Grafisk tjener"
 msgid "Partitions"
 msgstr "Partisjoner"
 
-#: ../control-center_.c:124 ../control-center_.c:161
+#: ../control-center_.c:124 ../control-center_.c:162
 msgid "Hardware"
 msgstr "Maskinvare"
 
@@ -348,173 +349,188 @@ msgstr "WebDAV-monteringspunkter"
 msgid "Boot"
 msgstr "Oppstart"
 
-#: ../control-center_.c:174
+#: ../control-center_.c:175
 msgid "Mount Points"
 msgstr ""
 "Monterings-\n"
 "punkter"
 
-#: ../control-center_.c:189
+#: ../control-center_.c:190
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: ../control-center_.c:190
+#: ../control-center_.c:191
 msgid "DVD"
 msgstr "DVD"
 
-#: ../control-center_.c:190
+#: ../control-center_.c:191
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: ../control-center_.c:191
+#: ../control-center_.c:192
 msgid "CD Burner"
 msgstr "CD-brenner"
 
-#: ../control-center_.c:191
+#: ../control-center_.c:192
 msgid "CD/DVD"
 msgstr "CD/DVD"
 
-#: ../control-center_.c:192
+#: ../control-center_.c:193
 msgid "Floppy"
 msgstr "Diskett"
 
-#: ../control-center_.c:192
+#: ../control-center_.c:193
 msgid "Floppy drive"
 msgstr "Diskettstasjon"
 
-#: ../control-center_.c:193
+#: ../control-center_.c:194
 msgid "ZIP drive"
 msgstr "ZIP-stasjon"
 
-#: ../control-center_.c:193
+#: ../control-center_.c:194
 msgid "Zip"
 msgstr "Zip"
 
-#: ../control-center_.c:202
+#: ../control-center_.c:203
 msgid "Network & Internet"
 msgstr "Nettverk & Internett"
 
-#: ../control-center_.c:213
+#: ../control-center_.c:214
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: ../control-center_.c:220
+#: ../control-center_.c:221
 msgid "System"
 msgstr "System"
 
-#: ../control-center_.c:236
+#: ../control-center_.c:237
 msgid "Software Management"
 msgstr ""
 "Programvare-\n"
 "håndtering"
 
-#: ../control-center_.c:245
+#: ../control-center_.c:246
 msgid "Server wizards"
 msgstr "Tjenerveiviserer"
 
-#: ../control-center_.c:252
+#: ../control-center_.c:253
 msgid "Configure DHCP"
 msgstr "Konfigurer DHCP"
 
-#: ../control-center_.c:253
+#: ../control-center_.c:254
 msgid "Add a DNS client"
 msgstr "Legg til en DNS-klient"
 
-#: ../control-center_.c:254
+#: ../control-center_.c:255
 msgid "Configure DNS"
 msgstr "Konfigurer DNS"
 
-#: ../control-center_.c:255
+#: ../control-center_.c:256
 msgid "Configure FTP"
 msgstr "Konfigurer FTP"
 
-#: ../control-center_.c:256
+#: ../control-center_.c:257
 msgid "Configure news"
 msgstr "Konfigurer nyheter"
 
-#: ../control-center_.c:257
+#: ../control-center_.c:258
 msgid "Configure mail"
 msgstr "Konfigurer epost"
 
-#: ../control-center_.c:258
+#: ../control-center_.c:259
 msgid "Configure proxy"
 msgstr "Konfigurer proxy"
 
-#: ../control-center_.c:259
+#: ../control-center_.c:260
 msgid "Configure Samba"
 msgstr "Konfigurer Samba"
 
-#: ../control-center_.c:260
+#: ../control-center_.c:261
 msgid "Configure time"
 msgstr "Konfigurer tid"
 
-#: ../control-center_.c:261
+#: ../control-center_.c:262
 msgid "Configure web"
 msgstr "Konfigurer web"
 
-#: ../control-center_.c:266
+#: ../control-center_.c:263
+#, fuzzy
+msgid "Configure NIS and Autofs"
+msgstr "Konfigurer DNS"
+
+#: ../control-center_.c:264
+#, fuzzy
+msgid "Configure installation server"
+msgstr "Menykonfigurasjon"
+
+#: ../control-center_.c:265
+#, fuzzy
+msgid "Configure PXE"
+msgstr "Konfigurer FTP"
+
+#: ../control-center_.c:271
 msgid "Online Administration"
 msgstr "Administrasjon over nett"
 
-#: ../control-center_.c:273
+#: ../control-center_.c:278
 msgid "Local administration"
 msgstr "Lokal administrasjon"
 
-#: ../control-center_.c:274
+#: ../control-center_.c:279
 msgid "Remote administration"
 msgstr "Fjernadministrasjon "
 
-#: ../control-center_.c:302
+#: ../control-center_.c:307
 msgid "/Display _Logs"
 msgstr "/Vis _logger"
 
 #. -PO Translators, please keep all "/" charaters !!!
-#: ../control-center_.c:302 ../control-center_.c:303 ../control-center_.c:304
-#: ../control-center_.c:323
+#: ../control-center_.c:307 ../control-center_.c:308 ../control-center_.c:309
+#: ../control-center_.c:328
 msgid "/_Options"
 msgstr "/_Valg"
 
-#: ../control-center_.c:303
+#: ../control-center_.c:308
 msgid "/_Embedded Mode"
 msgstr "/_Innebygd modus"
 
-#: ../control-center_.c:304
+#: ../control-center_.c:309
 msgid "/Expert mode in _wizards"
 msgstr "/Ekspertmodus i _wizards"
 
-#: ../control-center_.c:308
+#: ../control-center_.c:313
 msgid "/_Profiles"
 msgstr "/_Profiler"
 
-#: ../control-center_.c:309
+#: ../control-center_.c:314
 msgid "/_Delete"
 msgstr "/_Slett"
 
-#: ../control-center_.c:310
+#: ../control-center_.c:315
 msgid "/_New"
 msgstr "/_Ny"
 
-#: ../control-center_.c:321 ../control-center_.c:322
+#: ../control-center_.c:326 ../control-center_.c:327
 msgid "/_File"
 msgstr "/_Fil"
 
-#: ../control-center_.c:322
+#: ../control-center_.c:327
 msgid "/_Quit"
 msgstr "/_Avslutt"
 
-#: ../control-center_.c:322
+#: ../control-center_.c:327
 msgid "<control>Q"
 msgstr "<control>A"
 
-#: ../control-center_.c:322
+#: ../control-center_.c:327
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../control-center_.c:338 ../control-center_.c:341 ../control-center_.c:354
+#: ../control-center_.c:343 ../control-center_.c:346 ../control-center_.c:359
 msgid "/_Themes"
 msgstr "/_Temaer"
 
-#: ../control-center_.c:344
+#: ../control-center_.c:349
 msgid ""
 "This action will restart the control center.\n"
 "Any change not applied will be lost."
@@ -522,15 +538,15 @@ msgstr ""
 "Denne handlingen vil starte kontrollsenteret på nytt.\n"
 "Endringer som ikke er lagret vil gå tapt."
 
-#: ../control-center_.c:354
+#: ../control-center_.c:359
 msgid "/_More themes"
 msgstr "/_Flere temaer"
 
-#: ../control-center_.c:358
+#: ../control-center_.c:363
 msgid "New profile..."
 msgstr "Ny profil..."
 
-#: ../control-center_.c:361
+#: ../control-center_.c:366
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
@@ -538,57 +554,57 @@ msgstr ""
 "Navn på profilen som skal opprettes (den nye profilen blir opprettet som en "
 "kopi av den gjeldende):"
 
-#: ../control-center_.c:365 ../control-center_.c:398 ../control-center_.c:524
+#: ../control-center_.c:370 ../control-center_.c:403 ../control-center_.c:529
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../control-center_.c:367 ../control-center_.c:399
+#: ../control-center_.c:372 ../control-center_.c:404
 msgid "Ok"
 msgstr "Ok"
 
-#: ../control-center_.c:373
+#: ../control-center_.c:378
 msgid "Error"
 msgstr "Feil"
 
-#: ../control-center_.c:373
+#: ../control-center_.c:378
 #, c-format
 msgid "The \"%s\" profile already exists!"
 msgstr "\"%s\"-profilen eksisterer allerede!"
 
-#: ../control-center_.c:391
+#: ../control-center_.c:396
 msgid "Delete profile"
 msgstr "Slett profil"
 
-#: ../control-center_.c:393
+#: ../control-center_.c:398
 msgid "Profile to delete:"
 msgstr "Profil som skal slettes:"
 
-#: ../control-center_.c:402 ../control-center_.c:462 ../control-center_.c:913
+#: ../control-center_.c:407 ../control-center_.c:467 ../control-center_.c:918
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../control-center_.c:402
+#: ../control-center_.c:407
 msgid "You can not delete the current profile"
 msgstr "Du kan ikke slette den gjeldende profilen"
 
-#: ../control-center_.c:417 ../control-center_.c:418 ../control-center_.c:419
-#: ../control-center_.c:420
+#: ../control-center_.c:422 ../control-center_.c:423 ../control-center_.c:424
+#: ../control-center_.c:425
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../control-center_.c:418
+#: ../control-center_.c:423
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../control-center_.c:419
+#: ../control-center_.c:424
 msgid "/_Report Bug"
 msgstr "/_Rapporter feil"
 
-#: ../control-center_.c:420
+#: ../control-center_.c:425
 msgid "/_About..."
 msgstr "/_Om..."
 
-#: ../control-center_.c:463
+#: ../control-center_.c:468
 #, c-format
 msgid ""
 "We are about to switch from the \"%s\" profile to the \"%s\" profile.\n"
@@ -599,20 +615,20 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil gjøre byttet?"
 
-#: ../control-center_.c:513
+#: ../control-center_.c:518
 msgid "Please wait..."
 msgstr "Vennligst vent..."
 
-#: ../control-center_.c:529
+#: ../control-center_.c:534
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../control-center_.c:544
+#: ../control-center_.c:549
 #, c-format
 msgid "Mandrake Control Center %s [on %s]"
 msgstr "Mandrake Kontrollsenter %s [på %s]"
 
-#: ../control-center_.c:555
+#: ../control-center_.c:560
 msgid ""
 "_banner font:\n"
 "Sans 15"
@@ -620,106 +636,106 @@ msgstr ""
 "_banner font:\n"
 "Sans 15"
 
-#: ../control-center_.c:557
+#: ../control-center_.c:562
 msgid "Welcome to the Mandrake Control Center"
 msgstr "Velkommen til Mandrake Kontrollsenter"
 
-#: ../control-center_.c:700
+#: ../control-center_.c:705
 msgid "The modifications done in the current module won't be saved."
 msgstr "Modifiseringene som blir gjort i nåværende modul vil ikke bli lagret."
 
-#: ../control-center_.c:776
+#: ../control-center_.c:781
 #, c-format
 msgid "cannot fork: %s"
 msgstr "kan ikke dele: %s"
 
-#: ../control-center_.c:786
+#: ../control-center_.c:791
 #, c-format
 msgid "cannot fork and exec \"%s\" since it is not executable"
 msgstr "kan ikke spalte og kjøre \"%s\" siden den ikke er kjørbar"
 
-#: ../control-center_.c:904
+#: ../control-center_.c:909
 msgid "This program has exited abnormally"
 msgstr "Dette programmet avsluttet på en abnormal måte"
 
-#: ../control-center_.c:923
+#: ../control-center_.c:928
 msgid "Close"
 msgstr "Lukk"
 
-#: ../control-center_.c:930
+#: ../control-center_.c:935
 msgid "More themes"
 msgstr "Flere temaer"
 
-#: ../control-center_.c:932
+#: ../control-center_.c:937
 msgid "Getting new themes"
 msgstr "Få tak i nye temaer"
 
-#: ../control-center_.c:933
+#: ../control-center_.c:938
 msgid "Additional themes"
 msgstr "Flere temaer"
 
-#: ../control-center_.c:935
+#: ../control-center_.c:940
 msgid "Get additional themes on www.damz.net"
 msgstr "Få tak i flere temaer på www.damz.net"
 
-#: ../control-center_.c:943
+#: ../control-center_.c:948
 msgid "About - Mandrake Control Center"
 msgstr "Om - Mandrake Kontrollsenter"
 
-#: ../control-center_.c:953
+#: ../control-center_.c:958
 msgid "Authors: "
 msgstr "Opphavspersoner: "
 
-#: ../control-center_.c:954
+#: ../control-center_.c:959
 msgid "(original C version)"
 msgstr "(original C-versjon)"
 
 #. -PO "perl" here is the programming language
-#: ../control-center_.c:956 ../control-center_.c:959
+#: ../control-center_.c:961 ../control-center_.c:964
 msgid "(perl version)"
 msgstr "(perl-versjon)"
 
-#: ../control-center_.c:961
+#: ../control-center_.c:966
 msgid "Artwork: "
 msgstr "Grafisk design: "
 
-#: ../control-center_.c:962
+#: ../control-center_.c:967
 msgid "(design)"
 msgstr "(design)"
 
 #. -PO If your language allows it, use eacute for first "e" and egrave for 2nd one.
-#: ../control-center_.c:964
+#: ../control-center_.c:969
 msgid "Helene Durosini"
 msgstr "Hélène Durosini"
 
 #. -PO Add your Name here to find it in the About section in your language.
-#: ../control-center_.c:978
+#: ../control-center_.c:983
 msgid "~ * ~"
 msgstr "~ * ~"
 
 #. -PO Add your E-Mail address here if you want to show it in the about doialog.
-#: ../control-center_.c:980
+#: ../control-center_.c:985
 msgid "~ @ ~"
 msgstr "~ @ ~"
 
-#: ../control-center_.c:982
+#: ../control-center_.c:987
 msgid "Translator: "
 msgstr "Oversetter: "
 
-#: ../control-center_.c:988
+#: ../control-center_.c:993
 #, c-format
 msgid "Mandrake Control Center %s\n"
 msgstr "Mandrake Kontrollsenter %s\n"
 
-#: ../control-center_.c:989
+#: ../control-center_.c:994
 msgid "Copyright (C) 1999-2003 Mandrakesoft SA"
 msgstr "Copyright (C) 1999-2003 Mandrakesoft SA"
 
-#: ../control-center_.c:993
+#: ../control-center_.c:998
 msgid "Authors"
 msgstr "Forfattere"
 
-#: ../control-center_.c:994
+#: ../control-center_.c:999
 msgid "Mandrake Linux Contributors"
 msgstr "Mandrake Linux-bidragsytere"
 
@@ -762,6 +778,9 @@ msgstr "Klikk her for å konfigurere utskriftssystemet"
 msgid "Done"
 msgstr "Ferdig"
 
+#~ msgid "Bootstrapping"
+#~ msgstr "Oppstartssekvens"
+
 #~ msgid ""
 #~ "Mandrake Control Center is Mandrake Linux's main configuration\n"
 #~ "tool. It enables the system administrator to configure the hardware\n"