[network-manager-applet] Updated Norwegian bokmål tran slation.



commit b30321b87624b9fefb1cde6c66de7c37451ec292
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Wed Jul 23 14:52:30 2014 +0200

    Updated Norwegian bokmål translation.

 po/nb.po |  567 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 278 insertions(+), 289 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index fd868eb..03a1e26 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager 0.9.9.x\n"
+"Project-Id-Version: NetworkManager 0.9.10.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-05 19:10+0100\n"
-"PO-Revision-Date: 2014-03-05 19:16+0100\n"
+"POT-Creation-Date: 2014-07-23 14:49+0200\n"
+"PO-Revision-Date: 2014-07-23 14:52+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
 "Language: nb\n"
@@ -368,7 +368,7 @@ msgstr "Ko_ble fra VPN"
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager kjører ikke …"
 
-#: ../src/applet.c:1970 ../src/applet.c:2940
+#: ../src/applet.c:1970 ../src/applet.c:2948
 msgid "Networking disabled"
 msgstr "Nettverk slått av"
 
@@ -430,57 +430,57 @@ msgstr "Frakoblet"
 msgid "The network connection has been disconnected."
 msgstr "Nettverksforbindelsen har blitt frakoblet."
 
-#: ../src/applet.c:2802
+#: ../src/applet.c:2810
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Forbereder nettverkstilkobling «%s» …"
 
-#: ../src/applet.c:2805
+#: ../src/applet.c:2813
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Brukerautentisering kreves for nettverkstilkobling «%s» …"
 
-#: ../src/applet.c:2808 ../src/applet-device-bt.c:136
+#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
 #: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Ber om en nettverksadresse for «%s» …"
 
-#: ../src/applet.c:2811
+#: ../src/applet.c:2819
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Nettverkstilkobling «%s» er aktiv"
 
-#: ../src/applet.c:2894
+#: ../src/applet.c:2902
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Starter VPN-tilkobling «%s» …"
 
-#: ../src/applet.c:2897
+#: ../src/applet.c:2905
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Brukerautentisering kreves for VPN-tilkobling «%s» …"
 
-#: ../src/applet.c:2900
+#: ../src/applet.c:2908
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Ber om en nettverksadresse på VPN for «%s» …"
 
-#: ../src/applet.c:2903
+#: ../src/applet.c:2911
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-tilkobling «%s» er aktiv"
 
-#: ../src/applet.c:2945
+#: ../src/applet.c:2953
 msgid "No network connection"
 msgstr "Ingen nettverksforbindelse"
 
-#: ../src/applet.c:3615
+#: ../src/applet.c:3628
 msgid "NetworkManager Applet"
 msgstr "NetworkManager panelprogram"
 
 #: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:769 ../src/applet-device-bt.c:90
+#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
 #: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
 #: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
 #: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
@@ -489,7 +489,7 @@ msgid "Available"
 msgstr "Tilgjengelige"
 
 #: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:796 ../src/applet-device-bt.c:102
+#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
 #: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
 #: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
 #: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
@@ -565,13 +565,13 @@ msgstr "Feil PIN-kode. Vennligst kontakt leverandøren."
 msgid "Sending unlock code..."
 msgstr "Send kode for å låse opp …"
 
-#: ../src/applet-device-broadband.c:715 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:421
+#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilt bredbånd (%s)"
 
-#: ../src/applet-device-broadband.c:717 ../src/applet-device-cdma.c:249
+#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
 #: ../src/applet-device-gsm.c:305
 #: ../src/connection-editor/new-connection.c:114
 #: ../src/connection-editor/page-mobile.c:351
@@ -580,24 +580,24 @@ msgid "Mobile Broadband"
 msgstr "Mobilt bredbånd"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:782
+#: ../src/applet-device-broadband.c:783
 msgid "New Mobile Broadband connection..."
 msgstr "Ny mobil bredbåndstilkobling …"
 
-#: ../src/applet-device-broadband.c:797
+#: ../src/applet-device-broadband.c:798
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Du er nå koblet til mobilt bredbåndsnettverk."
 
-#: ../src/applet-device-broadband.c:932 ../src/applet-device-broadband.c:938
+#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
 msgid "Mobile Broadband network."
 msgstr "Mobilt bredbåndsnettverk."
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-cdma.c:403
+#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
 #: ../src/applet-device-gsm.c:662
 msgid "You are now registered on the home network."
 msgstr "Du er nå registrert på hjemmenettverket."
 
-#: ../src/applet-device-broadband.c:939 ../src/applet-device-cdma.c:409
+#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
 #: ../src/applet-device-gsm.c:668
 msgid "You are now registered on a roaming network."
 msgstr "Du er nå registrert på et roaming nettverk."
