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

From: Kjartan Maraas <kmaraas src gnome org>
To: commits-list gnome org
Cc:
Subject: [network-manager-applet] Updated Norwegian bokmål tran slation
Date: Mon, 10 Feb 2014 06:51:26 +0000 (UTC)
commit e58c9cb3d13be125321d17f9b08bac5aed410f93
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Mon Feb 10 07:51:13 2014 +0100

    Updated Norwegian bokmål translation

 po/nb.po |  897 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 513 insertions(+), 384 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index d4e34ad..aabd72e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,15 +1,15 @@
 # Norwegian bokmål translation of network-manager-applet.
 # This file is distributed under the same license as the NetworkManager package.
 # Copyright (C) 2004, 2005 Red Hat, Inc.
-# Kjartan Maraas <kmaraas gnome org>, 2004-2013.
+# Kjartan Maraas <kmaraas gnome org>, 2004-2014.
 # Terance Edward Sola <terance lyse net>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager 0.9.8.x\n"
+"Project-Id-Version: NetworkManager 0.9.9.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-20 10:48+0200\n"
-"PO-Revision-Date: 2013-06-20 10:48+0200\n"
+"POT-Creation-Date: 2014-02-10 07:48+0100\n"
+"PO-Revision-Date: 2014-02-10 07:51+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"
@@ -126,7 +126,7 @@ msgstr ""
 "Sett denne til «true» for å slå av advarsler om CA-sertifikater i fase 2 av "
 "EAP-autentisering."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
 msgid "802.1X authentication"
 msgstr "802.1X-autentisering"
 
@@ -135,37 +135,37 @@ msgstr "802.1X-autentisering"
 msgid "_Network name:"
 msgstr "_Nettverksnavn:"
 
-#: ../src/applet.c:563
+#: ../src/applet.c:574
 msgid "Failed to add/activate connection"
 msgstr "Kunne ikke å legge til/slå på tilkobling"
 
-#: ../src/applet.c:565 ../src/applet.c:609 ../src/applet.c:635
-#: ../src/applet-device-wifi.c:1377 ../src/applet-device-wifi.c:1396
+#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
+#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../src/applet.c:568 ../src/applet.c:638 ../src/applet-device-wifi.c:1380
-#: ../src/applet-device-wifi.c:1399
+#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
+#: ../src/applet-device-wifi.c:1350
 msgid "Connection failure"
 msgstr "Feil med tilkobling"
 
-#: ../src/applet.c:607
+#: ../src/applet.c:618
 msgid "Device disconnect failed"
 msgstr "Frakobling av enhet feilet"
 
-#: ../src/applet.c:612
+#: ../src/applet.c:623
 msgid "Disconnect failure"
 msgstr "Feil ved frakobling"
 
-#: ../src/applet.c:633
+#: ../src/applet.c:644
 msgid "Connection activation failed"
 msgstr "Aktivering av tilkobling feilet"
 
-#: ../src/applet.c:946 ../src/applet-device-wifi.c:1065
+#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
 msgid "Don't show this message again"
 msgstr "Ikke vis denne meldingen igjen"
 
-#: ../src/applet.c:1035
+#: ../src/applet.c:1046
 #, c-format
 msgid ""
 "\n"
@@ -175,7 +175,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi nettverksforbindelsen ble avbrutt."
 
-#: ../src/applet.c:1038
+#: ../src/applet.c:1049
 #, c-format
 msgid ""
 "\n"
@@ -184,7 +184,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten stoppet uventet."
 
-#: ../src/applet.c:1041
+#: ../src/applet.c:1052
 #, c-format
 msgid ""
 "\n"
@@ -195,7 +195,7 @@ msgstr ""
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten returnerte ugyldig "
 "konfigurasjon."
 
-#: ../src/applet.c:1044
+#: ../src/applet.c:1055
 #, c-format
 msgid ""
 "\n"
@@ -204,7 +204,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet pga tidsavbrudd for tilkoblingsforsøket."
 
-#: ../src/applet.c:1047
+#: ../src/applet.c:1058
 #, c-format
 msgid ""
 "\n"
@@ -213,7 +213,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten ikke startet i tide."
 
-#: ../src/applet.c:1050
+#: ../src/applet.c:1061
 #, c-format
 msgid ""
 "\n"
@@ -222,7 +222,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten ikke klarte å starte opp."
 
-#: ../src/applet.c:1053
+#: ../src/applet.c:1064
 #, c-format
 msgid ""
 "\n"
@@ -231,7 +231,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi det ikke finnes gyldige VPN-passord."
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:1067
 #, c-format
 msgid ""
 "\n"
@@ -240,7 +240,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet pga ugyldig hemmelighet for VPN."
 
-#: ../src/applet.c:1063
+#: ../src/applet.c:1074
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet."
 
-#: ../src/applet.c:1081
+#: ../src/applet.c:1092
 #, c-format
 msgid ""
 "\n"
@@ -259,7 +259,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» ble koblet fra fordi nettverkstilkoblingen ble avbrutt."
 
-#: ../src/applet.c:1084
+#: ../src/applet.c:1095
 #, c-format
 msgid ""
 "\n"
@@ -268,7 +268,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» koblet fra fordi VPN-tjenesten stoppet."
 
-#: ../src/applet.c:1090
+#: ../src/applet.c:1101
 #, c-format
 msgid ""
 "\n"
@@ -277,7 +277,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» koblet fra."
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:1131
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -288,19 +288,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1122
+#: ../src/applet.c:1133
 msgid "VPN connection has been successfully established.\n"
 msgstr "Etablering av VPN-tilkobling er fullført.\n"
 
-#: ../src/applet.c:1124
+#: ../src/applet.c:1135
 msgid "VPN Login Message"
 msgstr "Påloggingsmelding for VPN"
 
-#: ../src/applet.c:1130 ../src/applet.c:1138 ../src/applet.c:1188
+#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
 msgid "VPN Connection Failed"
 msgstr "VPN-tilkobling feilet"
 
-#: ../src/applet.c:1195
+#: ../src/applet.c:1206
 #, c-format
 msgid ""
 "\n"
@@ -313,7 +313,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1198
+#: ../src/applet.c:1209
 #, c-format
 msgid ""
 "\n"
@@ -326,156 +326,156 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1522
+#: ../src/applet.c:1533
 msgid "device not ready (firmware missing)"
 msgstr "enheten er ikke klar (fastvare mangler)"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1535
 msgid "device not ready"
 msgstr "enheten er ikke klar"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1534 ../src/applet-device-ethernet.c:123
