2005-06-20 Kjartan Maraas <kmaraas@gnome.org>

* nb.po: Update Norwegian Bokmål translation.
	* no.po: Same


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@723 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

po/ChangeLog

@@ -1,3 +1,8 @@
+2005-06-20  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Update Norwegian Bokmål translation.
+	* no.po: Same
+
 2005-06-17  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.

po/nb.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-01 17:25+0200\n"
-"PO-Revision-Date: 2005-05-01 17:35+0200\n"
+"POT-Creation-Date: 2005-06-20 17:18+0200\n"
+"PO-Revision-Date: 2005-06-20 17:30+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"
@@ -26,36 +26,42 @@ msgstr "Orientering"
 msgid "The orientation of the tray."
 msgstr "Orientering for trauet."
 
-#: ../gnome/applet/applet-dbus-info.c:853
+#: ../gnome/applet/applet-dbus-info.c:979
 #, c-format
 msgid ""
 "The requested wireless network '%s' does not appear to be in range.  A "
 "different wireless network will be used if any are available."
-msgstr "Forespurt trådløst nettverk «%s» ser ut til å være utenfor rekkevidde. Et annet trådløst nettverk vil bli brukt hvis tilgjengelig."
+msgstr ""
+"Forespurt trådløst nettverk «%s» ser ut til å være utenfor rekkevidde. Et "
+"annet trådløst nettverk vil bli brukt hvis tilgjengelig."
 
-#: ../gnome/applet/applet-dbus.c:563
+#: ../gnome/applet/applet-dbus.c:597
 #, c-format
 msgid "Connection to the wireless network '%s' failed.\n"
 msgstr "Tilkobling til trådløst nettverk «%s» feilet.\n"
 
-#: ../gnome/applet/applet-dbus.c:568
+#: ../gnome/applet/applet-dbus.c:602
 msgid "Connection to the wired network failed.\n"
 msgstr "Tilkobling til trådløst nettverk feilet.\n"
 
-#: ../gnome/applet/applet.c:169 ../gnome/applet/applet.c:187
+#: ../gnome/applet/applet.c:196 ../gnome/applet/applet.c:214
 msgid "NetworkManager Applet"
 msgstr "NetworkManager panelprogram"
 
-#: ../gnome/applet/applet.c:171 ../gnome/applet/applet.c:189
+#: ../gnome/applet/applet.c:198 ../gnome/applet/applet.c:216
 msgid "Copyright (C) 2004-2005 Red Hat, Inc."
 msgstr "Opphavsrett © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:172 ../gnome/applet/applet.c:190
+#: ../gnome/applet/applet.c:199 ../gnome/applet/applet.c:217
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Et panelprogram for å håndtere nettverksenheter og tilkoblinger."
 
-#: ../gnome/applet/applet.c:250
+#: ../gnome/applet/applet.c:303
+msgid "VPN Error"
+msgstr ""
+
+#: ../gnome/applet/applet.c:307
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
@@ -70,7 +76,69 @@ msgstr ""
 "\n"
 "Melding fra VPN-tjenesten: «%s»"
 
-#: ../gnome/applet/applet.c:306
+#: ../gnome/applet/applet.c:312
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Start Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+"<span weight=\"bold\" size\"larger\">Feil med VPN-pålogging</span>\n"
+"\n"
+"Kunne ikke starte VPN-tilkobling «%s» på grunn av feil ved pålogging.\n"
+"\n"
+"Melding fra VPN-tjenesten: «%s»"
+
+#: ../gnome/applet/applet.c:317
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' due to a connection error.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+"<span weight=\"bold\" size\"larger\">Feil med VPN-pålogging</span>\n"
+"\n"
+"Kunne ikke starte VPN-tilkobling «%s» på grunn av feil ved pålogging.\n"
+"\n"
+"Melding fra VPN-tjenesten: «%s»"
+
+#: ../gnome/applet/applet.c:322
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Configuration Error</span>\n"
+"\n"
+"The VPN connection '%s' was not correctly configured.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+"<span weight=\"bold\" size\"larger\">Feil med VPN-pålogging</span>\n"
+"\n"
+"Kunne ikke starte VPN-tilkobling «%s» på grunn av feil ved pålogging.\n"
+"\n"
+"Melding fra VPN-tjenesten: «%s»"
+
+#: ../gnome/applet/applet.c:327
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+"<span weight=\"bold\" size\"larger\">Feil med VPN-pålogging</span>\n"
+"\n"
+"Kunne ikke starte VPN-tilkobling «%s» på grunn av feil ved pålogging.\n"
+"\n"
+"Melding fra VPN-tjenesten: «%s»"
+
+#: ../gnome/applet/applet.c:394
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
@@ -85,159 +153,204 @@ msgstr ""
 "\n"
 "«%s»"
 
-#: ../gnome/applet/applet.c:523 ../gnome/applet/applet.c:1817
+#: ../gnome/applet/applet.c:612 ../gnome/applet/applet.c:2167
 #: ../gnome/applet/other-network-dialog.c:315
-#: ../gnome/applet/passphrase-dialog.c:366
+#: ../gnome/applet/passphrase-dialog.c:428
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr ""
 "NetworkManager fant ikke nødvendige ressurser (glade-filen ble ikke funnet)."
 