@@ -762,7 +762,7 @@ msgid "You are now connected to the teamed network."
 msgstr "Du er nå koblet til det nettverket."
 
 #: ../src/applet-device-team.c:110
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "Preparing team connection '%s'..."
 msgstr "Forbereder samlet tilkobling «%s» …"
 
@@ -932,8 +932,8 @@ msgstr "Feil under visning av tilkoblingsinformasjon:"
 
 #: ../src/applet-dialogs.c:109
 #: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:918
-#: ../src/wireless-security/wireless-security.c:441
+#: ../src/libnm-gtk/nm-wifi-dialog.c:924
+#: ../src/wireless-security/wireless-security.c:442
 msgid "LEAP"
 msgstr "LEAP"
 
@@ -961,12 +961,12 @@ msgstr "Ingen"
 msgid "%s (default)"
 msgstr "%s (forvalg)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:481
+#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:483
+#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ukjent"
@@ -986,150 +986,138 @@ msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../src/applet-dialogs.c:407
+#. Address
+#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
+msgid "IP Address:"
+msgstr "IP-adresse:"
+
+#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: ../src/applet-dialogs.c:400
+msgid "Broadcast Address:"
+msgstr "Kringkastingsadresse:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:409
+msgid "Subnet Mask:"
+msgstr "Subnettmaske:"
+
+#: ../src/applet-dialogs.c:411
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
+msgid "Default Route:"
+msgstr "Forvalgt rute:"
+
+#: ../src/applet-dialogs.c:530
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:533
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:540
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:542
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:546
 #, c-format
 msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:429 ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
 #: ../src/connection-editor/page-general.c:327
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:556
 msgid "Interface:"
 msgstr "Grensesnitt:"
 
-#: ../src/applet-dialogs.c:449
+#: ../src/applet-dialogs.c:572
 msgid "Hardware Address:"
 msgstr "Maskinvareadresse:"
 
 #. Driver
-#: ../src/applet-dialogs.c:457
+#: ../src/applet-dialogs.c:580
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:609
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../src/applet-dialogs.c:496
+#: ../src/applet-dialogs.c:619
 msgid "Security:"
 msgstr "Sikkerhet:"
 
-#: ../src/applet-dialogs.c:509
+#: ../src/applet-dialogs.c:632
 msgid "CINR:"
 msgstr "CINR:"
 
-#: ../src/applet-dialogs.c:522
+#: ../src/applet-dialogs.c:645
 msgid "BSID:"
 msgstr "BSID:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:550 ../src/applet-dialogs.c:657
-msgid "IP Address:"
-msgstr "IP-adresse:"
-
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:568
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: ../src/applet-dialogs.c:566
-msgid "Broadcast Address:"
-msgstr "Kringkastingsadresse:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:575
-msgid "Subnet Mask:"
-msgstr "Subnettmaske:"
-
-#: ../src/applet-dialogs.c:577
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: ../src/applet-dialogs.c:585 ../src/applet-dialogs.c:672
-msgid "Default Route:"
-msgstr "Forvalgt rute:"
-
-#: ../src/applet-dialogs.c:597
-msgid "Primary DNS:"
-msgstr "Primær DNS:"
-
-#: ../src/applet-dialogs.c:606
-msgid "Secondary DNS:"
-msgstr "Sekundær DNS:"
-
-#: ../src/applet-dialogs.c:616
-msgid "Ternary DNS:"
-msgstr "Ternær DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:631
+#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:640
+#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
 msgid "Ignored"
 msgstr "Ignorert"
 
-#: ../src/applet-dialogs.c:793
+#: ../src/applet-dialogs.c:814
 msgid "VPN Type:"
 msgstr "Type VPN:"
 
-#: ../src/applet-dialogs.c:800
+#: ../src/applet-dialogs.c:821
 msgid "VPN Gateway:"
 msgstr "VPN-gateway:"
 
-#: ../src/applet-dialogs.c:806
+#: ../src/applet-dialogs.c:827
 msgid "VPN Username:"
 msgstr "Brukernavn for VPN:"
 
-#: ../src/applet-dialogs.c:812
+#: ../src/applet-dialogs.c:833
 msgid "VPN Banner:"
 msgstr "VPN-topptekst:"
 
-#: ../src/applet-dialogs.c:818
+#: ../src/applet-dialogs.c:839
 msgid "Base Connection:"
 msgstr "Grunntilkobling:"
 
-#: ../src/applet-dialogs.c:820 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:883
+#: ../src/applet-dialogs.c:956
 msgid "No valid active connections found!"
 msgstr "Ingen gyldige aktive tilkoblinger funnet!"
 