+#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
 #: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
 msgid "disconnected"
 msgstr "frakoblet"
 
-#: ../src/applet.c:1550
+#: ../src/applet.c:1561
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../src/applet.c:1564
+#: ../src/applet.c:1575
 msgid "device not managed"
 msgstr "enheten er ikke håndtert"
 
-#: ../src/applet.c:1722
+#: ../src/applet.c:1735
 msgid "No network devices available"
 msgstr "Ingen nettverksenheter tilgjengelig"
 
-#: ../src/applet.c:1775
+#: ../src/applet.c:1788
 msgid "_VPN Connections"
 msgstr "_VPN-tilkoblinger"
 
-#: ../src/applet.c:1832
+#: ../src/applet.c:1845
 msgid "_Configure VPN..."
 msgstr "_Sett opp VPN …"
 
-#: ../src/applet.c:1836
+#: ../src/applet.c:1849
 msgid "_Disconnect VPN"
 msgstr "Ko_ble fra VPN"
 
-#: ../src/applet.c:1952
+#: ../src/applet.c:1965
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager kjører ikke …"
 
-#: ../src/applet.c:1957 ../src/applet.c:2927
+#: ../src/applet.c:1970 ../src/applet.c:2940
 msgid "Networking disabled"
 msgstr "Nettverk slått av"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2177
+#: ../src/applet.c:2190
 msgid "Enable _Networking"
 msgstr "Slå på _nettverk"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2186
+#: ../src/applet.c:2199
 msgid "Enable _Wi-Fi"
 msgstr "Slå på _trådløst"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2195
+#: ../src/applet.c:2208
 msgid "Enable _Mobile Broadband"
 msgstr "Slå på _mobilt bredbånd"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2204
+#: ../src/applet.c:2217
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "Slå på WiMA_X mobilt bredbånd"
 
 #. Toggle notifications item
-#: ../src/applet.c:2215
+#: ../src/applet.c:2228
 msgid "Enable N_otifications"
 msgstr "Slå på _varsling"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2226
+#: ../src/applet.c:2239
 msgid "Connection _Information"
 msgstr "Tilkoblings_informasjon"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2236
+#: ../src/applet.c:2249
 msgid "Edit Connections..."
 msgstr "Rediger tilkoblinger …"
 
 #. Help item
-#: ../src/applet.c:2250
+#: ../src/applet.c:2263
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. About item
-#: ../src/applet.c:2259
+#: ../src/applet.c:2272
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2512
+#: ../src/applet.c:2525
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Du er nå koblet til «%s»."
 
-#: ../src/applet.c:2553
+#: ../src/applet.c:2566
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: ../src/applet.c:2554
+#: ../src/applet.c:2567
 msgid "The network connection has been disconnected."
 msgstr "Nettverksforbindelsen har blitt frakoblet."
 
-#: ../src/applet.c:2789
+#: ../src/applet.c:2802
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Forbereder nettverkstilkobling «%s» …"
 
-#: ../src/applet.c:2792
+#: ../src/applet.c:2805
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Brukerautentisering kreves for nettverkstilkobling «%s» …"
 
-#: ../src/applet.c:2795 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:590
+#: ../src/applet.c:2808 ../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:2798
+#: ../src/applet.c:2811
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Nettverkstilkobling «%s» er aktiv"
 
-#: ../src/applet.c:2881
+#: ../src/applet.c:2894
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Starter VPN-tilkobling «%s» …"
 
-#: ../src/applet.c:2884
+#: ../src/applet.c:2897
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Brukerautentisering kreves for VPN-tilkobling «%s» …"
 
-#: ../src/applet.c:2887
+#: ../src/applet.c:2900
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Ber om en nettverksadresse på VPN for «%s» …"
 
-#: ../src/applet.c:2890
+#: ../src/applet.c:2903
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-tilkobling «%s» er aktiv"
 
-#: ../src/applet.c:2932
+#: ../src/applet.c:2945
 msgid "No network connection"
 msgstr "Ingen nettverksforbindelse"
 
-#: ../src/applet.c:3639
+#: ../src/applet.c:3615
 msgid "NetworkManager Applet"
 msgstr "NetworkManager panelprogram"
 
@@ -483,8 +483,8 @@ msgstr "NetworkManager panelprogram"
 #: ../src/applet-device-broadband.c:769 ../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-vlan.c:190 ../src/applet-device-wifi.c:856
-#: ../src/applet-device-wimax.c:276
+#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
+#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
 msgid "Available"
 msgstr "Tilgjengelige"
 
@@ -492,8 +492,8 @@ msgstr "Tilgjengelige"
 #: ../src/applet-device-broadband.c:796 ../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-vlan.c:203 ../src/applet-device-wifi.c:1262
-#: ../src/applet-device-wimax.c:401
+#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
+#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
 msgid "Connection Established"
 msgstr "Tilkoblingen er satt opp"
 
@@ -517,7 +517,8 @@ msgid "User authentication required for bond connection '%s'..."
 msgstr "Brukerautentisering kreves for bundet tilkobling «%s» …"
 
 #: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-vlan.c:237
+#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
+#: ../src/applet-device-vlan.c:237
 #, c-format
 msgid "Requesting address for '%s'..."
 msgstr "Ber om en nettverksadresse for «%s» …"
@@ -565,15 +566,15 @@ 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:425
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:421
 #, 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-gsm.c:305
-#: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/new-connection.c:114
+#: ../src/connection-editor/page-mobile.c:351
 #: ../src/libnm-gtk/nm-ui-utils.c:333
 msgid "Mobile Broadband"
 msgstr "Mobilt bredbånd"
@@ -592,12 +593,12 @@ msgid "Mobile Broadband network."
 msgstr "Mobilt bredbåndsnettverk."
 
 #: ../src/applet-device-broadband.c:933 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:663
+#: ../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-gsm.c:669
+#: ../src/applet-device-gsm.c:668
 msgid "You are now registered on a roaming network."
 msgstr "Du er nå registrert på et roaming nettverk."
 
@@ -606,24 +607,24 @@ msgid "You are now connected to the mobile broadband network."
 msgstr "Du er nå koblet til mobilt bredbåndsnettverk."
 
 #: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:581
+#: ../src/mobile-helpers.c:582
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Forbereder mobil bredbåndsforbindelse «%s» …"
 
 #: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:584
+#: ../src/mobile-helpers.c:585
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Konfigurerer mobil bredbåndsforbindelse «%s» …"
 
 #: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:587
