all: merge branch 'master' into nm-1-4

We wrongly did a 1.4.2 release based on an old nm-1-4 branch. Merge master and 1.4 branch together again. See also commit 54a3d4181358231706296abfc53a203796ef8491.
author: Thomas Haller <thaller@redhat.com> 2016-10-03 12:28:39 +0200
committer: Thomas Haller <thaller@redhat.com> 2016-10-03 12:32:19 +0200
commit: 47194f7a11984c47dc168ae9bd8696861f21d445 (patch)
tree: cd17c3d4f070e234476e72d945999bb040c944f5
parent: 6c71c7261ccfe84c4c3765a2e591728907f23102 (diff)
parent: 7ee48ac38eba13dbf7684449053fa55d3db1334b (diff)
download: network-manager-applet-47194f7a11984c47dc168ae9bd8696861f21d445.tar.gz
20 files changed, 2926 insertions, 1167 deletions
diff --git a/configure.ac b/configure.ac
index fa70c861..c867681d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,9 +25,7 @@ dnl Initialize libtool
 LT_PREREQ([2.2.6])
 LT_INIT
 
-m4_define([nma_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])])
-NMA_GIT_SHA=nma_git_sha
-AC_DEFINE_UNQUOTED(NMA_GIT_SHA,"$NMA_GIT_SHA",[git commit id of the original source code version])
+GIT_SHA_RECORD(NMA_GIT_SHA)
 
 dnl
 dnl Checks for typedefs, structures, and compiler characteristics.
diff --git a/m4/git-sha-record.m4 b/m4/git-sha-record.m4
new file mode 100644
index 00000000..e259b39f
--- /dev/null
+++ b/m4/git-sha-record.m4
@@ -0,0 +1,15 @@
+dnl GIT_SHA_RECORD($1, $2)
+dnl
+dnl $1: the name of the assigned variable. For example NM_GIT_SHA,
+dnl     NMA_GIT_SHA, LIBNL_GIT_SHA.
+dnl $2: by default, a define to config.h is added. This can be
+dnl     suppressed by passing "no-config-h".
+dnl
+AC_DEFUN([GIT_SHA_RECORD], [
+    m4_define([git_sha_record_v],
+              [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])])
+$1=git_sha_record_v
+if test ""$2"" != "no-config-h" ; then
+    AC_DEFINE_UNQUOTED($1,"$$1",[git commit id of the original source code version])
+fi
+])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d1b00e20..37ad1e30 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,6 +26,7 @@ src/connection-editor/ce-page.c
 [type: gettext/glade]src/connection-editor/ce-page-dsl.ui
 [type: gettext/glade]src/connection-editor/ce-page-ethernet.ui
 [type: gettext/glade]src/connection-editor/ce-page-general.ui
+src/connection-editor/ce-page.h
 [type: gettext/glade]src/connection-editor/ce-page-infiniband.ui
 [type: gettext/glade]src/connection-editor/ce-page-ip4.ui
 [type: gettext/glade]src/connection-editor/ce-page-ip6.ui
diff --git a/po/ca.po b/po/ca.po
index 3706a7bf..496269ef 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 14:02+0200\n"
-"PO-Revision-Date: 2016-03-20 07:35+0100\n"
+"POT-Creation-Date: 2016-09-07 21:25+0200\n"
+"PO-Revision-Date: 2016-09-06 17:31+0200\n"
 "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.esu>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3119
 msgid "Network"
 msgstr "Xarxa"
 
@@ -135,15 +135,15 @@ msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els certificats "
 "de CA en la segona fase de l'autenticació EAP."
 
-#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#: ../nm-connection-editor.appdata.xml.in.h:1
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-msgid "NetworkManager for GNOME"
-msgstr "NetworkManager per al GNOME"
+#: ../nm-connection-editor.appdata.xml.in.h:2
+msgid "NetworkManager connection editor"
+msgstr "Editor de connexions del NetworkManager"
 
-#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+#: ../nm-connection-editor.appdata.xml.in.h:3
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -151,7 +151,7 @@ msgstr ""
 "El NetworkManager és un servei de sistema per gestionar i configurar les "
 "vostres connexions de xarxa i els vostres dispositius."
 
-#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+#: ../nm-connection-editor.appdata.xml.in.h:4
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -159,6 +159,10 @@ msgstr ""
 "El programa nm-connection-editor funciona amb el NetworkManager per crear i "
 "editar perfils existents de connexions per al NetworkManager."
 
+#: ../nm-connection-editor.appdata.xml.in.h:5
+msgid "The NetworkManager Developers"
+msgstr "Els desenvolupadors del NetworkManager"
+
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticació 802.1X"
@@ -389,144 +393,144 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1280
+#: ../src/applet.c:1285
 msgid "device not ready (firmware missing)"
 msgstr "el dispositiu no està preparat (manca el microprogramari)"
 
-#: ../src/applet.c:1282
+#: ../src/applet.c:1287
 msgid "device not ready"
 msgstr "el dispositiu no està preparat"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1297 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconnectat"
 
-#: ../src/applet.c:1308
+#: ../src/applet.c:1313
 msgid "Disconnect"
 msgstr "Desconnecta"
 
-#: ../src/applet.c:1322
+#: ../src/applet.c:1327
 msgid "device not managed"
 msgstr "no es gestiona el dispositiu"
 
-#: ../src/applet.c:1395
+#: ../src/applet.c:1400
 msgid "No network devices available"
 msgstr "No hi ha cap dispositiu de xarxa disponible"
 
-#: ../src/applet.c:1449
+#: ../src/applet.c:1454
 msgid "_VPN Connections"
 msgstr "Connexions _VPN"
 
-#: ../src/applet.c:1503
+#: ../src/applet.c:1498
 msgid "_Configure VPN..."
 msgstr "_Configura la VPN..."
 
-#: ../src/applet.c:1508
-msgid "_Disconnect VPN"
-msgstr "_Desconnecta la VPN"
+#: ../src/applet.c:1501
+msgid "_Add a VPN connection..."
+msgstr "_Afegeix una connexió VPN..."
 
-#: ../src/applet.c:1615
+#: ../src/applet.c:1607
 msgid "NetworkManager is not running..."
 msgstr "No s'està executant el NetworkManager..."
 
-#: ../src/applet.c:1620 ../src/applet.c:2612
+#: ../src/applet.c:1612 ../src/applet.c:2619
 msgid "Networking disabled"
 msgstr "S'ha inhabilitat la gestió de xarxes"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1830
+#: ../src/applet.c:1822
 msgid "Enable _Networking"
 msgstr "Habilita la gestió de _xarxes"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1839
+#: ../src/applet.c:1831
 msgid "Enable _Wi-Fi"
 msgstr "Habilita el _sense fil"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1848
+#: ../src/applet.c:1840
 msgid "Enable _Mobile Broadband"
 msgstr "Habilita la banda ampla _mòbil"
 
 #. Toggle notifications item
-#: ../src/applet.c:1860
+#: ../src/applet.c:1852
 msgid "Enable N_otifications"
 msgstr "Habilita les n_otificacions"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1872
+#: ../src/applet.c:1864
 msgid "Connection _Information"
 msgstr "_Informació de la connexió"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1880
+#: ../src/applet.c:1872
 msgid "Edit Connections..."
 msgstr "Edita les connexions..."
 
-#: ../src/applet.c:1894
+#: ../src/applet.c:1886
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../src/applet.c:2179
+#: ../src/applet.c:2171
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Esteu connectat a «%s»."
 
-#: ../src/applet.c:2222
+#: ../src/applet.c:2214
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: ../src/applet.c:2223
+#: ../src/applet.c:2215
 msgid "The network connection has been disconnected."
 msgstr "S'ha desconnectat la connexió de xarxa."
 
-#: ../src/applet.c:2474
+#: ../src/applet.c:2481
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "S'està preparant la connexió de xarxa «%s»..."
 
-#: ../src/applet.c:2477
+#: ../src/applet.c:2484
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Cal l'autenticació d'usuari per a la connexió de xarxa «%s»..."
 
-#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2487 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "S'està sol·licitant una adreça de xarxa per a «%s»..."
 
-#: ../src/applet.c:2483
+#: ../src/applet.c:2490
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "La connexió de xarxa «%s» és activa"
 
-#: ../src/applet.c:2557
+#: ../src/applet.c:2564
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "S'està iniciant la connexió VPN «%s»..."
 
-#: ../src/applet.c:2560
+#: ../src/applet.c:2567
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Cal l'autenticació d'usuari per a la connexió VPN «%s»..."
 
-#: ../src/applet.c:2563
+#: ../src/applet.c:2570
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "S'està sol·licitant una adreça de xarxa per a la xarxa VPN «%s»..."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2573
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "La connexió VPN «%s» és activa"
+msgid "VPN connection active"
+msgstr "La connexió VPN és activa"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2623
 msgid "No network connection"
 msgstr "No hi ha cap connexió de xarxa"
 
-#: ../src/applet.c:3204
+#: ../src/applet.c:3218
 msgid "NetworkManager Applet"
 msgstr "Miniaplicació NetworkManager"
 
@@ -549,7 +553,7 @@ msgid "Mobile Broadband (%s)"
 msgstr "Banda ampla mòbil (%s)"
 
 #: ../src/applet-device-broadband.c:736
-#: ../src/connection-editor/connection-helpers.c:100
+#: ../src/connection-editor/connection-helpers.c:106
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
@@ -606,7 +610,7 @@ msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr ""
 "Cal l'autenticació d'usuari per a la connexió de banda ampla mòbil «%s»..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "La connexió de banda ampla mòbil «%s» és activa"
@@ -763,7 +767,7 @@ msgid "Error displaying connection information:"
 msgstr "S'ha produït un error en mostrar la informació de la connexió:"
 
 #: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:332
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
@@ -853,6 +857,8 @@ msgstr "CDMA (%s)"
 
 #. --- General ---
 #: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/ce-page-team-port.ui.h:23
+#: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "General"
@@ -880,6 +886,7 @@ msgstr "Seguretat:"
 
 #. --- IPv4 ---
 #: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -889,6 +896,7 @@ msgstr "Ruta predeterminada:"
 
 #. --- IPv6 ---
 #: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -946,33 +954,41 @@ msgstr ""
 msgid "NetworkManager Website"
 msgstr "Lloc web del NetworkManager"
 
-#: ../src/applet-dialogs.c:1005
+#: ../src/applet-dialogs.c:1001
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"La miniaplicació NetworkManager no ha pogut trobar alguns dels recursos "
+"necessaris (no s'ha trobat el fitxer d'interfície d'usuari)."
+
+#: ../src/applet-dialogs.c:1006
 msgid "Missing resources"
 msgstr "Recursos que manquen"
 
-#: ../src/applet-dialogs.c:1030
+#: ../src/applet-dialogs.c:1031
 msgid "Mobile broadband network password"
 msgstr "Contrasenya de la xarxa de banda ampla mòbil"
 
-#: ../src/applet-dialogs.c:1039
+#: ../src/applet-dialogs.c:1040
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Cal que introduïu una contrasenya per connectar-vos a «%s»."
 
-#: ../src/applet-dialogs.c:1054
+#: ../src/applet-dialogs.c:1055
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN unlock required"
 msgstr "Cal el codi PIN de desbloqueig de la SIM"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1338
 msgid "SIM PIN Unlock Required"
 msgstr "Cal el codi PIN de desbloqueig de la SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1340
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -982,25 +998,25 @@ msgstr ""
 "mòbil «%s»."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1341
+#: ../src/applet-dialogs.c:1342
 msgid "PIN code:"
 msgstr "Codi PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1346
 msgid "Show PIN code"
 msgstr "Mostra el codi PIN"
 
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK unlock required"
 msgstr "Cal el codi PUK de desbloqueig de la SIM"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1349
 msgid "SIM PUK Unlock Required"
 msgstr "Cal el codi PUK de desbloqueig de la SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1351
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1010,22 +1026,22 @@ msgstr ""
 "mòbil «%s»."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1352
+#: ../src/applet-dialogs.c:1353
 msgid "PUK code:"
 msgstr "Codi PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1356
 msgid "New PIN code:"
 msgstr "Codi PIN nou:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1357
+#: ../src/applet-dialogs.c:1358
 msgid "Re-enter new PIN code:"
 msgstr "Torneu a introduir el codi PIN nou:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1362
+#: ../src/applet-dialogs.c:1363
 msgid "Show PIN/PUK codes"
 msgstr "Mostra els codis PIN/PUK"
 
@@ -1053,7 +1069,7 @@ msgstr ""
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:9
 #: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:13
 #: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "_Add"
 msgstr "_Afegeix"
@@ -1065,7 +1081,7 @@ msgstr "_Afegeix"
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
 #: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../src/connection-editor/ce-page-team.ui.h:15
 #: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Suprimeix"
@@ -1119,10 +1135,12 @@ msgstr ""
 "llista, és probable que no tingueu el connector VPN adequat instal·lat."
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:21
 msgid "Round-robin"
 msgstr "Round-robin"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:2
+#: ../src/connection-editor/ce-page-team.ui.h:22
 msgid "Active backup"
 msgstr "Reserva activa"
 
@@ -1131,6 +1149,7 @@ msgid "XOR"
 msgstr "XOR"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:20
 msgid "Broadcast"
 msgstr "Difusió"
 
@@ -1166,7 +1185,7 @@ msgstr "M_ode:"
 #. Edit
 #: ../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/ce-page-team.ui.h:14
 #: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Edita"
@@ -1181,7 +1200,7 @@ msgstr "ms"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:17
 #: ../src/connection-editor/ce-page-bridge.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: ../src/connection-editor/ce-page-team.ui.h:16
 msgid "_Interface name:"
 msgstr "Nom de la _interfície:"
 
@@ -1224,7 +1243,7 @@ msgstr ""
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
 #: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
 msgid "_MTU:"
@@ -1233,7 +1252,7 @@ msgstr "_MTU:"
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
 #: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
 msgid "bytes"
@@ -1284,11 +1303,11 @@ msgstr "Edat _màxima:"
 msgid "_Aging time:"
 msgstr "Temps d'_envelliment:"
 
-#: ../src/connection-editor/ce-page.c:78
+#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automàtic"
 
-#: ../src/connection-editor/ce-page.c:86
+#: ../src/connection-editor/ce-page.c:86 ../src/connection-editor/ce-page.c:121
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
 #: ../src/connection-editor/page-wifi.c:168
 #: ../src/connection-editor/page-wifi.c:172
@@ -1297,44 +1316,44 @@ msgstr "automàtic"
 msgid "default"
 msgstr "predeterminat"
 
-#: ../src/connection-editor/ce-page.c:132
+#: ../src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "error no especificat"
 
-#: ../src/connection-editor/ce-page.c:245
+#: ../src/connection-editor/ce-page.c:302
 msgid "MAC address"
 msgstr "Adreça MAC"
 
-#: ../src/connection-editor/ce-page.c:245
+#: ../src/connection-editor/ce-page.c:302
 msgid "HW address"
 msgstr "Adreça HW"
 
-#: ../src/connection-editor/ce-page.c:248
+#: ../src/connection-editor/ce-page.c:305
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "%s no vàlid per a  %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:252
-#: ../src/connection-editor/ce-page.c:484
+#: ../src/connection-editor/ce-page.c:309
+#: ../src/connection-editor/ce-page.c:541
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "%s no vàlid (%s)"
 
-#: ../src/connection-editor/ce-page.c:268
+#: ../src/connection-editor/ce-page.c:325
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "nom no vàlid d'interfície per a %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:272
+#: ../src/connection-editor/ce-page.c:329
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "nom no vàlid d'interfície (%s)"
 
-#: ../src/connection-editor/ce-page.c:485
+#: ../src/connection-editor/ce-page.c:542
 msgid "device"
 msgstr "dispositiu"
 
-#: ../src/connection-editor/ce-page.c:591
+#: ../src/connection-editor/ce-page.c:650
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "No s'han pogut actualitzar els secrets de la connexió per un error "
@@ -1654,9 +1673,8 @@ msgid "De_fault"
 msgstr "Per de_fecte"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
-#, fuzzy
 msgid "_Ignore"
-msgstr "Ignora"
+msgstr "_Ignora"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
@@ -1862,6 +1880,7 @@ msgstr ""
 "que la configuració IPv6 falli."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
 msgstr "Bàsic"
 
@@ -1947,21 +1966,505 @@ msgid "Send PPP _echo packets"
 msgstr "Envia paquets d'_eco de PPP"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:2
-msgid "_JSON config:"
-msgstr "Configuració _JSON:"
+#: ../src/connection-editor/ce-page-team.ui.h:19
+msgid "Ad_vanced..."
+msgstr "A_vançat"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
-msgid "_Import team configuration from a file..."
+msgid "Set by master"
+msgstr "Establert pel mestre"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:3
+#: ../src/connection-editor/ce-page-team.ui.h:9
+msgid "Ethernet port state"
+msgstr "Estat del port Ethernet"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:10
+msgid "ARP (IPv4)"
+msgstr "ARP (IPv4)"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:5
+#: ../src/connection-editor/ce-page-team.ui.h:11
+msgid "NDP (IPv6)"
+msgstr "NDP (IPv6)"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:6
+#: ../src/connection-editor/ce-page-team.ui.h:37
+msgid "Team Advanced Options"
+msgstr "Opcions avançades d'equip"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:7
+msgid "_Queue ID:"
+msgstr "ID de la _cua:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:8
+#: ../src/connection-editor/ce-page-team.ui.h:42
+msgid ""
+"Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
+"port is enabled or disabled."
+msgstr ""
+"Nombre d'esclats de NAs no sol·licitats i paquets ARP no necessaris enviats "
+"després que el port s'habilita o deshabilita."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:9
+msgid "ID of queue which this port should be mapped to."
+msgstr "ID de la cua a la qual s'hauria de mapar aquest port."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:10
+msgid "_Port priority:"
+msgstr "_Prioritat del port:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:11
+msgid "Port _sticky"
+msgstr "Port _fixat"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:12
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+"Valida els paquets ARP rebuts usant els ports actius. Si no es marca això, "
+"tots els paquets ARP entrants es consideraran una resposta bona."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: ../src/connection-editor/ce-page-team.ui.h:44
+msgid ""
+"Value is positive number in milliseconds. Specifies an interval between "
+"bursts of notify-peer packets."
+msgstr ""
+"El valor és un nombre positiu en mil·lisegons. Especifica un interval entre "
+"esclats de paquets de notificació de parells."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port priority. The higher number means higher priority."
+msgstr "Prioritat del port. El número més gran vol dir una prioritat més gran."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:15
+msgid "Active-Backup runner options"
+msgstr "Opcions del runner de la còpia de seguretat activa"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:16
+msgid "_LACP port priority:"
+msgstr "Prioritat del port _LACP:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
+msgid "LACP port _key:"
+msgstr "_Clau del port LACP:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team.ui.h:43
+msgid ""
+"Number of bursts of multicast group rejoin requests sent after port is "
+"enabled or disabled."
+msgstr ""
+"Nombre d'esclats de demandes de tornar a unir-se al grup de multidifusió "
+"enviades després de que el port s'habilita o deshabilita."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
+msgid ""
+"Port priority according to LACP standard. The lower number means higher "
+"priority."
+msgstr ""
+"Prioritat del port d'acord amb l'estàndard LACP. El número més baix vol dir "
+"una prioritat més baixa."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team.ui.h:45
+msgid ""
+"Value is positive number in milliseconds. Specifies an interval between "
+"bursts of multicast group rejoin requests."
+msgstr ""
+"El valor el número de posició en mil·lisegons. Especifica un interval entre "
+"esclats de demandes de tornar a unir-se al grup de multidifusió."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
+msgid ""
+"Port key according to LACP standard. It is only possible to aggregate ports "
+"with the same key."
+msgstr ""
+"Clau del port d'acord amb l'estàndard LACP. Sols és possible agregar ports "
+"amb la mateixa clau."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
+msgid "LACP runner options"
+msgstr "Opcions del runner LACP"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:24
+#: ../src/connection-editor/ce-page-team.ui.h:70
+msgid "_Link watcher:"
+msgstr "Monitor de l'en_llaç:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:25
+#: ../src/connection-editor/ce-page-team.ui.h:71
+msgid "_Up delay:"
+msgstr "Retard de p_ujada:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:26
+#: ../src/connection-editor/ce-page-team.ui.h:72
+msgid "_Down delay:"
+msgstr "Retard de baixa_da:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:27
+#: ../src/connection-editor/ce-page-team.ui.h:73
+msgid "Send _interval:"
+msgstr "_Interval d'enviament:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:28
+#: ../src/connection-editor/ce-page-team.ui.h:74
+msgid "Delay _before first send:"
+msgstr "Retard a_bans del primer enviament:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:29
+#: ../src/connection-editor/ce-page-team.ui.h:75
+msgid "_Maximum missed replies:"
+msgstr "_Màxim de les respostes absents:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:30
+#: ../src/connection-editor/ce-page-team.ui.h:76
+msgid "_Source host:"
+msgstr "_Amfitrió origen:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:31
+#: ../src/connection-editor/ce-page-team.ui.h:77
+msgid "_Target host:"
+msgstr "Amfi_trió destí:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:32
+#: ../src/connection-editor/ce-page-team.ui.h:78
+msgid ""
+"Maximum number of missed replies. If this number is exceeded, link is "
+"reported as down."
+msgstr ""
+"Nombre màxim de respostes absents. Si s'excedeix aquest valor, es reporta "
+"l'enllaç com caigut."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:33
+#: ../src/connection-editor/ce-page-team.ui.h:79
+msgid ""
+"Hostname to be converted to IP address which will be filled into ARP request "
+"as source address."
+msgstr ""
+"Nom d'amfitrió que es convertirà en una adreça IP que s'omplirà a la demanda "
+"ARP com a adreça origen."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:34
+#: ../src/connection-editor/ce-page-team.ui.h:80
+msgid ""
+"Hostname to be converted to IP address which will be filled into request as "
+"destination address."
+msgstr ""
+"Nom d'amfitrió que es convertirà en una adreça IP que s'omplirà a la demanda "
+"com a adreça destí."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:35
+#: ../src/connection-editor/ce-page-team.ui.h:81
+msgid "Ignore invalid packets from _active ports"
+msgstr "Ignora els paquets no vàlids dels ports _actius"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:36
+#: ../src/connection-editor/ce-page-team.ui.h:83
+msgid "Ignore invalid packets from i_nactive ports"
+msgstr "Ignora els paquets no vàlids dels ports i_nactius"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:37
+#: ../src/connection-editor/ce-page-team.ui.h:84
+msgid ""
+"Validate received ARP packets on inactive ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+"Valida els paquets ARP rebuts usant els ports inactius. Si no es marca això, "
+"tots els paquets ARP entrants es consideraran com una resposta bona."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:38
+#: ../src/connection-editor/ce-page-team.ui.h:85
+msgid "S_end on inactive ports"
+msgstr "_Envia usant els ports inactius"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:39
+#: ../src/connection-editor/ce-page-team.ui.h:86
+msgid ""
+"By default, ARP requests are sent on active ports only. This option allows "
+"sending even on inactive ports."
+msgstr ""
+"Per defecte, les demandes ARP s'envien usant els ports actius solament. "
+"Aquesta opció permet l'enviament fins i tot usant els ports inactius."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:40
+#: ../src/connection-editor/ce-page-team.ui.h:87
+msgid ""
+"The delay between the link coming up and the runner being notified about it."
+msgstr ""
+"El retard entre l'aixecament de l'enllaç i la notificació d'això al runner."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:41
+#: ../src/connection-editor/ce-page-team.ui.h:88
+msgid ""
+"The delay between the link going down and the runner being notified about it."
+msgstr ""
+"El retard entre la caiguda de l'enllaç i la notificació d'això al runner."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:42
+#: ../src/connection-editor/ce-page-team.ui.h:89
+msgid "The interval between requests being sent."
+msgstr "L'interval entre enviaments de demandes."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:43
+#: ../src/connection-editor/ce-page-team.ui.h:90
+msgid ""
+"The delay between link watch initialization and the first request being sent."
+msgstr ""
+"El retard entre la inicialització del monitor d'enllaços i l'enviament de la "
+"primera demanda."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:44
+#: ../src/connection-editor/ce-page-team.ui.h:91
+msgid "The link watcher to be used."
+msgstr "El monitor d'enllaços a usar."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:45
+#: ../src/connection-editor/ce-page-team.ui.h:92
+msgid "Link Watcher"
+msgstr "Monitor d'enllaços"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:46
+#: ../src/connection-editor/ce-page-team.ui.h:93
+msgid "Im_port team configuration from a file..."
 msgstr "_Importa una configuració en equip des d'un fitxer..."
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:47
+#: ../src/connection-editor/ce-page-team.ui.h:94
+msgid "Edit _JSON configuration:"
+msgstr "Edita la configuració _JSON:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:48
+#: ../src/connection-editor/ce-page-team.ui.h:95
+msgid "Raw Configuration"
+msgstr "Configuració crua"
+
 #: ../src/connection-editor/ce-page-team.ui.h:1
+msgid "Highest priority"
+msgstr "Prioritat més alta"
+
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "Highest priority (stable)"
+msgstr "Prioritat més alta (estable)"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Bandwidth"
+msgstr "Amplada de banda"
+
+#: ../src/connection-editor/ce-page-team.ui.h:4
+msgid "Highest number of ports"
+msgstr "Nombre màxim de ports"
+
+#: ../src/connection-editor/ce-page-team.ui.h:5
+msgid "Port priority"
+msgstr "Prioritat del port"
+
+#: ../src/connection-editor/ce-page-team.ui.h:6
+msgid "From the team device"
+msgstr "Del dispositiu equip"
+
+#: ../src/connection-editor/ce-page-team.ui.h:7
+msgid "From the active port"
+msgstr "Des del port actiu"
+
+#: ../src/connection-editor/ce-page-team.ui.h:8
+msgid "From active to team device"
+msgstr "Des del dispositiu actiu al dispositiu equip"
+
+#: ../src/connection-editor/ce-page-team.ui.h:12
 msgid "_Teamed connections:"
 msgstr "Connexions en _equip:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "Im_port team configuration from a file..."
-msgstr "_Importa una configuració en equip des d'un fitxer..."
+#: ../src/connection-editor/ce-page-team.ui.h:23
+msgid "Load balance"
+msgstr "Balanç de la càrrega"
+
+#: ../src/connection-editor/ce-page-team.ui.h:24
+msgid "LACP"
+msgstr "LACP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:25
+msgid "None"
+msgstr "Cap"
+
+#: ../src/connection-editor/ce-page-team.ui.h:27
+#: ../src/connection-editor/connection-helpers.c:103
+#: ../src/connection-editor/page-ethernet.c:324
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+msgid "Ethernet"
+msgstr "Cable"
+
+#: ../src/connection-editor/ce-page-team.ui.h:28
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-vlan.c:592 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../src/connection-editor/ce-page-team.ui.h:31
+msgid "IP"
+msgstr "IP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:32
+msgid "Any L3 protocol"
+msgstr "Qualsevol protocol L3"
+
+#: ../src/connection-editor/ce-page-team.ui.h:33
+msgid "TCP"
+msgstr "TCP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:34
+msgid "UDP"
+msgstr "UDP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:35
+msgid "SCTP"
+msgstr "SCTP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:36
+msgid "Any L4 protocol"
+msgstr "Qualsevol protocol L4"
+
+#: ../src/connection-editor/ce-page-team.ui.h:38
+msgid "_Peer notification count:"
+msgstr "Nombre de notificacions de _parells:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:39
+msgid "Peer _notification interval:"
+msgstr "Interval de _notificacions de parells:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:40
+msgid "_Multicast rejoin count:"
+msgstr "Nombre de reincorporacions de _multidifusió:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:41
+msgid "Multicast _rejoin interval:"
+msgstr "Interval de _reincorporacions de _multidifusió:<"
+
+#: ../src/connection-editor/ce-page-team.ui.h:46
+msgid "_Hardware Address:"
+msgstr "_Adreça del maquinari:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:47
+msgid ""
+"Desired hardware address of new team device. Usual MAC address format is "
+"accepted."
+msgstr ""
+"Adreça desitjada de maquinari del nou dispositiu d'equip. S'accepta el "
+"format habitual d'adreça MAC."
+
+#: ../src/connection-editor/ce-page-team.ui.h:49
+msgid "_Runner:"
+msgstr "_Runner:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:50
+msgid "_Hardware address policy:"
+msgstr "Política d'_adreça del maquinari:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:51
+msgid "Name of runner to be used."
+msgstr "Nom del runner a usar."
+
+#: ../src/connection-editor/ce-page-team.ui.h:52
+msgid ""
+"This  defines the policy of how hardware addresses of team device and port "
+"devices should be set during the team lifetime."
+msgstr ""
+"Això defineix la política sobre com les adreces de maquinari dels "
+"dispositius d'equip i de port haurien d'establir-se durant el temps de vida "
+"de l'equip."
+
+#: ../src/connection-editor/ce-page-team.ui.h:53
+msgid "Send LACPDU frames _periodically"
+msgstr "Envia marcs LACPDU _periòdicament"
+
+#: ../src/connection-editor/ce-page-team.ui.h:54
+msgid ""
+"If checked, LACPDU frames are sent along the configured links periodically. "
+"If not, it acts as \"speak when spoken to\"."
+msgstr ""
+"Si està marcat, els marcs LACPDU s'envien periòdicament junt amb els "
+"enllaços configurats. Si no està marcat, actua com «parla quan et parlin»."
+
+#: ../src/connection-editor/ce-page-team.ui.h:55
+msgid "Send a LACPDU frame _every second"
+msgstr "Envia un marc LACPDU cada s_egon"
+
+#: ../src/connection-editor/ce-page-team.ui.h:56
+msgid ""
+"Option specifies the rate at which our link partner is asked to transmit "
+"LACPDU packets. If checked, packets will be sent once  per second. Otherwise "
+"they will be sent every 30 seconds."
+msgstr ""
+"L'opció especifica la velocitat a la qual se li demana al nostre soci "
+"d'enllaç de transmetre paquets LACPDU. Si està marcat, s'enviarà paquets un "
+"cop per segon. En cas contrari, s'enviaran cada 30 segons."
+
+#: ../src/connection-editor/ce-page-team.ui.h:57
+msgid "_System priority:"
+msgstr "Prioritat del _sistema:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:58
+msgid "_Minimum ports:"
+msgstr "Ports _mínims:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:59
+msgid "_Aggregator selection policy:"
+msgstr "Política de selecció d'_agregador:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:60
+msgid "System priority, value can be 0 – 65535."
+msgstr "Prioritat de sistema, el valor pot ser 0-65535."
+
+#: ../src/connection-editor/ce-page-team.ui.h:61
+msgid ""
+"Specifies the minimum number of ports that must be active before asserting "
+"carrier in the master interface, value can be 1 – 255."
+msgstr ""
+"Especifica el nombre mínim de ports que han d'estar actius abans de declarar "
+"l'operador a la interfície mestra, el valor pot ser 1-255."
+
+#: ../src/connection-editor/ce-page-team.ui.h:62
+msgid "This selects the policy of how the aggregators will be selected."
+msgstr "Això selecciona la política de com se seleccionaran els agregadors."
+
+#: ../src/connection-editor/ce-page-team.ui.h:63
+msgid ""
+"List of fragment types (strings) which should be used for packet Tx hash "
+"computation."
+msgstr ""
+"La llista de tipus de fragments (cadenes de text) que s'haurien d'usar per a "
+"la computació del resum Tx."
+
+#: ../src/connection-editor/ce-page-team.ui.h:64
+msgid "_Fields for tramsmission hash"
+msgstr "_Camps per al resum de transmissió"
+
+#: ../src/connection-editor/ce-page-team.ui.h:65
+msgid "In tenths of a second. Periodic interval between rebalancing."
+msgstr "En dècims de segon. Intervals periòdics entre rebalancejos."
+
+#: ../src/connection-editor/ce-page-team.ui.h:66
+msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
+msgstr ""
+"Nom del balancejador Tx actiu. El balanceig Tx actiu es deshabilita per "
+"defecte."
+
+#: ../src/connection-editor/ce-page-team.ui.h:67
+msgid "Transmission _balancing interval:"
+msgstr "Interval de _balanceig de la transmissió:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:68
+msgid "_Transmission balancer:"
+msgstr "Balancí de la _transmissió:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:69
+msgid "Runner"
+msgstr "Runner"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
@@ -2122,78 +2625,66 @@ msgstr ""
 "mètodes d'autenticació. En cas que fallin les connexions, intenteu "
 "inhabilitar-ne alguns."
 