-#: ../src/applet-dialogs.c:911
+#: ../src/applet-dialogs.c:984
 msgid ""
 "Copyright © 2004-2011 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1138,42 +1126,42 @@ msgstr ""
 "Opphavsrett © 2004-2011 Red Hat, Inc.\n"
 "Opphavsrett © 2005-2008 Novell, Inc."
 
-#: ../src/applet-dialogs.c:914
+#: ../src/applet-dialogs.c:987
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Panelprogram for håndtering av dine nettverksenheter og -tilkoblinger."
 
-#: ../src/applet-dialogs.c:916
+#: ../src/applet-dialogs.c:989
 msgid "NetworkManager Website"
 msgstr "NetworkManager nettsted"
 
-#: ../src/applet-dialogs.c:931
+#: ../src/applet-dialogs.c:1004
 msgid "Missing resources"
 msgstr "Mangler ressurser"
 
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:1029
 msgid "Mobile broadband network password"
 msgstr "Passord for tilkoblign med mobilt bredbånd"
 
-#: ../src/applet-dialogs.c:965
+#: ../src/applet-dialogs.c:1038
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Et passord kreves for å koble til «%s»."
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:1053
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/applet-dialogs.c:1261
+#: ../src/applet-dialogs.c:1334
 msgid "SIM PIN unlock required"
 msgstr "Du må låse opp PIN-koden for SIM"
 
-#: ../src/applet-dialogs.c:1262
+#: ../src/applet-dialogs.c:1335
 msgid "SIM PIN Unlock Required"
 msgstr "Du må låse opp PIN-kode for SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1264
+#: ../src/applet-dialogs.c:1337
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1182,25 +1170,25 @@ msgstr ""
 "Mobil bredbåndsenhet «%s» krever en PIN-kode for SIM før den kan brukes."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1266
+#: ../src/applet-dialogs.c:1339
 msgid "PIN code:"
 msgstr "PIN-kode:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1270
+#: ../src/applet-dialogs.c:1343
 msgid "Show PIN code"
 msgstr "Vis PIN-kode"
 
-#: ../src/applet-dialogs.c:1272
+#: ../src/applet-dialogs.c:1345
 msgid "SIM PUK unlock required"
 msgstr "Du må låse opp PUK-kode for SIM"
 
-#: ../src/applet-dialogs.c:1273
+#: ../src/applet-dialogs.c:1346
 msgid "SIM PUK Unlock Required"
 msgstr "Du må låse opp PUK-kode for SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1275
+#: ../src/applet-dialogs.c:1348
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1209,29 +1197,29 @@ msgstr ""
 "Mobil bredbåndsenhet «%s» krever en PUK-kode for SIM før den kan brukes."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1277
+#: ../src/applet-dialogs.c:1350
 msgid "PUK code:"
 msgstr "PUK-kode:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1280
+#: ../src/applet-dialogs.c:1353
 msgid "New PIN code:"
 msgstr "Ny PIN-kode:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1282
+#: ../src/applet-dialogs.c:1355
 msgid "Re-enter new PIN code:"
 msgstr "Tast inn ny PIN-kode igjen:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1287
+#: ../src/applet-dialogs.c:1360
 msgid "Show PIN/PUK codes"
 msgstr "Vis PIN/PUK-koder"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1344,7 +1332,7 @@ msgstr "R_ediger"
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:5
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:702
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -1572,14 +1560,12 @@ msgid "2:"
 msgstr "2:"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:30
-#, fuzzy
 msgid "3:"
-msgstr "3"
+msgstr "3:"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:31
-#, fuzzy
 msgid "4:"
-msgstr "4"
+msgstr "4:"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "5:"
@@ -1676,7 +1662,7 @@ msgstr "_Passord:"
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip6.c:142
+#: ../src/connection-editor/page-ip6.c:150
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatisk"
@@ -1804,7 +1790,7 @@ msgstr "Automatisk med manuelle DNS-innstillinger"
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:191
+#: ../src/connection-editor/page-ip6.c:199
 msgid "Manual"
 msgstr "Manuelt"
 
@@ -1816,17 +1802,17 @@ msgstr "Link-lokal"
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip6.c:219
 msgid "Shared to other computers"
 msgstr "Delt med andre datamaskiner"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_Metode:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "Adresser"
 
@@ -1841,7 +1827,7 @@ msgstr ""
 "for DHCP-klient kan du oppgi den her."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1854,16 +1840,16 @@ msgid "D_HCP client ID:"
 msgstr "Klient-ID for D_HCP:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/page-ip4.c:308
