[network-manager-applet] Updated Norwegian bokmÃl translation

[Kjartan Maraas <kmaraas src gnome org>]

commit c332f054eba6fa7acf1eff6fd41b5dee0e759d2b
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sun Dec 23 00:43:24 2012 +0100

    Updated Norwegian bokmÃl translation

 po/nb.po |  379 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 235 insertions(+), 144 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 696ff7c..3922898 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.9.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-05 21:21+0100\n"
-"PO-Revision-Date: 2012-11-05 21:45+0100\n"
+"POT-Creation-Date: 2012-12-22 20:57+0100\n"
+"PO-Revision-Date: 2012-12-23 00:43+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmÃl <i18n-nb lister ping uio no>\n"
 "Language: nb\n"
@@ -521,7 +521,7 @@ msgid "Mobile Broadband (%s)"
 msgstr "Mobilt bredbÃnd (%s)"
 
 #: ../src/applet-device-cdma.c:341 ../src/applet-device-gsm.c:395
-#: ../src/connection-editor/new-connection.c:112
+#: ../src/connection-editor/new-connection.c:113
 #: ../src/connection-editor/page-mobile.c:389
 #: ../src/libnm-gtk/nm-ui-utils.c:333
 msgid "Mobile Broadband"
@@ -551,11 +551,11 @@ msgstr "roaming"
 msgid "CDMA network."
 msgstr "CDMA-nettverk."
 
-#: ../src/applet-device-cdma.c:642 ../src/applet-device-gsm.c:1199
+#: ../src/applet-device-cdma.c:642 ../src/applet-device-gsm.c:1154
 msgid "You are now registered on the home network."
 msgstr "Du er nà registrert pà hjemmenettverket."
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1205
+#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1160
 msgid "You are now registered on a roaming network."
 msgstr "Du er nà registrert pà et roaming nettverk."
 
@@ -718,7 +718,7 @@ msgstr "Tast inn ny PIN-kode igjen:"
 msgid "Show PIN/PUK codes"
 msgstr "Vis PIN/PUK-koder"
 
-#: ../src/applet-device-gsm.c:1198 ../src/applet-device-gsm.c:1204
+#: ../src/applet-device-gsm.c:1153 ../src/applet-device-gsm.c:1159
 msgid "GSM network."
 msgstr "GSM-nettverk."
 
@@ -921,7 +921,7 @@ msgstr "WiMAX (%s)"
 
 #. --- General ---
 #: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
-#: ../src/connection-editor/page-general.c:326
+#: ../src/connection-editor/page-general.c:327
 msgid "General"
 msgstr "Generelt"
 
@@ -1125,7 +1125,8 @@ msgid ""
 msgstr ""
 "Velg type tilkobling du Ãnsker à lage.\n"
 "\n"
-"Hvis du lager en VPN-tilkobling og du ikke finner riktig type VPN-tilkobling i listen er det mulig at du ikke har korrekt VPN-tillegg installert."
+"Hvis du lager en VPN-tilkobling og du ikke finner riktig type VPN-tilkobling "
+"i listen er det mulig at du ikke har korrekt VPN-tillegg installert."
 
 #: ../src/connection-editor/ce-new-connection.ui.h:6
 msgid "Createâ"
@@ -1177,13 +1178,15 @@ msgstr "_Modus:"
 
 #. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/ce-page-bridge.ui.h:2
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "_Edit"
 msgstr "R_ediger"
 
 #. Delete
 #: ../src/connection-editor/ce-page-bond.ui.h:13
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/ce-page-bridge.ui.h:3
+#: ../src/connection-editor/nm-connection-list.c:702
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -1196,6 +1199,7 @@ msgid "ms"
 msgstr "ms"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:16
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Interface name:"
 msgstr "Navn pà grensesn_itt:"
 
@@ -1221,6 +1225,47 @@ msgstr ""
 msgid "Link _down delay:"
 msgstr ""
 
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:4
+msgid "_Priority:"
+msgstr "_Prioritet:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr "_HÃrnÃlmodus:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+msgid "Bridged _connections:"
+msgstr "Sammenkoblede _tilkoblinger:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:6
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "s"
+msgstr "s"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "_Aging time:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page.c:72
 msgid "automatic"
 msgstr "automatisk"
