merge

1 files changed, 47 insertions, 71 deletions

diff --git a/po/nb.po b/po/nb.po
index cd6977b8..62152b43 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-21 18:52+0100\n"
+"POT-Creation-Date: 2004-01-22 12:55+0100\n"
 "PO-Revision-Date: 2004-01-18 20:31+0100\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -219,7 +219,7 @@ msgstr "Autoinnlogging"
 msgid "Backups"
 msgstr "Backups"
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr "Oppstartslaster"
@@ -234,7 +234,7 @@ msgstr "Oppstartstema"
 msgid "Boot floppy"
 msgstr "Oppstartsdiskett"
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr "Deling av internettilkobling"
@@ -289,7 +289,7 @@ msgstr "Fonter"
 msgid "Graphical server"
 msgstr "Grafisk tjener"
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr "Partisjoner"
@@ -304,7 +304,7 @@ msgstr "Maskinvare"
 msgid "Install"
 msgstr "Installasjon"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "Tastatur"
@@ -329,7 +329,7 @@ msgstr "Menyer"
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "Mus"
@@ -394,7 +394,7 @@ msgstr "Nivå og sjekker"
 msgid "Permissions"
 msgstr "Rettigheter"
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "Tjenester"
@@ -409,7 +409,7 @@ msgstr "Mediahåndterer"
 msgid "TV card"
 msgstr "TV-kort"
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr "Brukere og grupper"
@@ -672,7 +672,7 @@ msgstr ""
 "Navn på profilen som skal opprettes (den nye profilen blir opprettet som en "
 "kopi av den gjeldende):"
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
@@ -749,7 +749,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Vennligst vent..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "Forrige"
@@ -878,74 +878,31 @@ msgstr "Mandrake Kontrollsenter %s\n"
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "Copyright (C) 1999-2004 Mandrakesoft SA"
 
-#: ../control-center:996
+#: ../control-center:998
 #, c-format
 msgid "Authors"
 msgstr "Forfattere"
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Mandrake Linux-bidragsytere"
 
 #: ../drakxconf:25
-#, fuzzy, c-format
-msgid "Display Configuration"
-msgstr ""
-"Tjener-\n"
-"konfigurasjon"
-
-#: ../drakxconf:26
-#, fuzzy, c-format
-msgid "KeyBoard Configuration"
-msgstr ""
-"Tjener-\n"
-"konfigurasjon"
-
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr ""
-"Tjener-\n"
-"konfigurasjon"
+#, c-format
+msgid "Display"
+msgstr "Visning"
 
 #: ../drakxconf:28
 #, fuzzy, c-format
 msgid "Internet & Network"
 msgstr "Internettilgang"
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr ""
-"Tjener-\n"
-"konfigurasjon"
-
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr "Oppstartskonfigurasjon"
-
 #: ../drakxconf:33
 #, fuzzy, c-format
 msgid "Auto Install"
 msgstr "Automatisk installasjonsdiskett"
 
-#: ../drakxconf:34
-#, fuzzy, c-format
-msgid "Connection Sharing"
-msgstr "Deling av internettilkobling"
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, fuzzy, c-format
 msgid "Control Center"
@@ -959,16 +916,6 @@ msgstr ""
 "\n"
 "Velg hvilken meny du ønsker å konfigurere"
 
-#: ../gecko.pm:52
-#, c-format
-msgid "Next"
-msgstr ""
-
-#: ../gecko.pm:60
-#, c-format
-msgid "Skip Wizard"
-msgstr ""
-
 #: ../menus_launcher.pl:19 ../menus_launcher.pl:41
 #, c-format
 msgid "Menu Configuration Center"
@@ -1015,6 +962,38 @@ msgstr "Klikk her for å konfigurere utskriftssystemet"
 msgid "Done"
 msgstr "Ferdig"
 
+#, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr ""
+#~ "Tjener-\n"
+#~ "konfigurasjon"
+
+#, fuzzy
+#~ msgid "KeyBoard Configuration"
+#~ msgstr ""
+#~ "Tjener-\n"
+#~ "konfigurasjon"
+
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr ""
+#~ "Tjener-\n"
+#~ "konfigurasjon"
+
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr ""
+#~ "Tjener-\n"
+#~ "konfigurasjon"
+
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr "Oppstartskonfigurasjon"
+
+#, fuzzy
+#~ msgid "Connection Sharing"
+#~ msgstr "Deling av internettilkobling"
+
 #~ msgid "Bootstrapping"
 #~ msgstr "Oppstartssekvens"
 
@@ -1556,9 +1535,6 @@ msgstr "Ferdig"
 #~ msgid "/Themes"
 #~ msgstr "/Temaer"
 
-#~ msgid "Display"
-#~ msgstr "Visning"
-
 #~ msgid "DrakConf: error"
 #~ msgstr "DrakConf: feil"