-#: ../src/connection-editor/page-ip6.c:307
+#: ../src/connection-editor/page-ip6.c:321
 msgid "S_earch domains:"
 msgstr "Søk_edomener:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 #: ../src/connection-editor/page-ip4.c:299
-#: ../src/connection-editor/page-ip6.c:298
+#: ../src/connection-editor/page-ip6.c:312
 msgid "DNS ser_vers:"
 msgstr "_DNS-tjenere"
 
@@ -1888,11 +1874,24 @@ msgstr ""
 "konfigurasjon fungerer når du kobler til et nettverk som har støtte for IPv6."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "_Routes…"
 msgstr "_Ruter …"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:197
+msgid "Disabled"
+msgstr "Slått av"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -1902,11 +1901,15 @@ msgstr ""
 "IP-adresse for navnetjenere som brukes for å slå opp vertsnavn. Bruk komma "
 "for å skille flere navnetjenere."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Krev IPv_6-adressering for at denne tilkoblingen skal fullføres"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2189,7 +2192,7 @@ msgstr ""
 #: ../src/connection-editor/ip4-routes-dialog.c:724
 #: ../src/connection-editor/ip6-routes-dialog.c:666
 #: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:887
+#: ../src/connection-editor/page-ip6.c:924
 msgid "Address"
 msgstr "Adresse"
 
@@ -2201,7 +2204,7 @@ msgstr "Nettmaske"
 #: ../src/connection-editor/ip4-routes-dialog.c:758
 #: ../src/connection-editor/ip6-routes-dialog.c:700
 #: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:921
+#: ../src/connection-editor/page-ip6.c:958
 msgid "Gateway"
 msgstr "Gateway"
 
@@ -2211,7 +2214,7 @@ msgid "Metric"
 msgstr "Metrisk"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:904
+#: ../src/connection-editor/page-ip6.c:941
 msgid "Prefix"
 msgstr "Prefiks"
 
@@ -2244,25 +2247,25 @@ msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:430 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
 #: ../src/libnm-gtk/nm-ui-utils.c:562
 msgid "Bond"
 msgstr "Koble sammen"
 
 #: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:255 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
 #: ../src/libnm-gtk/nm-ui-utils.c:564
 msgid "Team"
 msgstr ""
 
 #: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:212
+#: ../src/connection-editor/page-bridge.c:208
 #: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
 msgid "Bridge"
 msgstr "Bro"
 
 #: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:482 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
 #: ../src/libnm-gtk/nm-ui-utils.c:568
 msgid "VLAN"
 msgstr "VLAN"
@@ -2332,39 +2335,35 @@ 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:420
-msgid "_Save..."
-msgstr "_Lagre …"
-
-#: ../src/connection-editor/nm-connection-editor.c:421
 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:437
+#: ../src/connection-editor/nm-connection-editor.c:436
 msgid "Could not create connection"
 msgstr "Kunne ikke lage tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:437
+#: ../src/connection-editor/nm-connection-editor.c:436
 msgid "Could not edit connection"
 msgstr "Kunne ikke redigere tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:439
+#: ../src/connection-editor/nm-connection-editor.c:438
 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:573
+#: ../src/connection-editor/nm-connection-editor.c:572
 msgid "Error initializing editor"
 msgstr "Feil under initiering av redigering"
 
-#: ../src/connection-editor/nm-connection-editor.c:906
+#: ../src/connection-editor/nm-connection-editor.c:905
 msgid "Connection add failed"
 msgstr "Klarte ikke å legge til tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:946
+#: ../src/connection-editor/nm-connection-editor.c:945
 msgid "Error saving connection"
 msgstr "Feil under lagring av tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:947
+#: ../src/connection-editor/nm-connection-editor.c:946
 #, c-format
 msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "Egenskap «%s» / «%s» er ugyldig: %d"
@@ -2435,43 +2434,35 @@ msgid "Edit the selected connection"
 msgstr "Rediger valgt tilkobling"
 
 #: ../src/connection-editor/nm-connection-list.c:688
-msgid "_Edit..."
-msgstr "R_ediger …"
-
-#: ../src/connection-editor/nm-connection-list.c:689
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentiser for å redigere valgt tilkobling."
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:703
 msgid "Delete the selected connection"
 msgstr "Slett valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:705
-msgid "_Delete..."
-msgstr "_Slett …"
-
-#: ../src/connection-editor/nm-connection-list.c:706
+#: ../src/connection-editor/nm-connection-list.c:704
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentiser for å slette valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "No VPN plugins are installed."
 msgstr "Ingen VPN-tillegg er installert."
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:935
 #, 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:939
+#: ../src/connection-editor/nm-connection-list.c:937
 msgid "Error creating connection"
 msgstr "Feil under oppretting av tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:995