@@ -1746,122 +1791,127 @@ msgstr ""
 "autentiseringsmetoder. Hvis tilkoblinger feiler kan du prÃve à slà av stÃtte "
 "for noen metoder."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:911
-#: ../src/connection-editor/page-ip6.c:877
+#: ../src/connection-editor/ip4-routes-dialog.c:762
+#: ../src/connection-editor/ip6-routes-dialog.c:704
+#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/page-ip6.c:894
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:779
+#: ../src/connection-editor/page-ip4.c:945
 msgid "Netmask"
 msgstr "Nettmaske"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:945
-#: ../src/connection-editor/page-ip6.c:911
+#: ../src/connection-editor/ip4-routes-dialog.c:796
+#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/page-ip4.c:962
+#: ../src/connection-editor/page-ip6.c:928
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:813
+#: ../src/connection-editor/ip6-routes-dialog.c:755
 msgid "Metric"
 msgstr "Metrisk"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip6.c:911
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/new-connection.c:100
+#: ../src/connection-editor/new-connection.c:101
 #: ../src/connection-editor/page-ethernet.c:251
 #: ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/new-connection.c:106
+#: ../src/connection-editor/new-connection.c:107
 #: ../src/connection-editor/page-wifi.c:470 ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:118
+#: ../src/connection-editor/new-connection.c:119
 #: ../src/connection-editor/page-wimax.c:134
 #: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:75
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../src/connection-editor/new-connection.c:124
+#: ../src/connection-editor/new-connection.c:125
 #: ../src/connection-editor/page-dsl.c:141
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:130
+#: ../src/connection-editor/new-connection.c:131
 #: ../src/connection-editor/page-infiniband.c:168
 #: ../src/libnm-gtk/nm-ui-utils.c:335
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:136
-#: ../src/connection-editor/page-bond.c:747 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/connection-editor/new-connection.c:137
+#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
 msgid "Bond"
 msgstr "Koble sammen"
 
-#: ../src/connection-editor/new-connection.c:142
+#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/page-bridge.c:211
+msgid "Bridge"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:149
 #: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:339
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:155
-#: ../src/connection-editor/new-connection.c:295
+#: ../src/connection-editor/new-connection.c:162
+#: ../src/connection-editor/new-connection.c:302
 #: ../src/connection-editor/page-vpn.c:113
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:245
+#: ../src/connection-editor/new-connection.c:252
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: ../src/connection-editor/new-connection.c:265
+#: ../src/connection-editor/new-connection.c:272
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: ../src/connection-editor/new-connection.c:333
-#: ../src/connection-editor/new-connection.c:335
+#: ../src/connection-editor/new-connection.c:340
+#: ../src/connection-editor/new-connection.c:342
 msgid "Import a saved VPN configuration..."
 msgstr "Importer en lagret VPN-tilkobling â"
 
-#: ../src/connection-editor/new-connection.c:364
+#: ../src/connection-editor/new-connection.c:371
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Dialog for redigering av tilkobling kunne ikke startes pga en ukjent feil."
 
-#: ../src/connection-editor/new-connection.c:373
+#: ../src/connection-editor/new-connection.c:380
 msgid "Could not create new connection"
 msgstr "Kunne ikke lage en ny tilkobling"
 
-#: ../src/connection-editor/new-connection.c:508
+#: ../src/connection-editor/new-connection.c:515
 msgid "Connection delete failed"
 msgstr "Sletting av tilkobling feilet"
 
-#: ../src/connection-editor/new-connection.c:555
+#: ../src/connection-editor/new-connection.c:562
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Sikker pà at du vil slette denne tilkoblingen %s?"
 
-#: ../src/connection-editor/nm-connection-editor.c:115
+#: ../src/connection-editor/nm-connection-editor.c:118
 #, c-format
 msgid "Editing %s"
 msgstr "Redigerer %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:119
+#: ../src/connection-editor/nm-connection-editor.c:122
 msgid "Editing un-named connection"
 msgstr "Redigerer tilkobling uten navn"
 