-#: ../gnome/applet/applet.c:536
+#: ../gnome/applet/applet.c:625
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Nettverksenheten «%s (%s)» støtter ikke søk etter trådløse nettverk."
 
-#: ../gnome/applet/applet.c:543
+#: ../gnome/applet/applet.c:632
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr ""
 "Nettverksenheten «%s (%s)» støtter ikke informasjon om tilkoblet status."
 
-#: ../gnome/applet/applet.c:666
+#: ../gnome/applet/applet.c:753
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "Klargjør enhet %s for det trådløse nettverket..."
+
+#: ../gnome/applet/applet.c:755
+#, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "Klargjør enhet %s for trådløst nettverk «%s»..."
+
+#: ../gnome/applet/applet.c:762
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "Konfigurerer enhet %s for kablet nettverk..."
+
+#: ../gnome/applet/applet.c:764
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "Forsøker å bruke trådløst nettverk «%s»..."
+
+#: ../gnome/applet/applet.c:771
+#, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "Venter på nettverksnøkkel for trådløst nettverk «%s»..."
+
+#: ../gnome/applet/applet.c:778 ../gnome/applet/applet.c:787
+msgid "Requesting a network address from the wired network..."
+msgstr "Ber om en nettverksadresse fra kablet nettverk..."
+
+#: ../gnome/applet/applet.c:780 ../gnome/applet/applet.c:789
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "Ber om en nettverksadresse fra trådløst nettverk «%s»..."
+
+#: ../gnome/applet/applet.c:796
+msgid "Finishing connection to the wired network..."
+msgstr "Fullfører tilkobling til kablet nettverk..."
+
+#: ../gnome/applet/applet.c:798
+#, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "Fullfører tilkobling til trådløst nettverk «%s»..."
+
+#: ../gnome/applet/applet.c:844
 msgid "NetworkManager is not running"
 msgstr "NetworkManager kjører ikke"
 
-#: ../gnome/applet/applet.c:677
+#: ../gnome/applet/applet.c:855
 msgid "No network connection"
 msgstr "Ingen nettverksforbindelse"
 
-#: ../gnome/applet/applet.c:684
+#: ../gnome/applet/applet.c:862
 msgid "Wired network connection"
 msgstr "Trådløs nettverkforbindelse"
 
-#: ../gnome/applet/applet.c:691
+#: ../gnome/applet/applet.c:869
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Kobler til et Ad-Hoc trådløst nettverk"
 
-#: ../gnome/applet/applet.c:705
+#: ../gnome/applet/applet.c:883
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Trådløs nettverksforbindelse til «%s» (%d%%)"
 
-#: ../gnome/applet/applet.c:713
-msgid "Connecting to a wired network..."
-msgstr "Kobler til et trådløst nettverk..."
-
-#: ../gnome/applet/applet.c:715
+#: ../gnome/applet/applet.c:908
 #, c-format
-msgid "Connecting to wireless network '%s'..."
-msgstr "Kobler til et trådløst nettverk «%s»..."
+msgid "VPN connection to '%s'"
+msgstr "VPN-tilkobling til «%s»"
 
-#: ../gnome/applet/applet.c:722
-msgid "Scanning for wireless networks..."
-msgstr "Søker etter trådløse nettverk..."
+#: ../gnome/applet/applet.c:1333
+msgid "Connect to Other Wireless Network..."
+msgstr "Koble til annet trådløst nettverk..."
 
-#: ../gnome/applet/applet.c:1072
-msgid "Other Wireless Networks..."
-msgstr "Andre trådløse nettverk..."
+#: ../gnome/applet/applet.c:1354
+msgid "Create New Wireless Network..."
+msgstr "Opprett nytt trådløst nettverk..."
 
-#: ../gnome/applet/applet.c:1093
-msgid "Create new Wireless Network..."
-msgstr "Opprett nytt trådløse nettverk..."
-
-#: ../gnome/applet/applet.c:1206
+#: ../gnome/applet/applet.c:1467
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
 msgid "VPN Connections"
 msgstr "VPN-tilkoblinger"
 
-#: ../gnome/applet/applet.c:1228
+#: ../gnome/applet/applet.c:1489
+msgid "Configure VPN..."
+msgstr "Konfigurer VPN..."
+
+#: ../gnome/applet/applet.c:1493
 msgid "Disconnect VPN..."
 msgstr "Koble fra VPN..."
 
-#: ../gnome/applet/applet.c:1257
+#: ../gnome/applet/applet.c:1543
 msgid "No network devices have been found"
 msgstr "Ingen nettverksenheter ble funnet"
 
-#: ../gnome/applet/applet.c:1427
+#: ../gnome/applet/applet.c:1701
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager kjører ikke..."
 
-#: ../gnome/applet/applet.c:1497 ../gnome/applet/applet.c:1545
-msgid "Pause Wireless Scanning"
-msgstr "Stopp søk etter trådløse nettverk"
-
-#: ../gnome/applet/applet.c:1502
-msgid "Resume Wireless Scanning"
-msgstr "Gjenoppta søk etter trådløse nettverk"
-
-#: ../gnome/applet/applet.c:1512 ../gnome/applet/applet.c:1551
+#. Stop All Wireless Devices item
+#: ../gnome/applet/applet.c:1769 ../gnome/applet/applet.c:1833
 msgid "Stop All Wireless Devices"
 msgstr "Stopp alle trådløse enheter"
 