+#: ../src/connection-editor/nm-connection-list.c:993
 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:994
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Fant ingen tilkobling med UUID «%s»"
@@ -2488,20 +2479,20 @@ 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:433
+#: ../src/connection-editor/page-bond.c:436
 msgid "Could not load bond user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for sammenkobling."
 
-#: ../src/connection-editor/page-bond.c:587
+#: ../src/connection-editor/page-bond.c:590
 #, c-format
 msgid "Bond connection %d"
 msgstr "Sammenkoblet tilkobling %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:211
 msgid "Could not load bridge user interface."
 msgstr "Kunne ikke laste brukergrensesnitt."
 
-#: ../src/connection-editor/page-bridge.c:310
+#: ../src/connection-editor/page-bridge.c:306
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Sammenkoblet tilkobling %d"
@@ -2517,11 +2508,11 @@ msgstr "Port for sammenkobling"
 msgid "Could not load bridge port user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for port for sammenkobling."
 
-#: ../src/connection-editor/page-dcb.c:607
+#: ../src/connection-editor/page-dcb.c:606
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:609
+#: ../src/connection-editor/page-dcb.c:608
 msgid "Could not load DCB user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for DSB."
 
@@ -2588,32 +2579,32 @@ msgid "InfiniBand connection %d"
 msgstr "InfiniBand-tilkobling %d"
 
 #: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (VPN)"
 msgstr "Automatisk (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:141
 msgid "Automatic (VPN) addresses only"
 msgstr "Kun automatiske (VPN) adresser"
 
 #: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:144
 msgid "Automatic (PPP)"
 msgstr "Automatisk (PPP)"
 
 #: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:145
 msgid "Automatic (PPP) addresses only"
 msgstr "Kun automatiske (PPP) adresser"
 
 #: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip6.c:147
 msgid "Automatic (PPPoE)"
 msgstr "Automatisk (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Kunn automatiske (PPPoE) adresser"
 
@@ -2626,21 +2617,17 @@ msgid "Automatic (DHCP) addresses only"
 msgstr "Kun automatiske (DHCP) adresser"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip6.c:212
 msgid "Link-Local Only"
 msgstr "Kun lokal link"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Slått av"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:310
 msgid "Additional DNS ser_vers:"
 msgstr "Flere _DNS-tjenere:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:319
 msgid "Additional s_earch domains:"
 msgstr "Flere søk_edomener:"
 
@@ -2657,28 +2644,28 @@ msgstr "IPv4-innstillinger"
 msgid "Could not load IPv4 user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv4"
 
-#: ../src/connection-editor/page-ip6.c:143
+#: ../src/connection-editor/page-ip6.c:151
 msgid "Automatic, addresses only"
 msgstr "Automatisk, kun adresser"
 
-#: ../src/connection-editor/page-ip6.c:155
+#: ../src/connection-editor/page-ip6.c:163
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:187
 msgid "Automatic, DHCP only"
 msgstr "Automatisk. Kun DHCP"
 
-#: ../src/connection-editor/page-ip6.c:819
+#: ../src/connection-editor/page-ip6.c:856
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Rediger IPv6-ruter for %s"
 
-#: ../src/connection-editor/page-ip6.c:969
+#: ../src/connection-editor/page-ip6.c:1007
 msgid "IPv6 Settings"
 msgstr "IPv6-innstillinger"
 
-#: ../src/connection-editor/page-ip6.c:971
+#: ../src/connection-editor/page-ip6.c:1009
 msgid "Could not load IPv6 user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv6."
 
@@ -2688,9 +2675,9 @@ msgid "Duplicate slaves"
 msgstr "Dupliserte slaver"
 
 #: ../src/connection-editor/page-master.c:245
-#, c-format, fuzzy
+#, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
-msgstr "Slaver «%s» og «%s» er begge på enhet «%s»"
+msgstr "Slaver «%s» og «%s» brukes begge på enhet «%s»"
 
 #: ../src/connection-editor/page-master.c:256
 #, c-format
@@ -2749,24 +2736,24 @@ msgid "EAP"
 msgstr "EAP"
 
 #: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:248
+#: ../src/wireless-security/eap-method-ttls.c:255
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:298
+#: ../src/wireless-security/eap-method-ttls.c:300
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:264
-#: ../src/wireless-security/eap-method-ttls.c:281
+#: ../src/wireless-security/eap-method-fast.c:281
+#: ../src/wireless-security/eap-method-peap.c:269
+#: ../src/wireless-security/eap-method-ttls.c:285
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../src/wireless-security/eap-method-ttls.c:270
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -2788,23 +2775,23 @@ msgstr "PPP-innstillinger"
 msgid "Could not load PPP user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for PPP."
 