-#: ../src/connection-editor/nm-connection-editor.c:279
+#: ../src/connection-editor/nm-connection-editor.c:282
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -1869,49 +1919,49 @@ msgstr ""
 "Redigering av tilkobling fant ikke alle nÃdvendige ressurser (.ui-fil ble "
 "ikke funnet)."
 
-#: ../src/connection-editor/nm-connection-editor.c:405
+#: ../src/connection-editor/nm-connection-editor.c:408
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../src/connection-editor/nm-connection-editor.c:406
+#: ../src/connection-editor/nm-connection-editor.c:409
 msgid "Save any changes made to this connection."
 msgstr "Lagre alle endringer som er gjort pà denne tilkoblingen."
 
-#: ../src/connection-editor/nm-connection-editor.c:407
+#: ../src/connection-editor/nm-connection-editor.c:410
 msgid "_Save..."
 msgstr "_Lagre â"
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:411
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autentiser for à lagre denne tilkoblingen for alle brukere pà denne maskinen."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:427
 msgid "Could not create connection"
 msgstr "Kunne ikke lage tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:427
 msgid "Could not edit connection"
 msgstr "Kunne ikke redigere tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:426
+#: ../src/connection-editor/nm-connection-editor.c:429
 msgid "Unknown error creating connection editor dialog."
 msgstr "Ukjent feil under oppretting av dialog for redigering av tilkobling."
 
-#: ../src/connection-editor/nm-connection-editor.c:533
+#: ../src/connection-editor/nm-connection-editor.c:536
 msgid "Error saving connection"
 msgstr "Feil under lagring av tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:534
+#: ../src/connection-editor/nm-connection-editor.c:537
 #, c-format
 msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "Egenskap Â%s / Â%s er ugyldig: %d"
 
-#: ../src/connection-editor/nm-connection-editor.c:628
+#: ../src/connection-editor/nm-connection-editor.c:631
 msgid "Error initializing editor"
 msgstr "Feil under initiering av redigering"
 
-#: ../src/connection-editor/nm-connection-editor.c:957
+#: ../src/connection-editor/nm-connection-editor.c:968
 msgid "Connection add failed"
 msgstr "Klarte ikke à legge til tilkobling"
 
@@ -1968,52 +2018,52 @@ msgid_plural "%d years ago"
 msgstr[0] "%d Ãr siden"
 msgstr[1] "%d Ãr siden"
 
-#: ../src/connection-editor/nm-connection-list.c:628
+#: ../src/connection-editor/nm-connection-list.c:631
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/connection-editor/nm-connection-list.c:641
+#: ../src/connection-editor/nm-connection-list.c:644
 msgid "Last Used"
 msgstr "Sist brukt"
 
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:686
 msgid "Edit the selected connection"
 msgstr "Rediger valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:684
+#: ../src/connection-editor/nm-connection-list.c:687
 msgid "_Edit..."
 msgstr "R_ediger â"
 
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/nm-connection-list.c:688
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentiser for à redigere valgt tilkobling."
 
-#: ../src/connection-editor/nm-connection-list.c:700
+#: ../src/connection-editor/nm-connection-list.c:703
 msgid "Delete the selected connection"
 msgstr "Slett valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:701
+#: ../src/connection-editor/nm-connection-list.c:704
 msgid "_Delete..."
 msgstr "_Slett â"
 
-#: ../src/connection-editor/nm-connection-list.c:702
+#: ../src/connection-editor/nm-connection-list.c:705
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentiser for à slette valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:942
 msgid "Error creating connection"
 msgstr "Feil under oppretting av tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:940
+#: ../src/connection-editor/nm-connection-list.c:943
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Vet ikke hvordan tilkoblinger av type Â%s lages"
 
-#: ../src/connection-editor/nm-connection-list.c:995
+#: ../src/connection-editor/nm-connection-list.c:998
 msgid "Error editing connection"
 msgstr "Feil under redigering av tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:996