-#: ../gnome/applet/applet.c:1517
+#: ../gnome/applet/applet.c:1774
 msgid "Start All Wireless Devices"
 msgstr "Start alle trådløse enheter"
 
-#: ../gnome/applet/applet.c:1560
+#: ../gnome/applet/applet.c:1805
+msgid "Wireless Network Discovery"
+msgstr "Søk etter trådløse nettverk"
+
+#: ../gnome/applet/applet.c:1808
+msgid "Always Search"
+msgstr "Alltid søk"
+
+#: ../gnome/applet/applet.c:1815
+msgid "Search Only When Disconnected"
+msgstr "Søk kun når frakoblet"
+
+#: ../gnome/applet/applet.c:1822
+msgid "Never Search"
+msgstr "Aldri søk"
+
+#: ../gnome/applet/applet.c:1841
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../gnome/applet/applet.c:1567
+#: ../gnome/applet/applet.c:1848
 msgid "About"
 msgstr "Om"
 
-#: ../gnome/applet/applet.c:1965
+#: ../gnome/applet/applet.c:2315
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
-msgstr "Panelprogrammet for NetworkManager fant ikke noen av de nødvendige ressursene. Det kan ikke fortsette.\n"
+msgstr ""
+"Panelprogrammet for NetworkManager fant ikke noen av de nødvendige "
+"ressursene. Det kan ikke fortsette.\n"
 
-#: ../gnome/applet/gtkcellrendererprogress.c:243
-#: ../gnome/applet/gtkcellrendererprogress.c:301
-#, c-format
-msgid "progress bar label|%d %%"
-msgstr "%d %%"
-
-#: ../gnome/applet/menu-items.c:91
+#: ../gnome/applet/menu-items.c:86
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kablet nettverk (%s)"
 
-#: ../gnome/applet/menu-items.c:93
+#: ../gnome/applet/menu-items.c:88
 msgid "Wired Network"
 msgstr "Kablet nettverk"
 
-#: ../gnome/applet/menu-items.c:166
+#: ../gnome/applet/menu-items.c:161
 #, 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)"
 
-#: ../gnome/applet/menu-items.c:168
+#: ../gnome/applet/menu-items.c:163
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Trådløst nettverk"
 msgstr[1] "Trådløse nettverk"
 
-#: ../gnome/applet/menu-items.c:294
+#: ../gnome/applet/menu-items.c:305
 msgid " (invalid Unicode)"
 msgstr " (ugyldig Unicode)"
 
 #: ../gnome/applet/other-network-dialog.c:148
-#: ../gnome/applet/passphrase-dialog.c:164
+#: ../gnome/applet/passphrase-dialog.c:162
 #: ../gnome/applet/wireless-applet.glade.h:27
 msgid "Passphrase:"
 msgstr "Passord:"
 
 #: ../gnome/applet/other-network-dialog.c:151
-#: ../gnome/applet/passphrase-dialog.c:167
+#: ../gnome/applet/passphrase-dialog.c:165
 msgid "Ascii Key:"
 msgstr "Ascii-nøkkel"
 
 #: ../gnome/applet/other-network-dialog.c:154
-#: ../gnome/applet/passphrase-dialog.c:170
+#: ../gnome/applet/passphrase-dialog.c:168
 msgid "Hex Key:"
 msgstr "Heksadesimal nøkkel:"
 
@@ -261,20 +374,31 @@ msgstr "Egedefinert trådløst nettverk"
 msgid "Enter the ESSID of the wireless network to which you wish to connect."
 msgstr "Oppgi ESSID for det trådløse nettverket du ønsker å koble deg til."
 
-#: ../gnome/applet/vpn-password-dialog.c:105
+#: ../gnome/applet/vpn-password-dialog.c:132
+#: ../gnome/applet/vpn-password-dialog.c:171
 #, c-format
-msgid "You must log in to access the Virtual Private Network '%s'."
-msgstr "Du må logge inn for å aksessere det virtuelle private nettverket «%s»."
+msgid "Cannot start VPN connection '%s'"
+msgstr "Kan ikke starte VPN-tilkobling «%s»"
+
+#: ../gnome/applet/vpn-password-dialog.c:135
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:174
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
 
 #: ../gnome/applet/wireless-applet.glade.h:1
 msgid " "
 msgstr " "
 
 #: ../gnome/applet/wireless-applet.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../gnome/applet/wireless-applet.glade.h:3
 msgid ""
 "128-bit Passphrase (WEP)\n"
 "Ascii Key (WEP)\n"
@@ -284,7 +408,7 @@ msgstr ""
 "Ascii-nøkkel (WEP)\n"
 "Heksadesimal nøkkel (WEP)"
 
-#: ../gnome/applet/wireless-applet.glade.h:6
+#: ../gnome/applet/wireless-applet.glade.h:5
 msgid ""
 "128-bit passphrase (WEP)\n"
 "Ascii key (WEP)\n"
@@ -294,7 +418,7 @@ msgstr ""
 "Ascii-nøkkel (WEP)\n"
 "Heksadesimal nøkkel (WEP)"
 