-#: ../src/connection-editor/connection-helpers.c:97
-#: ../src/connection-editor/page-ethernet.c:326
-#: ../src/libnm-gtk/nm-ui-utils.c:321
-msgid "Ethernet"
-msgstr "Cable"
-
-#: ../src/connection-editor/connection-helpers.c:98
-#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/page-wifi.c:441 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Sense fil"
 
-#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/connection-helpers.c:112
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/connection-helpers.c:113
 #: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/connection-editor/connection-helpers.c:114
+#: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-bond.c:444 ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Vinculada"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-team.c:267 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Equip"
 
-#: ../src/connection-editor/connection-helpers.c:111
+#: ../src/connection-editor/connection-helpers.c:117
 #: ../src/connection-editor/page-bridge.c:210
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Pont"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/connection-helpers.c:254
-#: ../src/connection-editor/page-vpn.c:101
+#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/connection-helpers.c:252
+#: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:196
+#: ../src/connection-editor/connection-helpers.c:194
 msgid "Hardware"
 msgstr "Maquinari"
 
-#: ../src/connection-editor/connection-helpers.c:223
+#: ../src/connection-editor/connection-helpers.c:221
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/connection-helpers.c:292
-#: ../src/connection-editor/connection-helpers.c:294
+#: ../src/connection-editor/connection-helpers.c:370
+#: ../src/connection-editor/connection-helpers.c:372
 msgid "Import a saved VPN configuration..."
 msgstr "Importa una configuració VPN..."
 
-#: ../src/connection-editor/connection-helpers.c:323
+#: ../src/connection-editor/connection-helpers.c:401
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2201,15 +2692,15 @@ msgstr ""
 "No s'ha pogut inicialitzar el diàleg d'edició de les connexions a causa d'un "
 "error desconegut."
 
-#: ../src/connection-editor/connection-helpers.c:332
+#: ../src/connection-editor/connection-helpers.c:410
 msgid "Could not create new connection"
 msgstr "No s'ha pogut crear la connexió nova"
 
-#: ../src/connection-editor/connection-helpers.c:469
+#: ../src/connection-editor/connection-helpers.c:556
 msgid "Connection delete failed"
 msgstr "No s'ha pogut suprimir la connexió"
 
-#: ../src/connection-editor/connection-helpers.c:517
+#: ../src/connection-editor/connection-helpers.c:604
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Segur que voleu suprimir la connexió %s?"
@@ -2394,24 +2885,25 @@ msgstr "Suprimeix la connexió seleccionada"
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentiqueu-vos per suprimir la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:929
+#: ../src/connection-editor/nm-connection-list.c:914
+#: ../src/connection-editor/nm-connection-list.c:917
+msgid "Error creating connection"
+msgstr "S'ha produït un error en crear la connexió"
+
+#: ../src/connection-editor/nm-connection-list.c:915
 msgid "No VPN plugins are installed."
 msgstr "No hi ha cap connector VPN instal·lat."
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/nm-connection-list.c:918
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Es desconeix com crear connexions «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:933
-msgid "Error creating connection"
-msgstr "S'ha produït un error en crear la connexió"
-
-#: ../src/connection-editor/nm-connection-list.c:955
+#: ../src/connection-editor/nm-connection-list.c:941
 msgid "Error editing connection"
 msgstr "S'ha produït un error en editar la connexió"
 
-#: ../src/connection-editor/nm-connection-list.c:956
+#: ../src/connection-editor/nm-connection-list.c:942
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "No s'ha pogut trobar cap connexió amb UUID «%s»"
@@ -2435,7 +2927,7 @@ msgstr "Adreça MAC del dispositiu Bluetooh. Per exemple: 00:11:22:33:44:55"
 
 #: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
-msgstr "No s'ha pogut carregar la interfície d'usuari Bluetooth "
+msgstr "No s'ha pogut carregar la interfície d'usuari Bluetooth."
 
 #: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
@@ -2447,28 +2939,28 @@ msgstr "dispositiu Bluetooth no vàlid (%s)"
 msgid "Bluetooth connection %d"
 msgstr "Connexió Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:302
+#: ../src/connection-editor/page-bluetooth.c:303
 msgid "Bluetooth Type"
 msgstr "Tipus de Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:320
+#: ../src/connection-editor/page-bluetooth.c:321
 msgid "Select the type of the Bluetooth connection profile."
-msgstr "Selecciona el tipus del perfil de connexió Bluetooth"
+msgstr "Selecciona el tipus del perfil de connexió Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:325
+#: ../src/connection-editor/page-bluetooth.c:326
 msgid "_Personal Area Network"
 msgstr "Xarxa d'àrea _personal"
 
-#: ../src/connection-editor/page-bluetooth.c:330
+#: ../src/connection-editor/page-bluetooth.c:331
 msgid "_Dial-Up Network"
 msgstr "Xarxa _de connexió telefònica"
 
-#: ../src/connection-editor/page-bond.c:447
+#: ../src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió vinculada."
 
-#: ../src/connection-editor/page-bond.c:566
+#: ../src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "primària"
 
@@ -2481,7 +2973,7 @@ msgstr "Connexió vinculada %d"
 msgid "Could not load bridge user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per la connexió de pont."
 
-#: ../src/connection-editor/page-bridge.c:310
+#: ../src/connection-editor/page-bridge.c:311
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Connexió de pont %d"
@@ -2497,11 +2989,11 @@ msgstr "Port del pont"
 msgid "Could not load bridge port user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari de ponts de port."
 
-#: ../src/connection-editor/page-dcb.c:603
+#: ../src/connection-editor/page-dcb.c:622
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:605
+#: ../src/connection-editor/page-dcb.c:624
 msgid "Could not load DCB user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari DCB."
 
@@ -2509,7 +3001,7 @@ msgstr "No s'ha pogut carregar la interfície d'usuari DCB."
 msgid "Could not load DSL user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió DSL."
 
-#: ../src/connection-editor/page-dsl.c:214
+#: ../src/connection-editor/page-dsl.c:215
 #, c-format
 msgid "DSL connection %d"
 msgstr "Connexió DSL %d"
@@ -2524,26 +3016,26 @@ msgstr ""
 "bé pel seu nom d'interfície o per la MAC permanent o per ambdós. Exemples: "
 "«em1», «3C:97:0E:42:1A:19», «em1 (3C:97:0E:42:1A:19)»"
 
-#: ../src/connection-editor/page-ethernet.c:328
+#: ../src/connection-editor/page-ethernet.c:326
 msgid "Could not load ethernet user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió amb fil."
 
-#: ../src/connection-editor/page-ethernet.c:457
+#: ../src/connection-editor/page-ethernet.c:455
 msgid "Ethernet device"
 msgstr "Dispositiu Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:461
-#: ../src/connection-editor/page-vlan.c:741
-#: ../src/connection-editor/page-wifi.c:581
+#: ../src/connection-editor/page-ethernet.c:459
+#: ../src/connection-editor/page-vlan.c:739
+#: ../src/connection-editor/page-wifi.c:574
 msgid "cloned MAC"
 msgstr "MAC clonada"
 
-#: ../src/connection-editor/page-ethernet.c:465
+#: ../src/connection-editor/page-ethernet.c:463
 msgid "Wake-on-LAN password"
 msgstr "Contrasenya d'activació per LAN"
 
-#: ../src/connection-editor/page-ethernet.c:500
+#: ../src/connection-editor/page-ethernet.c:499
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Connexió de xarxa amb fil %d"
@@ -2585,16 +3077,16 @@ msgstr ""
 "«ib0», «80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65», «ib0 "
 "(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)»"
 
-#: ../src/connection-editor/page-infiniband.c:153
+#: ../src/connection-editor/page-infiniband.c:151
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:216
+#: ../src/connection-editor/page-infiniband.c:214
 msgid "infiniband device"
 msgstr "dispositiu infiniband"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: ../src/connection-editor/page-infiniband.c:250
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Connexió InfiniBand %d"
@@ -2757,11 +3249,11 @@ msgid "Unsupported mobile broadband connection type."
 msgstr "No s'admet el tipus de connexió de banda ampla mòbil."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:529
+#: ../src/connection-editor/page-mobile.c:530
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Seleccioneu el tipus de proveïdor de banda ampla mòbil"
 
-#: ../src/connection-editor/page-mobile.c:556
+#: ../src/connection-editor/page-mobile.c:557
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2769,23 +3261,23 @@ msgstr ""
 "Seleccioneu la tecnologia que utilitza el vostre proveïdor de banda ampla "
 "mòbil. Si no n'esteu segur, demaneu-ho al vostre proveïdor."
 
-#: ../src/connection-editor/page-mobile.c:561
+#: ../src/connection-editor/page-mobile.c:562
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "El meu proveïdor utilitza tecnologia basada en _GSM (és a dir, GPRS, EDGE, "
 "UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:568
+#: ../src/connection-editor/page-mobile.c:569
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "El meu proveïdor utilitza tecnologia basada en C_DMA (és a dir, 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/connection-editor/page-mobile.c:579 ../src/mb-menu-item.c:50
 #: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:582 ../src/mb-menu-item.c:54
 #: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
@@ -2805,7 +3297,7 @@ msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:280
+#: ../src/wireless-security/eap-method-fast.c:283
 #: ../src/wireless-security/eap-method-peap.c:272
 #: ../src/wireless-security/eap-method-ttls.c:288
 msgid "MSCHAPv2"
@@ -2834,22 +3326,22 @@ msgstr "Paràmetres PPP"
 msgid "Could not load PPP user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió PPP."
 
-#: ../src/connection-editor/page-team.c:98
-#: ../src/connection-editor/page-team-port.c:71
-#: ../src/connection-editor/vpn-helpers.c:165
+#: ../src/connection-editor/page-team.c:341
+#: ../src/connection-editor/page-team-port.c:203
+#: ../src/connection-editor/vpn-helpers.c:168
 msgid "Select file to import"
 msgstr "Seleccioneu el fitxer a importar"
 
-#: ../src/connection-editor/page-team.c:118
-#: ../src/connection-editor/page-team-port.c:91
+#: ../src/connection-editor/page-team.c:361
+#: ../src/connection-editor/page-team-port.c:223
 msgid "Error: file doesn't contain a valid JSON configuration"
 msgstr "Error: el fitxer no conté una configuració JSON vàlida"
 
-#: ../src/connection-editor/page-team.c:270
+#: ../src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari de l'equip."
 
-#: ../src/connection-editor/page-team.c:377
+#: ../src/connection-editor/page-team.c:1124
 #, c-format
 msgid "Team connection %d"
 msgstr "Connexió en equip %d"
@@ -2857,11 +3349,11 @@ msgstr "Connexió en equip %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:151
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
 msgstr "Port de l'equip"
 
-#: ../src/connection-editor/page-team-port.c:153
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari del port de l'equip."
 
@@ -2878,35 +3370,44 @@ msgstr "%s (via «%s»)"
 msgid "New connection..."
 msgstr "Connexió nova..."
 
-#: ../src/connection-editor/page-vlan.c:596
+#: ../src/connection-editor/page-vlan.c:594
 msgid "Could not load vlan user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió VLAN."
 
-#: ../src/connection-editor/page-vlan.c:734
+#: ../src/connection-editor/page-vlan.c:732
 msgid "vlan parent"
 msgstr "vlan arrel"
 
-#: ../src/connection-editor/page-vlan.c:797
+#: ../src/connection-editor/page-vlan.c:796
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Connexió VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:103
+#: ../src/connection-editor/page-vpn.c:98
 msgid "Could not load VPN user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió VPN."
 
-#: ../src/connection-editor/page-vpn.c:118
+#: ../src/connection-editor/page-vpn.c:113
 #, c-format
-msgid "Could not find VPN plugin service for '%s'."
-msgstr "No s'ha trobat cap servei de connector VPN per a «%s»."
+msgid "Could not find VPN plugin for '%s'."
+msgstr "No s'ha pogut trobar el connector VPN per a «%s»."
+
+#: ../src/connection-editor/page-vpn.c:122
+#, c-format
+msgid "Could not load editor VPN plugin for '%s' (%s)."
+msgstr "No s'ha pogut carregar el connector de VPN d'editor per a «%s» (%s)."
+
+#: ../src/connection-editor/page-vpn.c:123
+msgid "unknown failure"
+msgstr "fallada desconeguda"
 
-#: ../src/connection-editor/page-vpn.c:205
-#: ../src/connection-editor/page-vpn.c:300
+#: ../src/connection-editor/page-vpn.c:216
+#: ../src/connection-editor/page-vpn.c:364
 #, c-format
 msgid "VPN connection %d"
 msgstr "Connexió VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:229
+#: ../src/connection-editor/page-vpn.c:240
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2916,11 +3417,11 @@ msgstr ""
 "\n"
 "Error: no hi ha cap tipus de servei VPN."
 
-#: ../src/connection-editor/page-vpn.c:254
+#: ../src/connection-editor/page-vpn.c:266
 msgid "Choose a VPN Connection Type"
 msgstr "Seleccioneu un tipus de connexió VPN"
 
-#: ../src/connection-editor/page-vpn.c:255
+#: ../src/connection-editor/page-vpn.c:267
 msgid ""
 "Select the type of VPN you wish to use for the new connection.  If the type "
 "of VPN connection you wish to create does not appear in the list, you may "
@@ -2953,46 +3454,45 @@ msgstr ""
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:450
+#: ../src/connection-editor/page-wifi.c:443
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió sense fil."
 
-#: ../src/connection-editor/page-wifi.c:571
+#: ../src/connection-editor/page-wifi.c:564
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:577
+#: ../src/connection-editor/page-wifi.c:570
 msgid "Wi-Fi device"
 msgstr "Dispositiu Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:619
+#: ../src/connection-editor/page-wifi.c:613
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Connexió de xarxa sense fil %d"
 
 #: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: ../src/libnma/nma-wifi-dialog.c:920 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP de 40/128 bits (Hex o ASCII)"
 
 #: ../src/connection-editor/page-wifi-security.c:319
-#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Contrasenya WEP de 128 bits"
 
 #: ../src/connection-editor/page-wifi-security.c:345
-#: ../src/libnma/nma-wifi-dialog.c:945 ../src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinàmic 802.1X"
 
 #: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA i WPA2 Personal"
 
 #: ../src/connection-editor/page-wifi-security.c:371
-#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: ../src/libnma/nma-wifi-dialog.c:987 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
@@ -3022,11 +3522,11 @@ msgstr "falta el SSID"
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "La seguretat no és compatible amb el mode Ad-Hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:138
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "No es pot importar la connexió VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:140
+#: ../src/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3039,29 +3539,29 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:144
 msgid "unknown error"
 msgstr "error desconegut"
 
-#: ../src/connection-editor/vpn-helpers.c:215
+#: ../src/connection-editor/vpn-helpers.c:218
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Ja existeix un fitxer anomenat «%s»."
 
-#: ../src/connection-editor/vpn-helpers.c:217
+#: ../src/connection-editor/vpn-helpers.c:220
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: ../src/connection-editor/vpn-helpers.c:219
+#: ../src/connection-editor/vpn-helpers.c:222
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Voleu reemplaçar %s per la connexió VPN que esteu desant?"
 
-#: ../src/connection-editor/vpn-helpers.c:255
+#: ../src/connection-editor/vpn-helpers.c:258
 msgid "Cannot export VPN connection"
 msgstr "No es pot exportar la connexió VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:257
+#: ../src/connection-editor/vpn-helpers.c:260
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3072,18 +3572,10 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:295
 msgid "Export VPN connection..."
 msgstr "Exporta una connexió VPN..."
 
-#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"La miniaplicació NetworkManager no ha pogut trobar alguns dels recursos "
-"necessaris (no s'ha trobat el fitxer d'interfície d'usuari)."
-
 #: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Desbloqueja"
@@ -3344,20 +3836,24 @@ msgstr ""
 "O bé falta la contrasenya o la connexió no és vàlida. En el segon cas heu "
 "d'editar primer la connexió amb el nm-connection-editor"
 
-#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: ../src/libnma/nma-wifi-dialog.c:465 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nova..."
 
-#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: ../src/libnma/nma-wifi-dialog.c:903 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Cap"
 
-#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinàmic (802.1X)"
+
+#: ../src/libnma/nma-wifi-dialog.c:1071 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_rea"
 
-#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3365,35 +3861,35 @@ msgstr ""
 "Cal una contrasenya o claus d'encriptació per accedir a la xarxa sense fil "
 "«%s»."
 
-#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Cal autenticació per a la xarxa sense fil"
 
-#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Cal autenticació per a la xarxa sense fil"
 
-#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Crea una xarxa sense fil nova"
 
-#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1168 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Xarxa sense fil nova"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Introduïu el nom de la xarxa sense fil que voleu crear."
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connecta't a la xarxa sense fil oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1173 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Xarxa sense fil oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3560,12 +4056,12 @@ msgstr "Cal que introduïu el codi PIN"
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Cal que introduïu un codi PIN per al dispositiu de banda ampla mòbil"
 
-#: ../src/mobile-helpers.c:619
+#: ../src/mobile-helpers.c:622
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "La connexió de banda ampla mòbil «%s» és activa: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:622
+#: ../src/mobile-helpers.c:625
 msgid "roaming"
 msgstr "itinerància"
 
@@ -3575,43 +4071,47 @@ msgstr "itinerància"
 msgid "%s connection"
 msgstr "connexió de %s"
 
-#: ../src/wireless-security/eap-method.c:56
+#: ../src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "error no definit a la seguretat 802.1X (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:255
+#: ../src/wireless-security/eap-method.c:233
+msgid "no file selected"
+msgstr "no s'ha seleccionat cap fitxer"
+
+#: ../src/wireless-security/eap-method.c:264
 msgid "unspecified error validating eap-method file"
 msgstr ""
 "s'ha produït un error no especificat quan s'estava validant el fitxer del "
 "mètode eap"
 
-#: ../src/wireless-security/eap-method.c:452
+#: ../src/wireless-security/eap-method.c:468
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Claus privades DER, PEM o PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:471
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificats DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:70
+#: ../src/wireless-security/eap-method-fast.c:72
 msgid "missing EAP-FAST PAC file"
 msgstr "falta el fitxer EAP-FAST PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-fast.c:268
 #: ../src/wireless-security/eap-method-peap.c:302
 #: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:403
-msgid "Choose a PAC file..."
-msgstr "Seleccioneu un fitxer PAC..."
+#: ../src/wireless-security/eap-method-fast.c:406
+msgid "Choose a PAC file"
+msgstr "Seleccioneu un fitxer PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "Fitxers PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "Tots els fitxers"
 
@@ -3648,11 +4148,11 @@ msgstr "Autenticació i_nterna:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Permet la provisió automàtica PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:63
+#: ../src/wireless-security/eap-method-leap.c:65
 msgid "missing EAP-LEAP username"
 msgstr "falta el nom d'usuari EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-leap.c:69
+#: ../src/wireless-security/eap-method-leap.c:74
 msgid "missing EAP-LEAP password"
 msgstr "falta la contrasenya EAP-LEAP"
 
@@ -3672,10 +4172,10 @@ msgid "MD5"
 msgstr "MD5"
 
 #: ../src/wireless-security/eap-method-peap.c:381
-#: ../src/wireless-security/eap-method-tls.c:481
+#: ../src/wireless-security/eap-method-tls.c:501
 #: ../src/wireless-security/eap-method-ttls.c:412
-msgid "Choose a Certificate Authority certificate..."
-msgstr "Trieu un certificat d'autoritat de certificació (CA)..."
+msgid "Choose a Certificate Authority certificate"
+msgstr "Trieu un certificat d'autoritat de certificació"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
@@ -3701,46 +4201,46 @@ msgstr "No es _requereix cap certificat de CA"
 msgid "PEAP _version:"
 msgstr "Versió del _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:72
+#: ../src/wireless-security/eap-method-simple.c:74
 msgid "missing EAP username"
 msgstr "falta el nom d'usuari EAP"
 
-#: ../src/wireless-security/eap-method-simple.c:82
+#: ../src/wireless-security/eap-method-simple.c:87
 msgid "missing EAP password"
 msgstr "falta la clau EAP"
 
-#: ../src/wireless-security/eap-method-tls.c:66
+#: ../src/wireless-security/eap-method-tls.c:68
 msgid "missing EAP-TLS identity"
 msgstr "falta la identitat EAP-TLS"
 
-#: ../src/wireless-security/eap-method-tls.c:71
+#: ../src/wireless-security/eap-method-tls.c:77
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "certificat EAP-TLS CA no vàlid: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:76
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "certificat EAP-TLS CA no vàlid: no s'ha especificat cap certificat"
 
-#: ../src/wireless-security/eap-method-tls.c:84
+#: ../src/wireless-security/eap-method-tls.c:95
 msgid "invalid EAP-TLS password: missing"
 msgstr "contrasenya EAP-TLS no vàlida: falta"
 
-#: ../src/wireless-security/eap-method-tls.c:94
+#: ../src/wireless-security/eap-method-tls.c:109
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "clau privada EAP-TLS no vàlida: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:101
+#: ../src/wireless-security/eap-method-tls.c:119
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "certificat d'usuari EAP-TLS no vàlid: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:296
+#: ../src/wireless-security/eap-method-tls.c:316
 msgid "Unencrypted private keys are insecure"
 msgstr "Les claus privades sense encriptar no són segures"
 
-#: ../src/wireless-security/eap-method-tls.c:299
+#: ../src/wireless-security/eap-method-tls.c:319
 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 "
@@ -3754,13 +4254,13 @@ msgstr ""
 "\n"
 "(Podeu utilitzar l'OpenSSL per protegir la vostra clau privada)"
 
-#: ../src/wireless-security/eap-method-tls.c:475
-msgid "Choose your personal certificate..."
-msgstr "Trieu el vostre certificat personal..."
+#: ../src/wireless-security/eap-method-tls.c:495
+msgid "Choose your personal certificate"
+msgstr "Trieu el vostre certificat personal"
 
-#: ../src/wireless-security/eap-method-tls.c:487
-msgid "Choose your private key..."
-msgstr "Trieu la vostra clau privada..."
+#: ../src/wireless-security/eap-method-tls.c:507
+msgid "Choose your private key"
+msgstr "Trieu la vostra clau privada"
 
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
@@ -3817,26 +4317,26 @@ msgstr "EAP protegit (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Autenticació:"
 
-#: ../src/wireless-security/ws-leap.c:61
+#: ../src/wireless-security/ws-leap.c:63
 msgid "missing leap-username"
 msgstr "falta el nom d'usuari leap"
 
-#: ../src/wireless-security/ws-leap.c:69
+#: ../src/wireless-security/ws-leap.c:74
 msgid "missing leap-password"
 msgstr "falta la contrasenya leap"
 
-#: ../src/wireless-security/ws-wep-key.c:105
+#: ../src/wireless-security/ws-wep-key.c:107
 msgid "missing wep-key"
 msgstr "falta la clau wep"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: ../src/wireless-security/ws-wep-key.c:116
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "clau wep no vàlida: una clau amb longitud %zu ha de contenir sols dígits "
 "hexadecimals"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: ../src/wireless-security/ws-wep-key.c:124
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -3844,7 +4344,7 @@ msgstr ""
 "clau wep no vàlida: una clau amb longitud %zu ha de contenir sols caràcters "
 "ascii"
 
-#: ../src/wireless-security/ws-wep-key.c:125
+#: ../src/wireless-security/ws-wep-key.c:130
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -3853,11 +4353,11 @@ msgstr ""
 "clau web no vàlida: la longitud %zu és incorrecta. Una clau ha de tenir "
 "longitud 5/13 (ascii) o 10/26 (hex)"
 
-#: ../src/wireless-security/ws-wep-key.c:131
+#: ../src/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "clau web no vàlida: la frase de contrasenya no pot estar buida"
 
-#: ../src/wireless-security/ws-wep-key.c:133
+#: ../src/wireless-security/ws-wep-key.c:139
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "clau web no vàlida: la frase de contrasenya ha de tenir una longitud "
@@ -3887,7 +4387,7 @@ msgstr "Most_ra la clau"
 msgid "WEP inde_x:"
 msgstr "Índe_x WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:69
+#: ../src/wireless-security/ws-wpa-psk.c:70
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3896,7 +4396,7 @@ msgstr ""
 "wpa-psk no vàlida: la longitud de la clau %zu no és vàlida. Ha de ser [8,63] "
 "bytes o 64 dígits hexadecimals"
 
-#: ../src/wireless-security/ws-wpa-psk.c:77
+#: ../src/wireless-security/ws-wpa-psk.c:79
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk no vàlida: no es pot interpretar una clau amb 64 bytes com a "
@@ -3906,6 +4406,15 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Tipus:"
 
+#~ msgid "NetworkManager for GNOME"
+#~ msgstr "NetworkManager per al GNOME"
+
+#~ msgid "_Disconnect VPN"
+#~ msgstr "_Desconnecta la VPN"
+
+#~ msgid "_Import team configuration from a file..."
+#~ msgstr "_Importa una configuració en equip des d'un fitxer..."
+
 #~ msgid "_Help"
 #~ msgstr "A_juda"
 
diff --git a/po/de.po b/po/de.po
index a18f3e25..761916c1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,8 +23,8 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-08-04 07:41+0000\n"
-"PO-Revision-Date: 2016-08-12 23:38+0200\n"
+"POT-Creation-Date: 2016-09-14 12:18+0000\n"
+"PO-Revision-Date: 2016-09-18 20:45+0200\n"
 "Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -34,7 +34,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.8\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3104
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3119
 msgid "Network"
 msgstr "Netzwerk"
 
@@ -448,7 +448,7 @@ msgstr "Eine VPN-Verbindung _hinzufügen …"
 msgid "NetworkManager is not running..."
 msgstr "Der Netzwerk-Manager läuft zur Zeit nicht …"
 
-#: ../src/applet.c:1612 ../src/applet.c:2604
+#: ../src/applet.c:1612 ../src/applet.c:2619
 msgid "Networking disabled"
 msgstr "Netzwerk deaktiviert"
 
@@ -499,52 +499,52 @@ msgstr "Verbindung getrennt"
 msgid "The network connection has been disconnected."
 msgstr "Die Netzwerkverbindung wurde getrennt."
 
-#: ../src/applet.c:2466
+#: ../src/applet.c:2481
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Netzwerkverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet.c:2469
+#: ../src/applet.c:2484
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Benutzerlegitimierung ist erforderlich für Netzwerkverbindung »%s«"
 
-#: ../src/applet.c:2472 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2487 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Netzwerkadresse für »%s« wird angefordert …"
 
-#: ../src/applet.c:2475
+#: ../src/applet.c:2490
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Netzwerkverbindungen »%s« aktiv"
 
-#: ../src/applet.c:2549
+#: ../src/applet.c:2564
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN-Verbindung »%s« wird gestartet …"
 
-#: ../src/applet.c:2552
+#: ../src/applet.c:2567
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Benutzerlegitimierung ist erforderlich für VPN-Verbindung »%s«"
 
-#: ../src/applet.c:2555
+#: ../src/applet.c:2570
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Anfordern einer Netzwerkadresse von VPN-Verbindung »%s« …"
 
-#: ../src/applet.c:2558
+#: ../src/applet.c:2573
 #, c-format
 msgid "VPN connection active"
 msgstr "VPN-Verbindung ist aktiv"
 
-#: ../src/applet.c:2608
+#: ../src/applet.c:2623
 msgid "No network connection"
 msgstr "Keine Netzwerkverbindung"
 
-#: ../src/applet.c:3203
+#: ../src/applet.c:3218
 msgid "NetworkManager Applet"
 msgstr "Netzwerk-Manager-Applet"
 
@@ -1988,7 +1988,7 @@ msgstr "Er_weitert …"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
 msgid "Set by master"
-msgstr ""
+msgstr "Durch Master festgelegt"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:9
@@ -2024,6 +2024,7 @@ msgstr ""
 #: ../src/connection-editor/ce-page-team-port.ui.h:9
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
+"Kennung der Warteschlange, auf welche dieser Port abgebildet werden soll."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:10
 msgid "_Port priority:"
@@ -2039,16 +2040,17 @@ msgid ""
 "Validate received ARP packets on active ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
 msgstr ""
+"Auf aktiven Ports erhaltene ARP-Pakete prüfen. Falls nicht angewählt, werden "
+"alle eingehenden ARP-Pakete als valide Antwort eingestuft."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:44
-#, fuzzy
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
 msgstr ""
 "Der Wert ist eine positive Zahl in Millisekunden, die einen Intervall "
-"zwischen ? angibt."
+"zwischen Bursts von Notify-Peer-Paketen angibt."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:14
 msgid "Port priority. The higher number means higher priority."
@@ -2088,12 +2090,16 @@ msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
 msgstr ""
+"Wert ist eine positive Zahl in Millisekunden. Legt ein Intervall fest "
+"zwischen Bursts von Multicast group-rejoin-Anfragen."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:21
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
 msgstr ""
+"Portschlüssel nach dem LACP-Standard. Es ist nur möglich Ports mit dem "
+"gleichen Schlüssel zu aggregieren."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:22
 msgid "LACP runner options"
@@ -2102,7 +2108,7 @@ msgstr ""
 #: ../src/connection-editor/ce-page-team-port.ui.h:24
 #: ../src/connection-editor/ce-page-team.ui.h:70
 msgid "_Link watcher:"
-msgstr ""
+msgstr "_Verbindungsüberwachung:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:25
 #: ../src/connection-editor/ce-page-team.ui.h:71
@@ -2116,7 +2122,6 @@ msgstr "Verzögerung bei _Deaktivierung:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:27
 #: ../src/connection-editor/ce-page-team.ui.h:73
-#| msgid "_Parent interface:"
 msgid "Send _interval:"
 msgstr "Sende_intervall:"
 
@@ -2155,6 +2160,8 @@ msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
 msgstr ""
+"Rechnername, der in eine IP-Adresse umgewandelt werden soll. Sie wird als "
+"Quelladresse in ARP-Anfragen eingesetzt."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:34
 #: ../src/connection-editor/ce-page-team.ui.h:80
@@ -2162,6 +2169,8 @@ msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
 msgstr ""
+"Rechnername, der in eine IP-Adresse umgewandelt werden soll. Sie wird als "
+"Zieladresse in Anfragen eingesetzt."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:35
 #: ../src/connection-editor/ce-page-team.ui.h:81
@@ -2179,6 +2188,8 @@ msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
 msgstr ""