+#: ../src/connection-editor/nm-connection-list.c:999
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Fant ingen tilkobling med UUID Â%sÂ"
@@ -2030,20 +2080,37 @@ msgstr "Kunne ikke laste brukergrensesnitt for 802.1x-sikkerhet."
 msgid "Use 802.1_X security for this connection"
 msgstr "Bruk 802.1_X-sikkerhet for denne tilkoblingen"
 
-#: ../src/connection-editor/page-bond.c:559
-#, c-format
-msgid "%s slave %d"
-msgstr "%s slave %d"
-
-#: ../src/connection-editor/page-bond.c:750
+#: ../src/connection-editor/page-bond.c:422
 msgid "Could not load bond user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for sammenkobling."
 
-#: ../src/connection-editor/page-bond.c:910
+#: ../src/connection-editor/page-bond.c:561
 #, c-format
 msgid "Bond connection %d"
 msgstr "Sammenkoblet tilkobling %d"
 
+#: ../src/connection-editor/page-bridge.c:214
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "Kunne ikke laste brukergrensesnitt for sammenkobling."
+
+#: ../src/connection-editor/page-bridge.c:309
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "Sammenkoblet tilkobling %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:115
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:117
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "Kunne ikke laste brukergrensesnitt for sammenkobling."
+
 #: ../src/connection-editor/page-dsl.c:143
 msgid "Could not load DSL user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for DSL."
@@ -2075,7 +2142,7 @@ msgstr "Ethernet-tilkobling %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: ../src/connection-editor/page-general.c:57
-#: ../src/utils/nmn-mobile-providers.c:531
+#: ../src/libnm-gtk/nm-mobile-providers.c:808
 msgid "Default"
 msgstr "Forvalg"
 
@@ -2090,7 +2157,7 @@ msgstr ""
 msgid "FirewallD is not running."
 msgstr "FirewallD kjÃrer ikke."
 
-#: ../src/connection-editor/page-general.c:329
+#: ../src/connection-editor/page-general.c:330
 msgid "Could not load General user interface."
 msgstr "Kunne ikke laste generelt brukergrensesnitt."
 
@@ -2160,16 +2227,16 @@ msgstr "Flere _DNS-tjenere:"
 msgid "Additional s_earch domains:"
 msgstr "Flere sÃk_edomener:"
 
-#: ../src/connection-editor/page-ip4.c:843
+#: ../src/connection-editor/page-ip4.c:860
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Rediger IPv4-ruter for %s"
 
-#: ../src/connection-editor/page-ip4.c:994
+#: ../src/connection-editor/page-ip4.c:1011
 msgid "IPv4 Settings"
 msgstr "IPv4-innstillinger"
 
-#: ../src/connection-editor/page-ip4.c:996
+#: ../src/connection-editor/page-ip4.c:1013
 msgid "Could not load IPv4 user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv4"
 
@@ -2186,19 +2253,24 @@ msgstr "Ignorer"
 msgid "Automatic, DHCP only"
 msgstr "Automatisk. Kun DHCP"
 
-#: ../src/connection-editor/page-ip6.c:809
+#: ../src/connection-editor/page-ip6.c:826
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Rediger IPv6-ruter for %s"
 
-#: ../src/connection-editor/page-ip6.c:958
+#: ../src/connection-editor/page-ip6.c:975
 msgid "IPv6 Settings"
 msgstr "IPv6-innstillinger"
 
-#: ../src/connection-editor/page-ip6.c:960
+#: ../src/connection-editor/page-ip6.c:977
 msgid "Could not load IPv6 user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv6."
 
+#: ../src/connection-editor/page-master.c:290
+#, c-format
+msgid "%s slave %d"
+msgstr "%s slave %d"
+
 #: ../src/connection-editor/page-mobile.c:391
 msgid "Could not load mobile broadband user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for mobilt bredbÃnd."
@@ -2325,7 +2397,9 @@ msgstr ""
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
 "by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr "Dette valget lÃser denne tilkoblingen til Wi-Fi-aksesspunkt (AP) som spesifiseres av BSSID som oppgis her. Eksempel: 00:11:22:33:44:55"
