merge

1 files changed, 28 insertions, 23 deletions

diff --git a/po/nb.po b/po/nb.po
index 208dce94..1dfd80b3 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-03 17:51+0100\n"
+"POT-Creation-Date: 2004-03-04 16:55+0100\n"
 "PO-Revision-Date: 2004-03-03 17:22+0100\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -71,75 +71,75 @@ msgstr "Konfigurer nettverk"
 msgid "Configure Now!"
 msgstr "Konfigurer nå!"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:123
 msgid "Mandrake Updates Applet"
 msgstr "Mandrake Updates-panelprogram"
 
-#: ../mdkapplet:128
+#: ../mdkapplet:130
 msgid "Actions"
 msgstr "Handlinger"
 
-#: ../mdkapplet:130
+#: ../mdkapplet:132
 msgid "Install updates"
 msgstr "Installer oppdateringer"
 
-#: ../mdkapplet:131
+#: ../mdkapplet:133
 msgid "Configure"
 msgstr "Konfigurer"
 
-#: ../mdkapplet:132
+#: ../mdkapplet:134
 msgid "Check updates"
 msgstr "Sjekk etter oppdateringer"
 
-#: ../mdkapplet:133
+#: ../mdkapplet:135
 msgid "See logs"
 msgstr "Se logger"
 
-#: ../mdkapplet:136
+#: ../mdkapplet:138
 msgid "Status"
 msgstr "Status"
 
-#: ../mdkapplet:139
+#: ../mdkapplet:141
 msgid "Network Connection: "
 msgstr "Nettverkstilkobling"
 
-#: ../mdkapplet:140
+#: ../mdkapplet:142
 msgid "Down"
 msgstr "Ned"
 
-#: ../mdkapplet:140
+#: ../mdkapplet:142
 msgid "Up"
 msgstr "Opp"
 
-#: ../mdkapplet:143
+#: ../mdkapplet:145
 msgid "New Updates: "
 msgstr "Nye oppdateringer: "
 
-#: ../mdkapplet:144
+#: ../mdkapplet:146
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../mdkapplet:144
+#: ../mdkapplet:146
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: ../mdkapplet:147
+#: ../mdkapplet:149
 msgid "Last check: "
 msgstr "Siste sjekk: "
 
-#: ../mdkapplet:153
+#: ../mdkapplet:155
 msgid "Close"
 msgstr "Lukk"
 
-#: ../mdkapplet:220
+#: ../mdkapplet:222
 msgid "No check"
 msgstr "Ingen sjekk"
 
-#: ../mdkapplet:280
+#: ../mdkapplet:287
 msgid "About.."
 msgstr "Om.."
 
-#: ../mdkapplet:281
+#: ../mdkapplet:288
 msgid "Quit"
 msgstr "Avslutt"
 
@@ -207,6 +207,11 @@ msgstr "Tast inn ditt MandrakeOnline-brukernavn, passord og maskinnavn:"
 msgid "Machine name:"
 msgstr "Maskinnavn:"
 
+#: ../mdkonline:138
+#, fuzzy
+msgid "Send Configuration"
+msgstr "Konfigurasjon"
+
 #: ../mdkonline:139
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
@@ -244,6 +249,10 @@ msgstr ""
 "Til slutt så vil et epostalaias med ditt brukernavn@mandrakeline.net bli "
 "tilbudt til deg."
 
+#: ../mdkonline:144 ../mdkonline:247 ../mdkonline:275
+msgid "Finish"
+msgstr "Finsk"
+
 #: ../mdkonline:145
 msgid ""
 "From now you will receive on security and updates \n"
@@ -349,10 +358,6 @@ msgstr "Ikke en gyldig epostadresse!\n"
 msgid "Sending configuration..."
 msgstr "Sender konfigurasjon..."
 
-#: ../mdkonline:247 ../mdkonline:275
-msgid "Finish"
-msgstr "Finsk"
-
 #: ../mdkonline:251 ../mdkonline:326 ../mdkupdate:77
 msgid "Connection problem"
 msgstr "Tilkoblingsproblem"