+"Auf inaktiven Ports erhaltene ARP-Pakete prüfen. Falls nicht angewählt, "
+"werden alle eingehenden ARP-Pakete als valide Antwort eingestuft."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:38
 #: ../src/connection-editor/ce-page-team.ui.h:85
@@ -2220,12 +2231,12 @@ msgstr ""
 #: ../src/connection-editor/ce-page-team-port.ui.h:44
 #: ../src/connection-editor/ce-page-team.ui.h:91
 msgid "The link watcher to be used."
-msgstr ""
+msgstr "Die zu verwendende Verbindungsüberwachung."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:45
 #: ../src/connection-editor/ce-page-team.ui.h:92
 msgid "Link Watcher"
-msgstr ""
+msgstr "Verbindungsüberwachung"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:46
 #: ../src/connection-editor/ce-page-team.ui.h:93
@@ -2361,10 +2372,8 @@ msgid "_Runner:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team.ui.h:50
-#, fuzzy
-#| msgid "Hardware Address:"
 msgid "_Hardware address policy:"
-msgstr "Hardware-Adresse:"
+msgstr "Richtlinie der _Hardware-Adresse:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:51
 msgid "Name of runner to be used."
@@ -2387,6 +2396,9 @@ msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as \"speak when spoken to\"."
 msgstr ""
+"Legt fest, ob LACPDU-Rahmen periodisch über die eingerichteten Verbindungen "
+"gesendet werden. Wenn nicht wird »nur auf eingehende Nachrichten "
+"geantwortet«."
 
 #: ../src/connection-editor/ce-page-team.ui.h:55
 msgid "Send a LACPDU frame _every second"
@@ -2405,11 +2417,11 @@ msgstr "_Systempriorität:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:58
 msgid "_Minimum ports:"
-msgstr ""
+msgstr "_Minimale Ports:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:59
 msgid "_Aggregator selection policy:"
-msgstr ""
+msgstr "Richtlinie für die _Aggregator-Auswahl:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:60
 msgid "System priority, value can be 0 – 65535."
@@ -2423,37 +2435,38 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-team.ui.h:62
 msgid "This selects the policy of how the aggregators will be selected."
-msgstr ""
+msgstr "Wählt die Richtlinie, anhand welcher die Aggregatoren gewählt werden."
 
 #: ../src/connection-editor/ce-page-team.ui.h:63
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
 msgstr ""
+"Liste der Fragmenttypen (Zeichenketten), die für die Berechnung der Tx-"
+"Prüfsumme der Pakete verwendet werden soll"
 
 #: ../src/connection-editor/ce-page-team.ui.h:64
 msgid "_Fields for tramsmission hash"
-msgstr ""
+msgstr "_Felder für die Übertragungs-Prüfsumme"
 
 #: ../src/connection-editor/ce-page-team.ui.h:65
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
+"In Zehntel einer Sekunde. Periodisches Intervall zwischen Neubalancierung."
 
 #: ../src/connection-editor/ce-page-team.ui.h:66
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
+"Name der aktiven Tx-Balancierung. Aktive Tx-Balancierung ist per Vorgabe "
+"ausgeschaltet."
 
 #: ../src/connection-editor/ce-page-team.ui.h:67
-#, fuzzy
-#| msgid "Transmission po_wer:"
 msgid "Transmission _balancing interval:"
-msgstr "_Sendeleistung:"
+msgstr "_Intervall der Übertragungsbalancierung:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:68
-#, fuzzy
-#| msgid "Transmission po_wer:"
 msgid "_Transmission balancer:"
-msgstr "_Sendeleistung:"
+msgstr "_Übertragungsbalancierung:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:69
 msgid "Runner"
diff --git a/po/es.po b/po/es.po
index a19979bb..4812250e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,22 +1,22 @@
-# translation of networkmanager-applet.master.po to Spanish
-# Traducción de NetworkManager al español.
-# Copyright (C) Spanish translation for NetworkManager
-# This file is distributed under the same license as the NetworkManager package.
-# 
-# Antonio Ognio <antonio@linux.org.pe>, 2004.
-# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006.
-# Lucas Vieites Fariña <lucas@asixinformatica.com>, 2005, 2006.
-# Gladys Guerrero  <gguerrer@redhat.com>, 2010.
-# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
-# 
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013, 2014, 2015.
-, 2016.
+# translation of networkmanager-applet.master.po to Spanish
+# Traducción de NetworkManager al español.
+# Copyright (C) Spanish translation for NetworkManager
+# This file is distributed under the same license as the NetworkManager package.
+# 
+# Antonio Ognio <antonio@linux.org.pe>, 2004.
+# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006.
+# Lucas Vieites Fariña <lucas@asixinformatica.com>, 2005, 2006.
+# Gladys Guerrero  <gguerrer@redhat.com>, 2010.
+# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
+# 
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: networkmanager-applet.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-07-26 09:21+0000\n"
+"POT-Creation-Date: 2016-08-23 12:32+0000\n"
 "PO-Revision-Date: 2016-07-26 13:28+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
@@ -763,8 +763,7 @@ msgstr "Falló al añadir la conexión nueva"
 msgid "Error displaying connection information:"
 msgstr "Ha ocurrido un error al mostrar información de la conexión:"
 
-#: ../src/applet-dialogs.c:72
-#: ../src/connection-editor/page-wifi-security.c:332
+#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:332
 #: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
@@ -1104,8 +1103,7 @@ msgstr ""
 "predeterminada."
 
 #: ../src/connection-editor/ce-new-connection.ui.h:1 ../src/libnma/wifi.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../src/libnm-gtk/wifi.ui.h:1 ../src/wireless-security/eap-method-fast.ui.h:1
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 #: ../src/wireless-security/eap-method-ttls.ui.h:1
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:1
@@ -1302,13 +1300,11 @@ msgstr "Edad _máxima:"
 msgid "_Aging time:"
 msgstr "_Tiempo de de caducidad:"
 
-#: ../src/connection-editor/ce-page.c:78
-#: ../src/connection-editor/ce-page.c:112
+#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automático"
 
-#: ../src/connection-editor/ce-page.c:86
-#: ../src/connection-editor/ce-page.c:121
+#: ../src/connection-editor/ce-page.c:86 ../src/connection-editor/ce-page.c:121
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
 #: ../src/connection-editor/page-wifi.c:168
 #: ../src/connection-editor/page-wifi.c:172
@@ -1965,7 +1961,6 @@ msgstr "Enviar paquetes _echo PPP"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:19
-#| msgid "Advanced"
 msgid "Ad_vanced..."
 msgstr "Avanzada…"
 
@@ -1975,7 +1970,6 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:9
-#| msgid "Ethernet Networks"
 msgid "Ethernet port state"
 msgstr "Estado del puerto Ethernet"
 
@@ -2010,7 +2004,6 @@ msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:10
-#| msgid "_Priority:"
 msgid "_Port priority:"
 msgstr "_Prioridad del puerto:"
 
@@ -2041,12 +2034,10 @@ msgid "Active-Backup runner options"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:16
-#| msgid "_Priority:"
 msgid "_LACP port priority:"
 msgstr "Prioridad del puerto _LACP:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:17
-#| msgid "Private _key:"
 msgid "LACP port _key:"
 msgstr "Cla_ve del puerto LACP:"
 
@@ -2087,19 +2078,16 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:25
 #: ../src/connection-editor/ce-page-team.ui.h:71
-#| msgid "Link _up delay:"
 msgid "_Up delay:"
 msgstr "_Retardo al levantar el enlace:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:26
 #: ../src/connection-editor/ce-page-team.ui.h:72
-#| msgid "Link _down delay:"
 msgid "_Down delay:"
 msgstr "Retardo al _desconectar el enlace:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:27
 #: ../src/connection-editor/ce-page-team.ui.h:73
-#| msgid "_Parent interface:"
 msgid "Send _interval:"
 msgstr "_Intervalo de envío:"
 
@@ -2215,7 +2203,6 @@ msgstr "I_mportar configuración redundada desde un archivo…"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:47
 #: ../src/connection-editor/ce-page-team.ui.h:94
-#| msgid "_JSON config:"
 msgid "Edit _JSON configuration:"
 msgstr "Editar configuración de _JSON:"
 
@@ -2233,7 +2220,6 @@ msgid "Highest priority (stable)"
 msgstr "Prioridad más alta (estable)"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-#| msgid "Group Bandwidth:"
 msgid "Bandwidth"
 msgstr "Ancho de banda"
 
@@ -2242,7 +2228,6 @@ msgid "Highest number of ports"
 msgstr "Número de puertos más alto"
 
 #: ../src/connection-editor/ce-page-team.ui.h:5
-#| msgid "Priority"
 msgid "Port priority"
 msgstr "Prioridad del puerto"
 
@@ -2273,8 +2258,6 @@ msgid "LACP"
 msgstr "LACP"
 
 #: ../src/connection-editor/ce-page-team.ui.h:25
-#| msgctxt "Wi-Fi/Ethernet security"
-#| msgid "None"
 msgid "None"
 msgstr "Ninguna"
 
@@ -2293,7 +2276,6 @@ msgid "VLAN"
 msgstr "VLAN"
 
 #: ../src/connection-editor/ce-page-team.ui.h:31
-#| msgid "FIP"
 msgid "IP"
 msgstr "IP"
 
@@ -2302,7 +2284,6 @@ msgid "Any L3 protocol"
 msgstr "Cualquier protocolo L3"
 
 #: ../src/connection-editor/ce-page-team.ui.h:33
-#| msgid "GTC"
 msgid "TCP"
 msgstr "TCP"
 
@@ -2335,7 +2316,6 @@ msgid "Multicast _rejoin interval:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team.ui.h:46
-#| msgid "Hardware Address:"
 msgid "_Hardware Address:"
 msgstr "Dirección _hardware:"
 
@@ -2350,7 +2330,6 @@ msgid "_Runner:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team.ui.h:50
-#| msgid "Hardware Address:"
 msgid "_Hardware address policy:"
 msgstr "Política de dirección _hardware:"
 
@@ -2386,7 +2365,6 @@ msgid ""
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team.ui.h:57
-#| msgid "_Priority:"
 msgid "_System priority:"
 msgstr "_Prioridad del sistema:"
 
@@ -2431,12 +2409,10 @@ msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team.ui.h:67
-#| msgid "Transmission po_wer:"
 msgid "Transmission _balancing interval:"
 msgstr "_Intervalo de _balanceo de la transmisión:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:68
-#| msgid "Transmission po_wer:"
 msgid "_Transmission balancer:"
 msgstr "_Balanceador de la transmisión:"
 
@@ -2633,8 +2609,8 @@ msgid "Bond"
 msgstr "Bond"
 
 #: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-team.c:1028
-#: ../src/libnm-gtk/nm-ui-utils.c:335 ../src/libnm-gtk/nm-ui-utils.c:579
+#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Unir"
 
@@ -2885,11 +2861,15 @@ msgid "Did not find a connection with UUID '%s'"
 msgstr "No se encontró una conexión con UUID «%s»"
 
 #: ../src/connection-editor/page-8021x-security.c:109
-msgid "802.1x Security"
+#, fuzzy
+#| msgid "802.1x Security"
+msgid "802.1X Security"
 msgstr "Seguridad 802.1x"
 
 #: ../src/connection-editor/page-8021x-security.c:111
-msgid "Could not load 802.1x Security user interface."
+#, fuzzy
+#| msgid "Could not load 802.1x Security user interface."
+msgid "Could not load 802.1X Security user interface."
 msgstr "No se pudo cargar la interfaz de usuario de seguridad 802.1x."
 
 #: ../src/connection-editor/page-8021x-security.c:125
@@ -3450,8 +3430,9 @@ msgid "WEP 128-bit Passphrase"
 msgstr "Frase de paso WEP de 128 bits"
 
 #: ../src/connection-editor/page-wifi-security.c:345
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961
-msgid "Dynamic WEP (802.1x)"
+#, fuzzy
+#| msgid "Dynamic WEP (802.1x)"
+msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinámica (802.1x)"
 
 #: ../src/connection-editor/page-wifi-security.c:358
@@ -3809,6 +3790,10 @@ msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ninguna"
 
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinámica (802.1x)"
+
 #: ../src/libnma/nma-wifi-dialog.c:1071 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_rear"
@@ -4032,7 +4017,9 @@ msgid "%s connection"
 msgstr "Conexión %s"
 
 #: ../src/wireless-security/eap-method.c:57
-msgid "undefined error in 802.1x security (wpa-eap)"
+#, fuzzy
+#| msgid "undefined error in 802.1x security (wpa-eap)"
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "error no definido en la seguridad 802.1x (wpa-eap)"
 
 #: ../src/wireless-security/eap-method.c:233
@@ -4250,7 +4237,9 @@ msgstr ""
 "ningún certificado"
 
 #: ../src/wireless-security/wireless-security.c:72
-msgid "Unknown error validating 802.1x security"
+#, fuzzy
+#| msgid "Unknown error validating 802.1x security"
+msgid "Unknown error validating 802.1X security"
 msgstr "Error desconocido al validar la seguridad 802.1x"
 
 #: ../src/wireless-security/wireless-security.c:436
diff --git a/po/hu.po b/po/hu.po
index 30e70e59..f83bcbe4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-08-04 07:41+0000\n"
-"PO-Revision-Date: 2016-08-15 13:11+0200\n"
+"POT-Creation-Date: 2016-09-30 17:42+0000\n"
+"PO-Revision-Date: 2016-10-01 22:26+0200\n"
 "Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
 "Language-Team: Hungarian <openscope at gmail dot com>\n"
 "Language: hu\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.8\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3104
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3119
 msgid "Network"
 msgstr "Hálózat"
 
@@ -427,7 +427,7 @@ msgstr "VPN kapcsolat hozzá_adása…"
 msgid "NetworkManager is not running..."
 msgstr "A Hálózatkezelő nem fut…"
 
-#: ../src/applet.c:1612 ../src/applet.c:2604
+#: ../src/applet.c:1612 ../src/applet.c:2619
 msgid "Networking disabled"
 msgstr "Hálózat kikapcsolva"
 
@@ -479,52 +479,52 @@ msgstr "Kapcsolat bontva"
 msgid "The network connection has been disconnected."
 msgstr "A hálózati kapcsolat bontva."
 
-#: ../src/applet.c:2466
+#: ../src/applet.c:2481
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "A hálózati kapcsolat („%s”) előkészítése…"
 
-#: ../src/applet.c:2469
+#: ../src/applet.c:2484
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "A felhasználó hitelesítése szükséges a hálózati kapcsolathoz („%s”)…"
 
-#: ../src/applet.c:2472 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2487 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Hálózati cím kérése a következőhöz: „%s”…"
 
-#: ../src/applet.c:2475
+#: ../src/applet.c:2490
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "A hálózati kapcsolat („%s”) aktív"
 
-#: ../src/applet.c:2549
+#: ../src/applet.c:2564
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "A VPN kapcsolat („%s”) indítása…"
 
-#: ../src/applet.c:2552
+#: ../src/applet.c:2567
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "A felhasználó hitelesítése szükséges a VPN kapcsolathoz („%s”)…"
 
-#: ../src/applet.c:2555
+#: ../src/applet.c:2570
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "VPN cím kérése ehhez: „%s”…"
 
-#: ../src/applet.c:2558
+#: ../src/applet.c:2573
 #, c-format
 msgid "VPN connection active"
 msgstr "A VPN kapcsolat aktív"
 
-#: ../src/applet.c:2608
+#: ../src/applet.c:2623
 msgid "No network connection"
 msgstr "Nincs hálózati kapcsolat"
 
-#: ../src/applet.c:3203
+#: ../src/applet.c:3218
 msgid "NetworkManager Applet"
 msgstr "Hálózatkezelő kisalkalmazás"
 
@@ -854,7 +854,7 @@ msgstr "CDMA (%s)"
 #: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
 #: ../src/connection-editor/ce-page-team-port.ui.h:23
 #: ../src/connection-editor/ce-page-team.ui.h:48
-#: ../src/connection-editor/page-general.c:347
+#: ../src/connection-editor/page-general.c:344
 msgid "General"
 msgstr "Általános"
 
@@ -1045,8 +1045,7 @@ msgstr "_OK"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page.h:105
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1058,8 +1057,8 @@ msgstr ""
 #: ../src/connection-editor/ce-ip6-routes.ui.h:4
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 #: ../src/connection-editor/ce-page-team.ui.h:13
 #: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "_Add"
@@ -1070,8 +1069,8 @@ msgstr "Hozzá_adás"
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 #: ../src/connection-editor/ce-page-team.ui.h:15
 #: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
@@ -1574,8 +1573,8 @@ msgstr "_Jelszó:"
 #: ../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-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:135
+#: ../src/connection-editor/page-ip4.c:131
+#: ../src/connection-editor/page-ip6.c:136
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatikus"
@@ -1712,6 +1711,39 @@ msgstr "_Automatikus kapcsolódás ehhez a hálózathoz, ha elérhető"
 msgid "Firewall _zone:"
 msgstr "Tűzfal_zóna:"
 
+#: ../src/connection-editor/ce-page.h:102
+msgid ""
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add static IP address to be configured in addition to the "
+"automatic ones."
+msgstr ""
+"Az IP-címek azonosítják a számítógépét a hálózaton. Kattintson a „Hozzáadás” "
+"gombra, az automatikusak mellett beállítandó statikus IP-cím hozzáadásához."
+
+#: ../src/connection-editor/ce-page.h:107
+msgid ""
+"The IP address identify your computer on the network and determines the "
+"address range distributed to other computers.  Click the \"Add\" button to "
+"add an IP address.  If no address is provided, one in the 10.42.x.x range "
+"will be used."
+msgstr ""
+"Az IP-cím azonosítja a számítógépét a hálózaton, és meghatározza a más "
+"számítógépeknek kiosztott címtartományt. Kattintson a „Hozzáadás” gombra egy "
+"IP-cím hozzáadásához. Ha nincs cím megadva, akkor a 10.42.x.x tartomány "
+"egyike lesz használva."
+
+#: ../src/connection-editor/ce-page.h:113
+msgid "Additional static addresses"
+msgstr "További statikus címek"
+
+#: ../src/connection-editor/ce-page.h:114
+msgid "Addresses"
+msgstr "Címek"
+
+#: ../src/connection-editor/ce-page.h:115
+msgid "Address (optional)"
+msgstr "Cím (nem kötelező)"
+
 #: ../src/connection-editor/ce-page-infiniband.ui.h:1
 msgid "_Transport mode:"
 msgstr "Átviteli _mód:"
@@ -1733,8 +1765,8 @@ msgstr "Automatikus, kézi DNS beállításokkal"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:166
-#: ../src/connection-editor/page-ip6.c:184
+#: ../src/connection-editor/page-ip4.c:168
+#: ../src/connection-editor/page-ip6.c:185
 msgid "Manual"
 msgstr "Kézi"
 
@@ -1745,8 +1777,8 @@ msgstr "Közvetlen kapcsolat"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:186
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:188
+#: ../src/connection-editor/page-ip6.c:205
 msgid "Shared to other computers"
 msgstr "Más gépekkel megosztott"
 
@@ -1755,12 +1787,7 @@ msgstr "Más gépekkel megosztott"
 msgid "_Method:"
 msgstr "_Módszer:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-msgid "Addresses"
-msgstr "Címek"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:9
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1770,8 +1797,8 @@ msgstr ""
 "számítógép beállításainak személyre szabását. Ha szeretne DHCP "
 "kliensazonosítót használni, akkor itt adja meg azt."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1779,25 +1806,25 @@ msgstr ""
 "Gépnevek feloldásához használt tartományok. Több tartomány elválasztásához "
 "használjon vesszőket."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid "D_HCP client ID:"
 msgstr "DH_CP kliensazonosító:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:308
-#: ../src/connection-editor/page-ip6.c:306
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/page-ip4.c:372
+#: ../src/connection-editor/page-ip6.c:330
 msgid "S_earch domains:"
 msgstr "Keresési _tartományok:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:299
-#: ../src/connection-editor/page-ip6.c:297
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/page-ip4.c:363
+#: ../src/connection-editor/page-ip6.c:321
 msgid "DNS ser_vers:"
 msgstr "_DNS kiszolgálók:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:14
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1805,11 +1832,11 @@ msgstr ""
 "Gépnevek feloldásához használt tartománynév-kiszolgálók IP-címei. Több "
 "tartománynév-kiszolgáló címeinek elválasztásához használjon vesszőket."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip4.ui.h:15
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "IPv_4 címzés megkövetelése a kapcsolathoz"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:18
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1818,13 +1845,13 @@ msgstr ""
 "IPv4 beállítása meghiúsul, de az IPv6 beállítása sikerül. Ez itt "
 "kikapcsolható."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:19
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "_Routes…"
 msgstr "_Utak…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:196
+#: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "Tiltva"
 
@@ -1836,7 +1863,7 @@ msgstr "Engedélyezve (nyilvános cím előnyben)"
 msgid "Enabled (prefer temporary address)"
 msgstr "Engedélyezve (ideiglenes cím előnyben)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 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 "
@@ -1847,15 +1874,15 @@ msgstr ""
 "helyi kapcsolatok címei automatikusan a csatlakozó csatolóra lesznek "
 "leképezve."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6 _adatvédelmi kiterjesztések:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "IPv_6 címzés megkövetelése a kapcsolathoz"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: ../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."
@@ -2009,8 +2036,8 @@ msgid ""
 "Validate received ARP packets on active ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
 msgstr ""
-"A kapott ARP csomagok ellenőrzése az aktív portokon. Ha nincs bejelölve, akkor "
-"minden ARP csomag jó válasznak lesz tekintve."
+"A kapott ARP csomagok ellenőrzése az aktív portokon. Ha nincs bejelölve, "
+"akkor minden ARP csomag jó válasznak lesz tekintve."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:44
@@ -2637,7 +2664,7 @@ msgid "Bond"
 msgstr "Bond"
 
 #: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/page-team.c:1150 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Csapat"
@@ -2677,31 +2704,31 @@ msgstr "A kapcsolatszerkesztő ablak ismeretlen hiba miatt nem készíthető el�
 msgid "Could not create new connection"
 msgstr "Nem hozható létre új kapcsolat"
 
-#: ../src/connection-editor/connection-helpers.c:556
+#: ../src/connection-editor/connection-helpers.c:563
 msgid "Connection delete failed"
 msgstr "A kapcsolat törlése meghiúsult"
 
-#: ../src/connection-editor/connection-helpers.c:604
+#: ../src/connection-editor/connection-helpers.c:611
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Valóban törölni kívánja a(z) %s kapcsolatot?"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:804
 #: ../src/connection-editor/ip6-routes-dialog.c:746
-#: ../src/connection-editor/page-ip4.c:1068
-#: ../src/connection-editor/page-ip6.c:1066
+#: ../src/connection-editor/page-ip4.c:1136
+#: ../src/connection-editor/page-ip6.c:1090
 msgid "Address"
 msgstr "Cím"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:823
-#: ../src/connection-editor/page-ip4.c:1087
+#: ../src/connection-editor/page-ip4.c:1155
 msgid "Netmask"
 msgstr "Hálózati maszk"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:842
 #: ../src/connection-editor/ip6-routes-dialog.c:784
-#: ../src/connection-editor/page-ip4.c:1106
-#: ../src/connection-editor/page-ip6.c:1104
+#: ../src/connection-editor/page-ip4.c:1174
+#: ../src/connection-editor/page-ip6.c:1128
 msgid "Gateway"
 msgstr "Átjáró"
 
@@ -2711,7 +2738,7 @@ msgid "Metric"
 msgstr "Metrika"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:765
-#: ../src/connection-editor/page-ip6.c:1085
+#: ../src/connection-editor/page-ip6.c:1109
 msgid "Prefix"
 msgstr "Előtag"
 
@@ -3017,13 +3044,13 @@ msgid "Ethernet connection %d"
 msgstr "%d. vezetékes kapcsolat"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:51
+#: ../src/connection-editor/page-general.c:52
 #: ../src/libnma/nma-mobile-providers.c:806
 #: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: ../src/connection-editor/page-general.c:52
+#: ../src/connection-editor/page-general.c:53
 msgid ""
 "The zone defines the trust level of the connection. Default is not a regular "
 "zone, selecting it results in the use of the default zone set in the "
@@ -3033,11 +3060,7 @@ msgstr ""
 "valódi zóna, kiválasztásakor a tűzfalban beállított alapértelmezett zóna "
 "kerül felhasználásra. Csak akkor használható, ha a firewalld aktív."
 
-#: ../src/connection-editor/page-general.c:53
-msgid "FirewallD is not running."
-msgstr "A Firewalld nem fut."
-
-#: ../src/connection-editor/page-general.c:350
+#: ../src/connection-editor/page-general.c:347
 msgid "Could not load General user interface."
 msgstr "Nem tölthető be az általános felhasználói felület."
 
@@ -3066,124 +3089,124 @@ msgstr "infiniband eszköz"
 msgid "InfiniBand connection %d"
 msgstr "%d. InfiniBand kapcsolat"
 
-#: ../src/connection-editor/page-ip4.c:125
-#: ../src/connection-editor/page-ip6.c:129
+#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN)"
 msgstr "Automatikus (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip4.c:128
+#: ../src/connection-editor/page-ip6.c:131
 msgid "Automatic (VPN) addresses only"
 msgstr "Csak automatikus (VPN) címek"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic, addresses only"
 msgstr "Automatikus, csak címek"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE)"
 msgstr "Automatikus (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip6.c:134
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Csak automatikus (PPPoE) címek"
 
-#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip4.c:137
 msgid "Automatic (DHCP)"
 msgstr "Automatikus (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP) addresses only"
 msgstr "Csak automatikus (DHCP) címek"
 
-#: ../src/connection-editor/page-ip4.c:179
-#: ../src/connection-editor/page-ip6.c:197
+#: ../src/connection-editor/page-ip4.c:181
+#: ../src/connection-editor/page-ip6.c:198
 msgid "Link-Local Only"
 msgstr "Csak közvetlen kapcsolat"
 
-#: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:295
+#: ../src/connection-editor/page-ip4.c:361
+#: ../src/connection-editor/page-ip6.c:319
 msgid "Additional DNS ser_vers:"
 msgstr "To_vábbi DNS kiszolgálók:"
 
-#: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:304
+#: ../src/connection-editor/page-ip4.c:370
+#: ../src/connection-editor/page-ip6.c:328
 msgid "Additional s_earch domains:"
 msgstr "T_ovábbi keresési tartományok:"
 
-#: ../src/connection-editor/page-ip4.c:965
+#: ../src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "IPv4 utak szerkesztése ehhez: %s"
 
-#: ../src/connection-editor/page-ip4.c:1158
+#: ../src/connection-editor/page-ip4.c:1226
 msgid "IPv4 Settings"
 msgstr "IPv4 beállításai"
 
-#: ../src/connection-editor/page-ip4.c:1160
+#: ../src/connection-editor/page-ip4.c:1228
 msgid "Could not load IPv4 user interface."
 msgstr "Nem tölthető be az IPv4 felhasználói felület."
 
-#: ../src/connection-editor/page-ip4.c:1253
+#: ../src/connection-editor/page-ip4.c:1321
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "a(z) „%s” IPv4 cím érvénytelen"
 
-#: ../src/connection-editor/page-ip4.c:1261
+#: ../src/connection-editor/page-ip4.c:1329
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "az IPv4 cím „%s” hálózati maszkja érvénytelen"
 
-#: ../src/connection-editor/page-ip4.c:1270
+#: ../src/connection-editor/page-ip4.c:1338
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "a(z) „%s” IPv4 átjáró érvénytelen"
 
-#: ../src/connection-editor/page-ip4.c:1313
+#: ../src/connection-editor/page-ip4.c:1381
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "a(z) „%s” IPv4 DNS-kiszolgáló érvénytelen"
 
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip6.c:149
 msgid "Ignore"
 msgstr "Mellőzés"
 
-#: ../src/connection-editor/page-ip6.c:172
+#: ../src/connection-editor/page-ip6.c:173
 msgid "Automatic, DHCP only"
 msgstr "Automatikus, csak DHCP"
 
-#: ../src/connection-editor/page-ip6.c:964
+#: ../src/connection-editor/page-ip6.c:988
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "IPv6 utak szerkesztése ehhez: %s"
 
-#: ../src/connection-editor/page-ip6.c:1155
+#: ../src/connection-editor/page-ip6.c:1179
 msgid "IPv6 Settings"
 msgstr "IPv6 beállításai"
 
-#: ../src/connection-editor/page-ip6.c:1157
+#: ../src/connection-editor/page-ip6.c:1181
 msgid "Could not load IPv6 user interface."
 msgstr "Nem tölthető be az IPv6 felhasználói felület."
 
-#: ../src/connection-editor/page-ip6.c:1248
+#: ../src/connection-editor/page-ip6.c:1272
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "a(z) „%s” IPv6 cím érvénytelen"
 
-#: ../src/connection-editor/page-ip6.c:1256
+#: ../src/connection-editor/page-ip6.c:1280
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "a(z) „%s” IPv6 előtag érvénytelen"
 
-#: ../src/connection-editor/page-ip6.c:1265
+#: ../src/connection-editor/page-ip6.c:1289
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "a(z) „%s” IPv6 átjáró érvénytelen"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: ../src/connection-editor/page-ip6.c:1331
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "a(z) „%s” IPv6 DNS-kiszolgáló érvénytelen"
@@ -3307,11 +3330,11 @@ msgstr "Válassza ki az importálandó fájlt"
 msgid "Error: file doesn't contain a valid JSON configuration"
 msgstr "Hiba: a fájl nem tartalmaz érvényes JSON konfigurációt"
 
-#: ../src/connection-editor/page-team.c:1031
+#: ../src/connection-editor/page-team.c:1153
 msgid "Could not load team user interface."
 msgstr "Nem tölthető be a team felhasználói felülete."
 
-#: ../src/connection-editor/page-team.c:1124
+#: ../src/connection-editor/page-team.c:1246
 #, c-format
 msgid "Team connection %d"
 msgstr "%d. team kapcsolat"
@@ -3319,11 +3342,11 @@ msgstr "%d. team kapcsolat"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:655
+#: ../src/connection-editor/page-team-port.c:732
 msgid "Team Port"
 msgstr "Team port"
 
-#: ../src/connection-editor/page-team-port.c:657
+#: ../src/connection-editor/page-team-port.c:734
 msgid "Could not load team port user interface."
 msgstr "Nem tölthető be a team port felhasználói felülete."
 
@@ -4365,6 +4388,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Típus:"
 
+#~ msgid "FirewallD is not running."
+#~ msgstr "A Firewalld nem fut."
+
 #~ msgid "_Import team configuration from a file..."
 #~ msgstr "_Team beállítás importálása fájlból…"
 
diff --git a/po/pl.po b/po/pl.po
index 40691b2b..82921e5b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-10 00:09+0200\n"
-"PO-Revision-Date: 2016-09-10 00:10+0200\n"
+"POT-Creation-Date: 2016-10-02 12:54+0200\n"
+"PO-Revision-Date: 2016-10-02 12:55+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -850,7 +850,7 @@ msgstr "CDMA (%s)"
 #: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
 #: ../src/connection-editor/ce-page-team-port.ui.h:23
 #: ../src/connection-editor/ce-page-team.ui.h:48
-#: ../src/connection-editor/page-general.c:347
+#: ../src/connection-editor/page-general.c:344
 msgid "General"
 msgstr "Ogólne"
 