-#: ../gnome/applet/wireless-applet.glade.h:10
+#: ../gnome/applet/wireless-applet.glade.h:9
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -309,7 +433,7 @@ msgstr ""
 "Ett passord eller en krypteringsnøkkel kreves for å aksessere trådløst "
 "nettverk «%s»."
 
-#: ../gnome/applet/wireless-applet.glade.h:14
+#: ../gnome/applet/wireless-applet.glade.h:13
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -321,15 +445,15 @@ msgstr ""
 "\n"
 "%s  Ikke fullstendig funksjonell."
 
-#: ../gnome/applet/wireless-applet.glade.h:18
+#: ../gnome/applet/wireless-applet.glade.h:17
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
 "span>\n"
 "\n"
-"You have chosen log in to the wireless network '%s'.  If you are sure this "
-"wireless network is secure, click the checkbox below and NetworkManager will "
-"no longer pester you with stupid questions when you connect to it."
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Bekreftelse av pålogging på trådløst "
 "nettverk</span>\n"
@@ -338,30 +462,34 @@ msgstr ""
 "dette trådløse nettverket er sikkert kan du be NetworkManager om å slutte å "
 "spørre spørsmål når du kobler deg til det ved å krysse av i boksen nedenfor."
 
-#: ../gnome/applet/wireless-applet.glade.h:21
+#: ../gnome/applet/wireless-applet.glade.h:20
 msgid "Always Trust this Wireless Network"
 msgstr "Stol alltid på dette trådløse nettverket"
 
-#: ../gnome/applet/wireless-applet.glade.h:22
+#: ../gnome/applet/wireless-applet.glade.h:21
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#: ../gnome/applet/wireless-applet.glade.h:23
+#: ../gnome/applet/wireless-applet.glade.h:22
 msgid "Connect with encryption enabled"
 msgstr "Koble til med kryptering"
 
-#: ../gnome/applet/wireless-applet.glade.h:24
+#: ../gnome/applet/wireless-applet.glade.h:23
 msgid "Don't remind me again"
 msgstr "Ikke vis påminnelse igjen"
 
-#: ../gnome/applet/wireless-applet.glade.h:25
+#: ../gnome/applet/wireless-applet.glade.h:24
 msgid "Key Type:"
 msgstr "Type nøkkel:"
 
-#: ../gnome/applet/wireless-applet.glade.h:26
+#: ../gnome/applet/wireless-applet.glade.h:25
 msgid "Key type:"
 msgstr "Type nøkkel:"
 
+#: ../gnome/applet/wireless-applet.glade.h:26
+msgid "Other Wireless Network..."
+msgstr "Annet trådløst nettverk..."
+
 #: ../gnome/applet/wireless-applet.glade.h:28
 msgid "Wireless Network Key Required"
 msgstr "Nøkkel for trådløst nettverk kreves"
@@ -382,7 +510,121 @@ msgstr "_Logg på nettverk"
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../gnome/vpn-properties/nm-vpn-properties.c:374
+msgid "Cannot add VPN connection"
+msgstr "Kan ikke legge til VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:376
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:428
+msgid "Cannot import VPN connection"
+msgstr "Kan ikke importere VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:430
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:570
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:573
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:733
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "Slett VPN-tilkobling «%s»?"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:736
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1056
+msgid "Edit VPN Connection"
+msgstr "Rediger VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+msgid "Add a new VPN connection"
+msgstr "Legg til en ny VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Connect to:"
+msgstr "Koble til:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "Create VPN Connection"
+msgstr "Opprett VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Create VPN Connection - 1 of 2"
+msgstr "Opprett VPN-tilkobling - 1 av 2"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 2 of 2"
+msgstr "Opprett VPN-tilkobling - 2 av 2"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Delete the selected VPN connection"
+msgstr "Slett valgt VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid ""
+"Dependent on the private network you want to connect to, you need to select "
+"what type of connection you want to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr "E_ksporter"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr "Rediger valgt VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export VPN connection to a file"
+msgstr "Eksporter VPN-tilkobling til en fil"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the VPN settings to a file"
+msgstr "Eksporter innstillinger for VPN til en fil"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish create VPN Connection"
+msgstr "Fullfør oppretting av VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+msgid "Manage Virtual Private Network connections"
+msgstr "Håndter tilkoblinger til Virtuelle Private Nettverk"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a new VPN connection "
+"to a private network.\n"
+"\n"
+"It will require some information, such as IP addresses and secrets, that "
+"will probably be provided by your system administrator as appropriate."
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:159
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
@@ -390,7 +632,7 @@ msgstr ""
 "kan ikke opprette netlink-plugg for overvåking av kablede ethernet-enheter - "
 "%s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:177
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
@@ -398,23 +640,27 @@ msgstr ""
 "kan ikke binde til netlink-plugg for overvåking av kablede ethernet-enheter "
 "- %s"
 
-#: ../src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:409
 msgid "operation took too long"
 msgstr "operasjonen tok for lang tid"
 
-#: ../src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:506
 msgid "received data from wrong type of sender"
 msgstr "mottok data fra feil type avsender"
 
-#: ../src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:519
 msgid "received data from unexpected sender"
 msgstr "mottok data fra uventet avsender"
 