+msgstr ""
+"Dette valget lÃser denne tilkoblingen til Wi-Fi-aksesspunkt (AP) som "
+"spesifiseres av BSSID som oppgis her. Eksempel: 00:11:22:33:44:55"
 
 #: ../src/connection-editor/page-wifi.c:190
 #: ../src/connection-editor/page-wifi.c:194
@@ -2380,7 +2454,9 @@ msgstr "WPA og WPA2 enterprise"
 
 #: ../src/connection-editor/page-wifi-security.c:396
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
-msgstr "Kunne ikke laste brukergrensesnitt for Wi-Fi-sikkerhet; mangler WiFi-innstilling."
+msgstr ""
+"Kunne ikke laste brukergrensesnitt for Wi-Fi-sikkerhet; mangler WiFi-"
+"innstilling."
 
 #: ../src/connection-editor/page-wifi-security.c:407
 msgid "Wi-Fi Security"
@@ -2464,13 +2540,17 @@ msgstr ""
 #, c-format
 msgid ""
 "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "Konfigurasjon av Bluetooth er ikke mulig (klarte ikke à koble til D-Bus: (%s)%s)."
+msgstr ""
+"Konfigurasjon av Bluetooth er ikke mulig (klarte ikke à koble til D-Bus: "
+"(%s)%s)."
 
 #: ../src/gnome-bluetooth/bt-widget.c:330
 #, c-format
 msgid ""
 "Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "Konfigurasjon av Bluetooth er ikke mulig (klarte ikke à finne NetworkManager: (%s) %s)."
+msgstr ""
+"Konfigurasjon av Bluetooth er ikke mulig (klarte ikke à finne "
+"NetworkManager: (%s) %s)."
 
 #: ../src/gnome-bluetooth/bt-widget.c:445
 msgid "Use your mobile phone as a network device (PAN/NAP)"
@@ -2480,51 +2560,56 @@ msgstr "Bruk din mobiltelefon som en nettverksenhet (PAN/NAP)"
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "Koble til internett med din mobiltelefon (DUN)"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:318
+#: ../src/gnome-bluetooth/nma-bt-device.c:336
 #, c-format
 msgid "Error: %s"
 msgstr "Feil: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:425
+#: ../src/gnome-bluetooth/nma-bt-device.c:443
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "Kunne ikke lage en DUN-tilkobling: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:427
-#: ../src/gnome-bluetooth/nma-bt-device.c:833
+#: ../src/gnome-bluetooth/nma-bt-device.c:445
+#: ../src/gnome-bluetooth/nma-bt-device.c:959
 msgid "Your phone is now ready to use!"
 msgstr "Telefonen er klar til bruk!"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:450
+#: ../src/gnome-bluetooth/nma-bt-device.c:468
 msgid "Mobile wizard was canceled"
 msgstr "Veiviser for mobil ble avbrutt"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:459
+#: ../src/gnome-bluetooth/nma-bt-device.c:477
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "Ukjent enhetstype for telefon (ikke GSM eller CDMA)"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:567
+#: ../src/gnome-bluetooth/nma-bt-device.c:513
 msgid "unknown modem type."
 msgstr "ukjent modemtype."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:639
-#: ../src/gnome-bluetooth/nma-bt-device.c:645
+#: ../src/gnome-bluetooth/nma-bt-device.c:733
+#: ../src/gnome-bluetooth/nma-bt-device.c:739
 msgid "failed to connect to the phone."
 msgstr "klarte ikke à koble til telefonen."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:676
+#: ../src/gnome-bluetooth/nma-bt-device.c:770
 msgid "unexpectedly disconnected from the phone."
 msgstr "koblet fra telefonen uventet."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:686
+#: ../src/gnome-bluetooth/nma-bt-device.c:780
 msgid "timed out detecting phone details."
 msgstr "tidsavbrudd under henting av detaljer om telefonen."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:697
+#: ../src/gnome-bluetooth/nma-bt-device.c:791
 msgid "Detecting phone configuration..."
 msgstr "Gjenkjenner telefonkonfigurasjon â"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