@@ -1041,8 +1041,7 @@ msgstr "_OK"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page.h:105
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1054,8 +1053,8 @@ msgstr ""
 #: ../src/connection-editor/ce-ip6-routes.ui.h:4
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 #: ../src/connection-editor/ce-page-team.ui.h:13
 #: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "_Add"
@@ -1066,8 +1065,8 @@ msgstr "_Dodaj"
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 #: ../src/connection-editor/ce-page-team.ui.h:15
 #: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
@@ -1577,8 +1576,8 @@ msgstr "_Hasło:"
 #: ../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-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:135
+#: ../src/connection-editor/page-ip4.c:131
+#: ../src/connection-editor/page-ip6.c:136
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatycznie"
@@ -1716,6 +1715,39 @@ msgstr "_Automatyczne łączenie z tą siecią, kiedy jest dostępna"
 msgid "Firewall _zone:"
 msgstr "_Strefa zapory sieciowej:"
 
+#: ../src/connection-editor/ce-page.h:102
+msgid ""
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add static IP address to be configured in addition to the "
+"automatic ones."
+msgstr ""
+"Adresy IP identyfikują komputer w sieci. Proszę nacisnąć przycisk „Dodaj”, "
+"aby dodać statyczny adres IP do skonfigurowania poza automatycznymi."
+
+#: ../src/connection-editor/ce-page.h:107
+msgid ""
+"The IP address identify your computer on the network and determines the "
+"address range distributed to other computers.  Click the \"Add\" button to "
+"add an IP address.  If no address is provided, one in the 10.42.x.x range "
+"will be used."
+msgstr ""
+"Adres IP identyfikuje komputer w sieci i wyznacza zakres adresów "
+"rozprowadzanych do innych komputerów. Proszę nacisnąć przycisk „Dodaj”, aby "
+"dodać adres IP. Jeśli nie podano żadnego adresu, to zostanie użyty adres "
+"w zakresie 10.42.x.x."
+
+#: ../src/connection-editor/ce-page.h:113
+msgid "Additional static addresses"
+msgstr "Dodatkowe adresy statyczne"
+
+#: ../src/connection-editor/ce-page.h:114
+msgid "Addresses"
+msgstr "Adresy"
+
+#: ../src/connection-editor/ce-page.h:115
+msgid "Address (optional)"
+msgstr "Adres (opcjonalnie)"
+
 #: ../src/connection-editor/ce-page-infiniband.ui.h:1
 msgid "_Transport mode:"
 msgstr "_Tryb przesyłania:"
@@ -1737,8 +1769,8 @@ msgstr "Automatycznie z ręcznymi ustawieniami DNS"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:166
-#: ../src/connection-editor/page-ip6.c:184
+#: ../src/connection-editor/page-ip4.c:168
+#: ../src/connection-editor/page-ip6.c:185
 msgid "Manual"
 msgstr "Ręczne"
 
@@ -1749,8 +1781,8 @@ msgstr "Link-Local"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:186
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:188
+#: ../src/connection-editor/page-ip6.c:205
 msgid "Shared to other computers"
 msgstr "Współdzielone z innymi komputerami"
 
@@ -1759,12 +1791,7 @@ msgstr "Współdzielone z innymi komputerami"
 msgid "_Method:"
 msgstr "_Metoda:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-msgid "Addresses"
-msgstr "Adresy"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:9
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1774,8 +1801,8 @@ msgstr ""
 "konfigurację komputerów. Aby użyć identyfikatora, należy go podać w tym "
 "miejscu."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1783,25 +1810,25 @@ msgstr ""
 "Domeny używane do znajdowania nazw komputerów. Aby podać wiele domen, należy "
 "je rozdzielić przecinkami."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid "D_HCP client ID:"
 msgstr "Identyfikator klienta D_HCP:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:308
-#: ../src/connection-editor/page-ip6.c:306
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/page-ip4.c:372
+#: ../src/connection-editor/page-ip6.c:330
 msgid "S_earch domains:"
 msgstr "Dom_eny wyszukiwania:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:299
-#: ../src/connection-editor/page-ip6.c:297
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/page-ip4.c:363
+#: ../src/connection-editor/page-ip6.c:321
 msgid "DNS ser_vers:"
 msgstr "Serwery _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:14
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1809,11 +1836,11 @@ msgstr ""
 "Adresy IP serwerów nazw domen używane do znajdowania nazw komputerów. Aby "
 "podać wiele adresów, należy je rozdzielić przecinkami."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip4.ui.h:15
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Wymaganie adresowania IPv_4 do ukończenia tego połączenia"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:18
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1821,13 +1848,13 @@ msgstr ""
 "Podczas łączenia się z sieciami IPv6 umożliwia ukończenie nawiązania "
 "połączenia, jeśli konfiguracja IPv4 się nie powiedzie, a IPv6 tak."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:19
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "_Routes…"
 msgstr "_Trasy…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:196
+#: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "Wyłączone"
 
@@ -1839,7 +1866,7 @@ msgstr "Włączone (preferowanie publicznego adresu)"
 msgid "Enabled (prefer temporary address)"
 msgstr "Włączone (preferowanie tymczasowego adresu)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 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 "
@@ -1849,15 +1876,15 @@ msgstr ""
 "podać wiele adresów, należy je rozdzielić przecinkami. Adresy Link-Local "
 "będą automatycznie dołączane do łączącego się interfejsu."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 msgid "IPv6 _privacy extensions:"
 msgstr "_Rozszerzenia prywatności IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Wymaganie adresowania IPv_6 do ukończenia nawiązania tego połączenia"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: ../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."
@@ -2637,7 +2664,7 @@ msgid "Bond"
 msgstr "Łączenie"
 
 #: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/page-team.c:1150 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Zespołowe"
@@ -2679,31 +2706,31 @@ msgstr ""
 msgid "Could not create new connection"
 msgstr "Nie można utworzyć nowego połączenia"
 
-#: ../src/connection-editor/connection-helpers.c:556
+#: ../src/connection-editor/connection-helpers.c:563
 msgid "Connection delete failed"
 msgstr "Usunięcie połączenia się nie powiodło"
 
-#: ../src/connection-editor/connection-helpers.c:604
+#: ../src/connection-editor/connection-helpers.c:611
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Na pewno usunąć połączenie %s?"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:804
 #: ../src/connection-editor/ip6-routes-dialog.c:746
-#: ../src/connection-editor/page-ip4.c:1068
-#: ../src/connection-editor/page-ip6.c:1066
+#: ../src/connection-editor/page-ip4.c:1136
+#: ../src/connection-editor/page-ip6.c:1090
 msgid "Address"
 msgstr "Adres"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:823
-#: ../src/connection-editor/page-ip4.c:1087
+#: ../src/connection-editor/page-ip4.c:1155
 msgid "Netmask"
 msgstr "Maska sieci"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:842
 #: ../src/connection-editor/ip6-routes-dialog.c:784
-#: ../src/connection-editor/page-ip4.c:1106
-#: ../src/connection-editor/page-ip6.c:1104
+#: ../src/connection-editor/page-ip4.c:1174
+#: ../src/connection-editor/page-ip6.c:1128
 msgid "Gateway"
 msgstr "Brama"
 
@@ -2714,7 +2741,7 @@ msgid "Metric"
 msgstr "Parametry"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:765
-#: ../src/connection-editor/page-ip6.c:1085
+#: ../src/connection-editor/page-ip6.c:1109
 msgid "Prefix"
 msgstr "Przedrostek"
 
@@ -3026,13 +3053,13 @@ msgid "Ethernet connection %d"
 msgstr "Połączenie ethernetowe %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:51
+#: ../src/connection-editor/page-general.c:52
 #: ../src/libnma/nma-mobile-providers.c:806
 #: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Domyślne"
 
-#: ../src/connection-editor/page-general.c:52
+#: ../src/connection-editor/page-general.c:53
 msgid ""
 "The zone defines the trust level of the connection. Default is not a regular "
 "zone, selecting it results in the use of the default zone set in the "
@@ -3042,11 +3069,7 @@ msgstr ""
 "wybranie jej powoduje użycie domyślnej strefy ustawionej w zaporze "
 "sieciowej. Można tego używać tylko, jeśli usługa firewalld jest aktywna."
 
-#: ../src/connection-editor/page-general.c:53
-msgid "FirewallD is not running."
-msgstr "Usługa firewalld nie jest uruchomiona."
-
-#: ../src/connection-editor/page-general.c:350
+#: ../src/connection-editor/page-general.c:347
 msgid "Could not load General user interface."
 msgstr "Nie można wczytać interfejsu użytkownika karty ogólnej."
 
@@ -3075,124 +3098,124 @@ msgstr "urządzenie InfiniBand"
 msgid "InfiniBand connection %d"
 msgstr "Połączenie InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:125
-#: ../src/connection-editor/page-ip6.c:129
+#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN)"
 msgstr "Automatycznie (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip4.c:128
+#: ../src/connection-editor/page-ip6.c:131
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatycznie (VPN), tylko adresy"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic, addresses only"
 msgstr "Automatycznie, tylko adresy"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE)"
 msgstr "Automatycznie (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip6.c:134
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatycznie (PPPoE), tylko adresy"
 
-#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip4.c:137
 msgid "Automatic (DHCP)"
 msgstr "Automatycznie (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatycznie (DHCP), tylko adresy"
 
-#: ../src/connection-editor/page-ip4.c:179
-#: ../src/connection-editor/page-ip6.c:197
+#: ../src/connection-editor/page-ip4.c:181
+#: ../src/connection-editor/page-ip6.c:198
 msgid "Link-Local Only"
 msgstr "Tylko Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:295
+#: ../src/connection-editor/page-ip4.c:361
+#: ../src/connection-editor/page-ip6.c:319
 msgid "Additional DNS ser_vers:"
 msgstr "_Dodatkowe serwery DNS:"
 
-#: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:304
+#: ../src/connection-editor/page-ip4.c:370
+#: ../src/connection-editor/page-ip6.c:328
 msgid "Additional s_earch domains:"
 msgstr "Dodatkowe dom_eny wyszukiwania:"
 
-#: ../src/connection-editor/page-ip4.c:965
+#: ../src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Modyfikowanie tras IPv4 dla %s"
 
-#: ../src/connection-editor/page-ip4.c:1158
+#: ../src/connection-editor/page-ip4.c:1226
 msgid "IPv4 Settings"
 msgstr "Ustawienia IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1160
+#: ../src/connection-editor/page-ip4.c:1228
 msgid "Could not load IPv4 user interface."
 msgstr "Nie można wczytać interfejsu użytkownika IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1253
+#: ../src/connection-editor/page-ip4.c:1321
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "Adres IPv4 „%s” jest nieprawidłowy"
 
-#: ../src/connection-editor/page-ip4.c:1261
+#: ../src/connection-editor/page-ip4.c:1329
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "Maska sieci adresu IPv4 „%s” jest nieprawidłowa"
 
-#: ../src/connection-editor/page-ip4.c:1270
+#: ../src/connection-editor/page-ip4.c:1338
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "Brama IPv4 „%s” jest nieprawidłowa"
 
-#: ../src/connection-editor/page-ip4.c:1313
+#: ../src/connection-editor/page-ip4.c:1381
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "Serwer DNS IPv4 „%s” jest nieprawidłowy"
 
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip6.c:149
 msgid "Ignore"
 msgstr "Ignorowanie"
 
-#: ../src/connection-editor/page-ip6.c:172
+#: ../src/connection-editor/page-ip6.c:173
 msgid "Automatic, DHCP only"
 msgstr "Automatycznie, tylko DHCP"
 
-#: ../src/connection-editor/page-ip6.c:964
+#: ../src/connection-editor/page-ip6.c:988
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Modyfikowanie tras IPv6 dla %s"
 
-#: ../src/connection-editor/page-ip6.c:1155
+#: ../src/connection-editor/page-ip6.c:1179
 msgid "IPv6 Settings"
 msgstr "Ustawienia IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1157
+#: ../src/connection-editor/page-ip6.c:1181
 msgid "Could not load IPv6 user interface."
 msgstr "Nie można wczytać interfejsu użytkownika IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1248
+#: ../src/connection-editor/page-ip6.c:1272
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "Adres IPv6 „%s” jest nieprawidłowy"
 
-#: ../src/connection-editor/page-ip6.c:1256
+#: ../src/connection-editor/page-ip6.c:1280
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "Przedrostek IPv6 „%s” jest nieprawidłowy"
 
-#: ../src/connection-editor/page-ip6.c:1265
+#: ../src/connection-editor/page-ip6.c:1289
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "Brama IPv6 „%s” jest nieprawidłowa"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: ../src/connection-editor/page-ip6.c:1331
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "Serwer DNS IPv6 „%s” jest nieprawidłowy"
@@ -3316,11 +3339,11 @@ msgstr "Wybór pliku do zaimportowania"
 msgid "Error: file doesn't contain a valid JSON configuration"
 msgstr "Błąd: plik nie zawiera prawidłowej konfiguracji JSON"
 
-#: ../src/connection-editor/page-team.c:1031
+#: ../src/connection-editor/page-team.c:1153
 msgid "Could not load team user interface."
 msgstr "Nie można wczytać interfejsu użytkownika zespołu."
 
-#: ../src/connection-editor/page-team.c:1124
+#: ../src/connection-editor/page-team.c:1246
 #, c-format
 msgid "Team connection %d"
 msgstr "Połączenie zespołowe %d"
@@ -3328,11 +3351,11 @@ msgstr "Połączenie zespołowe %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:655
+#: ../src/connection-editor/page-team-port.c:732
 msgid "Team Port"
 msgstr "Port zespołowy"
 
-#: ../src/connection-editor/page-team-port.c:657
+#: ../src/connection-editor/page-team-port.c:734
 msgid "Could not load team port user interface."
 msgstr "Nie można wczytać interfejsu użytkownika portu zespołowego."
 
diff --git a/po/sr.po b/po/sr.po
index cb2cd7dd..3183fc42 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -10,12 +10,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-04-25 13:45+0000\n"
-"PO-Revision-Date: 2016-04-25 21:52+0200\n"
-"Last-Translator: Марко М. Костић <marko.m.kostic@gmail.com>\n"
-"Language-Team: Serbian <gnom@prevod.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Network"
+"Manager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2016-08-23 12:35+0000\n"
+"PO-Revision-Date: 2016-08-27 06:31+0200\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: српски <gnome-sr@googlegroups.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,9 +23,8 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
-"X-Generator: Poedit 1.8.7.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3104
 msgid "Network"
 msgstr "Мрежа"
 
@@ -380,144 +379,146 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1280
+#: ../src/applet.c:1285
 msgid "device not ready (firmware missing)"
 msgstr "уређај није спреман (недостаје фирмвер)"
 
-#: ../src/applet.c:1282
+#: ../src/applet.c:1287
 msgid "device not ready"
 msgstr "уређај није спреман"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1297 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "веза је прекинута"
 
-#: ../src/applet.c:1308
+#: ../src/applet.c:1313
 msgid "Disconnect"
 msgstr "Прекини везу"
 
-#: ../src/applet.c:1322
+#: ../src/applet.c:1327
 msgid "device not managed"
 msgstr "не могу да управљам уређајем"
 
-#: ../src/applet.c:1395
+#: ../src/applet.c:1400
 msgid "No network devices available"
 msgstr "Није пронађен ниједан мрежни уређај"
 
-#: ../src/applet.c:1449
+#: ../src/applet.c:1454
 msgid "_VPN Connections"
 msgstr "_ВПН везе"
 
-#: ../src/applet.c:1503
+#: ../src/applet.c:1498
 msgid "_Configure VPN..."
 msgstr "По_деси ВПН..."
 
-#: ../src/applet.c:1508
-msgid "_Disconnect VPN"
-msgstr "_Прекини ВПН везу"
+#: ../src/applet.c:1501
+#| msgid "Export VPN connection..."
+msgid "_Add a VPN connection..."
+msgstr "_Додај ВПН везу..."
 
-#: ../src/applet.c:1615
+#: ../src/applet.c:1607
 msgid "NetworkManager is not running..."
 msgstr "Управљач мрежом није покренут..."
 
-#: ../src/applet.c:1620 ../src/applet.c:2612
+#: ../src/applet.c:1612 ../src/applet.c:2604
 msgid "Networking disabled"
 msgstr "Умрежавање искључено"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1830
+#: ../src/applet.c:1822
 msgid "Enable _Networking"
 msgstr "Укључи _мрежне услуге"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1839
+#: ../src/applet.c:1831
 msgid "Enable _Wi-Fi"
 msgstr "Укључи _бежично мрежење"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1848
+#: ../src/applet.c:1840
 msgid "Enable _Mobile Broadband"
 msgstr "Омогући _мобилне везе"
 
 #. Toggle notifications item
-#: ../src/applet.c:1860
+#: ../src/applet.c:1852
 msgid "Enable N_otifications"
 msgstr "_Прикажи обавештења"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1872
+#: ../src/applet.c:1864
 msgid "Connection _Information"
 msgstr "Пода_ци о вези"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1880
+#: ../src/applet.c:1872
 msgid "Edit Connections..."
 msgstr "Уреди везе..."
 
-#: ../src/applet.c:1894
+#: ../src/applet.c:1886
 msgid "_About"
 msgstr "_О програму"
 
-#: ../src/applet.c:2179
+#: ../src/applet.c:2171
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Повезани сте на „%s“."
 
-#: ../src/applet.c:2222
+#: ../src/applet.c:2214
 msgid "Disconnected"
 msgstr "Веза је прекинута"
 
-#: ../src/applet.c:2223
+#: ../src/applet.c:2215
 msgid "The network connection has been disconnected."
 msgstr "Мрежна веза је прекинута."
 
-#: ../src/applet.c:2474
+#: ../src/applet.c:2466
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Припремам мрежну везу „%s“..."
 
-#: ../src/applet.c:2477
+#: ../src/applet.c:2469
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Потребна је пријава корисника за успостављање везе „%s“..."
 
-#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2472 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Захтевам мрежну адресу за „%s“..."
 
-#: ../src/applet.c:2483
+#: ../src/applet.c:2475
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Повезани сте преко везе „%s“"
 
-#: ../src/applet.c:2557
+#: ../src/applet.c:2549
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Успостављам ВПН везу „%s“..."
 
-#: ../src/applet.c:2560
+#: ../src/applet.c:2552
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Потребна је пријава корисника за успостављање ВПН везе „%s“..."
 
-#: ../src/applet.c:2563
+#: ../src/applet.c:2555
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Захтевам ВПН мрежну адресу за „%s“..."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2558
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "Повезани сте преко ВПН везе „%s“"
+#| msgid "VPN connection '%s' active"
+msgid "VPN connection active"
+msgstr "Повезани сте преко ВПН везе"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2608
 msgid "No network connection"
 msgstr "Нема мрежне везе"
 
-#: ../src/applet.c:3204
+#: ../src/applet.c:3203
 msgid "NetworkManager Applet"
 msgstr "Програмче управника мреже"
 
@@ -540,7 +541,7 @@ msgid "Mobile Broadband (%s)"
 msgstr "Мобилна веза (%s)"
 
 #: ../src/applet-device-broadband.c:736
-#: ../src/connection-editor/connection-helpers.c:100
+#: ../src/connection-editor/connection-helpers.c:106
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
@@ -596,7 +597,7 @@ msgstr "Подешавам мобилну, широкопојасну везу �
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Потребна је пријава корисника за повезивање у мобилној мрежи „%s“..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Повезани сте преко мобилне широкопојасне везе „%s“"
@@ -755,7 +756,7 @@ msgid "Error displaying connection information:"
 msgstr "Грешка при приказивању података о вези:"
 
 #: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:332
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "ЛЕАП"
@@ -845,6 +846,8 @@ msgstr "ЦДМА (%s)"
 
 #. --- General ---
 #: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/ce-page-team-port.ui.h:23
+#: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Опште"
@@ -872,6 +875,7 @@ msgstr "Безбедност:"
 
 #. --- IPv4 ---
 #: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "ИПв4"
 
@@ -881,6 +885,7 @@ msgstr "Подразумевана рута:"
 
 #. --- IPv6 ---
 #: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "ИПв6"
 
@@ -936,33 +941,41 @@ msgstr "Програмче обавештајне зоне за управљањ
 msgid "NetworkManager Website"
 msgstr "Веб страница Управника мрежом"
 
-#: ../src/applet-dialogs.c:1005
+#: ../src/applet-dialogs.c:1001
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"Програмче Управник мреже не може да пронађе неке потребне ресурсе („.ui“ "
+"датотека није пронађена)."
+
+#: ../src/applet-dialogs.c:1006
 msgid "Missing resources"
 msgstr "Недостају ресурси"
 
-#: ../src/applet-dialogs.c:1030
+#: ../src/applet-dialogs.c:1031
 msgid "Mobile broadband network password"
 msgstr "Лозинка мобилне широкопојасне мреже"
 
-#: ../src/applet-dialogs.c:1039
+#: ../src/applet-dialogs.c:1040
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Потребна је лозинка за повезивање на „%s“."
 
-#: ../src/applet-dialogs.c:1054
+#: ../src/applet-dialogs.c:1055
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN unlock required"
 msgstr "Потребно је откључати СИМ ПИН"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1338
 msgid "SIM PIN Unlock Required"
 msgstr "Потребно је откључати СИМ ПИН"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1340
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -970,25 +983,25 @@ msgid ""
 msgstr "Мобилни широкопојасни уређај „%s“ захтева СИМ ПИН код."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1341
+#: ../src/applet-dialogs.c:1342
 msgid "PIN code:"
 msgstr "ПИН кôд:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1346
 msgid "Show PIN code"
 msgstr "Прикажи ПИН кôд"
 
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK unlock required"
 msgstr "Потребно је откључати СИМ ПУК"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1349
 msgid "SIM PUK Unlock Required"
 msgstr "Потребно је откључати СИМ ПУК"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1351
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -996,22 +1009,22 @@ msgid ""
 msgstr "Мобилни широкопојасни уређај „%s“ захтева СИМ ПУК кôд."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1352
+#: ../src/applet-dialogs.c:1353
 msgid "PUK code:"
 msgstr "ПУК кôд:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1356
 msgid "New PIN code:"
 msgstr "Нови ПИН кôд:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1357
+#: ../src/applet-dialogs.c:1358
 msgid "Re-enter new PIN code:"
 msgstr "Поново унесите ПИН кôд:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1362
+#: ../src/applet-dialogs.c:1363
 msgid "Show PIN/PUK codes"
 msgstr "Прикажи ПИН/ПУК кôдове"
 
@@ -1039,7 +1052,7 @@ msgstr ""
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:9
 #: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:13
 #: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "_Add"
 msgstr "_Додај"
@@ -1051,7 +1064,7 @@ msgstr "_Додај"
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
 #: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../src/connection-editor/ce-page-team.ui.h:15
 #: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Обриши"
@@ -1105,10 +1118,12 @@ msgstr ""
 "инсталиран исправан ВПН прикључак."
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:21
 msgid "Round-robin"
 msgstr "Кружно мењање"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:2
+#: ../src/connection-editor/ce-page-team.ui.h:22
 msgid "Active backup"
 msgstr "Радна резерва"
 
@@ -1117,6 +1132,7 @@ msgid "XOR"
 msgstr "ИксОР"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:20
 msgid "Broadcast"
 msgstr "Емитовање"
 
@@ -1152,7 +1168,7 @@ msgstr "_Режим:"
 #. Edit
 #: ../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/ce-page-team.ui.h:14
 #: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Уређивање"
@@ -1167,7 +1183,7 @@ msgstr "ms"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:17
 #: ../src/connection-editor/ce-page-bridge.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: ../src/connection-editor/ce-page-team.ui.h:16
 msgid "_Interface name:"
 msgstr "_Уређај:"
 
@@ -1210,7 +1226,7 @@ msgstr ""
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
 #: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
 msgid "_MTU:"
@@ -1219,7 +1235,7 @@ msgstr "_МТУ:"
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
 #: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
 msgid "bytes"
@@ -1270,11 +1286,11 @@ msgstr "_Највеће време:"
 msgid "_Aging time:"
 msgstr "Време _старења:"
 
-#: ../src/connection-editor/ce-page.c:78
+#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "аутоматски"
 
-#: ../src/connection-editor/ce-page.c:86
+#: ../src/connection-editor/ce-page.c:86 ../src/connection-editor/ce-page.c:121
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
 #: ../src/connection-editor/page-wifi.c:168
 #: ../src/connection-editor/page-wifi.c:172
@@ -1283,44 +1299,44 @@ msgstr "аутоматски"
 msgid "default"
 msgstr "основно"
 
-#: ../src/connection-editor/ce-page.c:132
+#: ../src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "непозната грешка"
 
-#: ../src/connection-editor/ce-page.c:245
+#: ../src/connection-editor/ce-page.c:302
 msgid "MAC address"
 msgstr "МАЦ адреса"
 
-#: ../src/connection-editor/ce-page.c:245
+#: ../src/connection-editor/ce-page.c:302
 msgid "HW address"
 msgstr "ХВ адреса"
 
-#: ../src/connection-editor/ce-page.c:248
+#: ../src/connection-editor/ce-page.c:305
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "неисправно %s за %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:252
-#: ../src/connection-editor/ce-page.c:484
+#: ../src/connection-editor/ce-page.c:309
+#: ../src/connection-editor/ce-page.c:541
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "неисправно %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:268
+#: ../src/connection-editor/ce-page.c:325
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "неисправан назив сучеља за %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:272
+#: ../src/connection-editor/ce-page.c:329
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "неисправан назив сучеља (%s)"
 
-#: ../src/connection-editor/ce-page.c:485
+#: ../src/connection-editor/ce-page.c:542
 msgid "device"
 msgstr "уређај"
 
-#: ../src/connection-editor/ce-page.c:591
+#: ../src/connection-editor/ce-page.c:650
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Не могу да ажурурам лозинке везе због непознате грешке."
 
@@ -1835,6 +1851,7 @@ msgstr ""
 "не раде ИПв6 подешавања, а раде ИПв4 подешавања."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
 msgstr "Основнo"
 
@@ -1919,21 +1936,523 @@ msgid "Send PPP _echo packets"
 msgstr "Шаљи ППП _ехо пакете"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:2
-msgid "_JSON config:"
-msgstr "_ЈСОН подешавање:"
+#: ../src/connection-editor/ce-page-team.ui.h:19
+#| msgid "Advanced"
+msgid "Ad_vanced..."
+msgstr "_Напредно..."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
-msgid "_Import team configuration from a file..."
-msgstr "_Увези тимско подешавање из датотеке..."
+msgid "Set by master"
+msgstr "Подеси главним"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:3
+#: ../src/connection-editor/ce-page-team.ui.h:9
+#| msgid "Ethernet Networks"
+msgid "Ethernet port state"
+msgstr "Стање жичаног порта"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:10
+msgid "ARP (IPv4)"
+msgstr "АРП (ИПв4)"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:5
+#: ../src/connection-editor/ce-page-team.ui.h:11
+msgid "NDP (IPv6)"
+msgstr "НДП (ИПв6)"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:6
+#: ../src/connection-editor/ce-page-team.ui.h:37
+msgid "Team Advanced Options"
+msgstr "Напредне опције тима"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:7
+msgid "_Queue ID:"
+msgstr "_ИБ реда:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:8
+#: ../src/connection-editor/ce-page-team.ui.h:42
+msgid ""
+"Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
+"port is enabled or disabled."
+msgstr ""
+"Број излива нежељених НАс и бесплатних АРП пакета који се шаљу након "
+"укључивања или искључивања порта."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:9
+msgid "ID of queue which this port should be mapped to."
+msgstr "ИБ реда на који овај порт треба бити мапиран."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#| msgid "_Priority:"
+msgid "_Port priority:"
+msgstr "_Хитност порта:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:11
+msgid "Port _sticky"
+msgstr "_Лепљив порт"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:12
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+"Проверава примљене АРП пакете на активним портовима. Ако ово није изабрано, "
+"сви долазећи АРП пакети ће се сматрати добрим одговором."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: ../src/connection-editor/ce-page-team.ui.h:44
+msgid ""
+"Value is positive number in milliseconds. Specifies an interval between "
+"bursts of notify-peer packets."
+msgstr ""
+"Вредност је позитиван број у милисекундама. Наводи интервал између излива "
+"пакета обавештења о парњаку."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port priority. The higher number means higher priority."
+msgstr "Важност порта. Већи број значи већу хитност."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:15
+msgid "Active-Backup runner options"
+msgstr "Опције покретача активне резерве"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#| msgid "_Priority:"
+msgid "_LACP port priority:"
+msgstr "_Хитност ЛАЦП порта:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#| msgid "Private _key:"
+msgid "LACP port _key:"
+msgstr "Кључ ЛАЦП _порта:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team.ui.h:43
+msgid ""
+"Number of bursts of multicast group rejoin requests sent after port is "
+"enabled or disabled."
+msgstr ""
+"Број излива захтева за придруживање мултикаст групи након укључивања или "
+"искључивања порта."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
+msgid ""
+"Port priority according to LACP standard. The lower number means higher "
+"priority."
+msgstr ""
+"Хитност порта у складу са ЛАЦП стандардом. Мањи број значи већу хитност."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team.ui.h:45
+msgid ""
+"Value is positive number in milliseconds. Specifies an interval between "
+"bursts of multicast group rejoin requests."
+msgstr ""
+"Вредност је позитиван број у милисекундама. Наводи интервал између излива "
+"захтева за придруживање мултикаст групи."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
+msgid ""
+"Port key according to LACP standard. It is only possible to aggregate ports "
+"with the same key."
+msgstr ""
+"Кључ порта према ЛАЦП стандарду. Могуће је сјединити портове само са истим "
+"кључем."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
+msgid "LACP runner options"
+msgstr "Опције ЛАЦП покретача"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:24
+#: ../src/connection-editor/ce-page-team.ui.h:70
+msgid "_Link watcher:"
+msgstr "Посматрач _везе:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:25
+#: ../src/connection-editor/ce-page-team.ui.h:71
+#| msgid "Link _up delay:"
+msgid "_Up delay:"
+msgstr "Застој _слања:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:26
+#: ../src/connection-editor/ce-page-team.ui.h:72
+#| msgid "Link _down delay:"
+msgid "_Down delay:"
+msgstr "Застој _примања:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:27
+#: ../src/connection-editor/ce-page-team.ui.h:73
+#| msgid "_Parent interface:"
+msgid "Send _interval:"
+msgstr "_Интервал слања:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:28
+#: ../src/connection-editor/ce-page-team.ui.h:74
+msgid "Delay _before first send:"
+msgstr "Застој _пре првог слања:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:29
+#: ../src/connection-editor/ce-page-team.ui.h:75
+msgid "_Maximum missed replies:"
+msgstr "_Највише пропуштених одговора:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:30
+#: ../src/connection-editor/ce-page-team.ui.h:76
+msgid "_Source host:"
+msgstr "Домаћин _извора:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:31
+#: ../src/connection-editor/ce-page-team.ui.h:77
+#| msgid "ARP _targets:"
+msgid "_Target host:"
+msgstr "Домаћин _циља:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:32
+#: ../src/connection-editor/ce-page-team.ui.h:78
+msgid ""
+"Maximum number of missed replies. If this number is exceeded, link is "
+"reported as down."
+msgstr ""
+"Највећи број пропуштених одговора. Ако се превазиђе овај број, веза се "
+"означава палом."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:33
+#: ../src/connection-editor/ce-page-team.ui.h:79
+msgid ""
+"Hostname to be converted to IP address which will be filled into ARP request "
+"as source address."
+msgstr ""
+"Назив домаћина који ће бити претворен у ИП адресу која ће бити попуњена у "
+"АРП захтеву као адреса извора."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:34
+#: ../src/connection-editor/ce-page-team.ui.h:80
+msgid ""
+"Hostname to be converted to IP address which will be filled into request as "
+"destination address."
+msgstr ""
+"Назив домаћина који ће бити претворен у ИП адресу која ће бити попуњена у "
+"захтеву као адреса одредишта."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:35
+#: ../src/connection-editor/ce-page-team.ui.h:81
+msgid "Ignore invalid packets from _active ports"
+msgstr "Занемари неисправне пакете са _активних портова"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:36
+#: ../src/connection-editor/ce-page-team.ui.h:83
+msgid "Ignore invalid packets from i_nactive ports"
+msgstr "Занемари неисправне пакете са _неактивних портова"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:37
+#: ../src/connection-editor/ce-page-team.ui.h:84
+msgid ""
+"Validate received ARP packets on inactive ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+"Проверава примљене АРП пакете на неактивним портовима. Ако ово није "
+"изабрано, сви долазећи АРП пакети ће се сматрати добрим одговором."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:38
+#: ../src/connection-editor/ce-page-team.ui.h:85
+msgid "S_end on inactive ports"
+msgstr "_Пошаљи на неактивним портовима"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:39
+#: ../src/connection-editor/ce-page-team.ui.h:86
+msgid ""
+"By default, ARP requests are sent on active ports only. This option allows "
+"sending even on inactive ports."
+msgstr ""
+"По основи, АРП захтеви се шаљу само на активним портовима. Ова опција "
+"омогућава слање чак и на неактивним портовима."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:40
+#: ../src/connection-editor/ce-page-team.ui.h:87
+msgid ""
+"The delay between the link coming up and the runner being notified about it."
+msgstr "Застој између успостављања везе и обавештавања покретача о томе."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:41
+#: ../src/connection-editor/ce-page-team.ui.h:88
+msgid ""
+"The delay between the link going down and the runner being notified about it."
+msgstr "Застој између падања везе и обавештавања покретача о томе."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:42
+#: ../src/connection-editor/ce-page-team.ui.h:89
+msgid "The interval between requests being sent."
+msgstr "Интервал између слања захтева."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:43
+#: ../src/connection-editor/ce-page-team.ui.h:90
+msgid ""
+"The delay between link watch initialization and the first request being sent."
+msgstr "Застој између покретања праћења везе и слања првог захтева."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:44
+#: ../src/connection-editor/ce-page-team.ui.h:91
+msgid "The link watcher to be used."
+msgstr "Осматрач везе који ће се користити."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:45
+#: ../src/connection-editor/ce-page-team.ui.h:92
+msgid "Link Watcher"
+msgstr "Осматрач везе"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:46
+#: ../src/connection-editor/ce-page-team.ui.h:93
+msgid "Im_port team configuration from a file..."
+msgstr "Увези тимско _подешавање из датотеке..."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:47
+#: ../src/connection-editor/ce-page-team.ui.h:94
+#| msgid "_JSON config:"
+msgid "Edit _JSON configuration:"
+msgstr "Уреди _ЈСОН подешавање:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:48
+#: ../src/connection-editor/ce-page-team.ui.h:95
+msgid "Raw Configuration"
+msgstr "Сирово подешавање"
 
 #: ../src/connection-editor/ce-page-team.ui.h:1