-#: ../src/nm-netlink-monitor.c:535
+#: ../src/nm-netlink-monitor.c:541
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:650
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "for mye data ble sendt over pluggen og noe data gikk tapt"
+
+#: ../src/nm-netlink-monitor.c:739
+msgid "error occured while waiting for data on socket"
+msgstr ""

po/no.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-01 17:25+0200\n"
-"PO-Revision-Date: 2005-05-01 17:35+0200\n"
+"POT-Creation-Date: 2005-06-20 17:18+0200\n"
+"PO-Revision-Date: 2005-06-20 17:30+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"
@@ -26,36 +26,42 @@ msgstr "Orientering"
 msgid "The orientation of the tray."
 msgstr "Orientering for trauet."
 
-#: ../gnome/applet/applet-dbus-info.c:853
+#: ../gnome/applet/applet-dbus-info.c:979
 #, c-format
 msgid ""
 "The requested wireless network '%s' does not appear to be in range.  A "
 "different wireless network will be used if any are available."
-msgstr "Forespurt trådløst nettverk «%s» ser ut til å være utenfor rekkevidde. Et annet trådløst nettverk vil bli brukt hvis tilgjengelig."
+msgstr ""
+"Forespurt trådløst nettverk «%s» ser ut til å være utenfor rekkevidde. Et "
+"annet trådløst nettverk vil bli brukt hvis tilgjengelig."
 
-#: ../gnome/applet/applet-dbus.c:563
+#: ../gnome/applet/applet-dbus.c:597
 #, c-format
 msgid "Connection to the wireless network '%s' failed.\n"
 msgstr "Tilkobling til trådløst nettverk «%s» feilet.\n"
 
-#: ../gnome/applet/applet-dbus.c:568
+#: ../gnome/applet/applet-dbus.c:602
 msgid "Connection to the wired network failed.\n"
 msgstr "Tilkobling til trådløst nettverk feilet.\n"
 
-#: ../gnome/applet/applet.c:169 ../gnome/applet/applet.c:187
+#: ../gnome/applet/applet.c:196 ../gnome/applet/applet.c:214
 msgid "NetworkManager Applet"
 msgstr "NetworkManager panelprogram"
 
-#: ../gnome/applet/applet.c:171 ../gnome/applet/applet.c:189
+#: ../gnome/applet/applet.c:198 ../gnome/applet/applet.c:216
 msgid "Copyright (C) 2004-2005 Red Hat, Inc."
 msgstr "Opphavsrett © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:172 ../gnome/applet/applet.c:190
+#: ../gnome/applet/applet.c:199 ../gnome/applet/applet.c:217
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Et panelprogram for å håndtere nettverksenheter og tilkoblinger."
 
-#: ../gnome/applet/applet.c:250
+#: ../gnome/applet/applet.c:303
+msgid "VPN Error"
+msgstr ""
+
+#: ../gnome/applet/applet.c:307
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
@@ -70,7 +76,69 @@ msgstr ""
 "\n"
 "Melding fra VPN-tjenesten: «%s»"
 
-#: ../gnome/applet/applet.c:306
+#: ../gnome/applet/applet.c:312
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Start Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+"<span weight=\"bold\" size\"larger\">Feil med VPN-pålogging</span>\n"
+"\n"
+"Kunne ikke starte VPN-tilkobling «%s» på grunn av feil ved pålogging.\n"
+"\n"
+"Melding fra VPN-tjenesten: «%s»"
+
+#: ../gnome/applet/applet.c:317
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' due to a connection error.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+"<span weight=\"bold\" size\"larger\">Feil med VPN-pålogging</span>\n"
+"\n"
+"Kunne ikke starte VPN-tilkobling «%s» på grunn av feil ved pålogging.\n"
+"\n"
+"Melding fra VPN-tjenesten: «%s»"
+
+#: ../gnome/applet/applet.c:322
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Configuration Error</span>\n"
+"\n"
+"The VPN connection '%s' was not correctly configured.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+"<span weight=\"bold\" size\"larger\">Feil med VPN-pålogging</span>\n"
+"\n"
+"Kunne ikke starte VPN-tilkobling «%s» på grunn av feil ved pålogging.\n"
+"\n"
+"Melding fra VPN-tjenesten: «%s»"
+
+#: ../gnome/applet/applet.c:327
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+"<span weight=\"bold\" size\"larger\">Feil med VPN-pålogging</span>\n"
+"\n"
+"Kunne ikke starte VPN-tilkobling «%s» på grunn av feil ved pålogging.\n"
+"\n"
+"Melding fra VPN-tjenesten: «%s»"
+
+#: ../gnome/applet/applet.c:394
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
@@ -85,159 +153,204 @@ msgstr ""
 "\n"
 "«%s»"
 
-#: ../gnome/applet/applet.c:523 ../gnome/applet/applet.c:1817
+#: ../gnome/applet/applet.c:612 ../gnome/applet/applet.c:2167
 #: ../gnome/applet/other-network-dialog.c:315
-#: ../gnome/applet/passphrase-dialog.c:366
+#: ../gnome/applet/passphrase-dialog.c:428
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr ""
 "NetworkManager fant ikke nødvendige ressurser (glade-filen ble ikke funnet)."
 
-#: ../gnome/applet/applet.c:536
+#: ../gnome/applet/applet.c:625
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Nettverksenheten «%s (%s)» støtter ikke søk etter trådløse nettverk."
 