+#: ../src/mobile-helpers.c:588
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Brukerautentisering kreves for mobil bredbåndsforbindelse «%s» …"
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:607
+#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobil bredbåndsforbindelse «%s» er aktiv"
@@ -705,7 +706,7 @@ msgstr "Ny tilkobling med mobilt bredbånd (GSM) …"
 msgid "You are now connected to the GSM network."
 msgstr "Du er nå tilkoblet GSM-nettverk."
 
-#: ../src/applet-device-gsm.c:662 ../src/applet-device-gsm.c:668
+#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
 msgid "GSM network."
 msgstr "GSM-nettverk."
 
@@ -755,6 +756,31 @@ msgstr "Brukerautentisering kreves for InfiniBand-tilkobling «%s» …"
 msgid "InfiniBand connection '%s' active"
 msgstr "InfiniBand-tilkobling «%s» er aktiv"
 
+#: ../src/applet-device-team.c:86
+#, fuzzy
+msgid "You are now connected to the teamed network."
+msgstr "Du er nå koblet til ethernet-nettverket."
+
+#: ../src/applet-device-team.c:110
+#, fuzzy, c-format
+msgid "Preparing team connection '%s'..."
+msgstr "Forbereder bro-tilkobling «%s» …"
+
+#: ../src/applet-device-team.c:113
+#, fuzzy, c-format
+msgid "Configuring team connection '%s'..."
+msgstr "Konfigurerer bro-tilkobling «%s» …"
+
+#: ../src/applet-device-team.c:116
+#, fuzzy, c-format
+msgid "User authentication required for team connection '%s'..."
+msgstr "Brukerautentisering kreves for VPN-tilkobling «%s» …"
+
+#: ../src/applet-device-team.c:123
+#, fuzzy, c-format
+msgid "Team connection '%s' active"
+msgstr "VPN-tilkobling «%s» er aktiv"
+
 #: ../src/applet-device-vlan.c:204
 msgid "You are now connected to the VLAN."
 msgstr "Du er nå tilkoblet VLAN."
@@ -779,94 +805,94 @@ msgstr "Brukerautentisering kreves for VPN-tilkobling «%s» …"
 msgid "VLAN connection '%s' active"
 msgstr "VPN-tilkobling «%s» er aktiv"
 
-#: ../src/applet-device-wifi.c:98
+#: ../src/applet-device-wifi.c:96
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Koble til skjult Wi-Fi-nettverk …"
 
-#: ../src/applet-device-wifi.c:149
+#: ../src/applet-device-wifi.c:147
 msgid "Create _New Wi-Fi Network..."
 msgstr "Lag _nytt Wi-Fi-nettverk …"
 
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:291
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../src/applet-device-wifi.c:788
+#: ../src/applet-device-wifi.c:769
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi-nettverk (%s)"
 
-#: ../src/applet-device-wifi.c:790
+#: ../src/applet-device-wifi.c:771
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi-nettverk (%s)"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:773
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi-nettverk"
 msgstr[1] "Wi-Fi-nettverk"
 
-#: ../src/applet-device-wifi.c:821
+#: ../src/applet-device-wifi.c:802
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi er slått av"
 
-#: ../src/applet-device-wifi.c:822
+#: ../src/applet-device-wifi.c:803
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi er slått av med bryter"
 
-#: ../src/applet-device-wifi.c:883
+#: ../src/applet-device-wifi.c:864
 msgid "More networks"
 msgstr "Flere nettverk"
 
-#: ../src/applet-device-wifi.c:1061
+#: ../src/applet-device-wifi.c:1042
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi-nettverk er tilgjengelige"
 
-#: ../src/applet-device-wifi.c:1062
+#: ../src/applet-device-wifi.c:1043
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Bruk nettverksmenyen for å koble til et Wi-Fi-nettverk"
 
-#: ../src/applet-device-wifi.c:1261
+#: ../src/applet-device-wifi.c:1242
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Du er nå koblet til Wi-Fi-nettverk «%s»."
 
-#: ../src/applet-device-wifi.c:1292
+#: ../src/applet-device-wifi.c:1273
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Forbereder Wi-Fi-nettverkstilkobling «%s» …"
 
-#: ../src/applet-device-wifi.c:1295
+#: ../src/applet-device-wifi.c:1276
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Konfigurerer Wi-Fi-nettverkstilkobling «%s» …"
 
-#: ../src/applet-device-wifi.c:1298
+#: ../src/applet-device-wifi.c:1279
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Brukerautentisering kreves for Wi-Fi-nettverk «%s» …"
 
-#: ../src/applet-device-wifi.c:1301
+#: ../src/applet-device-wifi.c:1282
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Ber om en Wi-Fi-nettverksadresse for «%s» …"
 
-#: ../src/applet-device-wifi.c:1322
+#: ../src/applet-device-wifi.c:1303
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Wi-Fi-nettverkstilkobling «%s» er aktiv: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1327
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wi-Fi-nettverkforbindelse «%s» er aktiv"
 
-#: ../src/applet-device-wifi.c:1375
+#: ../src/applet-device-wifi.c:1326
 msgid "Failed to activate connection"
 msgstr "Kunne ikke å aktivere tilkobling"
 
-#: ../src/applet-device-wifi.c:1394
+#: ../src/applet-device-wifi.c:1345
 msgid "Failed to add new connection"
 msgstr "Klarte ikke å legge til ny tilkobling"
 
@@ -891,12 +917,12 @@ msgstr "WiMAX er slått av med bryter"
 msgid "You are now connected to the WiMAX network."
 msgstr "Du er nå tilkoblet WiMAX-nettverket."
 
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:602
+#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Mobil bredbåndsforbindelse «%s» er aktiv: (%d%%%s%s)"
 
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:605
+#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
 msgid "roaming"
 msgstr "roaming"
 
@@ -905,9 +931,9 @@ msgid "Error displaying connection information:"
 msgstr "Feil under visning av tilkoblingsinformasjon:"
 
 #: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:433
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnm-gtk/nm-wifi-dialog.c:918
+#: ../src/wireless-security/wireless-security.c:441
 msgid "LEAP"
 msgstr "LEAP"
 
@@ -915,195 +941,195 @@ msgstr "LEAP"
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:246
-#: ../src/applet-dialogs.c:248
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
+#: ../src/applet-dialogs.c:244
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:240
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:252 ../src/applet-dialogs.c:261
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
+#: ../src/connection-editor/page-wifi-security.c:261
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/applet-dialogs.c:278
+#: ../src/applet-dialogs.c:274
 #, c-format
 msgid "%s (default)"
 msgstr "%s (forvalg)"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:485