+msgid "Highest priority"
+msgstr "Највећа хитност"
+
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "Highest priority (stable)"
+msgstr "Највећа хитност (стабилно)"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#| msgid "Group Bandwidth:"
+msgid "Bandwidth"
+msgstr "Појасна ширина"
+
+#: ../src/connection-editor/ce-page-team.ui.h:4
+msgid "Highest number of ports"
+msgstr "Највећи број портова"
+
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#| msgid "Priority"
+msgid "Port priority"
+msgstr "Хитност порта"
+
+#: ../src/connection-editor/ce-page-team.ui.h:6
+#| msgid "Ethernet device"
+msgid "From the team device"
+msgstr "Са тимског уређаја"
+
+#: ../src/connection-editor/ce-page-team.ui.h:7
+msgid "From the active port"
+msgstr "Са активног порта"
+
+#: ../src/connection-editor/ce-page-team.ui.h:8
+msgid "From active to team device"
+msgstr "Са активног на тимски уређај"
+
+#: ../src/connection-editor/ce-page-team.ui.h:12
 msgid "_Teamed connections:"
 msgstr "_Тимске везе:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "Im_port team configuration from a file..."
-msgstr "Увези тимско _подешавање из датотеке..."
+#: ../src/connection-editor/ce-page-team.ui.h:23
+msgid "Load balance"
+msgstr "Равнотежа учитавања"
+
+#: ../src/connection-editor/ce-page-team.ui.h:24
+msgid "LACP"
+msgstr "ЛАЦП"
+
+#: ../src/connection-editor/ce-page-team.ui.h:25
+#| msgctxt "Wi-Fi/Ethernet security"
+#| msgid "None"
+msgid "None"
+msgstr "Ништа"
+
+#: ../src/connection-editor/ce-page-team.ui.h:27
+#: ../src/connection-editor/connection-helpers.c:103
+#: ../src/connection-editor/page-ethernet.c:324
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+msgid "Ethernet"
+msgstr "Жичана веза"
+
+#: ../src/connection-editor/ce-page-team.ui.h:28
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-vlan.c:592 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
+msgstr "ВЛАН"
+
+#: ../src/connection-editor/ce-page-team.ui.h:31
+#| msgid "FIP"
+msgid "IP"
+msgstr "ИП"
+
+#: ../src/connection-editor/ce-page-team.ui.h:32
+msgid "Any L3 protocol"
+msgstr "Неки Л3 протокол"
+
+#: ../src/connection-editor/ce-page-team.ui.h:33
+#| msgid "GTC"
+msgid "TCP"
+msgstr "ТЦП"
+
+#: ../src/connection-editor/ce-page-team.ui.h:34
+msgid "UDP"
+msgstr "УДП"
+
+#: ../src/connection-editor/ce-page-team.ui.h:35
+msgid "SCTP"
+msgstr "СЦТП"
+
+#: ../src/connection-editor/ce-page-team.ui.h:36
+msgid "Any L4 protocol"
+msgstr "Неки Л4 протокол"
+
+#: ../src/connection-editor/ce-page-team.ui.h:38
+msgid "_Peer notification count:"
+msgstr "Број обавештења _парњака:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:39
+msgid "Peer _notification interval:"
+msgstr "Интервал _обавештења парњака:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:40
+msgid "_Multicast rejoin count:"
+msgstr "_Број мултикаст придруживања:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:41
+msgid "Multicast _rejoin interval:"
+msgstr "_Интервал мултикаст придруживања:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:46
+#| msgid "Hardware Address:"
+msgid "_Hardware Address:"
+msgstr "_Хардверска адреса:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:47
+msgid ""
+"Desired hardware address of new team device. Usual MAC address format is "
+"accepted."
+msgstr ""
+"Жељена хардверска адреса новог тимског уређаја. Уобичајени запис МАК адресе "
+"је прихватљив."
+
+#: ../src/connection-editor/ce-page-team.ui.h:49
+msgid "_Runner:"
+msgstr "_Покретач:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:50
+#| msgid "Hardware Address:"
+msgid "_Hardware address policy:"
+msgstr "Политика _хардверске адресе:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:51
+msgid "Name of runner to be used."
+msgstr "Назив покретача за коришћење."
+
+#: ../src/connection-editor/ce-page-team.ui.h:52
+msgid ""
+"This  defines the policy of how hardware addresses of team device and port "
+"devices should be set during the team lifetime."
+msgstr ""
+"Ово одређује политику начина подешавања хардверских адреса тимског уређаја и "
+"уређаја порта за време трајања тима."
+
+#: ../src/connection-editor/ce-page-team.ui.h:53
+msgid "Send LACPDU frames _periodically"
+msgstr "ЛАЦПДУ кадрове пошаљи _повремено"
+
+#: ../src/connection-editor/ce-page-team.ui.h:54
+msgid ""
+"If checked, LACPDU frames are sent along the configured links periodically. "
+"If not, it acts as \"speak when spoken to\"."
+msgstr ""
+"Ако је изабрано, ЛАЦПДУ кадрови се шаљу повремено са подешеним везама. Ако "
+"није, делује као „говори када ти се обрате“."
+
+#: ../src/connection-editor/ce-page-team.ui.h:55
+msgid "Send a LACPDU frame _every second"
+msgstr "ЛАЦПДУ кадар пошаљи _сваке секунде"
+
+#: ../src/connection-editor/ce-page-team.ui.h:56
+msgid ""
+"Option specifies the rate at which our link partner is asked to transmit "
+"LACPDU packets. If checked, packets will be sent once  per second. Otherwise "
+"they will be sent every 30 seconds."
+msgstr ""
+"Опција одређује проток који се тражи од партнера наше везе за емитовање "
+"ЛАЦПДУ пакета. Ако је изабрано, пакети ће бити послати један у секунди. У "
+"супротном ће бити послати на сваких 30 секунди."
+
+#: ../src/connection-editor/ce-page-team.ui.h:57
+#| msgid "_Priority:"
+msgid "_System priority:"
+msgstr "Хитност _система:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:58
+msgid "_Minimum ports:"
+msgstr "_Најмање портова:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:59
+msgid "_Aggregator selection policy:"
+msgstr "Политика избора _сакупљача:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:60
+msgid "System priority, value can be 0 – 65535."
+msgstr "Хитност система, може бити од 0–65535."
+
+#: ../src/connection-editor/ce-page-team.ui.h:61
+msgid ""
+"Specifies the minimum number of ports that must be active before asserting "
+"carrier in the master interface, value can be 1 – 255."
+msgstr ""
+"Одређује најмањи број портова који морају бити активни пре потврђивања "
+"носача у главном сучељу, вредност може бити од 1—255."
+
+#: ../src/connection-editor/ce-page-team.ui.h:62
+msgid "This selects the policy of how the aggregators will be selected."
+msgstr "Ово бира политику начина избора сакупљача."
+
+#: ../src/connection-editor/ce-page-team.ui.h:63
+msgid ""
+"List of fragment types (strings) which should be used for packet Tx hash "
+"computation."
+msgstr ""
+"Списак врста одломака (ниски) које би требало да се користе за прорачун хеша "
+"Tx пакета."
+
+#: ../src/connection-editor/ce-page-team.ui.h:64
+msgid "_Fields for tramsmission hash"
+msgstr "_Поља за хеш преноса"
+
+#: ../src/connection-editor/ce-page-team.ui.h:65
+msgid "In tenths of a second. Periodic interval between rebalancing."
+msgstr ""
+"У десетим деловима секунде. Повремени интервал између поновног "
+"уравнотежавања."
+
+#: ../src/connection-editor/ce-page-team.ui.h:66
+msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
+msgstr ""
+"Назив активног Tx уравнотежавача. Активно Tx уравнотежавање је унапред "
+"искључено."
+
+#: ../src/connection-editor/ce-page-team.ui.h:67
+#| msgid "Transmission po_wer:"
+msgid "Transmission _balancing interval:"
+msgstr "Интервал _уравнотежавања преноса:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:68
+#| msgid "Transmission po_wer:"
+msgid "_Transmission balancer:"
+msgstr "Уравнотежавач _преноса:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:69
+msgid "Runner"
+msgstr "Покретач"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
@@ -2097,92 +2616,80 @@ msgstr ""
 "У већини случајева, ППП сервери добављача ће подржати све начине потврђивања "
 "идентитета.  Ако веза не успе, покушајте да искључите подршку за неке начине."
 
-#: ../src/connection-editor/connection-helpers.c:97
-#: ../src/connection-editor/page-ethernet.c:326
-#: ../src/libnm-gtk/nm-ui-utils.c:321
-msgid "Ethernet"
-msgstr "Жичана веза"
-
-#: ../src/connection-editor/connection-helpers.c:98
-#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/page-wifi.c:441 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Бежична"
 
-#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/connection-helpers.c:112
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Блутут"
 
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/connection-helpers.c:113
 #: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "ДСЛ"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/connection-editor/connection-helpers.c:114
+#: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "Инфини банд"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-bond.c:444 ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Веза"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-team.c:267 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Тим"
 
-#: ../src/connection-editor/connection-helpers.c:111
+#: ../src/connection-editor/connection-helpers.c:117
 #: ../src/connection-editor/page-bridge.c:210
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Мост"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
-msgid "VLAN"
-msgstr "ВЛАН"
-
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/connection-helpers.c:254
-#: ../src/connection-editor/page-vpn.c:101
+#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/connection-helpers.c:252
+#: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "ВПН"
 
-#: ../src/connection-editor/connection-helpers.c:196
+#: ../src/connection-editor/connection-helpers.c:194
 msgid "Hardware"
 msgstr "Хардвер"
 
-#: ../src/connection-editor/connection-helpers.c:223
+#: ../src/connection-editor/connection-helpers.c:221
 msgid "Virtual"
 msgstr "Виртуелно"
 
-#: ../src/connection-editor/connection-helpers.c:292
-#: ../src/connection-editor/connection-helpers.c:294
+#: ../src/connection-editor/connection-helpers.c:370
+#: ../src/connection-editor/connection-helpers.c:372
 msgid "Import a saved VPN configuration..."
 msgstr "Увези сачувна ВПН подешавања..."
 
-#: ../src/connection-editor/connection-helpers.c:323
+#: ../src/connection-editor/connection-helpers.c:401
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Не могу да покренем прозорче за измену везе због непознате грешке."
 
-#: ../src/connection-editor/connection-helpers.c:332
+#: ../src/connection-editor/connection-helpers.c:410
 msgid "Could not create new connection"
 msgstr "Не могу да направим нову везу"
 
-#: ../src/connection-editor/connection-helpers.c:469
+#: ../src/connection-editor/connection-helpers.c:556
 msgid "Connection delete failed"
 msgstr "Не могу да обришем везу"
 
-#: ../src/connection-editor/connection-helpers.c:517
+#: ../src/connection-editor/connection-helpers.c:604
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Да ли да заиста обришем везу %s?"
@@ -2374,24 +2881,25 @@ msgstr "Брише изабрану везу"
 msgid "Authenticate to delete the selected connection"
 msgstr "Пријавите се како би обрисали изабрану везу"
 
-#: ../src/connection-editor/nm-connection-list.c:929
+#: ../src/connection-editor/nm-connection-list.c:914
+#: ../src/connection-editor/nm-connection-list.c:917
+msgid "Error creating connection"
+msgstr "Грешка приликом стварања везе"
+
+#: ../src/connection-editor/nm-connection-list.c:915
 msgid "No VPN plugins are installed."
 msgstr "Нису инсталирани ВПН прикључци."
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/nm-connection-list.c:918
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Не знам како да направим „%s“ везу"
 
-#: ../src/connection-editor/nm-connection-list.c:933
-msgid "Error creating connection"
-msgstr "Грешка приликом стварања везе"
-
-#: ../src/connection-editor/nm-connection-list.c:955
+#: ../src/connection-editor/nm-connection-list.c:941
 msgid "Error editing connection"
 msgstr "Грешка приликом уређивања везе"
 
-#: ../src/connection-editor/nm-connection-list.c:956
+#: ../src/connection-editor/nm-connection-list.c:942
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Нисам нашао везу која има УУИД „%s“"
@@ -2426,27 +2934,27 @@ msgstr "неисправан блутут уређај (%s)"
 msgid "Bluetooth connection %d"
 msgstr "Блутут веза „%d“"
 
-#: ../src/connection-editor/page-bluetooth.c:302
+#: ../src/connection-editor/page-bluetooth.c:303
 msgid "Bluetooth Type"
 msgstr "Врста блутута"
 
-#: ../src/connection-editor/page-bluetooth.c:320
+#: ../src/connection-editor/page-bluetooth.c:321
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Изаберите врсту профила блутут везе."
 
-#: ../src/connection-editor/page-bluetooth.c:325
+#: ../src/connection-editor/page-bluetooth.c:326
 msgid "_Personal Area Network"
 msgstr "Мрежа _личног домена"
 
-#: ../src/connection-editor/page-bluetooth.c:330
+#: ../src/connection-editor/page-bluetooth.c:331
 msgid "_Dial-Up Network"
 msgstr "Мрежа _двојне парице"
 
-#: ../src/connection-editor/page-bond.c:447
+#: ../src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Не могу да учитам корисничко сучеље свезе."
 
-#: ../src/connection-editor/page-bond.c:566
+#: ../src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "примарни"
 
@@ -2459,7 +2967,7 @@ msgstr "Веза свезе %d"
 msgid "Could not load bridge user interface."
 msgstr "Не могу да учитам корисничко сучеље моста."
 
-#: ../src/connection-editor/page-bridge.c:310
+#: ../src/connection-editor/page-bridge.c:311
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Веза моста %d"
@@ -2475,11 +2983,11 @@ msgstr "Прикључник моста"
 msgid "Could not load bridge port user interface."
 msgstr "Не могу да учитам корисничко сучеље прикључника моста."
 
-#: ../src/connection-editor/page-dcb.c:603
+#: ../src/connection-editor/page-dcb.c:622
 msgid "DCB"
 msgstr "ДЦБ"
 
-#: ../src/connection-editor/page-dcb.c:605
+#: ../src/connection-editor/page-dcb.c:624
 msgid "Could not load DCB user interface."
 msgstr "Не могу да учитам ДЦБ корисничко сучеље."
 
@@ -2487,7 +2995,7 @@ msgstr "Не могу да учитам ДЦБ корисничко сучеље
 msgid "Could not load DSL user interface."
 msgstr "Не могу да учитам корисничко сучеље за DSL."
 
-#: ../src/connection-editor/page-dsl.c:214
+#: ../src/connection-editor/page-dsl.c:215
 #, c-format
 msgid "DSL connection %d"
 msgstr "ДСЛ веза „%d“"
@@ -2502,25 +3010,25 @@ msgstr ""
 "називом или трајном МАК адресом или са оба.  Нпр: „em1“, "
 "„3C:97:0E:42:1A:19“, „em1 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-ethernet.c:328
+#: ../src/connection-editor/page-ethernet.c:326
 msgid "Could not load ethernet user interface."
 msgstr "Не могу да учитам корисничко сучеље за жичану мрежу."
 
-#: ../src/connection-editor/page-ethernet.c:457
+#: ../src/connection-editor/page-ethernet.c:455
 msgid "Ethernet device"
 msgstr "Уређај жичане везе"
 
-#: ../src/connection-editor/page-ethernet.c:461
-#: ../src/connection-editor/page-vlan.c:741
-#: ../src/connection-editor/page-wifi.c:581
+#: ../src/connection-editor/page-ethernet.c:459
+#: ../src/connection-editor/page-vlan.c:739
+#: ../src/connection-editor/page-wifi.c:574
 msgid "cloned MAC"
 msgstr "клониран МАК"
 
-#: ../src/connection-editor/page-ethernet.c:465
+#: ../src/connection-editor/page-ethernet.c:463
 msgid "Wake-on-LAN password"
 msgstr "Пробуди са ЛАН лозинком"
 
-#: ../src/connection-editor/page-ethernet.c:500
+#: ../src/connection-editor/page-ethernet.c:499
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Жичана веза %d"
@@ -2562,15 +3070,15 @@ msgstr ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65“, „ib0 (80:00:00:48:"
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)“"
 
-#: ../src/connection-editor/page-infiniband.c:153
+#: ../src/connection-editor/page-infiniband.c:151
 msgid "Could not load InfiniBand user interface."
 msgstr "Не могу да учитам корисничко сучеље Инфини банда."
 
-#: ../src/connection-editor/page-infiniband.c:216
+#: ../src/connection-editor/page-infiniband.c:214
 msgid "infiniband device"
 msgstr "инфинибанд уређај"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: ../src/connection-editor/page-infiniband.c:250
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Инфини банд веза %d"
@@ -2730,11 +3238,11 @@ msgid "Unsupported mobile broadband connection type."
 msgstr "Није подржана ова врста мобилне, широкопојасне мреже."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:529
+#: ../src/connection-editor/page-mobile.c:530
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Изаберите врсту мобилног широкопојасног издавача"
 
-#: ../src/connection-editor/page-mobile.c:556
+#: ../src/connection-editor/page-mobile.c:557
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2742,20 +3250,20 @@ msgstr ""
 "Изаберите технологију коју користи ваш издавач мобилних широкопојасних "
 "услуга.  Уколико нисте сигурни, питајте издавача."
 
-#: ../src/connection-editor/page-mobile.c:561
+#: ../src/connection-editor/page-mobile.c:562
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Мој издавач користи _ГСМ технологије (нпр. ГПРС, ЕДГЕ, УМТС, ХСДПА)"
 
-#: ../src/connection-editor/page-mobile.c:568
+#: ../src/connection-editor/page-mobile.c:569
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Мој издавач користи Ц_ДМА технологије (нпр. 1xРТТ, ЕВДО)"
 
-#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/connection-editor/page-mobile.c:579 ../src/mb-menu-item.c:50
 #: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "ЦДМА"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:582 ../src/mb-menu-item.c:54
 #: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "ГСМ"
@@ -2775,7 +3283,7 @@ msgid "CHAP"
 msgstr "ЦХАП"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:280
+#: ../src/wireless-security/eap-method-fast.c:283
 #: ../src/wireless-security/eap-method-peap.c:272
 #: ../src/wireless-security/eap-method-ttls.c:288
 msgid "MSCHAPv2"
@@ -2804,22 +3312,22 @@ msgstr "ППП подешавања"
 msgid "Could not load PPP user interface."
 msgstr "Не могу да учитам ППП корисничко сучеље."
 
-#: ../src/connection-editor/page-team.c:98
-#: ../src/connection-editor/page-team-port.c:71
-#: ../src/connection-editor/vpn-helpers.c:165
+#: ../src/connection-editor/page-team.c:341
+#: ../src/connection-editor/page-team-port.c:203
+#: ../src/connection-editor/vpn-helpers.c:168
 msgid "Select file to import"
 msgstr "Изаберите датотеку за увоз"
 
-#: ../src/connection-editor/page-team.c:118
-#: ../src/connection-editor/page-team-port.c:91
+#: ../src/connection-editor/page-team.c:361
+#: ../src/connection-editor/page-team-port.c:223
 msgid "Error: file doesn't contain a valid JSON configuration"
 msgstr "Грешка: датотека не садржи исправно ЈСОН подешавање"
 
-#: ../src/connection-editor/page-team.c:270
+#: ../src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Не могу да учитам тимско корисничко сучеље."
 
-#: ../src/connection-editor/page-team.c:377
+#: ../src/connection-editor/page-team.c:1124
 #, c-format
 msgid "Team connection %d"
 msgstr "Тимска веза „%d“"
@@ -2827,11 +3335,11 @@ msgstr "Тимска веза „%d“"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:151
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
 msgstr "Тимски прикључник"
 
-#: ../src/connection-editor/page-team-port.c:153
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
 msgstr "Не могу да учитам корисничко сучеље тимског прикључника."
 
@@ -2848,35 +3356,47 @@ msgstr "%s (путем „%s“)"
 msgid "New connection..."
 msgstr "Нова веза..."
 
-#: ../src/connection-editor/page-vlan.c:596
+#: ../src/connection-editor/page-vlan.c:594
 msgid "Could not load vlan user interface."
 msgstr "Не могу да учитам корисничко сучеље влан-а."
 
-#: ../src/connection-editor/page-vlan.c:734
+#: ../src/connection-editor/page-vlan.c:732
 msgid "vlan parent"
 msgstr "влан надређени"
 
-#: ../src/connection-editor/page-vlan.c:797
+#: ../src/connection-editor/page-vlan.c:796
 #, c-format
 msgid "VLAN connection %d"
 msgstr "ВЛАН веза %d"
 
-#: ../src/connection-editor/page-vpn.c:103
+#: ../src/connection-editor/page-vpn.c:98
 msgid "Could not load VPN user interface."
 msgstr "Не могу да учитам ВПН корисничко сучеље."
 
-#: ../src/connection-editor/page-vpn.c:118
+#: ../src/connection-editor/page-vpn.c:113
+#, c-format
+#| msgid "Could not find VPN plugin service for '%s'."
+msgid "Could not find VPN plugin for '%s'."
+msgstr "Не могу да нађем ВПН прикључак за „%s“."
+
+#: ../src/connection-editor/page-vpn.c:122
 #, c-format
-msgid "Could not find VPN plugin service for '%s'."
-msgstr "Не могу да нађем услугу ВПН прикључка за „%s“."
+#| msgid "Could not find VPN plugin service for '%s'."
+msgid "Could not load editor VPN plugin for '%s' (%s)."
+msgstr "Не могу да учитам ВПН прикључак уређивача за „%s“ (%s)."
 
-#: ../src/connection-editor/page-vpn.c:205
-#: ../src/connection-editor/page-vpn.c:300
+#: ../src/connection-editor/page-vpn.c:123
+#| msgid "Connection failure"
+msgid "unknown failure"
+msgstr "непознат неуспех"
+
+#: ../src/connection-editor/page-vpn.c:216
+#: ../src/connection-editor/page-vpn.c:364
 #, c-format
 msgid "VPN connection %d"
 msgstr "ВПН веза %d"
 
-#: ../src/connection-editor/page-vpn.c:229
+#: ../src/connection-editor/page-vpn.c:240
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2886,11 +3406,11 @@ msgstr ""
 "\n"
 "Грешка: није изабрана врста ВПН сервиса."
 
-#: ../src/connection-editor/page-vpn.c:254
+#: ../src/connection-editor/page-vpn.c:266
 msgid "Choose a VPN Connection Type"
 msgstr "Избор врсте ВПН везе"
 
-#: ../src/connection-editor/page-vpn.c:255
+#: ../src/connection-editor/page-vpn.c:267
 msgid ""
 "Select the type of VPN you wish to use for the new connection.  If the type "
 "of VPN connection you wish to create does not appear in the list, you may "
@@ -2923,45 +3443,44 @@ msgstr ""
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:450
+#: ../src/connection-editor/page-wifi.c:443
 msgid "Could not load Wi-Fi user interface."
 msgstr "Не могу да учитам корисничко сучеље за бежичну мрежу."
 
-#: ../src/connection-editor/page-wifi.c:571
+#: ../src/connection-editor/page-wifi.c:564
 msgid "bssid"
 msgstr "бссид"
 
-#: ../src/connection-editor/page-wifi.c:577
+#: ../src/connection-editor/page-wifi.c:570
 msgid "Wi-Fi device"
 msgstr "Бежични уређај"
 
-#: ../src/connection-editor/page-wifi.c:619
+#: ../src/connection-editor/page-wifi.c:613
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Бежична веза %d"
 
 #: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: ../src/libnma/nma-wifi-dialog.c:920 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "ВЕП 40/128-битни кључ"
 
 #: ../src/connection-editor/page-wifi-security.c:319
-#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "ВЕП 128-битна лозинка"
 
 #: ../src/connection-editor/page-wifi-security.c:345
-#: ../src/libnma/nma-wifi-dialog.c:945 ../src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1X)"
 msgstr "Динамички ВЕП (802.1X)"
 
 #: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Лични ВПА & ВПА2"
 
 #: ../src/connection-editor/page-wifi-security.c:371
-#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: ../src/libnma/nma-wifi-dialog.c:987 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Пословни ВПА & ВПА2"
 
@@ -2989,11 +3508,11 @@ msgstr "недостаје ССИД"
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Безбедност није сагласна са ад-хок режимом"
 
-#: ../src/connection-editor/vpn-helpers.c:138
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "Не могу да увезем ВПН везу"
 
-#: ../src/connection-editor/vpn-helpers.c:140
+#: ../src/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3006,29 +3525,29 @@ msgstr ""
 "\n"
 "Грешка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:144
 msgid "unknown error"
 msgstr "непозната грешка"
 
-#: ../src/connection-editor/vpn-helpers.c:215
+#: ../src/connection-editor/vpn-helpers.c:218
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Већ постоји датотека „%s“."
 
-#: ../src/connection-editor/vpn-helpers.c:217
+#: ../src/connection-editor/vpn-helpers.c:220
 msgid "_Replace"
 msgstr "_Замени"
 
-#: ../src/connection-editor/vpn-helpers.c:219
+#: ../src/connection-editor/vpn-helpers.c:222
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Да ли желите да замените %s ВПН везом пре чувања?"
 
-#: ../src/connection-editor/vpn-helpers.c:255
+#: ../src/connection-editor/vpn-helpers.c:258
 msgid "Cannot export VPN connection"
 msgstr "Не могу да извезем ВПН везу"
 
-#: ../src/connection-editor/vpn-helpers.c:257
+#: ../src/connection-editor/vpn-helpers.c:260
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3039,18 +3558,10 @@ msgstr ""
 "\n"
 "Грешка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:295
 msgid "Export VPN connection..."
 msgstr "Извези ВПН везу..."
 
-#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"Програмче Управник мреже не може да пронађе неке потребне ресурсе („.ui“ "
-"датотека није пронађена)."
-
 #: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Откључај"
@@ -3308,55 +3819,60 @@ msgstr ""
 "Или недостаје лозинка или је веза неисправна. У сваком случају, прво ћете "
 "морати да уредите везу у уређивачу веза"
 
-#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: ../src/libnma/nma-wifi-dialog.c:465 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Нова..."
 
-#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: ../src/libnma/nma-wifi-dialog.c:903 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ништа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#| msgid "Dynamic WEP (802.1X)"
+msgid "Dynamic WEP (802.1x)"
+msgstr "Динамички ВЕП (802.1х)"
+
+#: ../src/libnma/nma-wifi-dialog.c:1071 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Направи"
 
-#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Потребне су лозинке или кључеви шифровања за приступ бежичној мрежи „%s“."
 
-#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Потребно је потврђивање идентитета за бежичну мрежу"
 
-#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Бежична мрежа захтева потврђивање идентитета"
 
-#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Направи нову бежичну мрежу"
 
-#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1168 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Нова бежична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Унесите назив за нову бежичну мрежу."
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Повежи се на скривену бежичну мрежу"
 
-#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1173 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Скривена бежична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3523,12 +4039,12 @@ msgstr "Потребан је ПИН кôд"
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Потребан је ПИН код за повезивање мобилног широкопојасног уређаја"
 
-#: ../src/mobile-helpers.c:619
+#: ../src/mobile-helpers.c:622
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Повезани сте на мобилну широкопојасну везу „%s“: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:622
+#: ../src/mobile-helpers.c:625
 msgid "roaming"
 msgstr "пребацивање"
 
@@ -3538,41 +4054,46 @@ msgstr "пребацивање"
 msgid "%s connection"
 msgstr "%s веза"
 
-#: ../src/wireless-security/eap-method.c:56
+#: ../src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "непозната грешка у 802.1X безбедности (впа-еап)"
 
-#: ../src/wireless-security/eap-method.c:255
+#: ../src/wireless-security/eap-method.c:233
+msgid "no file selected"
+msgstr "није изабрана датотека"
+
+#: ../src/wireless-security/eap-method.c:264
 msgid "unspecified error validating eap-method file"
 msgstr "непозната грешка проверавања датотеке еап-начина"
 
-#: ../src/wireless-security/eap-method.c:452
+#: ../src/wireless-security/eap-method.c:468
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "ДЕР, ПЕМ, или ПКЦС#12 лични кључеви (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:471
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "ДЕР или ПЕМ уверења (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:70
+#: ../src/wireless-security/eap-method-fast.c:72
 msgid "missing EAP-FAST PAC file"
 msgstr "недостаје ЕАП-ФАСТ ПАЦ датотека"
 