-#: ../gnome/applet/applet.c:543
+#: ../gnome/applet/applet.c:632
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr ""
 "Nettverksenheten «%s (%s)» støtter ikke informasjon om tilkoblet status."
 
-#: ../gnome/applet/applet.c:666
+#: ../gnome/applet/applet.c:753
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "Klargjør enhet %s for det trådløse nettverket..."
+
+#: ../gnome/applet/applet.c:755
+#, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "Klargjør enhet %s for trådløst nettverk «%s»..."
+
+#: ../gnome/applet/applet.c:762
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "Konfigurerer enhet %s for kablet nettverk..."
+
+#: ../gnome/applet/applet.c:764
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "Forsøker å bruke trådløst nettverk «%s»..."
+
+#: ../gnome/applet/applet.c:771
+#, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "Venter på nettverksnøkkel for trådløst nettverk «%s»..."
+
+#: ../gnome/applet/applet.c:778 ../gnome/applet/applet.c:787
+msgid "Requesting a network address from the wired network..."
+msgstr "Ber om en nettverksadresse fra kablet nettverk..."
+
+#: ../gnome/applet/applet.c:780 ../gnome/applet/applet.c:789
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "Ber om en nettverksadresse fra trådløst nettverk «%s»..."
+
+#: ../gnome/applet/applet.c:796
+msgid "Finishing connection to the wired network..."
+msgstr "Fullfører tilkobling til kablet nettverk..."
+
+#: ../gnome/applet/applet.c:798
+#, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "Fullfører tilkobling til trådløst nettverk «%s»..."
+
+#: ../gnome/applet/applet.c:844
 msgid "NetworkManager is not running"
 msgstr "NetworkManager kjører ikke"
 
-#: ../gnome/applet/applet.c:677
+#: ../gnome/applet/applet.c:855
 msgid "No network connection"
 msgstr "Ingen nettverksforbindelse"
 
-#: ../gnome/applet/applet.c:684
+#: ../gnome/applet/applet.c:862
 msgid "Wired network connection"
 msgstr "Trådløs nettverkforbindelse"
 
-#: ../gnome/applet/applet.c:691
+#: ../gnome/applet/applet.c:869
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Kobler til et Ad-Hoc trådløst nettverk"
 
-#: ../gnome/applet/applet.c:705
+#: ../gnome/applet/applet.c:883
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Trådløs nettverksforbindelse til «%s» (%d%%)"
 
-#: ../gnome/applet/applet.c:713
-msgid "Connecting to a wired network..."
-msgstr "Kobler til et trådløst nettverk..."
-
-#: ../gnome/applet/applet.c:715
+#: ../gnome/applet/applet.c:908
 #, c-format
-msgid "Connecting to wireless network '%s'..."
-msgstr "Kobler til et trådløst nettverk «%s»..."
+msgid "VPN connection to '%s'"
+msgstr "VPN-tilkobling til «%s»"
 
-#: ../gnome/applet/applet.c:722
-msgid "Scanning for wireless networks..."
-msgstr "Søker etter trådløse nettverk..."
+#: ../gnome/applet/applet.c:1333
+msgid "Connect to Other Wireless Network..."
+msgstr "Koble til annet trådløst nettverk..."
 
-#: ../gnome/applet/applet.c:1072
-msgid "Other Wireless Networks..."
-msgstr "Andre trådløse nettverk..."
+#: ../gnome/applet/applet.c:1354
+msgid "Create New Wireless Network..."
+msgstr "Opprett nytt trådløst nettverk..."
 
-#: ../gnome/applet/applet.c:1093
-msgid "Create new Wireless Network..."
-msgstr "Opprett nytt trådløse nettverk..."
-
-#: ../gnome/applet/applet.c:1206
+#: ../gnome/applet/applet.c:1467
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
 msgid "VPN Connections"
 msgstr "VPN-tilkoblinger"
 
-#: ../gnome/applet/applet.c:1228
+#: ../gnome/applet/applet.c:1489
+msgid "Configure VPN..."
+msgstr "Konfigurer VPN..."
+
+#: ../gnome/applet/applet.c:1493
 msgid "Disconnect VPN..."
 msgstr "Koble fra VPN..."
 
-#: ../gnome/applet/applet.c:1257
+#: ../gnome/applet/applet.c:1543
 msgid "No network devices have been found"
 msgstr "Ingen nettverksenheter ble funnet"
 
-#: ../gnome/applet/applet.c:1427
+#: ../gnome/applet/applet.c:1701
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager kjører ikke..."
 
-#: ../gnome/applet/applet.c:1497 ../gnome/applet/applet.c:1545
-msgid "Pause Wireless Scanning"
-msgstr "Stopp søk etter trådløse nettverk"
-
-#: ../gnome/applet/applet.c:1502
-msgid "Resume Wireless Scanning"
-msgstr "Gjenoppta søk etter trådløse nettverk"
-
-#: ../gnome/applet/applet.c:1512 ../gnome/applet/applet.c:1551
+#. Stop All Wireless Devices item
+#: ../gnome/applet/applet.c:1769 ../gnome/applet/applet.c:1833
 msgid "Stop All Wireless Devices"
 msgstr "Stopp alle trådløse enheter"
 