+#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:481
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:487
+#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:483
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/applet-dialogs.c:362
+#: ../src/applet-dialogs.c:358
 #, c-format
 msgid "%d dB"
 msgstr "%d dB"
 
-#: ../src/applet-dialogs.c:364
+#: ../src/applet-dialogs.c:360
 msgctxt "WiMAX CINR"
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../src/applet-dialogs.c:376
+#: ../src/applet-dialogs.c:372
 msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:407
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:414
+#: ../src/applet-dialogs.c:410
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:421
+#: ../src/applet-dialogs.c:417
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:419
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:427
+#: ../src/applet-dialogs.c:423
 #, c-format
 msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:433 ../src/applet-dialogs.c:792
-#: ../src/connection-editor/page-general.c:325
+#: ../src/applet-dialogs.c:429 ../src/applet-dialogs.c:788
+#: ../src/connection-editor/page-general.c:327
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/applet-dialogs.c:437
+#: ../src/applet-dialogs.c:433
 msgid "Interface:"
 msgstr "Grensesnitt:"
 
-#: ../src/applet-dialogs.c:453
+#: ../src/applet-dialogs.c:449
 msgid "Hardware Address:"
 msgstr "Maskinvareadresse:"
 
 #. Driver
-#: ../src/applet-dialogs.c:461
+#: ../src/applet-dialogs.c:457
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:490
+#: ../src/applet-dialogs.c:486
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../src/applet-dialogs.c:500
+#: ../src/applet-dialogs.c:496
 msgid "Security:"
 msgstr "Sikkerhet:"
 
-#: ../src/applet-dialogs.c:513
+#: ../src/applet-dialogs.c:509
 msgid "CINR:"
 msgstr "CINR:"
 
-#: ../src/applet-dialogs.c:526
+#: ../src/applet-dialogs.c:522
 msgid "BSID:"
 msgstr "BSID:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:543
+#: ../src/applet-dialogs.c:539
 msgid "IPv4"
 msgstr "IPv4"
 
 #. Address
-#: ../src/applet-dialogs.c:554 ../src/applet-dialogs.c:661
+#: ../src/applet-dialogs.c:550 ../src/applet-dialogs.c:657
 msgid "IP Address:"
 msgstr "IP-adresse:"
 
-#: ../src/applet-dialogs.c:556 ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:568
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/applet-dialogs.c:570
+#: ../src/applet-dialogs.c:566
 msgid "Broadcast Address:"
 msgstr "Kringkastingsadresse:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:579
+#: ../src/applet-dialogs.c:575
 msgid "Subnet Mask:"
 msgstr "Subnettmaske:"
 
-#: ../src/applet-dialogs.c:581
+#: ../src/applet-dialogs.c:577
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/applet-dialogs.c:589 ../src/applet-dialogs.c:676
+#: ../src/applet-dialogs.c:585 ../src/applet-dialogs.c:672
 msgid "Default Route:"
 msgstr "Forvalgt rute:"
 
-#: ../src/applet-dialogs.c:601
+#: ../src/applet-dialogs.c:597
 msgid "Primary DNS:"
 msgstr "Primær DNS:"
 
-#: ../src/applet-dialogs.c:610
+#: ../src/applet-dialogs.c:606
 msgid "Secondary DNS:"
 msgstr "Sekundær DNS:"
 
-#: ../src/applet-dialogs.c:620
+#: ../src/applet-dialogs.c:616
 msgid "Ternary DNS:"
 msgstr "Ternær DNS:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:635
+#: ../src/applet-dialogs.c:631
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:644
+#: ../src/applet-dialogs.c:640
 msgid "Ignored"
 msgstr "Ignorert"
 
-#: ../src/applet-dialogs.c:797
+#: ../src/applet-dialogs.c:793
 msgid "VPN Type:"
 msgstr "Type VPN:"
 
-#: ../src/applet-dialogs.c:804
+#: ../src/applet-dialogs.c:800
 msgid "VPN Gateway:"
 msgstr "VPN-gateway:"
 
-#: ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:806
 msgid "VPN Username:"
 msgstr "Brukernavn for VPN:"
 
-#: ../src/applet-dialogs.c:816
+#: ../src/applet-dialogs.c:812
 msgid "VPN Banner:"
 msgstr "VPN-topptekst:"
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:818
 msgid "Base Connection:"
 msgstr "Grunntilkobling:"
 
-#: ../src/applet-dialogs.c:824 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:820 ../src/libnm-gtk/nm-ui-utils.c:347
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:887
+#: ../src/applet-dialogs.c:883
 msgid "No valid active connections found!"
 msgstr "Ingen gyldige aktive tilkoblinger funnet!"
 
-#: ../src/applet-dialogs.c:915
+#: ../src/applet-dialogs.c:911
 msgid ""
 "Copyright © 2004-2011 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1112,42 +1138,42 @@ msgstr ""
 "Opphavsrett © 2004-2011 Red Hat, Inc.\n"
 "Opphavsrett © 2005-2008 Novell, Inc."
 
-#: ../src/applet-dialogs.c:918
+#: ../src/applet-dialogs.c:914
 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:920
+#: ../src/applet-dialogs.c:916
 msgid "NetworkManager Website"
 msgstr "NetworkManager nettsted"
 
-#: ../src/applet-dialogs.c:935
+#: ../src/applet-dialogs.c:931
 msgid "Missing resources"
 msgstr "Mangler ressurser"
 
-#: ../src/applet-dialogs.c:960
+#: ../src/applet-dialogs.c:956
 msgid "Mobile broadband network password"
 msgstr "Passord for tilkoblign med mobilt bredbånd"
 
-#: ../src/applet-dialogs.c:969
+#: ../src/applet-dialogs.c:965
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Et passord kreves for å koble til «%s»."
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:980
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/applet-dialogs.c:1282
+#: ../src/applet-dialogs.c:1261
 msgid "SIM PIN unlock required"
 msgstr "Du må låse opp PIN-koden for SIM"
 
-#: ../src/applet-dialogs.c:1283
+#: ../src/applet-dialogs.c:1262
 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:1285
+#: ../src/applet-dialogs.c:1264
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1156,25 +1182,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:1287
+#: ../src/applet-dialogs.c:1266
 msgid "PIN code:"
 msgstr "PIN-kode:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1291
+#: ../src/applet-dialogs.c:1270
 msgid "Show PIN code"
 msgstr "Vis PIN-kode"
 