-#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-fast.c:268
 #: ../src/wireless-security/eap-method-peap.c:302
 #: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "ГТЦ"
 
-#: ../src/wireless-security/eap-method-fast.c:403
-msgid "Choose a PAC file..."
-msgstr "Изабери ПАЦ датотеку..."
+#: ../src/wireless-security/eap-method-fast.c:406
+#| msgid "Choose a PAC file..."
+msgid "Choose a PAC file"
+msgstr "Изабери ПАЦ датотеку"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "ПАЦ датотеке (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "Све датотеке"
 
@@ -3609,11 +4130,11 @@ msgstr "_Унутрашња пријава:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дозволи самостално ПАЦ _резервисање"
 
-#: ../src/wireless-security/eap-method-leap.c:63
+#: ../src/wireless-security/eap-method-leap.c:65
 msgid "missing EAP-LEAP username"
 msgstr "недостаје ЕАП-ЛЕАП корисничко име"
 
-#: ../src/wireless-security/eap-method-leap.c:69
+#: ../src/wireless-security/eap-method-leap.c:74
 msgid "missing EAP-LEAP password"
 msgstr "недостаје ЕАП-ЛЕАП лозинка"
 
@@ -3633,10 +4154,11 @@ msgid "MD5"
 msgstr "МД5"
 
 #: ../src/wireless-security/eap-method-peap.c:381
-#: ../src/wireless-security/eap-method-tls.c:481
+#: ../src/wireless-security/eap-method-tls.c:501
 #: ../src/wireless-security/eap-method-ttls.c:412
-msgid "Choose a Certificate Authority certificate..."
-msgstr "Изаберите уверење издавача уверења..."
+#| msgid "Choose a Certificate Authority certificate..."
+msgid "Choose a Certificate Authority certificate"
+msgstr "Изаберите уверење издавача уверења"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
@@ -3662,46 +4184,46 @@ msgstr "Није потребно _уверење"
 msgid "PEAP _version:"
 msgstr "ПЕАП _издање:"
 
-#: ../src/wireless-security/eap-method-simple.c:72
+#: ../src/wireless-security/eap-method-simple.c:74
 msgid "missing EAP username"
 msgstr "недостаје ЕАП корисничко име"
 
-#: ../src/wireless-security/eap-method-simple.c:82
+#: ../src/wireless-security/eap-method-simple.c:87
 msgid "missing EAP password"
 msgstr "недостаје ЕАП лозинка"
 
-#: ../src/wireless-security/eap-method-tls.c:66
+#: ../src/wireless-security/eap-method-tls.c:68
 msgid "missing EAP-TLS identity"
 msgstr "недостаје ЕАП-ТЛС идентитет"
 
-#: ../src/wireless-security/eap-method-tls.c:71
+#: ../src/wireless-security/eap-method-tls.c:77
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "неисправно ЕАП-ТЛС уверење издавача уверења: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:76
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "неисправно ЕАП-ТЛС уверење издавача уверења: уверење није наведено"
 
-#: ../src/wireless-security/eap-method-tls.c:84
+#: ../src/wireless-security/eap-method-tls.c:95
 msgid "invalid EAP-TLS password: missing"
 msgstr "неисправна ЕАП-ТЛС лозинка: недостаје"
 
-#: ../src/wireless-security/eap-method-tls.c:94
+#: ../src/wireless-security/eap-method-tls.c:109
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "неисправан ЕАП-ТЛС лични кључ: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:101
+#: ../src/wireless-security/eap-method-tls.c:119
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "неисправно ЕАП-ТЛС корисничко уверење: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:296
+#: ../src/wireless-security/eap-method-tls.c:316
 msgid "Unencrypted private keys are insecure"
 msgstr "Нешифровани приватни кључеви нису сигурни"
 
-#: ../src/wireless-security/eap-method-tls.c:299
+#: ../src/wireless-security/eap-method-tls.c:319
 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 "
@@ -3715,13 +4237,15 @@ msgstr ""
 "\n"
 "(Можете заштитити приватне кључеве користећи „openssl“)"
 
-#: ../src/wireless-security/eap-method-tls.c:475
-msgid "Choose your personal certificate..."
-msgstr "Изаберите лично уверење..."
+#: ../src/wireless-security/eap-method-tls.c:495
+#| msgid "Choose your personal certificate..."
+msgid "Choose your personal certificate"
+msgstr "Изаберите лично уверење"
 
-#: ../src/wireless-security/eap-method-tls.c:487
-msgid "Choose your private key..."
-msgstr "Изаберите лични кључ..."
+#: ../src/wireless-security/eap-method-tls.c:507
+#| msgid "Choose your private key..."
+msgid "Choose your private key"
+msgstr "Изаберите лични кључ"
 
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
@@ -3778,30 +4302,30 @@ msgstr "Заштићени ЕАП (ПЕАП)"
 msgid "Au_thentication:"
 msgstr "По_тврђивање идентитета:"
 
-#: ../src/wireless-security/ws-leap.c:61
+#: ../src/wireless-security/ws-leap.c:63
 msgid "missing leap-username"
 msgstr "недостаје леап корисничко име"
 
-#: ../src/wireless-security/ws-leap.c:69
+#: ../src/wireless-security/ws-leap.c:74
 msgid "missing leap-password"
 msgstr "недостаје леап лозинка"
 
-#: ../src/wireless-security/ws-wep-key.c:105
+#: ../src/wireless-security/ws-wep-key.c:107
 msgid "missing wep-key"
 msgstr "недостаје веп кључ"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: ../src/wireless-security/ws-wep-key.c:116
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "неисправан веп кључ: кључ дужине %zu мора да садржи само хекса-бројеве"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: ../src/wireless-security/ws-wep-key.c:124
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "неисправан веп кључ: кључ дужине %zu мора да садржи само аскри знакове"
 
-#: ../src/wireless-security/ws-wep-key.c:125
+#: ../src/wireless-security/ws-wep-key.c:130
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -3810,11 +4334,11 @@ msgstr ""
 "неисправан веп кључ: погрешна дужина кључа %zu. Кључ мора бити или дужине "
 "5/13 (аскри) или 10/26 (хекс)"
 
-#: ../src/wireless-security/ws-wep-key.c:131
+#: ../src/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "неисправан веп-кључ: лозинка не сме бити празна"
 
-#: ../src/wireless-security/ws-wep-key.c:133
+#: ../src/wireless-security/ws-wep-key.c:139
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "неисправан веп-кључ: лозинка мора бити краћа од 64 знака"
 
@@ -3842,7 +4366,7 @@ msgstr "П_рикажи кључ"
 msgid "WEP inde_x:"
 msgstr "ВЕП _индекс:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:69
+#: ../src/wireless-security/ws-wpa-psk.c:70
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3851,7 +4375,7 @@ msgstr ""
 "неисправна впа лозинка: неисправна дужина кључа %zu. Мора бити [8,63] бајта "
 "или 64 хекса-броја"
 
-#: ../src/wireless-security/ws-wpa-psk.c:77
+#: ../src/wireless-security/ws-wpa-psk.c:79
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "неисправна впа лозинка: не могу да растумачим кључ од 64 бајта као "
@@ -3861,6 +4385,12 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Врста:"
 
+#~ msgid "_Disconnect VPN"
+#~ msgstr "_Прекини ВПН везу"
+
+#~ msgid "_Import team configuration from a file..."
+#~ msgstr "_Увези тимско подешавање из датотеке..."
+
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Управник мреже за Гном"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index aa56207c..8ae681f5 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -2,7 +2,7 @@
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2004 — 2016.
 # This file is distributed under the same license as the totem package.
 #
-# Translators: 
+# Translators:
 # Filip Miletic
 # Miloš Popović <gpopac@gmail.com>, 2010.
 # Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2016.
@@ -10,21 +10,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 14:02+0200\n"
-"PO-Revision-Date: 2016-03-29 18:34+0200\n"
-"Last-Translator: Marko M. Kostić <marko.m.kostic@gmail.com>\n"
-"Language-Team: Serbian <gnom@prevod.org>\n"
-"Language: sr@latin\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Network"
+"Manager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2016-08-23 12:35+0000\n"
+"PO-Revision-Date: 2016-08-27 06:31+0200\n"
+"Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: srpski <gnome-sr@googlegroups.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
-"X-Generator: Poedit 1.8.7.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3104
 msgid "Network"
 msgstr "Mreža"
 
@@ -98,8 +98,7 @@ msgstr "Onemogući obrazovanje bežične mreže"
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
-"Uključite ovu opciju da isključite obrazovanje adhok mreža iz Upravnika "
-"mrežama."
+"Uključite ovu opciju da isključite obrazovanje adhok mreža iz Upravnika mrežama."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
 msgid "Show the applet in notification area"
@@ -119,34 +118,34 @@ msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
-"Uključite ovu opciju da isključite upozorenja o CA uverenjima u EAP "
-"potvrđivanju identiteta."
+"Uključite ovu opciju da isključite upozorenja o CA uverenjima u EAP potvrđivanju "
+"identiteta."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
-"Uključite ovu opciju da isključite upozorenja o CA uverenjima u drugoj fazi "
-"EAP potvrđivanja identiteta."
+"Uključite ovu opciju da isključite upozorenja o CA uverenjima u drugoj fazi EAP "
+"potvrđivanja identiteta."
 
-#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#: ../nm-connection-editor.appdata.xml.in.h:1
 msgid "NetworkManager"
 msgstr "Upravnik mreže"
 
-#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-msgid "NetworkManager for GNOME"
-msgstr "Upravnik mreže za Gnom"
+#: ../nm-connection-editor.appdata.xml.in.h:2
+msgid "NetworkManager connection editor"
+msgstr "Uređivač veza upravnika mreže"
 
-#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+#: ../nm-connection-editor.appdata.xml.in.h:3
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
-"Upravnik mreže je sistemska usluga za upravljanje i podešavanje mrežnih veza "
-"i uređaja."
+"Upravnik mreže je sistemska usluga za upravljanje i podešavanje mrežnih veza i "
+"uređaja."
 
-#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+#: ../nm-connection-editor.appdata.xml.in.h:4
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -154,6 +153,10 @@ msgstr ""
 "Program um-uređivač-veza radi sa Upravnikom mreže da bi napravio i uredio "
 "postojeće profile veze za Upravnika mreže."
 
+#: ../nm-connection-editor.appdata.xml.in.h:5
+msgid "The NetworkManager Developers"
+msgstr "Programeri upravnika mreže"
+
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Potvrđivanje identiteta za 802.1X vezu"
@@ -231,8 +234,7 @@ msgid ""
 "The VPN connection '%s' failed because the VPN service stopped unexpectedly."
 msgstr ""
 "\n"
-"Ne mogu da uspostavim VPN vezu „%s“ zbog neočekivanog isključenja VPN "
-"servisa."
+"Ne mogu da uspostavim VPN vezu „%s“ zbog neočekivanog isključenja VPN servisa."
 
 #: ../src/applet.c:850
 #, c-format
@@ -377,144 +379,146 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1280
+#: ../src/applet.c:1285
 msgid "device not ready (firmware missing)"
 msgstr "uređaj nije spreman (nedostaje firmver)"
 
-#: ../src/applet.c:1282
+#: ../src/applet.c:1287
 msgid "device not ready"
 msgstr "uređaj nije spreman"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1297 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "veza je prekinuta"
 
-#: ../src/applet.c:1308
+#: ../src/applet.c:1313
 msgid "Disconnect"
 msgstr "Prekini vezu"
 
-#: ../src/applet.c:1322
+#: ../src/applet.c:1327
 msgid "device not managed"
 msgstr "ne mogu da upravljam uređajem"
 
-#: ../src/applet.c:1395
+#: ../src/applet.c:1400
 msgid "No network devices available"
 msgstr "Nije pronađen nijedan mrežni uređaj"
 
-#: ../src/applet.c:1449
+#: ../src/applet.c:1454
 msgid "_VPN Connections"
 msgstr "_VPN veze"
 
-#: ../src/applet.c:1503
+#: ../src/applet.c:1498
 msgid "_Configure VPN..."
 msgstr "Po_desi VPN..."
 
-#: ../src/applet.c:1508
-msgid "_Disconnect VPN"
-msgstr "_Prekini VPN vezu"
+#: ../src/applet.c:1501
+#| msgid "Export VPN connection..."
+msgid "_Add a VPN connection..."
+msgstr "_Dodaj VPN vezu..."
 
-#: ../src/applet.c:1615
+#: ../src/applet.c:1607
 msgid "NetworkManager is not running..."
 msgstr "Upravljač mrežom nije pokrenut..."
 
-#: ../src/applet.c:1620 ../src/applet.c:2612
+#: ../src/applet.c:1612 ../src/applet.c:2604
 msgid "Networking disabled"
 msgstr "Umrežavanje isključeno"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1830
+#: ../src/applet.c:1822
 msgid "Enable _Networking"
 msgstr "Uključi _mrežne usluge"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1839
+#: ../src/applet.c:1831
 msgid "Enable _Wi-Fi"
 msgstr "Uključi _bežično mreženje"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1848
+#: ../src/applet.c:1840
 msgid "Enable _Mobile Broadband"
 msgstr "Omogući _mobilne veze"
 
 #. Toggle notifications item
-#: ../src/applet.c:1860
+#: ../src/applet.c:1852
 msgid "Enable N_otifications"
 msgstr "_Prikaži obaveštenja"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1872
+#: ../src/applet.c:1864
 msgid "Connection _Information"
 msgstr "Poda_ci o vezi"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1880
+#: ../src/applet.c:1872
 msgid "Edit Connections..."
 msgstr "Uredi veze..."
 
-#: ../src/applet.c:1894
+#: ../src/applet.c:1886
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/applet.c:2179
+#: ../src/applet.c:2171
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Povezani ste na „%s“."
 
-#: ../src/applet.c:2222
+#: ../src/applet.c:2214
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
-#: ../src/applet.c:2223
+#: ../src/applet.c:2215
 msgid "The network connection has been disconnected."
 msgstr "Mrežna veza je prekinuta."
 
-#: ../src/applet.c:2474
+#: ../src/applet.c:2466
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Pripremam mrežnu vezu „%s“..."
 
-#: ../src/applet.c:2477
+#: ../src/applet.c:2469
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Potrebna je prijava korisnika za uspostavljanje veze „%s“..."
 
-#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2472 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Zahtevam mrežnu adresu za „%s“..."
 
-#: ../src/applet.c:2483
+#: ../src/applet.c:2475
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Povezani ste preko veze „%s“"
 
-#: ../src/applet.c:2557
+#: ../src/applet.c:2549
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Uspostavljam VPN vezu „%s“..."
 
-#: ../src/applet.c:2560
+#: ../src/applet.c:2552
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Potrebna je prijava korisnika za uspostavljanje VPN veze „%s“..."
 
-#: ../src/applet.c:2563
+#: ../src/applet.c:2555
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Zahtevam VPN mrežnu adresu za „%s“..."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2558
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "Povezani ste preko VPN veze „%s“"
+#| msgid "VPN connection '%s' active"
+msgid "VPN connection active"
+msgstr "Povezani ste preko VPN veze"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2608
 msgid "No network connection"
 msgstr "Nema mrežne veze"
 
-#: ../src/applet.c:3204
+#: ../src/applet.c:3203
 msgid "NetworkManager Applet"
 msgstr "Programče upravnika mreže"
 
@@ -537,7 +541,7 @@ msgid "Mobile Broadband (%s)"
 msgstr "Mobilna veza (%s)"
 
 #: ../src/applet-device-broadband.c:736
-#: ../src/connection-editor/connection-helpers.c:100
+#: ../src/connection-editor/connection-helpers.c:106
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
@@ -593,7 +597,7 @@ msgstr "Podešavam mobilnu, širokopojasnu vezu „%s“..."
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Potrebna je prijava korisnika za povezivanje u mobilnoj mreži „%s“..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Povezani ste preko mobilne širokopojasne veze „%s“"
@@ -752,7 +756,7 @@ msgid "Error displaying connection information:"
 msgstr "Greška pri prikazivanju podataka o vezi:"
 
 #: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:332
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
@@ -842,6 +846,8 @@ msgstr "CDMA (%s)"
 
 #. --- General ---
 #: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/ce-page-team-port.ui.h:23
+#: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Opšte"
@@ -869,6 +875,7 @@ msgstr "Bezbednost:"
 
 #. --- IPv4 ---
 #: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -878,6 +885,7 @@ msgstr "Podrazumevana ruta:"
 
 #. --- IPv6 ---
 #: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -933,33 +941,41 @@ msgstr "Programče obaveštajne zone za upravljanje mrežnim uređajima i vezama
 msgid "NetworkManager Website"
 msgstr "Veb stranica Upravnika mrežom"
 
-#: ../src/applet-dialogs.c:1005
+#: ../src/applet-dialogs.c:1001
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"Programče Upravnik mreže ne može da pronađe neke potrebne resurse („.ui“ "
+"datoteka nije pronađena)."
+
+#: ../src/applet-dialogs.c:1006
 msgid "Missing resources"
 msgstr "Nedostaju resursi"
 
-#: ../src/applet-dialogs.c:1030
+#: ../src/applet-dialogs.c:1031
 msgid "Mobile broadband network password"
 msgstr "Lozinka mobilne širokopojasne mreže"
 
-#: ../src/applet-dialogs.c:1039
+#: ../src/applet-dialogs.c:1040
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Potrebna je lozinka za povezivanje na „%s“."
 
-#: ../src/applet-dialogs.c:1054
+#: ../src/applet-dialogs.c:1055
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN unlock required"
 msgstr "Potrebno je otključati SIM PIN"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1338
 msgid "SIM PIN Unlock Required"
 msgstr "Potrebno je otključati SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1340
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -967,25 +983,25 @@ msgid ""
 msgstr "Mobilni širokopojasni uređaj „%s“ zahteva SIM PIN kod."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1341
+#: ../src/applet-dialogs.c:1342
 msgid "PIN code:"
 msgstr "PIN kôd:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1346
 msgid "Show PIN code"
 msgstr "Prikaži PIN kôd"
 
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK unlock required"
 msgstr "Potrebno je otključati SIM PUK"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1349
 msgid "SIM PUK Unlock Required"
 msgstr "Potrebno je otključati SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1351
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -993,22 +1009,22 @@ msgid ""
 msgstr "Mobilni širokopojasni uređaj „%s“ zahteva SIM PUK kôd."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1352
+#: ../src/applet-dialogs.c:1353
 msgid "PUK code:"
 msgstr "PUK kôd:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1356
 msgid "New PIN code:"
 msgstr "Novi PIN kôd:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1357
+#: ../src/applet-dialogs.c:1358
 msgid "Re-enter new PIN code:"
 msgstr "Ponovo unesite PIN kôd:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1362
+#: ../src/applet-dialogs.c:1363
 msgid "Show PIN/PUK codes"
 msgstr "Prikaži PIN/PUK kôdove"
 
@@ -1036,7 +1052,7 @@ msgstr ""
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:9
 #: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:13
 #: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "_Add"
 msgstr "_Dodaj"
@@ -1048,7 +1064,7 @@ msgstr "_Dodaj"
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
 #: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../src/connection-editor/ce-page-team.ui.h:15
 #: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Obriši"
@@ -1069,8 +1085,7 @@ msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
-"Ukoliko je uključeno, ova veza nikada neće biti u korišćena kao "
-"podrazumevana."
+"Ukoliko je uključeno, ova veza nikada neće biti u korišćena kao podrazumevana."
 
 # bug: translatable, really?
 #: ../src/connection-editor/ce-new-connection.ui.h:1 ../src/libnma/wifi.ui.h:1
@@ -1103,10 +1118,12 @@ msgstr ""
 "instaliran ispravan VPN priključak."
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:21
 msgid "Round-robin"
 msgstr "Kružno menjanje"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:2
+#: ../src/connection-editor/ce-page-team.ui.h:22
 msgid "Active backup"
 msgstr "Radna rezerva"
 
@@ -1115,6 +1132,7 @@ msgid "XOR"
 msgstr "IksOR"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:20
 msgid "Broadcast"
 msgstr "Emitovanje"
 
@@ -1150,7 +1168,7 @@ msgstr "_Režim:"
 #. Edit
 #: ../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/ce-page-team.ui.h:14
 #: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Uređivanje"
@@ -1165,7 +1183,7 @@ msgstr "ms"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:17
 #: ../src/connection-editor/ce-page-bridge.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: ../src/connection-editor/ce-page-team.ui.h:16
 msgid "_Interface name:"
 msgstr "_Uređaj:"
 
@@ -1202,13 +1220,13 @@ msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 msgstr ""
-"Naziv sučelja primarnog uređaja. Ako je postavljeno, ovaj uređaj će uvek "
-"biti aktivan sporedni kada je dostupan."
+"Naziv sučelja primarnog uređaja. Ako je postavljeno, ovaj uređaj će uvek biti "
+"aktivan sporedni kada je dostupan."
 
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
 #: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
 msgid "_MTU:"
@@ -1217,7 +1235,7 @@ msgstr "_MTU:"
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
 #: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
 msgid "bytes"
@@ -1268,11 +1286,11 @@ msgstr "_Najveće vreme:"
 msgid "_Aging time:"
 msgstr "Vreme _starenja:"
 
-#: ../src/connection-editor/ce-page.c:78
+#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatski"
 
-#: ../src/connection-editor/ce-page.c:86
+#: ../src/connection-editor/ce-page.c:86 ../src/connection-editor/ce-page.c:121
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
 #: ../src/connection-editor/page-wifi.c:168
 #: ../src/connection-editor/page-wifi.c:172
@@ -1281,44 +1299,44 @@ msgstr "automatski"
 msgid "default"
 msgstr "osnovno"
 
-#: ../src/connection-editor/ce-page.c:132
+#: ../src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "nepoznata greška"
 
-#: ../src/connection-editor/ce-page.c:245
+#: ../src/connection-editor/ce-page.c:302
 msgid "MAC address"
 msgstr "MAC adresa"
 
-#: ../src/connection-editor/ce-page.c:245
+#: ../src/connection-editor/ce-page.c:302
 msgid "HW address"
 msgstr "HV adresa"
 
-#: ../src/connection-editor/ce-page.c:248
+#: ../src/connection-editor/ce-page.c:305
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "neispravno %s za %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:252
-#: ../src/connection-editor/ce-page.c:484
+#: ../src/connection-editor/ce-page.c:309
+#: ../src/connection-editor/ce-page.c:541
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "neispravno %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:268
+#: ../src/connection-editor/ce-page.c:325
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "neispravan naziv sučelja za %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:272
+#: ../src/connection-editor/ce-page.c:329
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "neispravan naziv sučelja (%s)"
 
-#: ../src/connection-editor/ce-page.c:485
+#: ../src/connection-editor/ce-page.c:542
 msgid "device"
 msgstr "uređaj"
 
-#: ../src/connection-editor/ce-page.c:591
+#: ../src/connection-editor/ce-page.c:650
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Ne mogu da ažururam lozinke veze zbog nepoznate greške."
 
@@ -1785,8 +1803,8 @@ msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
-"Pri povezivanju na IPv6 kablovske mreže dozvoljava uspostavljanje veze "
-"ukoliko ne rade IPv4 podešavanja, a rade IPv6 podešavanja."
+"Pri povezivanju na IPv6 kablovske mreže dozvoljava uspostavljanje veze ukoliko "
+"ne rade IPv4 podešavanja, a rade IPv6 podešavanja."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:19
 #: ../src/connection-editor/ce-page-ip6.ui.h:21
@@ -1829,10 +1847,11 @@ msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
-"Pri povezivanju na IPv4 kablovske mreže dozvoljava uspostavljanje veze "
-"ukoliko ne rade IPv6 podešavanja, a rade IPv4 podešavanja."
+"Pri povezivanju na IPv4 kablovske mreže dozvoljava uspostavljanje veze ukoliko "
+"ne rade IPv6 podešavanja, a rade IPv4 podešavanja."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -1917,21 +1936,523 @@ msgid "Send PPP _echo packets"
 msgstr "Šalji PPP _eho pakete"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:2
-msgid "_JSON config:"
-msgstr "_JSON podešavanje:"
+#: ../src/connection-editor/ce-page-team.ui.h:19
+#| msgid "Advanced"
+msgid "Ad_vanced..."
+msgstr "_Napredno..."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
-msgid "_Import team configuration from a file..."
-msgstr "_Uvezi timsko podešavanje iz datoteke..."
+msgid "Set by master"
+msgstr "Podesi glavnim"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:3
+#: ../src/connection-editor/ce-page-team.ui.h:9
+#| msgid "Ethernet Networks"
+msgid "Ethernet port state"
+msgstr "Stanje žičanog porta"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:10
+msgid "ARP (IPv4)"
+msgstr "ARP (IPv4)"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:5
+#: ../src/connection-editor/ce-page-team.ui.h:11
+msgid "NDP (IPv6)"
+msgstr "NDP (IPv6)"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:6
+#: ../src/connection-editor/ce-page-team.ui.h:37
+msgid "Team Advanced Options"
+msgstr "Napredne opcije tima"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:7
+msgid "_Queue ID:"
+msgstr "_IB reda:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:8
+#: ../src/connection-editor/ce-page-team.ui.h:42
+msgid ""
+"Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
+"port is enabled or disabled."
+msgstr ""
+"Broj izliva neželjenih NAs i besplatnih ARP paketa koji se šalju nakon "
+"uključivanja ili isključivanja porta."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:9
+msgid "ID of queue which this port should be mapped to."
+msgstr "IB reda na koji ovaj port treba biti mapiran."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#| msgid "_Priority:"
+msgid "_Port priority:"
+msgstr "_Hitnost porta:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:11
+msgid "Port _sticky"
+msgstr "_Lepljiv port"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:12
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+"Proverava primljene ARP pakete na aktivnim portovima. Ako ovo nije izabrano, "
+"svi dolazeći ARP paketi će se smatrati dobrim odgovorom."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: ../src/connection-editor/ce-page-team.ui.h:44
+msgid ""
+"Value is positive number in milliseconds. Specifies an interval between "
+"bursts of notify-peer packets."
+msgstr ""
+"Vrednost je pozitivan broj u milisekundama. Navodi interval između izliva "
+"paketa obaveštenja o parnjaku."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port priority. The higher number means higher priority."
+msgstr "Važnost porta. Veći broj znači veću hitnost."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:15
+msgid "Active-Backup runner options"
+msgstr "Opcije pokretača aktivne rezerve"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#| msgid "_Priority:"
+msgid "_LACP port priority:"
+msgstr "_Hitnost LACP porta:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#| msgid "Private _key:"
+msgid "LACP port _key:"
+msgstr "Ključ LACP _porta:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team.ui.h:43
+msgid ""
+"Number of bursts of multicast group rejoin requests sent after port is "
+"enabled or disabled."
+msgstr ""
+"Broj izliva zahteva za pridruživanje multikast grupi nakon uključivanja ili "
+"isključivanja porta."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
+msgid ""
+"Port priority according to LACP standard. The lower number means higher "
+"priority."
+msgstr ""
+"Hitnost porta u skladu sa LACP standardom. Manji broj znači veću hitnost."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team.ui.h:45
+msgid ""
+"Value is positive number in milliseconds. Specifies an interval between "
+"bursts of multicast group rejoin requests."
+msgstr ""
+"Vrednost je pozitivan broj u milisekundama. Navodi interval između izliva "
+"zahteva za pridruživanje multikast grupi."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
+msgid ""
+"Port key according to LACP standard. It is only possible to aggregate ports "
+"with the same key."
+msgstr ""
+"Ključ porta prema LACP standardu. Moguće je sjediniti portove samo sa istim "
+"ključem."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
+msgid "LACP runner options"
+msgstr "Opcije LACP pokretača"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:24
+#: ../src/connection-editor/ce-page-team.ui.h:70
+msgid "_Link watcher:"
+msgstr "Posmatrač _veze:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:25
+#: ../src/connection-editor/ce-page-team.ui.h:71
+#| msgid "Link _up delay:"
+msgid "_Up delay:"
+msgstr "Zastoj _slanja:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:26
+#: ../src/connection-editor/ce-page-team.ui.h:72
+#| msgid "Link _down delay:"
+msgid "_Down delay:"
+msgstr "Zastoj _primanja:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:27
+#: ../src/connection-editor/ce-page-team.ui.h:73
+#| msgid "_Parent interface:"
+msgid "Send _interval:"
+msgstr "_Interval slanja:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:28
+#: ../src/connection-editor/ce-page-team.ui.h:74
+msgid "Delay _before first send:"
+msgstr "Zastoj _pre prvog slanja:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:29
+#: ../src/connection-editor/ce-page-team.ui.h:75
+msgid "_Maximum missed replies:"
+msgstr "_Najviše propuštenih odgovora:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:30
+#: ../src/connection-editor/ce-page-team.ui.h:76
+msgid "_Source host:"
+msgstr "Domaćin _izvora:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:31
+#: ../src/connection-editor/ce-page-team.ui.h:77
+#| msgid "ARP _targets:"
+msgid "_Target host:"
+msgstr "Domaćin _cilja:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:32
+#: ../src/connection-editor/ce-page-team.ui.h:78
+msgid ""
+"Maximum number of missed replies. If this number is exceeded, link is "
+"reported as down."
+msgstr ""
+"Najveći broj propuštenih odgovora. Ako se prevaziđe ovaj broj, veza se "
+"označava palom."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:33
+#: ../src/connection-editor/ce-page-team.ui.h:79
+msgid ""
+"Hostname to be converted to IP address which will be filled into ARP request "
+"as source address."
+msgstr ""
+"Naziv domaćina koji će biti pretvoren u IP adresu koja će biti popunjena u "
+"ARP zahtevu kao adresa izvora."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:34
+#: ../src/connection-editor/ce-page-team.ui.h:80
+msgid ""
+"Hostname to be converted to IP address which will be filled into request as "
+"destination address."
+msgstr ""
+"Naziv domaćina koji će biti pretvoren u IP adresu koja će biti popunjena u "
+"zahtevu kao adresa odredišta."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:35
+#: ../src/connection-editor/ce-page-team.ui.h:81
+msgid "Ignore invalid packets from _active ports"
+msgstr "Zanemari neispravne pakete sa _aktivnih portova"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:36
+#: ../src/connection-editor/ce-page-team.ui.h:83
+msgid "Ignore invalid packets from i_nactive ports"
+msgstr "Zanemari neispravne pakete sa _neaktivnih portova"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:37
+#: ../src/connection-editor/ce-page-team.ui.h:84
+msgid ""
+"Validate received ARP packets on inactive ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+"Proverava primljene ARP pakete na neaktivnim portovima. Ako ovo nije "
+"izabrano, svi dolazeći ARP paketi će se smatrati dobrim odgovorom."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:38
+#: ../src/connection-editor/ce-page-team.ui.h:85
+msgid "S_end on inactive ports"
+msgstr "_Pošalji na neaktivnim portovima"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:39
+#: ../src/connection-editor/ce-page-team.ui.h:86
+msgid ""
+"By default, ARP requests are sent on active ports only. This option allows "
+"sending even on inactive ports."
+msgstr ""
+"Po osnovi, ARP zahtevi se šalju samo na aktivnim portovima. Ova opcija "
+"omogućava slanje čak i na neaktivnim portovima."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:40
+#: ../src/connection-editor/ce-page-team.ui.h:87
+msgid ""
+"The delay between the link coming up and the runner being notified about it."
+msgstr "Zastoj između uspostavljanja veze i obaveštavanja pokretača o tome."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:41
+#: ../src/connection-editor/ce-page-team.ui.h:88
+msgid ""
+"The delay between the link going down and the runner being notified about it."
+msgstr "Zastoj između padanja veze i obaveštavanja pokretača o tome."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:42
+#: ../src/connection-editor/ce-page-team.ui.h:89
+msgid "The interval between requests being sent."
+msgstr "Interval između slanja zahteva."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:43
+#: ../src/connection-editor/ce-page-team.ui.h:90
+msgid ""
+"The delay between link watch initialization and the first request being sent."
+msgstr "Zastoj između pokretanja praćenja veze i slanja prvog zahteva."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:44
+#: ../src/connection-editor/ce-page-team.ui.h:91
+msgid "The link watcher to be used."
+msgstr "Osmatrač veze koji će se koristiti."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:45
+#: ../src/connection-editor/ce-page-team.ui.h:92
+msgid "Link Watcher"
+msgstr "Osmatrač veze"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:46
+#: ../src/connection-editor/ce-page-team.ui.h:93
+msgid "Im_port team configuration from a file..."
+msgstr "Uvezi timsko _podešavanje iz datoteke..."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:47
+#: ../src/connection-editor/ce-page-team.ui.h:94
+#| msgid "_JSON config:"
+msgid "Edit _JSON configuration:"
+msgstr "Uredi _JSON podešavanje:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:48
+#: ../src/connection-editor/ce-page-team.ui.h:95
+msgid "Raw Configuration"
+msgstr "Sirovo podešavanje"
 
 #: ../src/connection-editor/ce-page-team.ui.h:1