+#: ../src/gnome-bluetooth/nma-bt-device.c:823
+#, fuzzy
+msgid "error getting bus connection"
+msgstr "Feil under redigering av tilkobling"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:920
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
@@ -2532,12 +2617,12 @@ msgstr ""
 "Forvalgt Bluetooth-enhet mà slÃs pà fÃr du setter opp en oppringt "
 "nettverkstilkobling."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:831
+#: ../src/gnome-bluetooth/nma-bt-device.c:957
 #, c-format
 msgid "Failed to create PAN connection: %s"
 msgstr "Kunne ikke lage en PAN-tilkobling: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:852
+#: ../src/gnome-bluetooth/nma-bt-device.c:978
 #, c-format
 msgid "%s Network"
 msgstr "%s nettverk:"
@@ -2558,28 +2643,28 @@ msgstr "Tilkoblingsinformasjon"
 msgid "Active Network Connections"
 msgstr "Aktive nettverkstilkoblinger"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:207
+#: ../src/libnm-gtk/nm-mobile-wizard.c:208
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 "Din mobile bredbÃndstilkobling er konfigurert med fÃlgende innstillinger:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:214
+#: ../src/libnm-gtk/nm-mobile-wizard.c:215
 msgid "Your Device:"
 msgstr "Din enhet:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:225
+#: ../src/libnm-gtk/nm-mobile-wizard.c:226
 msgid "Your Provider:"
 msgstr "Din tilbyder:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:236
+#: ../src/libnm-gtk/nm-mobile-wizard.c:237
 msgid "Your Plan:"
 msgstr "Din plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid ""
 "A connection will now be made to your mobile broadband provider using the "
 "settings you selected.  If the connection fails or you cannot access network "
@@ -2593,23 +2678,23 @@ msgstr ""
 "endre dine innstillinger for mobil bredbÃndstilkobling kan du velge "
 "ÂNettverkstilkoblinger fra menyen System->Brukervalg."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:273
+#: ../src/libnm-gtk/nm-mobile-wizard.c:274
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Bekreft innstillinger for mobilt bredbÃnd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:337
+#: ../src/libnm-gtk/nm-mobile-wizard.c:338
 msgid "Unlisted"
 msgstr "Ikke listet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:492
+#: ../src/libnm-gtk/nm-mobile-wizard.c:493
 msgid "_Select your plan:"
 msgstr "_Velg din plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:516
+#: ../src/libnm-gtk/nm-mobile-wizard.c:517
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "_APN (Navn pà aksesspunkt) for valgt plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:540
+#: ../src/libnm-gtk/nm-mobile-wizard.c:541
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -2621,67 +2706,67 @@ msgstr ""
 "\n"
 "SpÃr tilbyder om APN for ditt abonnement hvis du er usikker."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:547
+#: ../src/libnm-gtk/nm-mobile-wizard.c:548
 msgid "Choose your Billing Plan"
 msgstr "Velg din betalingsplan"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:596
+#: ../src/libnm-gtk/nm-mobile-wizard.c:597
 msgid "My plan is not listed..."
 msgstr "Min plan er ikke pà listen â"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnm-gtk/nm-mobile-wizard.c:754
 msgid "Select your provider from a _list:"
 msgstr "Velg din tilbyder fra en _liste:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:766
+#: ../src/libnm-gtk/nm-mobile-wizard.c:767
 msgid "Provider"
 msgstr "Tilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "I can't find my provider and I wish to enter it _manually:"
 msgstr "Jeg kan ikke finne min tilbyder og Ãnsker à oppgi denne _manuelt:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:802
+#: ../src/libnm-gtk/nm-mobile-wizard.c:803
 msgid "Provider:"
 msgstr "Tilbyder:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:826