-#: ../src/connection-editor/page-team.c:94
+#: ../src/connection-editor/page-team.c:92
 #: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:234
+#: ../src/connection-editor/vpn-helpers.c:239
 msgid "Select file to import"
 msgstr "Velg fil som skal importeres"
 
-#: ../src/connection-editor/page-team.c:114
+#: ../src/connection-editor/page-team.c:112
 #: ../src/connection-editor/page-team-port.c:97
 msgid "Error: file doesn't contain a valid JSON configuration"
 msgstr "Feil: filen inneholder ikke en gyldig JSON-konfigurasjon"
 
-#: ../src/connection-editor/page-team.c:258
+#: ../src/connection-editor/page-team.c:247
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for vlan."
 
-#: ../src/connection-editor/page-team.c:353
+#: ../src/connection-editor/page-team.c:342
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "DSL-tilkobling %d"
@@ -2825,16 +2812,16 @@ msgstr "Kunne ikke laste brukergrensesnitt for port for sammenkobling."
 #. Translators: the first %s is a device name (eg, "em1"), the
 #. * second is a connection name (eg, "Auto Ethernet").
 #.
-#: ../src/connection-editor/page-vlan.c:318
+#: ../src/connection-editor/page-vlan.c:323
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (via «%s»)"
 
-#: ../src/connection-editor/page-vlan.c:484
+#: ../src/connection-editor/page-vlan.c:489
 msgid "Could not load vlan user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for vlan."
 
-#: ../src/connection-editor/page-vlan.c:680
+#: ../src/connection-editor/page-vlan.c:685
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-tilkobling %d"
@@ -2901,27 +2888,27 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi-tilkobling %d"
 
 #: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:892
+#: ../src/libnm-gtk/nm-wifi-dialog.c:898
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit nøkkel (Heksadesimal eller ASCII)"
 
 #: ../src/connection-editor/page-wifi-security.c:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:901
+#: ../src/libnm-gtk/nm-wifi-dialog.c:907
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit passord"
 
 #: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/libnm-gtk/nm-wifi-dialog.c:937
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisk WEP (802.1x)"
 
 #: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:945
+#: ../src/libnm-gtk/nm-wifi-dialog.c:951
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 personlig"
 
 #: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:959
+#: ../src/libnm-gtk/nm-wifi-dialog.c:965
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
@@ -2948,11 +2935,11 @@ msgstr "Kunne ikke laste brukergrensesnitt for WiMAX."
 msgid "WiMAX connection %d"
 msgstr "WiMAX-tilkobling %d"
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:212
 msgid "Cannot import VPN connection"
 msgstr "Kan ikke importere VPN-tilkobling"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:214
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2965,25 +2952,25 @@ msgstr ""
 "\n"
 "Feil: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:284
+#: ../src/connection-editor/vpn-helpers.c:289
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "En fil med navn «%s» eksisterer allerede."
 
-#: ../src/connection-editor/vpn-helpers.c:286
+#: ../src/connection-editor/vpn-helpers.c:291
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: ../src/connection-editor/vpn-helpers.c:288
+#: ../src/connection-editor/vpn-helpers.c:293
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Vil du erstatte %s med VPN-tilkoblingen du lagrer?"
 
-#: ../src/connection-editor/vpn-helpers.c:324
+#: ../src/connection-editor/vpn-helpers.c:329
 msgid "Cannot export VPN connection"
 msgstr "Kan ikke eksportere VPN-tilkobling"
 
-#: ../src/connection-editor/vpn-helpers.c:326
+#: ../src/connection-editor/vpn-helpers.c:331
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2994,7 +2981,7 @@ msgstr ""
 "\n"
 "Feil: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:361
+#: ../src/connection-editor/vpn-helpers.c:366
 msgid "Export VPN connection..."
 msgstr "Eksporter VPN-tilkobling …"
 
@@ -3040,7 +3027,7 @@ msgid "Failed to create DUN connection: %s"
 msgstr "Kunne ikke lage en DUN-tilkobling: %s"
 
 #: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:947
+#: ../src/gnome-bluetooth/nma-bt-device.c:957
 msgid "Your phone is now ready to use!"
 msgstr "Telefonen er klar til bruk!"
 
@@ -3056,28 +3043,28 @@ msgstr "Ukjent enhetstype for telefon (ikke GSM eller CDMA)"
 msgid "unknown modem type."
 msgstr "ukjent modemtype."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:721
-#: ../src/gnome-bluetooth/nma-bt-device.c:727
+#: ../src/gnome-bluetooth/nma-bt-device.c:726
+#: ../src/gnome-bluetooth/nma-bt-device.c:732
 msgid "failed to connect to the phone."
 msgstr "klarte ikke å koble til telefonen."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:758