+msgid "Highest priority"
+msgstr "Najveća hitnost"
+
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "Highest priority (stable)"
+msgstr "Najveća hitnost (stabilno)"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#| msgid "Group Bandwidth:"
+msgid "Bandwidth"
+msgstr "Pojasna širina"
+
+#: ../src/connection-editor/ce-page-team.ui.h:4
+msgid "Highest number of ports"
+msgstr "Najveći broj portova"
+
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#| msgid "Priority"
+msgid "Port priority"
+msgstr "Hitnost porta"
+
+#: ../src/connection-editor/ce-page-team.ui.h:6
+#| msgid "Ethernet device"
+msgid "From the team device"
+msgstr "Sa timskog uređaja"
+
+#: ../src/connection-editor/ce-page-team.ui.h:7
+msgid "From the active port"
+msgstr "Sa aktivnog porta"
+
+#: ../src/connection-editor/ce-page-team.ui.h:8
+msgid "From active to team device"
+msgstr "Sa aktivnog na timski uređaj"
+
+#: ../src/connection-editor/ce-page-team.ui.h:12
 msgid "_Teamed connections:"
 msgstr "_Timske veze:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "Im_port team configuration from a file..."
-msgstr "Uvezi timsko _podešavanje iz datoteke..."
+#: ../src/connection-editor/ce-page-team.ui.h:23
+msgid "Load balance"
+msgstr "Ravnoteža učitavanja"
+
+#: ../src/connection-editor/ce-page-team.ui.h:24
+msgid "LACP"
+msgstr "LACP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:25
+#| msgctxt "Wi-Fi/Ethernet security"
+#| msgid "None"
+msgid "None"
+msgstr "Ništa"
+
+#: ../src/connection-editor/ce-page-team.ui.h:27
+#: ../src/connection-editor/connection-helpers.c:103
+#: ../src/connection-editor/page-ethernet.c:324
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+msgid "Ethernet"
+msgstr "Žičana veza"
+
+#: ../src/connection-editor/ce-page-team.ui.h:28
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-vlan.c:592 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../src/connection-editor/ce-page-team.ui.h:31
+#| msgid "FIP"
+msgid "IP"
+msgstr "IP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:32
+msgid "Any L3 protocol"
+msgstr "Neki L3 protokol"
+
+#: ../src/connection-editor/ce-page-team.ui.h:33
+#| msgid "GTC"
+msgid "TCP"
+msgstr "TCP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:34
+msgid "UDP"
+msgstr "UDP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:35
+msgid "SCTP"
+msgstr "SCTP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:36
+msgid "Any L4 protocol"
+msgstr "Neki L4 protokol"
+
+#: ../src/connection-editor/ce-page-team.ui.h:38
+msgid "_Peer notification count:"
+msgstr "Broj obaveštenja _parnjaka:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:39
+msgid "Peer _notification interval:"
+msgstr "Interval _obaveštenja parnjaka:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:40
+msgid "_Multicast rejoin count:"
+msgstr "_Broj multikast pridruživanja:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:41
+msgid "Multicast _rejoin interval:"
+msgstr "_Interval multikast pridruživanja:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:46
+#| msgid "Hardware Address:"
+msgid "_Hardware Address:"
+msgstr "_Hardverska adresa:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:47
+msgid ""
+"Desired hardware address of new team device. Usual MAC address format is "
+"accepted."
+msgstr ""
+"Željena hardverska adresa novog timskog uređaja. Uobičajeni zapis MAK adrese "
+"je prihvatljiv."
+
+#: ../src/connection-editor/ce-page-team.ui.h:49
+msgid "_Runner:"
+msgstr "_Pokretač:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:50
+#| msgid "Hardware Address:"
+msgid "_Hardware address policy:"
+msgstr "Politika _hardverske adrese:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:51
+msgid "Name of runner to be used."
+msgstr "Naziv pokretača za korišćenje."
+
+#: ../src/connection-editor/ce-page-team.ui.h:52
+msgid ""
+"This  defines the policy of how hardware addresses of team device and port "
+"devices should be set during the team lifetime."
+msgstr ""
+"Ovo određuje politiku načina podešavanja hardverskih adresa timskog uređaja i "
+"uređaja porta za vreme trajanja tima."
+
+#: ../src/connection-editor/ce-page-team.ui.h:53
+msgid "Send LACPDU frames _periodically"
+msgstr "LACPDU kadrove pošalji _povremeno"
+
+#: ../src/connection-editor/ce-page-team.ui.h:54
+msgid ""
+"If checked, LACPDU frames are sent along the configured links periodically. "
+"If not, it acts as \"speak when spoken to\"."
+msgstr ""
+"Ako je izabrano, LACPDU kadrovi se šalju povremeno sa podešenim vezama. Ako "
+"nije, deluje kao „govori kada ti se obrate“."
+
+#: ../src/connection-editor/ce-page-team.ui.h:55
+msgid "Send a LACPDU frame _every second"
+msgstr "LACPDU kadar pošalji _svake sekunde"
+
+#: ../src/connection-editor/ce-page-team.ui.h:56
+msgid ""
+"Option specifies the rate at which our link partner is asked to transmit "
+"LACPDU packets. If checked, packets will be sent once  per second. Otherwise "
+"they will be sent every 30 seconds."
+msgstr ""
+"Opcija određuje protok koji se traži od partnera naše veze za emitovanje "
+"LACPDU paketa. Ako je izabrano, paketi će biti poslati jedan u sekundi. U "
+"suprotnom će biti poslati na svakih 30 sekundi."
+
+#: ../src/connection-editor/ce-page-team.ui.h:57
+#| msgid "_Priority:"
+msgid "_System priority:"
+msgstr "Hitnost _sistema:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:58
+msgid "_Minimum ports:"
+msgstr "_Najmanje portova:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:59
+msgid "_Aggregator selection policy:"
+msgstr "Politika izbora _sakupljača:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:60
+msgid "System priority, value can be 0 – 65535."
+msgstr "Hitnost sistema, može biti od 0–65535."
+
+#: ../src/connection-editor/ce-page-team.ui.h:61
+msgid ""
+"Specifies the minimum number of ports that must be active before asserting "
+"carrier in the master interface, value can be 1 – 255."
+msgstr ""
+"Određuje najmanji broj portova koji moraju biti aktivni pre potvrđivanja "
+"nosača u glavnom sučelju, vrednost može biti od 1—255."
+
+#: ../src/connection-editor/ce-page-team.ui.h:62
+msgid "This selects the policy of how the aggregators will be selected."
+msgstr "Ovo bira politiku načina izbora sakupljača."
+
+#: ../src/connection-editor/ce-page-team.ui.h:63
+msgid ""
+"List of fragment types (strings) which should be used for packet Tx hash "
+"computation."
+msgstr ""
+"Spisak vrsta odlomaka (niski) koje bi trebalo da se koriste za proračun heša "
+"Tx paketa."
+
+#: ../src/connection-editor/ce-page-team.ui.h:64
+msgid "_Fields for tramsmission hash"
+msgstr "_Polja za heš prenosa"
+
+#: ../src/connection-editor/ce-page-team.ui.h:65
+msgid "In tenths of a second. Periodic interval between rebalancing."
+msgstr ""
+"U desetim delovima sekunde. Povremeni interval između ponovnog "
+"uravnotežavanja."
+
+#: ../src/connection-editor/ce-page-team.ui.h:66
+msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
+msgstr ""
+"Naziv aktivnog Tx uravnotežavača. Aktivno Tx uravnotežavanje je unapred "
+"isključeno."
+
+#: ../src/connection-editor/ce-page-team.ui.h:67
+#| msgid "Transmission po_wer:"
+msgid "Transmission _balancing interval:"
+msgstr "Interval _uravnotežavanja prenosa:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:68
+#| msgid "Transmission po_wer:"
+msgid "_Transmission balancer:"
+msgstr "Uravnotežavač _prenosa:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:69
+msgid "Runner"
+msgstr "Pokretač"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
@@ -2092,96 +2613,83 @@ msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
 msgstr ""
-"U većini slučajeva, PPP serveri dobavljača će podržati sve načine "
-"potvrđivanja identiteta.  Ako veza ne uspe, pokušajte da isključite podršku "
-"za neke načine."
+"U većini slučajeva, PPP serveri dobavljača će podržati sve načine potvrđivanja "
+"identiteta.  Ako veza ne uspe, pokušajte da isključite podršku za neke načine."
 
-#: ../src/connection-editor/connection-helpers.c:97
-#: ../src/connection-editor/page-ethernet.c:326
-#: ../src/libnm-gtk/nm-ui-utils.c:321
-msgid "Ethernet"
-msgstr "Žičana veza"
-
-#: ../src/connection-editor/connection-helpers.c:98
-#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/page-wifi.c:441 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Bežična"
 
-#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/connection-helpers.c:112
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Blutut"
 
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/connection-helpers.c:113
 #: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/connection-editor/connection-helpers.c:114
+#: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "Infini band"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-bond.c:444 ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Veza"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-team.c:267 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Tim"
 
-#: ../src/connection-editor/connection-helpers.c:111
+#: ../src/connection-editor/connection-helpers.c:117
 #: ../src/connection-editor/page-bridge.c:210
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Most"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/connection-helpers.c:254
-#: ../src/connection-editor/page-vpn.c:101
+#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/connection-helpers.c:252
+#: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:196
+#: ../src/connection-editor/connection-helpers.c:194
 msgid "Hardware"
 msgstr "Hardver"
 
-#: ../src/connection-editor/connection-helpers.c:223
+#: ../src/connection-editor/connection-helpers.c:221
 msgid "Virtual"
 msgstr "Virtuelno"
 
-#: ../src/connection-editor/connection-helpers.c:292
-#: ../src/connection-editor/connection-helpers.c:294
+#: ../src/connection-editor/connection-helpers.c:370
+#: ../src/connection-editor/connection-helpers.c:372
 msgid "Import a saved VPN configuration..."
 msgstr "Uvezi sačuvna VPN podešavanja..."
 
-#: ../src/connection-editor/connection-helpers.c:323
+#: ../src/connection-editor/connection-helpers.c:401
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Ne mogu da pokrenem prozorče za izmenu veze zbog nepoznate greške."
 
-#: ../src/connection-editor/connection-helpers.c:332
+#: ../src/connection-editor/connection-helpers.c:410
 msgid "Could not create new connection"
 msgstr "Ne mogu da napravim novu vezu"
 
-#: ../src/connection-editor/connection-helpers.c:469
+#: ../src/connection-editor/connection-helpers.c:556
 msgid "Connection delete failed"
 msgstr "Ne mogu da obrišem vezu"
 
-#: ../src/connection-editor/connection-helpers.c:517
+#: ../src/connection-editor/connection-helpers.c:604
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Da li da zaista obrišem vezu %s?"
@@ -2247,8 +2755,8 @@ msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
-"Program za uređivanje veza ne može da pronađe neke od potrebnih resursa "
-"(nije nađena „.ui“ datoteka)."
+"Program za uređivanje veza ne može da pronađe neke od potrebnih resursa (nije "
+"nađena „.ui“ datoteka)."
 
 #: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
@@ -2373,24 +2881,25 @@ msgstr "Briše izabranu vezu"
 msgid "Authenticate to delete the selected connection"
 msgstr "Prijavite se kako bi obrisali izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:929
+#: ../src/connection-editor/nm-connection-list.c:914
+#: ../src/connection-editor/nm-connection-list.c:917
+msgid "Error creating connection"
+msgstr "Greška prilikom stvaranja veze"
+
+#: ../src/connection-editor/nm-connection-list.c:915
 msgid "No VPN plugins are installed."
 msgstr "Nisu instalirani VPN priključci."
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/nm-connection-list.c:918
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Ne znam kako da napravim „%s“ vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:933
-msgid "Error creating connection"
-msgstr "Greška prilikom stvaranja veze"
-
-#: ../src/connection-editor/nm-connection-list.c:955
+#: ../src/connection-editor/nm-connection-list.c:941
 msgid "Error editing connection"
 msgstr "Greška prilikom uređivanja veze"
 
-#: ../src/connection-editor/nm-connection-list.c:956
+#: ../src/connection-editor/nm-connection-list.c:942
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Nisam našao vezu koja ima UUID „%s“"
@@ -2425,27 +2934,27 @@ msgstr "neispravan blutut uređaj (%s)"
 msgid "Bluetooth connection %d"
 msgstr "Blutut veza „%d“"
 
-#: ../src/connection-editor/page-bluetooth.c:302
+#: ../src/connection-editor/page-bluetooth.c:303
 msgid "Bluetooth Type"
 msgstr "Vrsta blututa"
 
-#: ../src/connection-editor/page-bluetooth.c:320
+#: ../src/connection-editor/page-bluetooth.c:321
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Izaberite vrstu profila blutut veze."
 
-#: ../src/connection-editor/page-bluetooth.c:325
+#: ../src/connection-editor/page-bluetooth.c:326
 msgid "_Personal Area Network"
 msgstr "Mreža _ličnog domena"
 
-#: ../src/connection-editor/page-bluetooth.c:330
+#: ../src/connection-editor/page-bluetooth.c:331
 msgid "_Dial-Up Network"
 msgstr "Mreža _dvojne parice"
 
-#: ../src/connection-editor/page-bond.c:447
+#: ../src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Ne mogu da učitam korisničko sučelje sveze."
 
-#: ../src/connection-editor/page-bond.c:566
+#: ../src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "primarni"
 
@@ -2458,7 +2967,7 @@ msgstr "Veza sveze %d"
 msgid "Could not load bridge user interface."
 msgstr "Ne mogu da učitam korisničko sučelje mosta."
 
-#: ../src/connection-editor/page-bridge.c:310
+#: ../src/connection-editor/page-bridge.c:311
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Veza mosta %d"
@@ -2474,11 +2983,11 @@ msgstr "Priključnik mosta"
 msgid "Could not load bridge port user interface."
 msgstr "Ne mogu da učitam korisničko sučelje priključnika mosta."
 
-#: ../src/connection-editor/page-dcb.c:603
+#: ../src/connection-editor/page-dcb.c:622
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:605
+#: ../src/connection-editor/page-dcb.c:624
 msgid "Could not load DCB user interface."
 msgstr "Ne mogu da učitam DCB korisničko sučelje."
 
@@ -2486,7 +2995,7 @@ msgstr "Ne mogu da učitam DCB korisničko sučelje."
 msgid "Could not load DSL user interface."
 msgstr "Ne mogu da učitam korisničko sučelje za DSL."
 
-#: ../src/connection-editor/page-dsl.c:214
+#: ../src/connection-editor/page-dsl.c:215
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL veza „%d“"
@@ -2501,25 +3010,25 @@ msgstr ""
 "nazivom ili trajnom MAK adresom ili sa oba.  Npr: „em1“, "
 "„3C:97:0E:42:1A:19“, „em1 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-ethernet.c:328
+#: ../src/connection-editor/page-ethernet.c:326
 msgid "Could not load ethernet user interface."
 msgstr "Ne mogu da učitam korisničko sučelje za žičanu mrežu."
 
-#: ../src/connection-editor/page-ethernet.c:457
+#: ../src/connection-editor/page-ethernet.c:455
 msgid "Ethernet device"
 msgstr "Uređaj žičane veze"
 
-#: ../src/connection-editor/page-ethernet.c:461
-#: ../src/connection-editor/page-vlan.c:741
-#: ../src/connection-editor/page-wifi.c:581
+#: ../src/connection-editor/page-ethernet.c:459
+#: ../src/connection-editor/page-vlan.c:739
+#: ../src/connection-editor/page-wifi.c:574
 msgid "cloned MAC"
 msgstr "kloniran MAK"
 
-#: ../src/connection-editor/page-ethernet.c:465
+#: ../src/connection-editor/page-ethernet.c:463
 msgid "Wake-on-LAN password"
 msgstr "Probudi sa LAN lozinkom"
 
-#: ../src/connection-editor/page-ethernet.c:500
+#: ../src/connection-editor/page-ethernet.c:499
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Žičana veza %d"
@@ -2538,8 +3047,8 @@ msgid ""
 "firewall. Only usable if firewalld is active."
 msgstr ""
 "Oblast određuje nivo pouzdanosti veze. Zadata nije uobičajena oblast, njeno "
-"biranje dovodi do korišćenja zadate oblasti podešene u mrežnoj barijeri. "
-"Može se koristiti samo ako je pokrenut demon mrežne barijere (firewalld)."
+"biranje dovodi do korišćenja zadate oblasti podešene u mrežnoj barijeri. Može "
+"se koristiti samo ako je pokrenut demon mrežne barijere (firewalld)."
 
 #: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
@@ -2561,15 +3070,15 @@ msgstr ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65“, „ib0 (80:00:00:48:"
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)“"
 
-#: ../src/connection-editor/page-infiniband.c:153
+#: ../src/connection-editor/page-infiniband.c:151
 msgid "Could not load InfiniBand user interface."
 msgstr "Ne mogu da učitam korisničko sučelje Infini banda."
 
-#: ../src/connection-editor/page-infiniband.c:216
+#: ../src/connection-editor/page-infiniband.c:214
 msgid "infiniband device"
 msgstr "infiniband uređaj"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: ../src/connection-editor/page-infiniband.c:250
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Infini band veza %d"
@@ -2712,8 +3221,8 @@ msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
 "same physical device."
 msgstr ""
-"Podređeni „%s“ i „%s“ se primenjuju na različite virtuelne priključnike "
-"(„%s“ i „%s“) istog fizičkog uređaja."
+"Podređeni „%s“ i „%s“ se primenjuju na različite virtuelne priključnike („%s“ "
+"i „%s“) istog fizičkog uređaja."
 
 #: ../src/connection-editor/page-master.c:385
 #, c-format
@@ -2729,11 +3238,11 @@ msgid "Unsupported mobile broadband connection type."
 msgstr "Nije podržana ova vrsta mobilne, širokopojasne mreže."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:529
+#: ../src/connection-editor/page-mobile.c:530
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Izaberite vrstu mobilnog širokopojasnog izdavača"
 
-#: ../src/connection-editor/page-mobile.c:556
+#: ../src/connection-editor/page-mobile.c:557
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2741,20 +3250,20 @@ msgstr ""
 "Izaberite tehnologiju koju koristi vaš izdavač mobilnih širokopojasnih "
 "usluga.  Ukoliko niste sigurni, pitajte izdavača."
 