+#: ../src/libnm-gtk/nm-mobile-wizard.c:827
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Min tilbyder bruker GSM-teknologi (GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:832
+#: ../src/libnm-gtk/nm-mobile-wizard.c:833
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Min tilbyder bruker CDMA-teknologi (1xRTT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:843
+#: ../src/libnm-gtk/nm-mobile-wizard.c:844
 msgid "Choose your Provider"
 msgstr "Velg din tilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1094
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
 msgid "Country or Region List:"
 msgstr "Liste med land eller regioner:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1106
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
 msgid "Country or region"
 msgstr "Land eller region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
 msgid "My country is not listed"
 msgstr "Landet mitt er ikke pà listen"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1159
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
 msgid "Choose your Provider's Country or Region"
 msgstr "Velg din tilbyders land eller region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1213
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
 msgid "Installed GSM device"
 msgstr "Installert GSM-enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
 msgid "Installed CDMA device"
 msgstr "Installert CDMA-enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1388
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -2689,37 +2774,37 @@ msgstr ""
 "Denne assistenten hjelper deg à sette opp en mobil bredbÃndstilkobling til "
 "et mobilnettverk (3G)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
 msgid "You will need the following information:"
 msgstr "Du trenger fÃlgende informasjon:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
 msgid "Your broadband provider's name"
 msgstr "Navnet pà din bredbÃndstilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Your broadband billing plan name"
 msgstr "Navn pà betalingsplan for bredbÃnd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(i enkelte tilfeller) APN (navn pà aksesspunkt) for din betalingsplan for "
 "bredbÃnd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1447
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Lag en tilkobling for _denne mobile bredbÃndsenheten:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
 msgid "Any device"
 msgstr "Enhver enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1475
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Sett opp en mobil bredbÃndstilkobling"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1643
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
 msgid "New Mobile Broadband Connection"
 msgstr "Ny mobil bredbÃndstilkobling"
 
@@ -2771,7 +2856,9 @@ msgstr "_Lag:"
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
-msgstr "Passord eller krypteringsnÃkler er nÃdvendig for à koble til Wi-Fi-nettverk Â%sÂ."
+msgstr ""
+"Passord eller krypteringsnÃkler er nÃdvendig for à koble til Wi-Fi-nettverk "
+"Â%sÂ."
 
 #: ../src/libnm-gtk/nm-wifi-dialog.c:1138
 msgid "Wi-Fi Network Authentication Required"
@@ -2805,7 +2892,8 @@ msgstr "Skjult Wi-Fi-nettverk"
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
-msgstr "Oppgi navnet til det skjulte Wi-Fi-nettverket du Ãnsker à koble deg til."
+msgstr ""
+"Oppgi navnet til det skjulte Wi-Fi-nettverket du Ãnsker à koble deg til."
 
 #: ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
@@ -2936,7 +3024,10 @@ msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
 "to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
 "Authority certificate?"
-msgstr "Hvis man ikke bruker et Certificate Authority-sertifikat (CA) kan dette resultere i tilkoblinger til usikre og villedende Wi-Fi-nettverk. Vil du velge et Certificate Authority-sertifikat?"
+msgstr ""
+"Hvis man ikke bruker et Certificate Authority-sertifikat (CA) kan dette "
+"resultere i tilkoblinger til usikre og villedende Wi-Fi-nettverk. Vil du "
+"velge et Certificate Authority-sertifikat?"
 
 #: ../src/wireless-security/eap-method.c:285
 msgid "Choose CA Certificate"
@@ -3005,7 +3096,7 @@ msgid "MD5"
 msgstr "MD5"
 
 #: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
+#: ../src/wireless-security/eap-method-tls.c:434
 #: ../src/wireless-security/eap-method-ttls.c:350
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Velg et Certificate Authority-sertifikat â"
@@ -3032,11 +3123,11 @@ msgstr "PEAP-_versjon:"
 msgid "As_k for this password every time"
 msgstr "SpÃr om dette passordet _hver gang"
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:260
 msgid "Unencrypted private keys are insecure"
 msgstr "Private nÃkler uten kryptering er ikke sikre"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../src/wireless-security/eap-method-tls.c:263
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
 "This could allow your security credentials to be compromised.  Please select "
@@ -3050,11 +3141,11 @@ msgstr ""
 "\n"
 "Du kan passordbeskytte din private nÃkkel med openssl"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:428
 msgid "Choose your personal certificate..."
 msgstr "Velg ditt personlige sertifikat â"
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:440
 msgid "Choose your private key..."
 msgstr "Velg din private nÃkkel â"