+#: ../src/gnome-bluetooth/nma-bt-device.c:745
+msgid "error getting bus connection"
+msgstr "feil ved tilkobling til buss"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:799
 msgid "unexpectedly disconnected from the phone."
 msgstr "koblet fra telefonen uventet."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:768
+#: ../src/gnome-bluetooth/nma-bt-device.c:809
 msgid "timed out detecting phone details."
 msgstr "tidsavbrudd under henting av detaljer om telefonen."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:779
+#: ../src/gnome-bluetooth/nma-bt-device.c:820
 msgid "Detecting phone configuration..."
 msgstr "Gjenkjenner telefonkonfigurasjon …"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:811
-msgid "error getting bus connection"
-msgstr "feil ved tilkobling til buss"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:908
+#: ../src/gnome-bluetooth/nma-bt-device.c:918
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
@@ -3085,12 +3072,12 @@ msgstr ""
 "Forvalgt Bluetooth-enhet må slås på før du setter opp en oppringt "
 "nettverkstilkobling."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:945
+#: ../src/gnome-bluetooth/nma-bt-device.c:955
 #, c-format
 msgid "Failed to create PAN connection: %s"
 msgstr "Kunne ikke lage en PAN-tilkobling: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:966
+#: ../src/gnome-bluetooth/nma-bt-device.c:976
 #, c-format
 msgid "%s Network"
 msgstr "%s nettverk:"
@@ -3146,23 +3133,23 @@ msgstr ""
 "endre dine innstillinger for mobil bredbåndstilkobling kan du velge "
 "«Nettverkstilkoblinger» fra menyen System->Brukervalg."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:266
+#: ../src/libnm-gtk/nm-mobile-wizard.c:267
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Bekreft innstillinger for mobilt bredbånd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:330
+#: ../src/libnm-gtk/nm-mobile-wizard.c:331
 msgid "Unlisted"
 msgstr "Ikke listet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:461
+#: ../src/libnm-gtk/nm-mobile-wizard.c:462
 msgid "_Select your plan:"
 msgstr "_Velg din plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:485
+#: ../src/libnm-gtk/nm-mobile-wizard.c:486
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "_APN (Navn på aksesspunkt) for valgt plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:505
+#: ../src/libnm-gtk/nm-mobile-wizard.c:506
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -3174,67 +3161,67 @@ msgstr ""
 "\n"
 "Spør tilbyder om APN for ditt abonnement hvis du er usikker."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:512
+#: ../src/libnm-gtk/nm-mobile-wizard.c:514
 msgid "Choose your Billing Plan"
 msgstr "Velg din betalingsplan"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:561
+#: ../src/libnm-gtk/nm-mobile-wizard.c:563
 msgid "My plan is not listed..."
 msgstr "Min plan er ikke på listen …"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:714
+#: ../src/libnm-gtk/nm-mobile-wizard.c:716
 msgid "Select your provider from a _list:"
 msgstr "Velg din tilbyder fra en _liste:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:727
+#: ../src/libnm-gtk/nm-mobile-wizard.c:729
 msgid "Provider"
 msgstr "Tilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:752
+#: ../src/libnm-gtk/nm-mobile-wizard.c:754
 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:765
+#: ../src/libnm-gtk/nm-mobile-wizard.c:767
 msgid "Provider:"
 msgstr "Tilbyder:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:782
+#: ../src/libnm-gtk/nm-mobile-wizard.c:784
 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:784