-#: ../src/applet-dialogs.c:1293
+#: ../src/applet-dialogs.c:1272
 msgid "SIM PUK unlock required"
 msgstr "Du må låse opp PUK-kode for SIM"
 
-#: ../src/applet-dialogs.c:1294
+#: ../src/applet-dialogs.c:1273
 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:1296
+#: ../src/applet-dialogs.c:1275
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1183,22 +1209,22 @@ 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:1298
+#: ../src/applet-dialogs.c:1277
 msgid "PUK code:"
 msgstr "PUK-kode:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1301
+#: ../src/applet-dialogs.c:1280
 msgid "New PIN code:"
 msgstr "Ny PIN-kode:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1303
+#: ../src/applet-dialogs.c:1282
 msgid "Re-enter new PIN code:"
 msgstr "Tast inn ny PIN-kode igjen:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1308
+#: ../src/applet-dialogs.c:1287
 msgid "Show PIN/PUK codes"
 msgstr "Vis PIN/PUK-koder"
 
@@ -1309,14 +1335,16 @@ msgstr "_Modus:"
 #. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/ce-page-team.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:686
 msgid "_Edit"
 msgstr "R_ediger"
 
 #. Delete
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:703
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -1330,6 +1358,7 @@ msgstr "ms"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:16
 #: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: ../src/connection-editor/ce-page-team.ui.h:6
 msgid "_Interface name:"
 msgstr "Navn på grensesn_itt:"
 
@@ -1357,6 +1386,16 @@ msgstr "Pause før tilkoblingen tas _opp:"
 msgid "Link _down delay:"
 msgstr "Pause før tilkoblingen tas ne_d:"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "_Primary:"
+msgstr "_Primær:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr ""
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "_Kostnad for sti:"
@@ -1402,7 +1441,7 @@ msgstr "_Aldringstid:"
 msgid "automatic"
 msgstr "automatisk"
 
-#: ../src/connection-editor/ce-page.c:348
+#: ../src/connection-editor/ce-page.c:342
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Klarte ikke å oppdatere hemmelighet for tilkobling på grunn av en ukjent "
@@ -1423,7 +1462,7 @@ msgstr "Tjene_ste:"
 #: ../src/connection-editor/ce-page-dsl.ui.h:3
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../src/wireless-security/eap-method-tls.ui.h:7
 #: ../src/wireless-security/ws-leap.ui.h:3
 #: ../src/wireless-security/ws-wpa-psk.ui.h:3
 msgid "Sho_w password"
@@ -1635,7 +1674,6 @@ msgid "DNS ser_vers:"
 msgstr "_DNS-tjenere"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1660,6 +1698,16 @@ msgstr ""
 msgid "_Routes…"
 msgstr "_Ruter …"
 
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#, fuzzy
+msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses. Link-local addresses will "
+"be automatically scoped to the connecting interface."
+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
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Krev IPv_6-adressering for at denne tilkoblingen skal fullføres"
@@ -1789,6 +1837,26 @@ msgstr "Ekko"
 msgid "Send PPP _echo packets"
 msgstr "Send _ekko-pakker for PPP"
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr "_JSON-konfigurasjon:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#, fuzzy
+msgid "_Import team configuration from a file..."
+msgstr "Importer en  …"
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Sammenkoblede _tilkoblinger:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+msgid "I_mport team configuration from a file..."
+msgstr "Importer en lagret VPN-tilkobling …"
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Opphavs-grensesnitt:"
@@ -1924,130 +1992,136 @@ msgstr ""
 "autentiseringsmetoder. Hvis tilkoblinger feiler kan du prøve å slå av støtte "
 "for noen metoder."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:749
-#: ../src/connection-editor/ip6-routes-dialog.c:691
-#: ../src/connection-editor/page-ip4.c:915
-#: ../src/connection-editor/page-ip6.c:881
+#: ../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
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:766
-#: ../src/connection-editor/page-ip4.c:932
+#: ../src/connection-editor/ip4-routes-dialog.c:741
+#: ../src/connection-editor/page-ip4.c:941
 msgid "Netmask"
 msgstr "Nettmaske"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:783
-#: ../src/connection-editor/ip6-routes-dialog.c:725
-#: ../src/connection-editor/page-ip4.c:949
-#: ../src/connection-editor/page-ip6.c:915
+#: ../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
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:800
-#: ../src/connection-editor/ip6-routes-dialog.c:742
+#: ../src/connection-editor/ip4-routes-dialog.c:775
+#: ../src/connection-editor/ip6-routes-dialog.c:717
 msgid "Metric"
 msgstr "Metrisk"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:708
-#: ../src/connection-editor/page-ip6.c:898
+#: ../src/connection-editor/ip6-routes-dialog.c:683
+#: ../src/connection-editor/page-ip6.c:904
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/new-connection.c:101
+#: ../src/connection-editor/new-connection.c:102
 #: ../src/connection-editor/page-ethernet.c:242
 #: ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/new-connection.c:107
+#: ../src/connection-editor/new-connection.c:108
 #: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:119
+#: ../src/connection-editor/new-connection.c:120
 #: ../src/connection-editor/page-wimax.c:125
 #: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../src/connection-editor/new-connection.c:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/new-connection.c:126
+#: ../src/connection-editor/page-dsl.c:137
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:131
+#: ../src/connection-editor/new-connection.c:132
 #: ../src/connection-editor/page-infiniband.c:159
 #: ../src/libnm-gtk/nm-ui-utils.c:335
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:392 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:559
+#: ../src/connection-editor/new-connection.c:138
+#: ../src/connection-editor/page-bond.c:430 ../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:143
+#: ../src/connection-editor/new-connection.c:144
+#: ../src/connection-editor/page-team.c:255 ../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/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+#: ../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:149
-#: ../src/connection-editor/page-vlan.c:475 ../src/libnm-gtk/nm-ui-utils.c:341
-#: ../src/libnm-gtk/nm-ui-utils.c:563
+#: ../src/connection-editor/new-connection.c:156
+#: ../src/connection-editor/page-vlan.c:482 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/libnm-gtk/nm-ui-utils.c:568
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
+#: ../src/connection-editor/new-connection.c:169
+#: ../src/connection-editor/new-connection.c:309
 #: ../src/connection-editor/page-vpn.c:113
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:252
+#: ../src/connection-editor/new-connection.c:259
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: ../src/connection-editor/new-connection.c:272
+#: ../src/connection-editor/new-connection.c:279
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: ../src/connection-editor/new-connection.c:340
-#: ../src/connection-editor/new-connection.c:342
+#: ../src/connection-editor/new-connection.c:347
+#: ../src/connection-editor/new-connection.c:349
 msgid "Import a saved VPN configuration..."
 msgstr "Importer en lagret VPN-tilkobling …"
 
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/new-connection.c:378
 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:380
