diff --git a/po/ChangeLog b/po/ChangeLog
index 9fc7eb52e..eecaab556 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-08  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* POTFILES.in: Add missing file.
+	* nb.po: Update 
+	* no.po: Update
+
 2004-10-05  Raphael Higino  <raphaelh@cvs.gnome.org>
 
 	* pt_BR.po: Updated Brazilian Portuguese translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1a4e0d4b6..4626a07e1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,6 +2,7 @@
 # Please keep this file sorted alphabetically.
 info-daemon/networks.glade
 info-daemon/passphrase.glade
+info-daemon/NetworkManagerInfoPassphraseDialog.c
 panel-applet/NMWirelessApplet.c
 panel-applet/NMWirelessApplet.xml
 panel-applet/wireless-applet.glade
diff --git a/po/nb.po b/po/nb.po
index 9639c0b3a..bae0f4abc 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-29 22:54+0200\n"
-"PO-Revision-Date: 2004-09-29 22:56+0200\n"
+"POT-Creation-Date: 2004-10-08 12:38+0200\n"
+"PO-Revision-Date: 2004-10-08 12:38+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -28,45 +28,63 @@ msgstr "Endre trådløse nettverk"
 msgid "*"
 msgstr "*"
 
-#: info-daemon/passphrase.glade.h:3
+#: info-daemon/passphrase.glade.h:2
+msgid ""
+"128-bit Passphrase\n"
+"128-bit Raw Hex Key"
+msgstr ""
+"128-bit passord\n"
+"128-bit heksadesimal nøkkel"
+
+#: info-daemon/passphrase.glade.h:5
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
 "Network</span>\n"
 "\n"
-"A passphrase or WEP key is required to access the wireless network '%s'."
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Passord kreves av trådløst nettverk</"
+"<span weight=\"bold\" size=\"larger\">Passord kreves for trådløst nettverk</"
 "span>\n"
 "\n"
-"Ett passord eller en WEP-nøkkel kreves for å aksessere trådløst nettverk «%"
-"s»."
+"Ett passord eller en krypteringsnøkkel kreves for å aksessere trådløst "
+"nettverk «%s»."
 
-#: info-daemon/passphrase.glade.h:6
+#: info-daemon/passphrase.glade.h:8
+msgid "Key Type:"
+msgstr "Type nøkkel:"
+
+#: info-daemon/passphrase.glade.h:9
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:101
 msgid "Passphrase:"
 msgstr "Passord:"
 
-#: info-daemon/passphrase.glade.h:7
+#: info-daemon/passphrase.glade.h:10
 msgid "Wireless Network Key Required"
 msgstr "Nøkkel for trådløst nettverk kreves"
 
-#: info-daemon/passphrase.glade.h:8 panel-applet/wireless-applet.glade.h:7
+#: info-daemon/passphrase.glade.h:11 panel-applet/wireless-applet.glade.h:7
 msgid "_Login to Network"
 msgstr "_Logg på nettverk"
 
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:104
+msgid "Key:"
+msgstr "Nøkkel:"
+
 #: panel-applet/NMWirelessApplet.c:600
-msgid "Other Wireless Network..."
+msgid "Other Wireless Networks..."
 msgstr "Andre trådløse nettverk..."
 
-#: panel-applet/NMWirelessApplet.c:712
+#: panel-applet/NMWirelessApplet.c:710
 msgid "No network devices have been found"
 msgstr "Ingen nettverksenheter ble funnet"
 
-#: panel-applet/NMWirelessApplet.c:829
+#: panel-applet/NMWirelessApplet.c:827
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager kjører ikke..."
 
-#: panel-applet/NMWirelessApplet.c:968 panel-applet/NMWirelessApplet.c:1028
+#: panel-applet/NMWirelessApplet.c:966 panel-applet/NMWirelessApplet.c:1018
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -111,37 +129,28 @@ msgstr "Orientering"
 msgid "The orientation of the tray."
 msgstr "Orientering for trauet."
 
-#: panel-applet/menu-info.c:97
+#: panel-applet/menu-info.c:77
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kablet nettverk (%s)"
 
-#: panel-applet/menu-info.c:99
+#: panel-applet/menu-info.c:79
 msgid "Wired Network"
 msgstr "Kablet nettverk"
 
-#: panel-applet/menu-info.c:103
+#: panel-applet/menu-info.c:143
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Trådløst nettverk (%s)"
 msgstr[1] "Trådløse nettverk (%s)"
 
-#: panel-applet/menu-info.c:105
+#: panel-applet/menu-info.c:145
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Trådløst nettverk"
 msgstr[1] "Trådløse nettverk"
 
-#: panel-applet/menu-info.c:224
+#: panel-applet/menu-info.c:262
 msgid " (invalid Unicode)"
 msgstr " (ugyldig Unicode)"