-#: ../gnome/applet/applet.c:1517
+#: ../gnome/applet/applet.c:1774
 msgid "Start All Wireless Devices"
 msgstr "Start alle trådløse enheter"
 
-#: ../gnome/applet/applet.c:1560
+#: ../gnome/applet/applet.c:1805
+msgid "Wireless Network Discovery"
+msgstr "Søk etter trådløse nettverk"
+
+#: ../gnome/applet/applet.c:1808
+msgid "Always Search"
+msgstr "Alltid søk"
+
+#: ../gnome/applet/applet.c:1815
+msgid "Search Only When Disconnected"
+msgstr "Søk kun når frakoblet"
+
+#: ../gnome/applet/applet.c:1822
+msgid "Never Search"
+msgstr "Aldri søk"
+
+#: ../gnome/applet/applet.c:1841
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../gnome/applet/applet.c:1567
+#: ../gnome/applet/applet.c:1848
 msgid "About"
 msgstr "Om"
 
-#: ../gnome/applet/applet.c:1965
+#: ../gnome/applet/applet.c:2315
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
-msgstr "Panelprogrammet for NetworkManager fant ikke noen av de nødvendige ressursene. Det kan ikke fortsette.\n"
+msgstr ""
+"Panelprogrammet for NetworkManager fant ikke noen av de nødvendige "
+"ressursene. Det kan ikke fortsette.\n"
 
-#: ../gnome/applet/gtkcellrendererprogress.c:243
-#: ../gnome/applet/gtkcellrendererprogress.c:301
-#, c-format
-msgid "progress bar label|%d %%"
-msgstr "%d %%"
-
-#: ../gnome/applet/menu-items.c:91
+#: ../gnome/applet/menu-items.c:86
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kablet nettverk (%s)"
 
-#: ../gnome/applet/menu-items.c:93
+#: ../gnome/applet/menu-items.c:88
 msgid "Wired Network"
 msgstr "Kablet nettverk"
 
-#: ../gnome/applet/menu-items.c:166
+#: ../gnome/applet/menu-items.c:161
 #, 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)"
 
-#: ../gnome/applet/menu-items.c:168
+#: ../gnome/applet/menu-items.c:163
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Trådløst nettverk"
 msgstr[1] "Trådløse nettverk"
 
-#: ../gnome/applet/menu-items.c:294
+#: ../gnome/applet/menu-items.c:305
 msgid " (invalid Unicode)"
 msgstr " (ugyldig Unicode)"
 
 #: ../gnome/applet/other-network-dialog.c:148
-#: ../gnome/applet/passphrase-dialog.c:164
+#: ../gnome/applet/passphrase-dialog.c:162
 #: ../gnome/applet/wireless-applet.glade.h:27
 msgid "Passphrase:"
 msgstr "Passord:"
 
 #: ../gnome/applet/other-network-dialog.c:151
-#: ../gnome/applet/passphrase-dialog.c:167
+#: ../gnome/applet/passphrase-dialog.c:165
 msgid "Ascii Key:"
 msgstr "Ascii-nøkkel"
 
 #: ../gnome/applet/other-network-dialog.c:154
-#: ../gnome/applet/passphrase-dialog.c:170
+#: ../gnome/applet/passphrase-dialog.c:168
 msgid "Hex Key:"
 msgstr "Heksadesimal nøkkel:"
 
@@ -261,20 +374,31 @@ msgstr "Egedefinert trådløst nettverk"
 msgid "Enter the ESSID of the wireless network to which you wish to connect."
 msgstr "Oppgi ESSID for det trådløse nettverket du ønsker å koble deg til."
 
-#: ../gnome/applet/vpn-password-dialog.c:105
+#: ../gnome/applet/vpn-password-dialog.c:132
+#: ../gnome/applet/vpn-password-dialog.c:171
 #, c-format
-msgid "You must log in to access the Virtual Private Network '%s'."
-msgstr "Du må logge inn for å aksessere det virtuelle private nettverket «%s»."
+msgid "Cannot start VPN connection '%s'"
+msgstr "Kan ikke starte VPN-tilkobling «%s»"
+
+#: ../gnome/applet/vpn-password-dialog.c:135
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:174
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
 
 #: ../gnome/applet/wireless-applet.glade.h:1
 msgid " "
 msgstr " "
 
 #: ../gnome/applet/wireless-applet.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../gnome/applet/wireless-applet.glade.h:3
 msgid ""
 "128-bit Passphrase (WEP)\n"
 "Ascii Key (WEP)\n"
@@ -284,7 +408,7 @@ msgstr ""
 "Ascii-nøkkel (WEP)\n"
 "Heksadesimal nøkkel (WEP)"
 
-#: ../gnome/applet/wireless-applet.glade.h:6
+#: ../gnome/applet/wireless-applet.glade.h:5
 msgid ""
 "128-bit passphrase (WEP)\n"
 "Ascii key (WEP)\n"
@@ -294,7 +418,7 @@ msgstr ""
 "Ascii-nøkkel (WEP)\n"
 "Heksadesimal nøkkel (WEP)"
 
-#: ../gnome/applet/wireless-applet.glade.h:10
+#: ../gnome/applet/wireless-applet.glade.h:9
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -309,7 +433,7 @@ msgstr ""
 "Ett passord eller en krypteringsnøkkel kreves for å aksessere trådløst "
 "nettverk «%s»."
 