+#: ../src/connection-editor/new-connection.c:387
 msgid "Could not create new connection"
 msgstr "Kunne ikke lage en ny tilkobling"
 
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/new-connection.c:522
 msgid "Connection delete failed"
 msgstr "Sletting av tilkobling feilet"
 
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/new-connection.c:569
 #, 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:118
+#: ../src/connection-editor/nm-connection-editor.c:122
 #, c-format
 msgid "Editing %s"
 msgstr "Redigerer %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:126
 msgid "Editing un-named connection"
 msgstr "Redigerer tilkobling uten navn"
 
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:286
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2055,48 +2129,48 @@ msgstr ""
 "Redigering av tilkobling fant ikke alle nødvendige ressurser (.ui-fil ble "
 "ikke funnet)."
 
-#: ../src/connection-editor/nm-connection-editor.c:413
+#: ../src/connection-editor/nm-connection-editor.c:417
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../src/connection-editor/nm-connection-editor.c:414
+#: ../src/connection-editor/nm-connection-editor.c:418
 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:415
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save..."
 msgstr "_Lagre …"
 
-#: ../src/connection-editor/nm-connection-editor.c:416
+#: ../src/connection-editor/nm-connection-editor.c:420
 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:432
+#: ../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:432
+#: ../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:434
+#: ../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:602
+#: ../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:923
+#: ../src/connection-editor/nm-connection-editor.c:903
 msgid "Connection add failed"
 msgstr "Klarte ikke å legge til tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:973
+#: ../src/connection-editor/nm-connection-editor.c:943
 msgid "Error saving connection"
 msgstr "Feil under lagring av tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:974
+#: ../src/connection-editor/nm-connection-editor.c:944
 #, c-format
 msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "Egenskap «%s» / «%s» er ugyldig: %d"
@@ -2154,56 +2228,56 @@ msgid_plural "%d years ago"
 msgstr[0] "%d år siden"
 msgstr[1] "%d år siden"
 
-#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:632
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:645
 msgid "Last Used"
 msgstr "Sist brukt"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:687
 msgid "Edit the selected connection"
 msgstr "Rediger valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:688
 msgid "_Edit..."
 msgstr "R_ediger …"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../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:703
+#: ../src/connection-editor/nm-connection-list.c:704
 msgid "Delete the selected connection"
 msgstr "Slett valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:705
 msgid "_Delete..."
 msgstr "_Slett …"
 
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:706
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentiser for å slette valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:934
+#: ../src/connection-editor/nm-connection-list.c:935
 msgid "No VPN plugins are installed."
 msgstr "Ingen VPN-tillegg er installert."
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:937
 #, 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:938
+#: ../src/connection-editor/nm-connection-list.c:939
 msgid "Error creating connection"
 msgstr "Feil under oppretting av tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:995
 msgid "Error editing connection"
 msgstr "Feil under redigering av tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:995
+#: ../src/connection-editor/nm-connection-list.c:996
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Fant ingen tilkobling med UUID «%s»"
@@ -2220,11 +2294,11 @@ 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:395
+#: ../src/connection-editor/page-bond.c:433
 msgid "Could not load bond user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for sammenkobling."
 
-#: ../src/connection-editor/page-bond.c:534
+#: ../src/connection-editor/page-bond.c:587
 #, c-format
 msgid "Bond connection %d"
 msgstr "Sammenkoblet tilkobling %d"
@@ -2249,11 +2323,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-dsl.c:143
+#: ../src/connection-editor/page-dsl.c:139
 msgid "Could not load DSL user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for DSL."
 
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:231
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-tilkobling %d"
@@ -2298,7 +2372,7 @@ msgstr ""
 msgid "FirewallD is not running."
 msgstr "FirewallD kjører ikke."
 
-#: ../src/connection-editor/page-general.c:328
+#: ../src/connection-editor/page-general.c:330
 msgid "Could not load General user interface."
 msgstr "Kunne ikke laste generelt brukergrensesnitt."
 
@@ -2368,16 +2442,16 @@ msgstr "Flere _DNS-tjenere:"
 msgid "Additional s_earch domains:"
 msgstr "Flere søk_edomener:"
 
-#: ../src/connection-editor/page-ip4.c:847
+#: ../src/connection-editor/page-ip4.c:856
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Rediger IPv4-ruter for %s"
 
-#: ../src/connection-editor/page-ip4.c:998
+#: ../src/connection-editor/page-ip4.c:1008
 msgid "IPv4 Settings"
 msgstr "IPv4-innstillinger"
 
-#: ../src/connection-editor/page-ip4.c:1000
+#: ../src/connection-editor/page-ip4.c:1010
 msgid "Could not load IPv4 user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv4"
 
@@ -2386,7 +2460,6 @@ msgid "Automatic, addresses only"
 msgstr "Automatisk, kun adresser"
 
 #: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -2394,38 +2467,55 @@ msgstr "Ignorer"
 msgid "Automatic, DHCP only"
 msgstr "Automatisk. Kun DHCP"
 
-#: ../src/connection-editor/page-ip6.c:813
+#: ../src/connection-editor/page-ip6.c:819
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Rediger IPv6-ruter for %s"
 
-#: ../src/connection-editor/page-ip6.c:962
+#: ../src/connection-editor/page-ip6.c:969
 msgid "IPv6 Settings"
 msgstr "IPv6-innstillinger"
 
-#: ../src/connection-editor/page-ip6.c:964
+#: ../src/connection-editor/page-ip6.c:971
 msgid "Could not load IPv6 user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv6."
 
-#: ../src/connection-editor/page-master.c:284
+#: ../src/connection-editor/page-master.c:244
+#: ../src/connection-editor/page-master.c:255
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:245
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:256
+#, c-format
+msgid ""
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:373
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:393
+#: ../src/connection-editor/page-mobile.c:353
 msgid "Could not load mobile broadband user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for mobilt bredbånd."
 
-#: ../src/connection-editor/page-mobile.c:410
+#: ../src/connection-editor/page-mobile.c:370
 msgid "Unsupported mobile broadband connection type."
 msgstr "Ikke støttet type mobil bredbåndsforbindelse."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:660
+#: ../src/connection-editor/page-mobile.c:620
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Velg type tilbyder for mobilt bredbånd"
 