+#: ../src/libnm-gtk/nm-mobile-wizard.c:786
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Min tilbyder bruker CDMA-teknologi (1xRTT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:795
+#: ../src/libnm-gtk/nm-mobile-wizard.c:797
 msgid "Choose your Provider"
 msgstr "Velg din tilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
 msgid "Country or Region List:"
 msgstr "Liste med land eller regioner:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1060
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
 msgid "Country or region"
 msgstr "Land eller region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
 msgid "My country is not listed"
 msgstr "Landet mitt er ikke på listen"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1120
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
 msgid "Choose your Provider's Country or Region"
 msgstr "Velg din tilbyders land eller region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1174
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
 msgid "Installed GSM device"
 msgstr "Installert GSM-enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
 msgid "Installed CDMA device"
 msgstr "Installert CDMA-enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1345
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -3242,37 +3229,37 @@ msgstr ""
 "Denne assistenten hjelper deg å sette opp en mobil bredbåndstilkobling til "
 "et mobilnettverk (3G)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1350
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
 msgid "You will need the following information:"
 msgstr "Du trenger følgende informasjon:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
 msgid "Your broadband provider's name"
 msgstr "Navnet på din bredbåndstilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
 msgid "Your broadband billing plan name"
 msgstr "Navn på betalingsplan for bredbånd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1373
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
 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:1402
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
 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:1417
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
 msgid "Any device"
 msgstr "Enhver enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Sett opp en mobil bredbåndstilkobling"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
 msgid "New Mobile Broadband Connection"
 msgstr "Ny mobil bredbåndstilkobling"
 
@@ -3312,20 +3299,20 @@ msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:435
+#: ../src/libnm-gtk/nm-wifi-dialog.c:441
 msgid "New..."
 msgstr "Ny …"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:875
+#: ../src/libnm-gtk/nm-wifi-dialog.c:881
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1046
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
 msgid "C_reate"
 msgstr "_Lag:"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1130
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3333,35 +3320,35 @@ msgstr ""
 "Passord eller krypteringsnøkler er nødvendig for å koble til Wi-Fi-nettverk "
 "«%s»."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1132
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentisering for Wi-Fi-nettverk kreves"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1134
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentisering kreves av Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
 msgid "Create New Wi-Fi Network"
 msgstr "Lag et nytt Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
 msgid "New Wi-Fi network"
 msgstr "Nytt Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Oppgi et navn på Wi-Fi-nettverket du ønsker å opprette."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Koble til skjult Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
 msgid "Hidden Wi-Fi network"
 msgstr "Skjult Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3509,11 +3496,11 @@ msgstr "PIN-kode kreves for enhet for mobilt bredbånd"
 msgid "%s connection"
 msgstr "%s-tilkobling"
 
-#: ../src/utils/utils.c:376
+#: ../src/utils/utils.c:379
 msgid "Store the password only for this _user"
 msgstr "Lagre passordet kun for denne br_ukeren"
 
-#: ../src/utils/utils.c:378
+#: ../src/utils/utils.c:381
 msgid "Store the password for _all users"
 msgstr "Lagre passordet for _alle brukere"
 
@@ -3525,20 +3512,21 @@ msgstr "DER, PEM eller PKCS#12 private nøkler (*.der, *.pem, *.p12, *.key)"
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER eller PEM-sertifikater (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:298
+#: ../src/wireless-security/eap-method-fast.c:266
+#: ../src/wireless-security/eap-method-peap.c:299
+#: ../src/wireless-security/eap-method-ttls.c:330
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:400
+#: ../src/wireless-security/eap-method-fast.c:404
 msgid "Choose a PAC file..."
 msgstr "Velg en PAC-fil …"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:411
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:415
 msgid "All files"
 msgstr "Alle filer"
 
@@ -3574,14 +3562,15 @@ msgstr "_Indre autentisering:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillat automatisk PAC-pro_visjonering"
 
-#: ../src/wireless-security/eap-method-peap.c:281
-#: ../src/wireless-security/wireless-security.c:417
+#: ../src/wireless-security/eap-method-peap.c:284
+#: ../src/wireless-security/eap-method-ttls.c:315
+#: ../src/wireless-security/wireless-security.c:418
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:377
-#: ../src/wireless-security/eap-method-tls.c:464
-#: ../src/wireless-security/eap-method-ttls.c:377
+#: ../src/wireless-security/eap-method-peap.c:378
+#: ../src/wireless-security/eap-method-tls.c:461
+#: ../src/wireless-security/eap-method-ttls.c:409
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Velg et Certificate Authority-sertifikat …"
 
@@ -3613,11 +3602,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:279
+#: ../src/wireless-security/eap-method-tls.c:276
 msgid "Unencrypted private keys are insecure"
 msgstr "Private nøkler uten kryptering er ikke sikre"
 
-#: ../src/wireless-security/eap-method-tls.c:282
+#: ../src/wireless-security/eap-method-tls.c:279
 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 "
@@ -3631,11 +3620,11 @@ msgstr ""
 "\n"
 "Du kan passordbeskytte din private nøkkel med openssl"
 
-#: ../src/wireless-security/eap-method-tls.c:458
+#: ../src/wireless-security/eap-method-tls.c:455
 msgid "Choose your personal certificate..."
 msgstr "Velg ditt personlige sertifikat …"
 
-#: ../src/wireless-security/eap-method-tls.c:470
+#: ../src/wireless-security/eap-method-tls.c:467
 msgid "Choose your private key..."
 msgstr "Velg din private nøkkel …"
 
@@ -3655,7 +3644,7 @@ msgstr "Privat nø_kkel:"
 msgid "_Private key password:"
 msgstr "Passord for _privat nøkkel:"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:430
 msgid "TLS"
 msgstr "TLS"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]