-#: ../gnome/applet/wireless-applet.glade.h:14
+#: ../gnome/applet/wireless-applet.glade.h:13
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -321,15 +445,15 @@ msgstr ""
 "\n"
 "%s  Ikke fullstendig funksjonell."
 
-#: ../gnome/applet/wireless-applet.glade.h:18
+#: ../gnome/applet/wireless-applet.glade.h:17
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
 "span>\n"
 "\n"
-"You have chosen log in to the wireless network '%s'.  If you are sure this "
-"wireless network is secure, click the checkbox below and NetworkManager will "
-"no longer pester you with stupid questions when you connect to it."
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Bekreftelse av pålogging på trådløst "
 "nettverk</span>\n"
@@ -338,30 +462,34 @@ msgstr ""
 "dette trådløse nettverket er sikkert kan du be NetworkManager om å slutte å "
 "spørre spørsmål når du kobler deg til det ved å krysse av i boksen nedenfor."
 
-#: ../gnome/applet/wireless-applet.glade.h:21
+#: ../gnome/applet/wireless-applet.glade.h:20
 msgid "Always Trust this Wireless Network"
 msgstr "Stol alltid på dette trådløse nettverket"
 
-#: ../gnome/applet/wireless-applet.glade.h:22
+#: ../gnome/applet/wireless-applet.glade.h:21
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#: ../gnome/applet/wireless-applet.glade.h:23
+#: ../gnome/applet/wireless-applet.glade.h:22
 msgid "Connect with encryption enabled"
 msgstr "Koble til med kryptering"
 
-#: ../gnome/applet/wireless-applet.glade.h:24
+#: ../gnome/applet/wireless-applet.glade.h:23
 msgid "Don't remind me again"
 msgstr "Ikke vis påminnelse igjen"
 
-#: ../gnome/applet/wireless-applet.glade.h:25
+#: ../gnome/applet/wireless-applet.glade.h:24
 msgid "Key Type:"
 msgstr "Type nøkkel:"
 
-#: ../gnome/applet/wireless-applet.glade.h:26
+#: ../gnome/applet/wireless-applet.glade.h:25
 msgid "Key type:"
 msgstr "Type nøkkel:"
 
+#: ../gnome/applet/wireless-applet.glade.h:26
+msgid "Other Wireless Network..."
+msgstr "Annet trådløst nettverk..."
+
 #: ../gnome/applet/wireless-applet.glade.h:28
 msgid "Wireless Network Key Required"
 msgstr "Nøkkel for trådløst nettverk kreves"
@@ -382,7 +510,121 @@ msgstr "_Logg på nettverk"
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../gnome/vpn-properties/nm-vpn-properties.c:374
+msgid "Cannot add VPN connection"
+msgstr "Kan ikke legge til VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:376
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:428
+msgid "Cannot import VPN connection"
+msgstr "Kan ikke importere VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:430
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:570
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:573
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:733
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "Slett VPN-tilkobling «%s»?"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:736
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1056
+msgid "Edit VPN Connection"
+msgstr "Rediger VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+msgid "Add a new VPN connection"
+msgstr "Legg til en ny VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Connect to:"
+msgstr "Koble til:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "Create VPN Connection"
+msgstr "Opprett VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Create VPN Connection - 1 of 2"
+msgstr "Opprett VPN-tilkobling - 1 av 2"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 2 of 2"
+msgstr "Opprett VPN-tilkobling - 2 av 2"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Delete the selected VPN connection"
+msgstr "Slett valgt VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid ""
+"Dependent on the private network you want to connect to, you need to select "
+"what type of connection you want to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr "E_ksporter"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr "Rediger valgt VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export VPN connection to a file"
+msgstr "Eksporter VPN-tilkobling til en fil"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the VPN settings to a file"
+msgstr "Eksporter innstillinger for VPN til en fil"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish create VPN Connection"
+msgstr "Fullfør oppretting av VPN-tilkobling"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+msgid "Manage Virtual Private Network connections"
+msgstr "Håndter tilkoblinger til Virtuelle Private Nettverk"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a new VPN connection "
+"to a private network.\n"
+"\n"
+"It will require some information, such as IP addresses and secrets, that "
+"will probably be provided by your system administrator as appropriate."
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:159
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
@@ -390,7 +632,7 @@ msgstr ""
 "kan ikke opprette netlink-plugg for overvåking av kablede ethernet-enheter - "
 "%s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:177
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
@@ -398,23 +640,27 @@ msgstr ""
 "kan ikke binde til netlink-plugg for overvåking av kablede ethernet-enheter "
 "- %s"
 
-#: ../src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:409
 msgid "operation took too long"
 msgstr "operasjonen tok for lang tid"
 
-#: ../src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:506
 msgid "received data from wrong type of sender"
 msgstr "mottok data fra feil type avsender"
 
-#: ../src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:519
 msgid "received data from unexpected sender"
 msgstr "mottok data fra uventet avsender"
 
-#: ../src/nm-netlink-monitor.c:535
+#: ../src/nm-netlink-monitor.c:541
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:650
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "for mye data ble sendt over pluggen og noe data gikk tapt"
+
+#: ../src/nm-netlink-monitor.c:739
+msgid "error occured while waiting for data on socket"
+msgstr ""