-#: ../src/connection-editor/page-mobile.c:687
+#: ../src/connection-editor/page-mobile.c:647
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2433,21 +2523,21 @@ msgstr ""
 "Velg tekonlogien din bredbåndstilbyder for mobil bruker. Spør tilbyderen "
 "hvis du er usikker."
 
-#: ../src/connection-editor/page-mobile.c:692
+#: ../src/connection-editor/page-mobile.c:652
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Min tilbyder bruker _GSM-basert teknologi (f.eks GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:699
+#: ../src/connection-editor/page-mobile.c:659
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Min tilbyder bruker C_DMA-basert teknologi (f.eks 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:709 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
 #: ../src/mobile-helpers.c:270
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:712 ../src/mb-menu-item.c:58
+#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
 #: ../src/mobile-helpers.c:268
 msgid "GSM"
 msgstr "GSM"
@@ -2457,24 +2547,24 @@ msgid "EAP"
 msgstr "EAP"
 
 #: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/wireless-security/eap-method-ttls.c:248
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/wireless-security/eap-method-ttls.c:298
 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:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../src/wireless-security/eap-method-peap.c:264
+#: ../src/wireless-security/eap-method-ttls.c:281
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/wireless-security/eap-method-ttls.c:265
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -2496,11 +2586,53 @@ msgstr "PPP-innstillinger"
 msgid "Could not load PPP user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for PPP."
 
-#: ../src/connection-editor/page-vlan.c:477
+#: ../src/connection-editor/page-team.c:94
+#: ../src/connection-editor/page-team-port.c:77
+#: ../src/connection-editor/vpn-helpers.c:234
+msgid "Select file to import"
+msgstr "Velg fil som skal importeres"
+
+#: ../src/connection-editor/page-team.c:114
+#: ../src/connection-editor/page-team-port.c:97
+msgid "Error: file doesn't contain a valid JSON configuration"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:258
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "Kunne ikke laste brukergrensesnitt for vlan."
+
+#: ../src/connection-editor/page-team.c:353
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "DSL-tilkobling %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:157
+#, fuzzy
+msgid "Team Port"
+msgstr "Port for sammenkobling"
+
+#: ../src/connection-editor/page-team-port.c:159
+#, fuzzy
+msgid "Could not load team port user interface."
+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
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr "%s (via «%s»)"
+
+#: ../src/connection-editor/page-vlan.c:484
 msgid "Could not load vlan user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for vlan."
 
-#: ../src/connection-editor/page-vlan.c:673
+#: ../src/connection-editor/page-vlan.c:680
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-tilkobling %d"
@@ -2568,52 +2700,47 @@ msgstr "%u (%u MHz)"
 msgid "Could not load Wi-Fi user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:645
+#: ../src/connection-editor/page-wifi.c:638
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi-tilkobling %d"
 
-#: ../src/connection-editor/page-wifi-security.c:265
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "Ingen"
-
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/libnm-gtk/nm-wifi-dialog.c:892
 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:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:296
+#: ../src/libnm-gtk/nm-wifi-dialog.c:901
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit passord"
 
-#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../src/connection-editor/page-wifi-security.c:322
+#: ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisk WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:336
+#: ../src/libnm-gtk/nm-wifi-dialog.c:945
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 personlig"
 
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:350
+#: ../src/libnm-gtk/nm-wifi-dialog.c:959
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:396
+#: ../src/connection-editor/page-wifi-security.c:391
 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."
 
-#: ../src/connection-editor/page-wifi-security.c:407
+#: ../src/connection-editor/page-wifi-security.c:402
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi-sikkerhet"
 
-#: ../src/connection-editor/page-wifi-security.c:409
+#: ../src/connection-editor/page-wifi-security.c:404
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for Wi-Fi-sikkerhet."
 
@@ -2643,29 +2770,25 @@ msgstr ""
 "\n"
 "Feil: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:241
-msgid "Select file to import"
-msgstr "Velg fil som skal importeres"
-
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:284
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "En fil med navn «%s» eksisterer allerede."
 
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:286
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:288
 #, 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:332
+#: ../src/connection-editor/vpn-helpers.c:324
 msgid "Cannot export VPN connection"
 msgstr "Kan ikke eksportere VPN-tilkobling"
 
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:326
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2676,11 +2799,11 @@ msgstr ""
 "\n"
 "Feil: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:361
 msgid "Export VPN connection..."
 msgstr "Eksporter VPN-tilkobling …"
 
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -2836,15 +2959,15 @@ msgstr "Bekreft innstillinger for mobilt bredbånd"
 msgid "Unlisted"
 msgstr "Ikke listet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: ../src/libnm-gtk/nm-mobile-wizard.c:461
 msgid "_Select your plan:"
 msgstr "_Velg din plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:505
+#: ../src/libnm-gtk/nm-mobile-wizard.c:485
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "_APN (Navn på aksesspunkt) for valgt plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:525
+#: ../src/libnm-gtk/nm-mobile-wizard.c:505
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -2856,67 +2979,67 @@ msgstr ""
 "\n"
 "Spør tilbyder om APN for ditt abonnement hvis du er usikker."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:532
+#: ../src/libnm-gtk/nm-mobile-wizard.c:512
 msgid "Choose your Billing Plan"
 msgstr "Velg din betalingsplan"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:581
+#: ../src/libnm-gtk/nm-mobile-wizard.c:561
 msgid "My plan is not listed..."
 msgstr "Min plan er ikke på listen …"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:734
+#: ../src/libnm-gtk/nm-mobile-wizard.c:714
 msgid "Select your provider from a _list:"
 msgstr "Velg din tilbyder fra en _liste:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:747
+#: ../src/libnm-gtk/nm-mobile-wizard.c:727
 msgid "Provider"
 msgstr "Tilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:772
+#: ../src/libnm-gtk/nm-mobile-wizard.c:752
 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:785
+#: ../src/libnm-gtk/nm-mobile-wizard.c:765
 msgid "Provider:"
 msgstr "Tilbyder:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:802
+#: ../src/libnm-gtk/nm-mobile-wizard.c:782
 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:804
+#: ../src/libnm-gtk/nm-mobile-wizard.c:784
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Min tilbyder bruker CDMA-teknologi (1xRTT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:815
+#: ../src/libnm-gtk/nm-mobile-wizard.c:795
 msgid "Choose your Provider"
 msgstr "Velg din tilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
 msgid "Country or Region List:"
 msgstr "Liste med land eller regioner:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1060
 msgid "Country or region"
 msgstr "Land eller region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1090
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
 msgid "My country is not listed"
 msgstr "Landet mitt er ikke på listen"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1140
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1120
 msgid "Choose your Provider's Country or Region"
 msgstr "Velg din tilbyders land eller region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1194
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1174
 msgid "Installed GSM device"
 msgstr "Installert GSM-enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1197
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
 msgid "Installed CDMA device"
 msgstr "Installert CDMA-enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1365
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1345
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -2924,41 +3047,41 @@ msgstr ""
 "Denne assistenten hjelper deg å sette opp en mobil bredbåndstilkobling til "
 "et mobilnettverk (3G)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1370
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1350
 msgid "You will need the following information:"
 msgstr "Du trenger følgende informasjon:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1381
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "Your broadband provider's name"
 msgstr "Navnet på din bredbåndstilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
 msgid "Your broadband billing plan name"
 msgstr "Navn på betalingsplan for bredbånd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1373
 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:1420
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
 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:1435
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1417
 msgid "Any device"
 msgstr "Enhver enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Sett opp en mobil bredbåndstilkobling"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1621
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
 msgid "New Mobile Broadband Connection"
 msgstr "Ny mobil bredbåndstilkobling"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
 msgid "Wired"
 msgstr "Kablet"
 
@@ -2970,15 +3093,15 @@ msgstr "Bluetooth"
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/libnm-gtk/nm-ui-utils.c:345
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:405
+#: ../src/libnm-gtk/nm-ui-utils.c:408
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:410
 msgid "USB"
 msgstr "USB"
 
@@ -2988,21 +3111,26 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
+#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnm-gtk/nm-wifi-dialog.c:435
 msgid "New..."
 msgstr "Ny …"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
+#: ../src/libnm-gtk/nm-wifi-dialog.c:875
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ingen"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1046
 msgid "C_reate"
 msgstr "_Lag:"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1130
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3010,35 +3138,35 @@ msgstr ""
 "Passord eller krypteringsnøkler er nødvendig for å koble til Wi-Fi-nettverk "
 "«%s»."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1132
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentisering for Wi-Fi-nettverk kreves"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1134
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentisering kreves av Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
 msgid "Create New Wi-Fi Network"
 msgstr "Lag et nytt Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
 msgid "New Wi-Fi network"
 msgstr "Nytt Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
 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:1150
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Koble til skjult Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
 msgid "Hidden Wi-Fi network"
 msgstr "Skjult Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3167,16 +3295,16 @@ msgstr "\"Roaming\" nettverk (%s)"
 msgid "Roaming network"
 msgstr "\"Roaming\" nettverk"
 
-#: ../src/mobile-helpers.c:317
+#: ../src/mobile-helpers.c:318
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN-kode for SIM-kort «%s» på «%s»"
 
-#: ../src/mobile-helpers.c:450
+#: ../src/mobile-helpers.c:451
 msgid "PIN code required"
 msgstr "PIN-kode kreves"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:459
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN-kode kreves for enhet for mobilt bredbånd"
 
@@ -3186,46 +3314,36 @@ msgstr "PIN-kode kreves for enhet for mobilt bredbånd"
 msgid "%s connection"
 msgstr "%s-tilkobling"
 
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "Ingen Certificate Authority-sertifikat er valgt"
-
-#: ../src/wireless-security/eap-method.c:276
-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?"
+#: ../src/utils/utils.c:376
+msgid "Store the password only for this _user"
+msgstr "Lagre passordet kun for denne br_ukeren"
 
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "Velg CA-sertifikat"
+#: ../src/utils/utils.c:378
+msgid "Store the password for _all users"
+msgstr "Lagre passordet for _alle brukere"
 
-#: ../src/wireless-security/eap-method.c:645
+#: ../src/wireless-security/eap-method.c:440
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM eller PKCS#12 private nøkler (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:648
+#: ../src/wireless-security/eap-method.c:443
 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:280
+#: ../src/wireless-security/eap-method-peap.c:298
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:400
 msgid "Choose a PAC file..."
 msgstr "Velg en PAC-fil …"
 
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:407
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:411
 msgid "All files"
 msgstr "Alle filer"
 
@@ -3252,8 +3370,8 @@ msgid "PAC _file:"
 msgstr "PAC-_fil:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "_Indre autentisering:"
 
@@ -3261,14 +3379,14 @@ msgstr "_Indre autentisering:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillat automatisk PAC-pro_visjonering"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:409
+#: ../src/wireless-security/eap-method-peap.c:281
+#: ../src/wireless-security/wireless-security.c:417
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../src/wireless-security/eap-method-peap.c:377
+#: ../src/wireless-security/eap-method-tls.c:464
+#: ../src/wireless-security/eap-method-ttls.c:377
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Velg et Certificate Authority-sertifikat …"
 
@@ -3286,7 +3404,14 @@ msgstr "Versjon 1"
 msgid "C_A certificate:"
 msgstr "C_A-sertifikat:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "Overse CA-sertifikat"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "PEAP-_versjon:"
 
@@ -3294,11 +3419,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:260
+#: ../src/wireless-security/eap-method-tls.c:279
 msgid "Unencrypted private keys are insecure"
 msgstr "Private nøkler uten kryptering er ikke sikre"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:282
 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 "
@@ -3312,11 +3437,11 @@ msgstr ""
 "\n"
 "Du kan passordbeskytte din private nøkkel med openssl"
 
-#: ../src/wireless-security/eap-method-tls.c:428
+#: ../src/wireless-security/eap-method-tls.c:458
 msgid "Choose your personal certificate..."
 msgstr "Velg ditt personlige sertifikat …"
 
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:470
 msgid "Choose your private key..."
 msgstr "Velg din private nøkkel …"
 
@@ -3328,27 +3453,31 @@ msgstr "I_dentitet:"
 msgid "_User certificate:"
 msgstr "Br_ukersertifikat:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Privat nø_kkel:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "Passord for _privat nøkkel:"
 
-#: ../src/wireless-security/wireless-security.c:421
+#: ../src/wireless-security/wireless-security.c:429
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:445
+#: ../src/wireless-security/wireless-security.c:454
+msgid "PWD"
+msgstr "PWD"
+
+#: ../src/wireless-security/wireless-security.c:465
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:456
+#: ../src/wireless-security/wireless-security.c:476
 msgid "Tunneled TLS"
 msgstr "Tunnelert TLS (TTLS)"
 
-#: ../src/wireless-security/wireless-security.c:467
+#: ../src/wireless-security/wireless-security.c:487
 msgid "Protected EAP (PEAP)"
 msgstr "Beskyttet EAP (PEAP)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]