-#: ../src/connection-editor/page-mobile.c:561
+#: ../src/connection-editor/page-mobile.c:562
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Moj izdavač koristi _GSM tehnologije (npr. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:568
+#: ../src/connection-editor/page-mobile.c:569
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Moj izdavač koristi C_DMA tehnologije (npr. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/connection-editor/page-mobile.c:579 ../src/mb-menu-item.c:50
 #: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:582 ../src/mb-menu-item.c:54
 #: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
@@ -2774,7 +3283,7 @@ msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:280
+#: ../src/wireless-security/eap-method-fast.c:283
 #: ../src/wireless-security/eap-method-peap.c:272
 #: ../src/wireless-security/eap-method-ttls.c:288
 msgid "MSCHAPv2"
@@ -2803,22 +3312,22 @@ msgstr "PPP podešavanja"
 msgid "Could not load PPP user interface."
 msgstr "Ne mogu da učitam PPP korisničko sučelje."
 
-#: ../src/connection-editor/page-team.c:98
-#: ../src/connection-editor/page-team-port.c:71
-#: ../src/connection-editor/vpn-helpers.c:165
+#: ../src/connection-editor/page-team.c:341
+#: ../src/connection-editor/page-team-port.c:203
+#: ../src/connection-editor/vpn-helpers.c:168
 msgid "Select file to import"
 msgstr "Izaberite datoteku za uvoz"
 
-#: ../src/connection-editor/page-team.c:118
-#: ../src/connection-editor/page-team-port.c:91
+#: ../src/connection-editor/page-team.c:361
+#: ../src/connection-editor/page-team-port.c:223
 msgid "Error: file doesn't contain a valid JSON configuration"
 msgstr "Greška: datoteka ne sadrži ispravno JSON podešavanje"
 
-#: ../src/connection-editor/page-team.c:270
+#: ../src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Ne mogu da učitam timsko korisničko sučelje."
 
-#: ../src/connection-editor/page-team.c:377
+#: ../src/connection-editor/page-team.c:1124
 #, c-format
 msgid "Team connection %d"
 msgstr "Timska veza „%d“"
@@ -2826,11 +3335,11 @@ msgstr "Timska veza „%d“"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:151
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
 msgstr "Timski priključnik"
 
-#: ../src/connection-editor/page-team-port.c:153
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
 msgstr "Ne mogu da učitam korisničko sučelje timskog priključnika."
 
@@ -2847,35 +3356,47 @@ msgstr "%s (putem „%s“)"
 msgid "New connection..."
 msgstr "Nova veza..."
 
-#: ../src/connection-editor/page-vlan.c:596
+#: ../src/connection-editor/page-vlan.c:594
 msgid "Could not load vlan user interface."
 msgstr "Ne mogu da učitam korisničko sučelje vlan-a."
 
-#: ../src/connection-editor/page-vlan.c:734
+#: ../src/connection-editor/page-vlan.c:732
 msgid "vlan parent"
 msgstr "vlan nadređeni"
 
-#: ../src/connection-editor/page-vlan.c:797
+#: ../src/connection-editor/page-vlan.c:796
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN veza %d"
 
-#: ../src/connection-editor/page-vpn.c:103
+#: ../src/connection-editor/page-vpn.c:98
 msgid "Could not load VPN user interface."
 msgstr "Ne mogu da učitam VPN korisničko sučelje."
 
-#: ../src/connection-editor/page-vpn.c:118
+#: ../src/connection-editor/page-vpn.c:113
 #, c-format
-msgid "Could not find VPN plugin service for '%s'."
-msgstr "Ne mogu da nađem uslugu VPN priključka za „%s“."
+#| msgid "Could not find VPN plugin service for '%s'."
+msgid "Could not find VPN plugin for '%s'."
+msgstr "Ne mogu da nađem VPN priključak za „%s“."
 
-#: ../src/connection-editor/page-vpn.c:205
-#: ../src/connection-editor/page-vpn.c:300
+#: ../src/connection-editor/page-vpn.c:122
+#, c-format
+#| msgid "Could not find VPN plugin service for '%s'."
+msgid "Could not load editor VPN plugin for '%s' (%s)."
+msgstr "Ne mogu da učitam VPN priključak uređivača za „%s“ (%s)."
+
+#: ../src/connection-editor/page-vpn.c:123
+#| msgid "Connection failure"
+msgid "unknown failure"
+msgstr "nepoznat neuspeh"
+
+#: ../src/connection-editor/page-vpn.c:216
+#: ../src/connection-editor/page-vpn.c:364
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN veza %d"
 
-#: ../src/connection-editor/page-vpn.c:229
+#: ../src/connection-editor/page-vpn.c:240
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2885,11 +3406,11 @@ msgstr ""
 "\n"
 "Greška: nije izabrana vrsta VPN servisa."
 
-#: ../src/connection-editor/page-vpn.c:254
+#: ../src/connection-editor/page-vpn.c:266
 msgid "Choose a VPN Connection Type"
 msgstr "Izbor vrste VPN veze"
 
-#: ../src/connection-editor/page-vpn.c:255
+#: ../src/connection-editor/page-vpn.c:267
 msgid ""
 "Select the type of VPN you wish to use for the new connection.  If the type "
 "of VPN connection you wish to create does not appear in the list, you may "
@@ -2922,45 +3443,44 @@ msgstr ""
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:450
+#: ../src/connection-editor/page-wifi.c:443
 msgid "Could not load Wi-Fi user interface."
 msgstr "Ne mogu da učitam korisničko sučelje za bežičnu mrežu."
 
-#: ../src/connection-editor/page-wifi.c:571
+#: ../src/connection-editor/page-wifi.c:564
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:577
+#: ../src/connection-editor/page-wifi.c:570
 msgid "Wi-Fi device"
 msgstr "Bežični uređaj"
 
-#: ../src/connection-editor/page-wifi.c:619
+#: ../src/connection-editor/page-wifi.c:613
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Bežična veza %d"
 
 #: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: ../src/libnma/nma-wifi-dialog.c:920 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "VEP 40/128-bitni ključ"
 
 #: ../src/connection-editor/page-wifi-security.c:319
-#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "VEP 128-bitna lozinka"
 
 #: ../src/connection-editor/page-wifi-security.c:345
-#: ../src/libnma/nma-wifi-dialog.c:945 ../src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamički VEP (802.1X)"
 
 #: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Lični VPA & VPA2"
 
 #: ../src/connection-editor/page-wifi-security.c:371
-#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: ../src/libnma/nma-wifi-dialog.c:987 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Poslovni VPA & VPA2"
 
@@ -2988,11 +3508,11 @@ msgstr "nedostaje SSID"
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Bezbednost nije saglasna sa ad-hok režimom"
 
-#: ../src/connection-editor/vpn-helpers.c:138
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "Ne mogu da uvezem VPN vezu"
 
-#: ../src/connection-editor/vpn-helpers.c:140
+#: ../src/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3005,29 +3525,29 @@ msgstr ""
 "\n"
 "Greška: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:144
 msgid "unknown error"
 msgstr "nepoznata greška"
 
-#: ../src/connection-editor/vpn-helpers.c:215
+#: ../src/connection-editor/vpn-helpers.c:218
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Već postoji datoteka „%s“."
 
-#: ../src/connection-editor/vpn-helpers.c:217
+#: ../src/connection-editor/vpn-helpers.c:220
 msgid "_Replace"
 msgstr "_Zameni"
 
-#: ../src/connection-editor/vpn-helpers.c:219
+#: ../src/connection-editor/vpn-helpers.c:222
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Da li želite da zamenite %s VPN vezom pre čuvanja?"
 
-#: ../src/connection-editor/vpn-helpers.c:255
+#: ../src/connection-editor/vpn-helpers.c:258
 msgid "Cannot export VPN connection"
 msgstr "Ne mogu da izvezem VPN vezu"
 
-#: ../src/connection-editor/vpn-helpers.c:257
+#: ../src/connection-editor/vpn-helpers.c:260
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3038,18 +3558,10 @@ msgstr ""
 "\n"
 "Greška: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:295
 msgid "Export VPN connection..."
 msgstr "Izvezi VPN vezu..."
 
-#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"Programče Upravnik mreže ne može da pronađe neke potrebne resurse („.ui“ "
-"datoteka nije pronađena)."
-
 #: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Otključaj"
@@ -3101,8 +3613,8 @@ msgid ""
 msgstr ""
 "Sada će biti napravljena veza sa vašim izdavačem mobilnih širokopojasnih "
 "usluga na osnovu podešavanja koje ste uneli.  Ukoliko ne uspete da se "
-"povežete na mrežu, proverite ponovo uneta podešavanja.  Za izmenu "
-"podešavanja, izaberite „Veze sa mrežom“ iz izbornika Sistem >> Postavke."
+"povežete na mrežu, proverite ponovo uneta podešavanja.  Za izmenu podešavanja, "
+"izaberite „Veze sa mrežom“ iz izbornika Sistem >> Postavke."
 
 #: ../src/libnma/nma-mobile-wizard.c:261
 #: ../src/libnm-gtk/nm-mobile-wizard.c:262
@@ -3307,55 +3819,60 @@ msgstr ""
 "Ili nedostaje lozinka ili je veza neispravna. U svakom slučaju, prvo ćete "
 "morati da uredite vezu u uređivaču veza"
 
-#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: ../src/libnma/nma-wifi-dialog.c:465 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nova..."
 
-#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: ../src/libnma/nma-wifi-dialog.c:903 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#| msgid "Dynamic WEP (802.1X)"
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dinamički VEP (802.1h)"
+
+#: ../src/libnma/nma-wifi-dialog.c:1071 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Napravi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Potrebne su lozinke ili ključevi šifrovanja za pristup bežičnoj mreži „%s“."
 
-#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Potrebno je potvrđivanje identiteta za bežičnu mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Bežična mreža zahteva potvrđivanje identiteta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Napravi novu bežičnu mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1168 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nova bežična mreža"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Unesite naziv za novu bežičnu mrežu."
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Poveži se na skrivenu bežičnu mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1173 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Skrivena bežična mreža"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3522,12 +4039,12 @@ msgstr "Potreban je PIN kôd"
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Potreban je PIN kod za povezivanje mobilnog širokopojasnog uređaja"
 
-#: ../src/mobile-helpers.c:619
+#: ../src/mobile-helpers.c:622
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Povezani ste na mobilnu širokopojasnu vezu „%s“: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:622
+#: ../src/mobile-helpers.c:625
 msgid "roaming"
 msgstr "prebacivanje"
 
@@ -3537,41 +4054,46 @@ msgstr "prebacivanje"
 msgid "%s connection"
 msgstr "%s veza"
 
-#: ../src/wireless-security/eap-method.c:56
+#: ../src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "nepoznata greška u 802.1X bezbednosti (vpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:255
+#: ../src/wireless-security/eap-method.c:233
+msgid "no file selected"
+msgstr "nije izabrana datoteka"
+
+#: ../src/wireless-security/eap-method.c:264
 msgid "unspecified error validating eap-method file"
 msgstr "nepoznata greška proveravanja datoteke eap-načina"
 
-#: ../src/wireless-security/eap-method.c:452
+#: ../src/wireless-security/eap-method.c:468
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, ili PKCS#12 lični ključevi (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:471
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ili PEM uverenja (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:70
+#: ../src/wireless-security/eap-method-fast.c:72
 msgid "missing EAP-FAST PAC file"
 msgstr "nedostaje EAP-FAST PAC datoteka"
 
-#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-fast.c:268
 #: ../src/wireless-security/eap-method-peap.c:302
 #: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:403
-msgid "Choose a PAC file..."
-msgstr "Izaberi PAC datoteku..."
+#: ../src/wireless-security/eap-method-fast.c:406
+#| msgid "Choose a PAC file..."
+msgid "Choose a PAC file"
+msgstr "Izaberi PAC datoteku"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "PAC datoteke (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "Sve datoteke"
 
@@ -3608,11 +4130,11 @@ msgstr "_Unutrašnja prijava:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Dozvoli samostalno PAC _rezervisanje"
 
-#: ../src/wireless-security/eap-method-leap.c:63
+#: ../src/wireless-security/eap-method-leap.c:65
 msgid "missing EAP-LEAP username"
 msgstr "nedostaje EAP-LEAP korisničko ime"
 
-#: ../src/wireless-security/eap-method-leap.c:69
+#: ../src/wireless-security/eap-method-leap.c:74
 msgid "missing EAP-LEAP password"
 msgstr "nedostaje EAP-LEAP lozinka"
 
@@ -3632,10 +4154,11 @@ msgid "MD5"
 msgstr "MD5"
 
 #: ../src/wireless-security/eap-method-peap.c:381
-#: ../src/wireless-security/eap-method-tls.c:481
+#: ../src/wireless-security/eap-method-tls.c:501
 #: ../src/wireless-security/eap-method-ttls.c:412
-msgid "Choose a Certificate Authority certificate..."
-msgstr "Izaberite uverenje izdavača uverenja..."
+#| msgid "Choose a Certificate Authority certificate..."
+msgid "Choose a Certificate Authority certificate"
+msgstr "Izaberite uverenje izdavača uverenja"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
@@ -3661,46 +4184,46 @@ msgstr "Nije potrebno _uverenje"
 msgid "PEAP _version:"
 msgstr "PEAP _izdanje:"
 
-#: ../src/wireless-security/eap-method-simple.c:72
+#: ../src/wireless-security/eap-method-simple.c:74
 msgid "missing EAP username"
 msgstr "nedostaje EAP korisničko ime"
 
-#: ../src/wireless-security/eap-method-simple.c:82
+#: ../src/wireless-security/eap-method-simple.c:87
 msgid "missing EAP password"
 msgstr "nedostaje EAP lozinka"
 
-#: ../src/wireless-security/eap-method-tls.c:66
+#: ../src/wireless-security/eap-method-tls.c:68
 msgid "missing EAP-TLS identity"
 msgstr "nedostaje EAP-TLS identitet"
 
-#: ../src/wireless-security/eap-method-tls.c:71
+#: ../src/wireless-security/eap-method-tls.c:77
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "neispravno EAP-TLS uverenje izdavača uverenja: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:76
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "neispravno EAP-TLS uverenje izdavača uverenja: uverenje nije navedeno"
 
-#: ../src/wireless-security/eap-method-tls.c:84
+#: ../src/wireless-security/eap-method-tls.c:95
 msgid "invalid EAP-TLS password: missing"
 msgstr "neispravna EAP-TLS lozinka: nedostaje"
 
-#: ../src/wireless-security/eap-method-tls.c:94
+#: ../src/wireless-security/eap-method-tls.c:109
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "neispravan EAP-TLS lični ključ: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:101
+#: ../src/wireless-security/eap-method-tls.c:119
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "neispravno EAP-TLS korisničko uverenje: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:296
+#: ../src/wireless-security/eap-method-tls.c:316
 msgid "Unencrypted private keys are insecure"
 msgstr "Nešifrovani privatni ključevi nisu sigurni"
 
-#: ../src/wireless-security/eap-method-tls.c:299
+#: ../src/wireless-security/eap-method-tls.c:319
 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 "
@@ -3708,19 +4231,21 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"Izgleda da izabrani privatni ključ nije zaštićen lozinkom.  Ovo može "
-"ugroziti vaše sigurnosne podatke.  Izaberite privatni ključ koji ze zaštićen "
+"Izgleda da izabrani privatni ključ nije zaštićen lozinkom.  Ovo može ugroziti "
+"vaše sigurnosne podatke.  Izaberite privatni ključ koji ze zaštićen "
 "lozinkom.\n"
 "\n"
 "(Možete zaštititi privatne ključeve koristeći „openssl“)"
 
-#: ../src/wireless-security/eap-method-tls.c:475
-msgid "Choose your personal certificate..."
-msgstr "Izaberite lično uverenje..."
+#: ../src/wireless-security/eap-method-tls.c:495
+#| msgid "Choose your personal certificate..."
+msgid "Choose your personal certificate"
+msgstr "Izaberite lično uverenje"
 
-#: ../src/wireless-security/eap-method-tls.c:487
-msgid "Choose your private key..."
-msgstr "Izaberite lični ključ..."
+#: ../src/wireless-security/eap-method-tls.c:507
+#| msgid "Choose your private key..."
+msgid "Choose your private key"
+msgstr "Izaberite lični ključ"
 
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
@@ -3777,32 +4302,30 @@ msgstr "Zaštićeni EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Po_tvrđivanje identiteta:"
 
-#: ../src/wireless-security/ws-leap.c:61
+#: ../src/wireless-security/ws-leap.c:63
 msgid "missing leap-username"
 msgstr "nedostaje leap korisničko ime"
 
-#: ../src/wireless-security/ws-leap.c:69
+#: ../src/wireless-security/ws-leap.c:74
 msgid "missing leap-password"
 msgstr "nedostaje leap lozinka"
 
-#: ../src/wireless-security/ws-wep-key.c:105
+#: ../src/wireless-security/ws-wep-key.c:107
 msgid "missing wep-key"
 msgstr "nedostaje vep ključ"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: ../src/wireless-security/ws-wep-key.c:116
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
-msgstr ""
-"neispravan vep ključ: ključ dužine %zu mora da sadrži samo heksa-brojeve"
+msgstr "neispravan vep ključ: ključ dužine %zu mora da sadrži samo heksa-brojeve"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: ../src/wireless-security/ws-wep-key.c:124
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
-msgstr ""
-"neispravan vep ključ: ključ dužine %zu mora da sadrži samo askri znakove"
+msgstr "neispravan vep ključ: ključ dužine %zu mora da sadrži samo askri znakove"
 
-#: ../src/wireless-security/ws-wep-key.c:125
+#: ../src/wireless-security/ws-wep-key.c:130
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -3811,11 +4334,11 @@ msgstr ""
 "neispravan vep ključ: pogrešna dužina ključa %zu. Ključ mora biti ili dužine "
 "5/13 (askri) ili 10/26 (heks)"
 
-#: ../src/wireless-security/ws-wep-key.c:131
+#: ../src/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "neispravan vep-ključ: lozinka ne sme biti prazna"
 
-#: ../src/wireless-security/ws-wep-key.c:133
+#: ../src/wireless-security/ws-wep-key.c:139
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "neispravan vep-ključ: lozinka mora biti kraća od 64 znaka"
 
@@ -3843,7 +4366,7 @@ msgstr "P_rikaži ključ"
 msgid "WEP inde_x:"
 msgstr "VEP _indeks:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:69
+#: ../src/wireless-security/ws-wpa-psk.c:70
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3852,7 +4375,7 @@ msgstr ""
 "neispravna vpa lozinka: neispravna dužina ključa %zu. Mora biti [8,63] bajta "
 "ili 64 heksa-broja"
 
-#: ../src/wireless-security/ws-wpa-psk.c:77
+#: ../src/wireless-security/ws-wpa-psk.c:79
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "neispravna vpa lozinka: ne mogu da rastumačim ključ od 64 bajta kao "
@@ -3862,6 +4385,15 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Vrsta:"
 
+#~ msgid "_Disconnect VPN"
+#~ msgstr "_Prekini VPN vezu"
+
+#~ msgid "_Import team configuration from a file..."
+#~ msgstr "_Uvezi timsko podešavanje iz datoteke..."
+
+#~ msgid "NetworkManager for GNOME"
+#~ msgstr "Upravnik mreže za Gnom"
+
 #~ msgid "_Help"
 #~ msgstr "Po_moć"
 
@@ -3993,8 +4525,8 @@ msgstr "_Vrsta:"
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
 #~ msgstr ""
-#~ "Nije moguće podešavanje Blututa (nisam uspeo da se povežem na D-"
-#~ "sabirnicu: (%s) %s)."
+#~ "Nije moguće podešavanje Blututa (nisam uspeo da se povežem na D-sabirnicu: "
+#~ "(%s) %s)."
 
 #~ msgid ""
 #~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
diff --git a/src/applet.c b/src/applet.c
index 08be7720..8b6b6164 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -2291,6 +2291,13 @@ foo_manager_permission_changed (NMClient *client,
 		applet->permissions[permission] = result;
 }
 
+static void
+foo_wireless_enabled_changed_cb (NMClient *client, GParamSpec *pspec, NMApplet *applet)
+{
+	applet_schedule_update_icon (applet);
+	applet_schedule_update_menu (applet);
+}
+
 static gboolean
 foo_set_initial_state (gpointer data)
 {
@@ -2340,6 +2347,14 @@ foo_client_setup (NMApplet *applet)
 	                  G_CALLBACK (foo_manager_permission_changed),
 	                  applet);
 
+	g_signal_connect (applet->nm_client, "notify::wireless-enabled",
+	                  G_CALLBACK (foo_wireless_enabled_changed_cb),
+	                  applet);
+
+	g_signal_connect (applet->nm_client, "notify::wwan-enabled",
+	                  G_CALLBACK (foo_wireless_enabled_changed_cb),
+	                  applet);
+
 	/* Initialize permissions - the initial 'permission-changed' signal is emitted from NMClient constructor, and thus not caught */
 	for (perm = NM_CLIENT_PERMISSION_NONE + 1; perm <= NM_CLIENT_PERMISSION_LAST; perm++) {
 		applet->permissions[perm] = nm_client_get_permission_result (applet->nm_client, perm);
diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui
index fe49af58..ab0a453c 100644
--- a/src/connection-editor/ce-page-general.ui
+++ b/src/connection-editor/ce-page-general.ui
@@ -91,7 +91,7 @@
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="firewall_zone_label">
-            <property name="visible">True</property>
+            <property name="visible">False</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">Firewall _zone:</property>
diff --git a/src/connection-editor/ce-page-ip4.ui b/src/connection-editor/ce-page-ip4.ui
index 7acaab56..11c077fe 100644
--- a/src/connection-editor/ce-page-ip4.ui
+++ b/src/connection-editor/ce-page-ip4.ui
@@ -84,7 +84,6 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Addresses</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -117,8 +116,6 @@
                         <property name="height_request">100</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">IP addresses identify your computer on the network.  Click the "Add" button to add an IP address.</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" id="treeview-selection1"/>
                         </child>
diff --git a/src/connection-editor/ce-page-ip6.ui b/src/connection-editor/ce-page-ip6.ui
index e3b94b06..511383b6 100644
--- a/src/connection-editor/ce-page-ip6.ui
+++ b/src/connection-editor/ce-page-ip6.ui
@@ -101,7 +101,6 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Addresses</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -134,8 +133,6 @@
                         <property name="height_request">100</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">IP addresses identify your computer on the network.  Click the "Add" button to add an IP address.</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" id="treeview-selection1"/>
                         </child>
diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h
index 6fdb33cb..f1b0810f 100644
--- a/src/connection-editor/ce-page.h
+++ b/src/connection-editor/ce-page.h
@@ -99,6 +99,20 @@ typedef CEPage* (*CEPageNewFunc)(NMConnectionEditor *editor,
                                  const char **out_secrets_setting_name,
                                  GError **error);
 
+#define CE_TOOLTIP_ADDR_AUTO _("IP addresses identify your computer on the network.  " \
+                               "Click the \"Add\" button to add static IP address to be " \
+                               "configured in addition to the automatic ones.")
+#define CE_TOOLTIP_ADDR_MANUAL _("IP addresses identify your computer on the network.  " \
+                                 "Click the \"Add\" button to add an IP address.")
+#define CE_TOOLTIP_ADDR_SHARED _("The IP address identify your computer on the network and " \
+                                 "determines the address range distributed to other computers.  " \
+                                 "Click the \"Add\" button to add an IP address.  "\
+                                 "If no address is provided, one in the 10.42.x.x range will " \
+                                 "be used.")
+
+#define CE_LABEL_ADDR_AUTO _("Additional static addresses")
+#define CE_LABEL_ADDR_MANUAL _("Addresses")
+#define CE_LABEL_ADDR_SHARED _("Address (optional)")
 
 GType ce_page_get_type (void);
 
diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c
index 89d499a6..322f4b3e 100644
--- a/src/connection-editor/connection-helpers.c
+++ b/src/connection-editor/connection-helpers.c
@@ -478,6 +478,7 @@ new_connection_dialog_full (GtkWindow *parent_window,
 	gpointer detail_data = NULL;
 	GError *error = NULL;
 	CEPageVpnDetailData vpn_data;
+	GtkButton *create_button;
 
 	/* load GUI */
 	gui = gtk_builder_new ();
@@ -495,8 +496,13 @@ new_connection_dialog_full (GtkWindow *parent_window,
 
 	combo = GTK_COMBO_BOX (gtk_builder_get_object (gui, "new_connection_type_combo"));
 	label = GTK_LABEL (gtk_builder_get_object (gui, "new_connection_desc_label"));
+	create_button = GTK_BUTTON (gtk_builder_get_object (gui, "create_button"));
 	set_up_connection_type_combo (combo, label, type_filter_func, user_data);
 
+	/* Disable "Create" button if no item is available */
+	if (!gtk_tree_model_iter_n_children (gtk_combo_box_get_model (combo), NULL))
+		gtk_widget_set_sensitive (GTK_WIDGET (create_button), FALSE);
+
 	if (primary_label) {
 		label = GTK_LABEL (gtk_builder_get_object (gui, "new_connection_primary_label"));
 		gtk_label_set_text (label, primary_label);
@@ -508,20 +514,21 @@ new_connection_dialog_full (GtkWindow *parent_window,
 
 	response = gtk_dialog_run (type_dialog);
 	if (response == GTK_RESPONSE_OK) {
-		gtk_combo_box_get_active_iter (combo, &iter);
-		gtk_tree_model_get (gtk_combo_box_get_model (combo), &iter,
-		                    COL_NEW_FUNC, &new_func,
-		                    COL_VPN_SERVICE_TYPE, &vpn_service_type,
-		                    COL_VPN_ADD_DETAIL_KEY, &vpn_add_detail_key,
-		                    COL_VPN_ADD_DETAIL_VAL, &vpn_add_detail_val,
-		                    -1);
-		if (vpn_service_type) {
-			memset (&vpn_data, 0, sizeof (vpn_data));
-			vpn_data.add_detail_key = vpn_add_detail_key;
-			vpn_data.add_detail_val = vpn_add_detail_val;
+		if (gtk_combo_box_get_active_iter (combo, &iter)) {
+			gtk_tree_model_get (gtk_combo_box_get_model (combo), &iter,
+			                    COL_NEW_FUNC, &new_func,
+			                    COL_VPN_SERVICE_TYPE, &vpn_service_type,
+			                    COL_VPN_ADD_DETAIL_KEY, &vpn_add_detail_key,
+			                    COL_VPN_ADD_DETAIL_VAL, &vpn_add_detail_val,
+			                    -1);
+			if (vpn_service_type) {
+				memset (&vpn_data, 0, sizeof (vpn_data));
+				vpn_data.add_detail_key = vpn_add_detail_key;
+				vpn_data.add_detail_val = vpn_add_detail_val;
 
-			detail = vpn_service_type;
-			detail_data = &vpn_data;
+				detail = vpn_service_type;
+				detail_data = &vpn_data;
+			}
 		}
 	}
 
diff --git a/src/connection-editor/page-8021x-security.c b/src/connection-editor/page-8021x-security.c
index 6dad8db9..b1904c74 100644
--- a/src/connection-editor/page-8021x-security.c
+++ b/src/connection-editor/page-8021x-security.c
@@ -172,8 +172,12 @@ ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error)
 			ws_802_1x_fill_connection (priv->security, "wpa_eap_auth_combo", tmp_connection);
 
 			s_8021x = nm_connection_get_setting (tmp_connection, NM_TYPE_SETTING_802_1X);
-			nm_connection_add_setting (connection, nm_setting_duplicate (s_8021x));
+			nm_connection_add_setting (connection, NM_SETTING (g_object_ref (s_8021x)));
 
+			/* Remove the 8021x setting to prevent the clearing of secrets when the
+			 * simple-connection is destroyed.
+			 */
+			nm_connection_remove_setting (tmp_connection, NM_TYPE_SETTING_802_1X);
 			g_object_unref (tmp_connection);
 		}
 	} else {
diff --git a/src/connection-editor/page-general.c b/src/connection-editor/page-general.c
index 3b8b0022..a0275647 100644
--- a/src/connection-editor/page-general.c
+++ b/src/connection-editor/page-general.c
@@ -34,6 +34,7 @@ typedef struct {
 	GDBusProxy *fw_proxy;
 	GCancellable *cancellable;
 	GtkComboBoxText *firewall_zone;
+	GtkLabel *firewall_zone_label;
 	char **zones;
 	gboolean got_zones;
 
@@ -49,8 +50,7 @@ typedef struct {
 
 /* TRANSLATORS: Default zone set for firewall, when no zone is selected */
 #define FIREWALL_ZONE_DEFAULT _("Default")
-#define FIREWALL_ZONE_TOOLTIP_AVAILBALE _("The zone defines the trust level of the connection. Default is not a regular zone, selecting it results in the use of the default zone set in the firewall. Only usable if firewalld is active.")
-#define FIREWALL_ZONE_TOOLTIP_UNAVAILBALE _("FirewallD is not running.")
+#define FIREWALL_ZONE_TOOLTIP _("The zone defines the trust level of the connection. Default is not a regular zone, selecting it results in the use of the default zone set in the firewall. Only usable if firewalld is active.")
 
 enum {
 	COL_ID,
@@ -132,7 +132,6 @@ general_private_init (CEPageGeneral *self)
 	CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (self);
 	GtkBuilder *builder;
 	GtkWidget *vbox;
-	GtkLabel *label;
 
 	builder = CE_PAGE (self)->builder;
 
@@ -141,7 +140,6 @@ general_private_init (CEPageGeneral *self)
 
 	vbox = GTK_WIDGET (gtk_builder_get_object (builder, "firewall_zone_vbox"));
 	gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->firewall_zone));
-	gtk_widget_show_all (GTK_WIDGET (priv->firewall_zone));
 
 	/* Get zones from FirewallD */
 	priv->cancellable = g_cancellable_new ();
@@ -156,8 +154,8 @@ general_private_init (CEPageGeneral *self)
 	                          self);
 
 	/* Set mnemonic widget for device Firewall zone label */
-	label = GTK_LABEL (gtk_builder_get_object (builder, "firewall_zone_label"));
-	gtk_label_set_mnemonic_widget (label, GTK_WIDGET (priv->firewall_zone));
+	priv->firewall_zone_label = GTK_LABEL (gtk_builder_get_object (builder, "firewall_zone_label"));
+	gtk_label_set_mnemonic_widget (priv->firewall_zone_label, GTK_WIDGET (priv->firewall_zone));
 
 	/*-- Dependent VPN connection --*/
 	priv->dependent_vpn_checkbox = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "dependent_vpn_checkbox"));
@@ -228,11 +226,10 @@ populate_firewall_zones_ui (CEPageGeneral *self)
 
 	/* Zone tooltip and availability */
 	if (priv->zones) {
-		gtk_widget_set_tooltip_text (GTK_WIDGET (priv->firewall_zone), FIREWALL_ZONE_TOOLTIP_AVAILBALE);
+		gtk_widget_set_tooltip_text (GTK_WIDGET (priv->firewall_zone), FIREWALL_ZONE_TOOLTIP);
 		gtk_widget_set_sensitive (GTK_WIDGET (priv->firewall_zone), TRUE);
-	} else {
-		gtk_widget_set_tooltip_text (GTK_WIDGET (priv->firewall_zone), FIREWALL_ZONE_TOOLTIP_UNAVAILBALE);
-		gtk_widget_set_sensitive (GTK_WIDGET (priv->firewall_zone), FALSE);
+		gtk_widget_show_all (GTK_WIDGET (priv->firewall_zone));
+		gtk_widget_show (GTK_WIDGET (priv->firewall_zone_label));
 	}
 
 	stuff_changed (NULL, self);
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index b457448d..9f4dbc86 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -59,6 +59,8 @@ typedef struct {
 	GtkButton *addr_delete;
 	GtkTreeView *addr_list;
 	GtkCellRenderer *addr_cells[COL_LAST + 1];
+	GtkTreeModel *addr_saved;
+	guint32 addr_method;
 
 	/* DNS servers */
 	GtkWidget *dns_servers_label;
@@ -235,6 +237,22 @@ ip4_private_init (CEPageIP4 *self, NMConnection *connection)
 }
 
 static void
+address_list_changed (CEPageIP4 *self)
+{
+	CEPageIP4Private *priv = CE_PAGE_IP4_GET_PRIVATE (self);
+	GtkTreeModel *model;
+	int num_rows;
+
+	if (priv->addr_method != IP4_METHOD_SHARED)
+		return;
+
+	/* Only one address is allowed in shared mode */
+	model = gtk_tree_view_get_model (priv->addr_list);
+	num_rows = gtk_tree_model_iter_n_children (model, NULL);
+	gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_add), num_rows == 0);
+}
+
+static void
 method_changed (GtkComboBox *combo, gpointer user_data)
 {
 	CEPageIP4Private *priv = CE_PAGE_IP4_GET_PRIVATE (user_data);
@@ -246,6 +264,8 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 	gboolean ip4_required_enabled = TRUE;
 	gboolean method_auto = FALSE;
 	GtkTreeIter iter;
+	GtkListStore *store;
+	const char *tooltip = NULL, *label = NULL;
 
 	if (gtk_combo_box_get_active_iter (priv->method, &iter)) {
 		gtk_tree_model_get (GTK_TREE_MODEL (priv->method_store), &iter,
@@ -254,24 +274,40 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 
 	switch (method) {
 	case IP4_METHOD_AUTO:
-		addr_enabled = FALSE;
+		addr_enabled = TRUE;
 		dhcp_enabled = routes_enabled = TRUE;
 		dns_enabled = TRUE;
 		method_auto = TRUE;
+		tooltip = CE_TOOLTIP_ADDR_AUTO;
+		label = CE_LABEL_ADDR_AUTO;
 		break;
 	case IP4_METHOD_AUTO_ADDRESSES:
-		addr_enabled = FALSE;
+		addr_enabled = TRUE;
 		dns_enabled = dhcp_enabled = routes_enabled = TRUE;
+		tooltip = CE_TOOLTIP_ADDR_AUTO;
+		label = CE_LABEL_ADDR_AUTO;
 		break;
 	case IP4_METHOD_MANUAL:
 		addr_enabled = dns_enabled = routes_enabled = TRUE;
+		tooltip = CE_TOOLTIP_ADDR_MANUAL;
+		label = CE_LABEL_ADDR_MANUAL;
+		break;
+	case IP4_METHOD_SHARED:
+		addr_enabled = TRUE;
+		tooltip = CE_TOOLTIP_ADDR_SHARED;
+		label = CE_LABEL_ADDR_SHARED;
 		break;
 	case IP4_METHOD_DISABLED:
 		addr_enabled = dns_enabled = dhcp_enabled = routes_enabled = ip4_required_enabled = FALSE;
+		break;
 	default:
 		break;
 	}
 
+	priv->addr_method = method;
+	gtk_widget_set_tooltip_text (GTK_WIDGET (priv->addr_list), tooltip);
+	gtk_label_set_text (GTK_LABEL (priv->addr_label), label);
+
 	/* Disable DHCP stuff for VPNs (though in the future we should support
 	 * DHCP over tap interfaces for OpenVPN and vpnc).
 	 */
@@ -285,13 +321,41 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_add), addr_enabled);
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_delete), addr_enabled);
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_list), addr_enabled);
-	if (!addr_enabled) {
-		GtkListStore *store;
 
-		store = GTK_LIST_STORE (gtk_tree_view_get_model (priv->addr_list));
-		gtk_list_store_clear (store);
+	if (addr_enabled) {
+		if (priv->addr_saved) {
+			/* Restore old entries */
+			gtk_tree_view_set_model (priv->addr_list, priv->addr_saved);
+			g_clear_object (&priv->addr_saved);
+		}
+	} else {
+		if (!priv->addr_saved) {
+			/* Save current entries, set empty list */
+			priv->addr_saved = g_object_ref (gtk_tree_view_get_model (priv->addr_list));
+			store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+			gtk_tree_view_set_model (priv->addr_list, GTK_TREE_MODEL (store));
+			g_object_unref (store);
+		}
 	}
 
+	if (method == IP4_METHOD_SHARED) {
+		GtkTreeModel *model;
+		gboolean iter_valid;
+		int i;
+
+		/* Remove all rows except first */
+		model = gtk_tree_view_get_model (priv->addr_list);
+		iter_valid = gtk_tree_model_get_iter_first (model, &iter);
+		for (i = 0; iter_valid; i++) {
+			if (i > 0)
+				iter_valid = gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+			else
+				iter_valid = gtk_tree_model_iter_next (model, &iter);
+		}
+	}
+
+	address_list_changed (user_data);
+
 	gtk_widget_set_sensitive (priv->dns_servers_label, dns_enabled);
 	if (method_auto)
 		gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), _("Additional DNS ser_vers:"));
@@ -470,12 +534,14 @@ addr_add_clicked (GtkButton *button, gpointer user_data)
 
 	g_list_free (cells);
 	gtk_tree_path_free (path);
+	address_list_changed (user_data);
 }
 
 static void
 addr_delete_clicked (GtkButton *button, gpointer user_data)
 {
-	GtkTreeView *treeview = GTK_TREE_VIEW (user_data);
+	CEPageIP4Private *priv = CE_PAGE_IP4_GET_PRIVATE (user_data);
+	GtkTreeView *treeview = priv->addr_list;
 	GtkTreeSelection *selection;
 	GList *selected_rows;
 	GtkTreeModel *model = NULL;
@@ -501,6 +567,8 @@ addr_delete_clicked (GtkButton *button, gpointer user_data)
 		selection = gtk_tree_view_get_selection (treeview);
 		gtk_tree_selection_select_iter (selection, &iter);
 	}
+
+	address_list_changed (user_data);
 }
 
 static void
@@ -742,7 +810,7 @@ gateway_matches_address (const char *gw_str, const char *addr_str, guint32 prefi
 static gboolean
 possibly_wrong_gateway (GtkTreeModel *model, GtkTreeIter *iter, const char *gw_str)
 {
-	char *addr_str, *prefix_str;
+	gs_free char *addr_str = NULL, *prefix_str = NULL;
 	gboolean addr_valid;
 	guint32 prefix;
 
@@ -1118,7 +1186,7 @@ finish_setup (CEPageIP4 *self, gpointer unused, GError *error, gpointer user_dat
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_delete), FALSE);
 
 	g_signal_connect (priv->addr_add, "clicked", G_CALLBACK (addr_add_clicked), self);
-	g_signal_connect (priv->addr_delete, "clicked", G_CALLBACK (addr_delete_clicked), priv->addr_list);
+	g_signal_connect (priv->addr_delete, "clicked", G_CALLBACK (addr_delete_clicked), self);
 	selection = gtk_tree_view_get_selection (priv->addr_list);
 	g_signal_connect (selection, "changed", G_CALLBACK (list_selection_changed), priv->addr_delete);
 
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index 124269ee..5bebf419 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -58,6 +58,7 @@ typedef struct {
 	GtkButton *addr_delete;
 	GtkTreeView *addr_list;
 	GtkCellRenderer *addr_cells[COL_LAST + 1];
+	GtkTreeModel *addr_saved;
 
 	/* DNS servers */
 	GtkWidget *dns_servers_label;
@@ -246,6 +247,8 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 	gboolean ip6_required_enabled = TRUE;
 	gboolean method_auto = FALSE;
 	GtkTreeIter iter;
+	GtkListStore *store;
+	const char *tooltip = NULL, *label = NULL;
 
 	if (gtk_combo_box_get_active_iter (priv->method, &iter)) {
 		gtk_tree_model_get (GTK_TREE_MODEL (priv->method_store), &iter,
@@ -254,23 +257,31 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 
 	switch (method) {
 	case IP6_METHOD_AUTO:
-		addr_enabled = FALSE;
+		addr_enabled = TRUE;
 		routes_enabled = TRUE;
 		dns_enabled = TRUE;
 		method_auto = TRUE;
 		ip6_privacy_enabled = TRUE;
+		tooltip = CE_TOOLTIP_ADDR_AUTO;
+		label = CE_LABEL_ADDR_AUTO;
 		break;
 	case IP6_METHOD_AUTO_ADDRESSES:
-		addr_enabled = FALSE;
+		addr_enabled = TRUE;
 		dns_enabled = routes_enabled = TRUE;
 		ip6_privacy_enabled = TRUE;
+		tooltip = CE_TOOLTIP_ADDR_AUTO;
+		label = CE_LABEL_ADDR_AUTO;
 		break;
 	case IP6_METHOD_AUTO_DHCP_ONLY:
-		addr_enabled = FALSE;
+		addr_enabled = TRUE;
 		routes_enabled = TRUE;
+		tooltip = CE_TOOLTIP_ADDR_AUTO;
+		label = CE_LABEL_ADDR_AUTO;
 		break;
 	case IP6_METHOD_MANUAL:
 		addr_enabled = dns_enabled = routes_enabled = TRUE;
+		tooltip = CE_TOOLTIP_ADDR_MANUAL;
+		label = CE_LABEL_ADDR_MANUAL;
 		break;
 	case IP6_METHOD_IGNORE:
 		ip6_required_enabled = FALSE;
@@ -279,15 +290,28 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 		break;
 	}
 
+	gtk_widget_set_tooltip_text (GTK_WIDGET (priv->addr_list), tooltip);
+	gtk_label_set_text (GTK_LABEL (priv->addr_label), label);
+
 	gtk_widget_set_sensitive (priv->addr_label, addr_enabled);
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_add), addr_enabled);
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_delete), addr_enabled);
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_list), addr_enabled);
-	if (!addr_enabled) {
-		GtkListStore *store;
 
-		store = GTK_LIST_STORE (gtk_tree_view_get_model (priv->addr_list));
-		gtk_list_store_clear (store);
+	if (addr_enabled) {
+		if (priv->addr_saved) {
+			/* Restore old entries */
+			gtk_tree_view_set_model (priv->addr_list, priv->addr_saved);
+			g_clear_object (&priv->addr_saved);
+		}
+	} else {
+		if (!priv->addr_saved) {
+			/* Save current entries, set empty list */
+			priv->addr_saved = g_object_ref (gtk_tree_view_get_model (priv->addr_list));
+			store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+			gtk_tree_view_set_model (priv->addr_list, GTK_TREE_MODEL (store));
+			g_object_unref (store);
+		}
 	}
 
 	gtk_widget_set_sensitive (priv->dns_servers_label, dns_enabled);
author	Thomas Haller <thaller@redhat.com>	2016-10-03 12:28:39 +0200
committer	Thomas Haller <thaller@redhat.com>	2016-10-03 12:32:19 +0200
commit	47194f7a11984c47dc168ae9bd8696861f21d445 (patch)
tree	cd17c3d4f070e234476e72d945999bb040c944f5
parent	6c71c7261ccfe84c4c3765a2e591728907f23102 (diff)
parent	7ee48ac38eba13dbf7684449053fa55d3db1334b (diff)
download	network-manager-applet-47194f7a11984c47dc168ae9bd8696861f21d445.tar.gz