-
-#~ msgid "There are no wireless networks..."
-#~ msgstr "Ingen trådløse nettverk funnet..."
-
-#~ msgid "There are no network devices..."
-#~ msgstr "Ingen nettverksenheter funnet..."
-
-#~ msgid "Network Connections"
-#~ msgstr "Nettverkstilkoblinger"
diff --git a/po/no.po b/po/no.po
index 9639c0b3a..bae0f4abc 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-29 22:54+0200\n"
-"PO-Revision-Date: 2004-09-29 22:56+0200\n"
+"POT-Creation-Date: 2004-10-08 12:38+0200\n"
+"PO-Revision-Date: 2004-10-08 12:38+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -28,45 +28,63 @@ msgstr "Endre trådløse nettverk"
 msgid "*"
 msgstr "*"
 
-#: info-daemon/passphrase.glade.h:3
+#: info-daemon/passphrase.glade.h:2
+msgid ""
+"128-bit Passphrase\n"
+"128-bit Raw Hex Key"
+msgstr ""
+"128-bit passord\n"
+"128-bit heksadesimal nøkkel"
+
+#: info-daemon/passphrase.glade.h:5
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
 "Network</span>\n"
 "\n"
-"A passphrase or WEP key is required to access the wireless network '%s'."
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Passord kreves av trådløst nettverk</"
+"<span weight=\"bold\" size=\"larger\">Passord kreves for trådløst nettverk</"
 "span>\n"
 "\n"
-"Ett passord eller en WEP-nøkkel kreves for å aksessere trådløst nettverk «%"
-"s»."
+"Ett passord eller en krypteringsnøkkel kreves for å aksessere trådløst "
+"nettverk «%s»."
 
-#: info-daemon/passphrase.glade.h:6
+#: info-daemon/passphrase.glade.h:8
+msgid "Key Type:"
+msgstr "Type nøkkel:"
+
+#: info-daemon/passphrase.glade.h:9
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:101
 msgid "Passphrase:"
 msgstr "Passord:"
 
-#: info-daemon/passphrase.glade.h:7
+#: info-daemon/passphrase.glade.h:10
 msgid "Wireless Network Key Required"
 msgstr "Nøkkel for trådløst nettverk kreves"
 
-#: info-daemon/passphrase.glade.h:8 panel-applet/wireless-applet.glade.h:7
+#: info-daemon/passphrase.glade.h:11 panel-applet/wireless-applet.glade.h:7
 msgid "_Login to Network"
 msgstr "_Logg på nettverk"
 
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:104
+msgid "Key:"
+msgstr "Nøkkel:"
+
 #: panel-applet/NMWirelessApplet.c:600
-msgid "Other Wireless Network..."
+msgid "Other Wireless Networks..."
 msgstr "Andre trådløse nettverk..."
 
-#: panel-applet/NMWirelessApplet.c:712
+#: panel-applet/NMWirelessApplet.c:710
 msgid "No network devices have been found"
 msgstr "Ingen nettverksenheter ble funnet"
 
-#: panel-applet/NMWirelessApplet.c:829
+#: panel-applet/NMWirelessApplet.c:827
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager kjører ikke..."
 
-#: panel-applet/NMWirelessApplet.c:968 panel-applet/NMWirelessApplet.c:1028
+#: panel-applet/NMWirelessApplet.c:966 panel-applet/NMWirelessApplet.c:1018
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -111,37 +129,28 @@ msgstr "Orientering"
 msgid "The orientation of the tray."
 msgstr "Orientering for trauet."
 
-#: panel-applet/menu-info.c:97
+#: panel-applet/menu-info.c:77
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kablet nettverk (%s)"
 
-#: panel-applet/menu-info.c:99
+#: panel-applet/menu-info.c:79
 msgid "Wired Network"
 msgstr "Kablet nettverk"
 
-#: panel-applet/menu-info.c:103
+#: panel-applet/menu-info.c:143
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Trådløst nettverk (%s)"
 msgstr[1] "Trådløse nettverk (%s)"
 
-#: panel-applet/menu-info.c:105
+#: panel-applet/menu-info.c:145
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Trådløst nettverk"
 msgstr[1] "Trådløse nettverk"
 
-#: panel-applet/menu-info.c:224
+#: panel-applet/menu-info.c:262
 msgid " (invalid Unicode)"
 msgstr " (ugyldig Unicode)"
-
-#~ msgid "There are no wireless networks..."
-#~ msgstr "Ingen trådløse nettverk funnet..."
-
-#~ msgid "There are no network devices..."
-#~ msgstr "Ingen nettverksenheter funnet..."
-
-#~ msgid "Network Connections"
-#~ msgstr "Nettverkstilkoblinger"