Merge tag 'upstream/1.2.2'

Upstream version 1.2.2

11 files changed, 416 insertions, 377 deletions

diff --git a/NEWS b/NEWS
index 1cbaf24d..c27a4c8b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+====================================================
+network-manager-applet-1.2.2
+Overview of changes since network-manager-applet-1.2
+====================================================
+
+This is a new stable release of network-manager-applet.  Notable changes include:
+
+* Connecting to multiple VPNs from the applet is now possible
+* Updated German, Hungarian, Italian, Polish and Swedish translations
+* A minor crash bugfix
+
 ======================================================
 network-manager-applet-1.2
 Overview of changes since network-manager-applet-1.0.0
diff --git a/configure b/configure
index c3085a8d..c625fd89 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for nm-applet 1.2.0.
+# Generated by GNU Autoconf 2.69 for nm-applet 1.2.2.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='nm-applet'
 PACKAGE_TARNAME='network-manager-applet'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='nm-applet 1.2.0'
+PACKAGE_VERSION='1.2.2'
+PACKAGE_STRING='nm-applet 1.2.2'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1448,7 +1448,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures nm-applet 1.2.0 to adapt to many kinds of systems.
+\`configure' configures nm-applet 1.2.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1519,7 +1519,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of nm-applet 1.2.0:";;
+     short | recursive ) echo "Configuration of nm-applet 1.2.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1691,7 +1691,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-nm-applet configure 1.2.0
+nm-applet configure 1.2.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2114,7 +2114,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by nm-applet $as_me 1.2.0, which was
+It was created by nm-applet $as_me 1.2.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2982,7 +2982,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='network-manager-applet'
- VERSION='1.2.0'
+ VERSION='1.2.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12436,7 +12436,7 @@ CC=$lt_save_CC
 
 
 
-NMA_GIT_SHA=b9b1832768cd0f1c3ceb331086db5844633990d2
+NMA_GIT_SHA=9d21b1491f5fde0109cdfca8548fc2aaaa499ac9
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13842,25 +13842,25 @@ if test -n "$LIBNM_GLIB_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.32
-		 NetworkManager >= 1.1
-		 libnm-glib >= 1.1
-		 libnm-util >= 1.1
-		 libnm-glib-vpn >= 1.1
+		 NetworkManager >= 1.2
+		 libnm-glib >= 1.2
+		 libnm-util >= 1.2
+		 libnm-glib-vpn >= 1.2
 		 gmodule-export-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.32
-		 NetworkManager >= 1.1
-		 libnm-glib >= 1.1
-		 libnm-util >= 1.1
-		 libnm-glib-vpn >= 1.1
+		 NetworkManager >= 1.2
+		 libnm-glib >= 1.2
+		 libnm-util >= 1.2
+		 libnm-glib-vpn >= 1.2
 		 gmodule-export-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBNM_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.32
-		 NetworkManager >= 1.1
-		 libnm-glib >= 1.1
-		 libnm-util >= 1.1
-		 libnm-glib-vpn >= 1.1
+		 NetworkManager >= 1.2
+		 libnm-glib >= 1.2
+		 libnm-util >= 1.2
+		 libnm-glib-vpn >= 1.2
 		 gmodule-export-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -13874,25 +13874,25 @@ if test -n "$LIBNM_GLIB_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.32
-		 NetworkManager >= 1.1
-		 libnm-glib >= 1.1
-		 libnm-util >= 1.1
-		 libnm-glib-vpn >= 1.1
+		 NetworkManager >= 1.2
+		 libnm-glib >= 1.2
+		 libnm-util >= 1.2
+		 libnm-glib-vpn >= 1.2
 		 gmodule-export-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.32
-		 NetworkManager >= 1.1
-		 libnm-glib >= 1.1
-		 libnm-util >= 1.1
-		 libnm-glib-vpn >= 1.1
+		 NetworkManager >= 1.2
+		 libnm-glib >= 1.2
+		 libnm-util >= 1.2
+		 libnm-glib-vpn >= 1.2
 		 gmodule-export-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBNM_GLIB_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.32
-		 NetworkManager >= 1.1
-		 libnm-glib >= 1.1
-		 libnm-util >= 1.1
-		 libnm-glib-vpn >= 1.1
+		 NetworkManager >= 1.2
+		 libnm-glib >= 1.2
+		 libnm-util >= 1.2
+		 libnm-glib-vpn >= 1.2
 		 gmodule-export-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -13915,27 +13915,27 @@ else
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        LIBNM_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.32
-		 NetworkManager >= 1.1
-		 libnm-glib >= 1.1
-		 libnm-util >= 1.1
-		 libnm-glib-vpn >= 1.1
+		 NetworkManager >= 1.2
+		 libnm-glib >= 1.2
+		 libnm-util >= 1.2
+		 libnm-glib-vpn >= 1.2
 		 gmodule-export-2.0" 2>&1`
         else
 	        LIBNM_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.32
-		 NetworkManager >= 1.1
-		 libnm-glib >= 1.1
-		 libnm-util >= 1.1
-		 libnm-glib-vpn >= 1.1
+		 NetworkManager >= 1.2
+		 libnm-glib >= 1.2
+		 libnm-util >= 1.2
+		 libnm-glib-vpn >= 1.2
 		 gmodule-export-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBNM_GLIB_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (gio-2.0 >= 2.32
-		 NetworkManager >= 1.1
-		 libnm-glib >= 1.1
-		 libnm-util >= 1.1
-		 libnm-glib-vpn >= 1.1
+		 NetworkManager >= 1.2
+		 libnm-glib >= 1.2
+		 libnm-util >= 1.2
+		 libnm-glib-vpn >= 1.2
 		 gmodule-export-2.0) were not met:
 
 $LIBNM_GLIB_PKG_ERRORS
@@ -13981,12 +13981,12 @@ if test -n "$LIBNM_CFLAGS"; then
     pkg_cv_LIBNM_CFLAGS="$LIBNM_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm gio-2.0 >= 2.32 gmodule-export-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnm gio-2.0 >= 2.32 gmodule-export-2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm >= 1.2 gio-2.0 >= 2.32 gmodule-export-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnm >= 1.2 gio-2.0 >= 2.32 gmodule-export-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBNM_CFLAGS=`$PKG_CONFIG --cflags "libnm gio-2.0 >= 2.32 gmodule-export-2.0" 2>/dev/null`
+  pkg_cv_LIBNM_CFLAGS=`$PKG_CONFIG --cflags "libnm >= 1.2 gio-2.0 >= 2.32 gmodule-export-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13998,12 +13998,12 @@ if test -n "$LIBNM_LIBS"; then
     pkg_cv_LIBNM_LIBS="$LIBNM_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm gio-2.0 >= 2.32 gmodule-export-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnm gio-2.0 >= 2.32 gmodule-export-2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm >= 1.2 gio-2.0 >= 2.32 gmodule-export-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnm >= 1.2 gio-2.0 >= 2.32 gmodule-export-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBNM_LIBS=`$PKG_CONFIG --libs "libnm gio-2.0 >= 2.32 gmodule-export-2.0" 2>/dev/null`
+  pkg_cv_LIBNM_LIBS=`$PKG_CONFIG --libs "libnm >= 1.2 gio-2.0 >= 2.32 gmodule-export-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -14024,14 +14024,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBNM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnm gio-2.0 >= 2.32 gmodule-export-2.0" 2>&1`
+	        LIBNM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnm >= 1.2 gio-2.0 >= 2.32 gmodule-export-2.0" 2>&1`
         else
-	        LIBNM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnm gio-2.0 >= 2.32 gmodule-export-2.0" 2>&1`
+	        LIBNM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnm >= 1.2 gio-2.0 >= 2.32 gmodule-export-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBNM_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libnm gio-2.0 >= 2.32 gmodule-export-2.0) were not met:
+	as_fn_error $? "Package requirements (libnm >= 1.2 gio-2.0 >= 2.32 gmodule-export-2.0) were not met:
 
 $LIBNM_PKG_ERRORS
 
@@ -16405,7 +16405,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by nm-applet $as_me 1.2.0, which was
+This file was extended by nm-applet $as_me 1.2.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16471,7 +16471,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-nm-applet config.status 1.2.0
+nm-applet config.status 1.2.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 858c168b..1b09f7d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.63])
 AC_INIT([nm-applet],
-        [1.2.0],
+        [1.2.2],
         [https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager],
         [network-manager-applet])
 
@@ -75,16 +75,16 @@ fi
 
 PKG_CHECK_MODULES(LIBNM_GLIB,
 		[gio-2.0 >= 2.32
-		 NetworkManager >= 1.1
-		 libnm-glib >= 1.1
-		 libnm-util >= 1.1
-		 libnm-glib-vpn >= 1.1
+		 NetworkManager >= 1.2
+		 libnm-glib >= 1.2
+		 libnm-util >= 1.2
+		 libnm-glib-vpn >= 1.2
 		 gmodule-export-2.0])
 LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
 LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
 LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
 
-PKG_CHECK_MODULES(LIBNM, [libnm gio-2.0 >= 2.32 gmodule-export-2.0])
+PKG_CHECK_MODULES(LIBNM, [libnm >= 1.2 gio-2.0 >= 2.32 gmodule-export-2.0])
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
diff --git a/po/de.po b/po/de.po
index 4dc2d67d..45826e34 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,19 +21,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 14:02+0200\n"
-"PO-Revision-Date: 2016-03-29 22:55+0200\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\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-05-08 10:44+0000\n"
+"PO-Revision-Date: 2016-05-08 14:30+0200\n"
+"Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.8.7\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3097
 msgid "Network"
 msgstr "Netzwerk"
 
@@ -150,8 +151,8 @@ msgid "NetworkManager"
 msgstr "NetworkManager"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-msgid "NetworkManager for GNOME"
-msgstr "NetworkManager für GNOME"
+msgid "NetworkManager connection editor"
+msgstr "NetworkManager-Verbindungseditor"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
 msgid ""
@@ -169,6 +170,10 @@ msgstr ""
 "nm-connection-editor arbeitet gemeinsam mit NetworkManager zum Anlegen und "
 "Bearbeiten von vorhandenen Verbindungsprofilen für NetworkManager."
 
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:5
+msgid "The NetworkManager Developers"
+msgstr "Die Entwickler von NetworkManager"
+
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-Legitimierung"
@@ -402,144 +407,144 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1280
+#: ../src/applet.c:1284
 msgid "device not ready (firmware missing)"
 msgstr "Gerät ist nicht betriebsbereit (Firmware fehlt)"
 
-#: ../src/applet.c:1282
+#: ../src/applet.c:1286
 msgid "device not ready"
 msgstr "Gerät ist nicht betriebsbereit"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1296 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "nicht verbunden"
 
-#: ../src/applet.c:1308
+#: ../src/applet.c:1312
 msgid "Disconnect"
 msgstr "Verbindung trennen"
 
-#: ../src/applet.c:1322
+#: ../src/applet.c:1326
 msgid "device not managed"
 msgstr "Gerät wird nicht verwaltet"
 
-#: ../src/applet.c:1395
+#: ../src/applet.c:1399
 msgid "No network devices available"
 msgstr "Es sind keine Netzwerkgeräte verfügbar"
 
-#: ../src/applet.c:1449
+#: ../src/applet.c:1453
 msgid "_VPN Connections"
 msgstr "_VPN-Verbindungen"
 
-#: ../src/applet.c:1503
+#: ../src/applet.c:1497
 msgid "_Configure VPN..."
 msgstr "VPN _konfigurieren …"
 
-#: ../src/applet.c:1508
-msgid "_Disconnect VPN"
-msgstr "VPN _trennen"
+#: ../src/applet.c:1500
+msgid "_Add a VPN connection..."
+msgstr "VPN-Verbindung _hinzufügen …"
 
-#: ../src/applet.c:1615
+#: ../src/applet.c:1606
 msgid "NetworkManager is not running..."
 msgstr "Der Netzwerk-Manager läuft zur Zeit nicht …"
 
-#: ../src/applet.c:1620 ../src/applet.c:2612
+#: ../src/applet.c:1611 ../src/applet.c:2603
 msgid "Networking disabled"
 msgstr "Netzwerk deaktiviert"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1830
+#: ../src/applet.c:1821
 msgid "Enable _Networking"
 msgstr "_Netzwerk aktivieren"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1839
+#: ../src/applet.c:1830
 msgid "Enable _Wi-Fi"
 msgstr "_Funknetzwerk aktivieren"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1848
+#: ../src/applet.c:1839
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobiles Breitband aktivieren"
 
 #. Toggle notifications item
-#: ../src/applet.c:1860
+#: ../src/applet.c:1851
 msgid "Enable N_otifications"
 msgstr "_Benachrichtigungen aktivieren"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1872
+#: ../src/applet.c:1863
 msgid "Connection _Information"
 msgstr "Verbindungs_informationen"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1880
+#: ../src/applet.c:1871
 msgid "Edit Connections..."
 msgstr "Verbindungen bearbeiten …"
 
-#: ../src/applet.c:1894
+#: ../src/applet.c:1885
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/applet.c:2179
+#: ../src/applet.c:2170
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Sie sind nun mit »%s« verbunden."
 
-#: ../src/applet.c:2222
+#: ../src/applet.c:2213
 msgid "Disconnected"
 msgstr "Verbindung getrennt"
 
-#: ../src/applet.c:2223
+#: ../src/applet.c:2214
 msgid "The network connection has been disconnected."
 msgstr "Die Netzwerkverbindung wurde getrennt."
 
-#: ../src/applet.c:2474
+#: ../src/applet.c:2465
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Netzwerkverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet.c:2477
+#: ../src/applet.c:2468
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Benutzerlegitimierung ist erforderlich für Netzwerkverbindung »%s«"
 
-#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2471 ../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:2483
+#: ../src/applet.c:2474
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Netzwerkverbindungen »%s« aktiv"
 
-#: ../src/applet.c:2557
+#: ../src/applet.c:2548
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN-Verbindung »%s« wird gestartet …"
 
-#: ../src/applet.c:2560
+#: ../src/applet.c:2551
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Benutzerlegitimierung ist erforderlich für VPN-Verbindung »%s«"
 
-#: ../src/applet.c:2563
+#: ../src/applet.c:2554
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Anfordern einer Netzwerkadresse von VPN-Verbindung »%s« …"
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2557
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN-Verbindung »%s« aktiv"
+msgid "VPN connection active"
+msgstr "VPN-Verbindung aktiv"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2607
 msgid "No network connection"
 msgstr "Keine Netzwerkverbindung"
 
-#: ../src/applet.c:3204
+#: ../src/applet.c:3196
 msgid "NetworkManager Applet"
 msgstr "Netzwerk-Manager-Applet"
 
@@ -2412,24 +2417,24 @@ msgstr "Die ausgewählte Verbindung löschen"
 msgid "Authenticate to delete the selected connection"
 msgstr "Legitimieren, um die ausgewählte Verbindung zu löschen"
 
-#: ../src/connection-editor/nm-connection-list.c:929
+#: ../src/connection-editor/nm-connection-list.c:912
 msgid "No VPN plugins are installed."
 msgstr "Es sind keine VPN-Plugins installiert."
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/nm-connection-list.c:914
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Es ist unbekannt, wie »%s«-Verbindungen erstellt werden können"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:916
 msgid "Error creating connection"
 msgstr "Fehler beim Erstellen der Verbindung"
 
-#: ../src/connection-editor/nm-connection-list.c:955
+#: ../src/connection-editor/nm-connection-list.c:938
 msgid "Error editing connection"
 msgstr "Fehler beim Bearbeiten der Verbindung"
 
-#: ../src/connection-editor/nm-connection-list.c:956
+#: ../src/connection-editor/nm-connection-list.c:939
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Eine Verbindung mit der UUID »%s« konnte nicht gefunden werden"
@@ -3925,6 +3930,12 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Typ:"
 
+#~ msgid "_Disconnect VPN"
+#~ msgstr "VPN _trennen"
+
+#~ msgid "NetworkManager for GNOME"
+#~ msgstr "NetworkManager für GNOME"
+
 #~ msgid "_Help"
 #~ msgstr "_Hilfe"
 
diff --git a/po/hu.po b/po/hu.po
index 09579d26..b8a7cd10 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,19 +9,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 14:02+0200\n"
-"PO-Revision-Date: 2016-03-30 09:58+0200\n"
-"Last-Translator: Gabor Kelemen <kelemeng at ubuntu dot com>\n"
-"Language-Team: Hungarian <openscope at googlegroups dot com>\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-29 01:44+0000\n"
+"PO-Revision-Date: 2016-04-29 09:39+0200\n"
+"Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
+"Language-Team: Hungarian <openscope at gmail dot com>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.8.7\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3097
 msgid "Network"
 msgstr "Hálózat"
 
@@ -135,8 +136,8 @@ msgid "NetworkManager"
 msgstr "Hálózatkezelő"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-msgid "NetworkManager for GNOME"
-msgstr "Hálózatkezelő a GNOME-hoz"
+msgid "NetworkManager connection editor"
+msgstr "Hálózatkezelő kapcsolatszerkesztő"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
 msgid ""
@@ -154,6 +155,10 @@ msgstr ""
 "A Hálózati kapcsolatok program használható kapcsolati profilok létrehozására "
 "a Hálózatkezelőhöz, és a meglévők kezelésére."
 
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:5
+msgid "The NetworkManager Developers"
+msgstr "A Hálózatkezelő fejlesztői"
+
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X hitelesítés"
@@ -381,145 +386,145 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1280
+#: ../src/applet.c:1284
 msgid "device not ready (firmware missing)"
 msgstr "az eszköz nem áll készen (hiányzó firmware)"
 
-#: ../src/applet.c:1282
+#: ../src/applet.c:1286
 msgid "device not ready"
 msgstr "az eszköz nem áll készen"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1296 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "leválasztva"
 
-#: ../src/applet.c:1308
+#: ../src/applet.c:1312
 msgid "Disconnect"
 msgstr "Bontás"
 
-#: ../src/applet.c:1322
+#: ../src/applet.c:1326
 msgid "device not managed"
 msgstr "az eszköz nem kezelt"
 
-#: ../src/applet.c:1395
+#: ../src/applet.c:1399
 msgid "No network devices available"
 msgstr "Nem érhetők el hálózati eszközök"
 
-#: ../src/applet.c:1449
+#: ../src/applet.c:1453
 msgid "_VPN Connections"
 msgstr "_VPN kapcsolatok"
 
-#: ../src/applet.c:1503
+#: ../src/applet.c:1497
 msgid "_Configure VPN..."
 msgstr "V_PN beállítása…"
 
-#: ../src/applet.c:1508
-msgid "_Disconnect VPN"
-msgstr "VP_N bontása"
+#: ../src/applet.c:1500
+msgid "_Add a VPN connection..."
+msgstr "VPN kapcsolat hozzá_adása…"
 
-#: ../src/applet.c:1615
+#: ../src/applet.c:1606
 msgid "NetworkManager is not running..."
 msgstr "A Hálózatkezelő nem fut…"
 
-#: ../src/applet.c:1620 ../src/applet.c:2612
+#: ../src/applet.c:1611 ../src/applet.c:2603
 msgid "Networking disabled"
 msgstr "Hálózat kikapcsolva"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1830
+#: ../src/applet.c:1821
 msgid "Enable _Networking"
 msgstr "_Hálózat bekapcsolása"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1839
+#: ../src/applet.c:1830
 msgid "Enable _Wi-Fi"
 msgstr "_Wi-Fi bekapcsolása"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1848
+#: ../src/applet.c:1839
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobil széles sáv bekapcsolása"
 
 #. Toggle notifications item
-#: ../src/applet.c:1860
+#: ../src/applet.c:1851
 msgid "Enable N_otifications"
 msgstr "Ért_esítések bekapcsolása"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1872
+#: ../src/applet.c:1863
 msgid "Connection _Information"
 msgstr "_Kapcsolatinformációk"
 
 # Megjegyzés: Itt a magyar fordításban hozzárendeltem gyorsbillentyűt a fordításhoz, az angolban eredetileg nincs.
 #. 'Edit Connections...' item
-#: ../src/applet.c:1880
+#: ../src/applet.c:1871
 msgid "Edit Connections..."
 msgstr "Kap_csolatok szerkesztése…"
 
-#: ../src/applet.c:1894
+#: ../src/applet.c:1885
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../src/applet.c:2179
+#: ../src/applet.c:2170
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Kapcsolódott ehhez: „%s”."
 
-#: ../src/applet.c:2222
+#: ../src/applet.c:2213
 msgid "Disconnected"
 msgstr "Kapcsolat bontva"
 
-#: ../src/applet.c:2223
+#: ../src/applet.c:2214
 msgid "The network connection has been disconnected."
 msgstr "A hálózati kapcsolat bontva."
 
-#: ../src/applet.c:2474
+#: ../src/applet.c:2465
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "A hálózati kapcsolat („%s”) előkészítése…"
 
-#: ../src/applet.c:2477
+#: ../src/applet.c:2468
 #, 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:2480 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2471 ../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:2483
+#: ../src/applet.c:2474
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "A hálózati kapcsolat („%s”) aktív"
 
-#: ../src/applet.c:2557
+#: ../src/applet.c:2548
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "A VPN kapcsolat („%s”) indítása…"
 
-#: ../src/applet.c:2560
+#: ../src/applet.c:2551
 #, 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:2563
+#: ../src/applet.c:2554
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "VPN cím kérése ehhez: „%s”…"
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2557
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "A VPN kapcsolat („%s”) aktív"
+msgid "VPN connection active"
+msgstr "A VPN kapcsolat aktív"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2607
 msgid "No network connection"
 msgstr "Nincs hálózati kapcsolat"
 
-#: ../src/applet.c:3204
+#: ../src/applet.c:3196
 msgid "NetworkManager Applet"
 msgstr "Hálózatkezelő kisalkalmazás"
 
@@ -2375,24 +2380,24 @@ msgstr "A kiválasztott kapcsolat törlése"
 msgid "Authenticate to delete the selected connection"
 msgstr "A kiválasztott kapcsolat törléséhez azonosítás szükséges"
 
-#: ../src/connection-editor/nm-connection-list.c:929
+#: ../src/connection-editor/nm-connection-list.c:912
 msgid "No VPN plugins are installed."
 msgstr "Nincs telepítve VPN bővítmény."
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/nm-connection-list.c:914
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Nem hozhatók létre a(z) „%s” kapcsolatok"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:916
 msgid "Error creating connection"
 msgstr "Hiba a kapcsolat létrehozásakor"
 
-#: ../src/connection-editor/nm-connection-list.c:955
+#: ../src/connection-editor/nm-connection-list.c:938
 msgid "Error editing connection"
 msgstr "Hiba a kapcsolat szerkesztésekor"
 
-#: ../src/connection-editor/nm-connection-list.c:956
+#: ../src/connection-editor/nm-connection-list.c:939
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Nem található „%s” UUID-vel rendelkező kapcsolat"
@@ -3865,6 +3870,12 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Típus:"
 
+#~ msgid "_Disconnect VPN"
+#~ msgstr "VP_N bontása"
+
+#~ msgid "NetworkManager for GNOME"
+#~ msgstr "Hálózatkezelő a GNOME-hoz"
+
 #~ msgid "_Help"
 #~ msgstr "_Súgó"
 
diff --git a/po/it.po b/po/it.po
index 3599aa5f..2bfb03d0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,5 +1,5 @@
 # Italian translation for network-manager-Applet
-# Copyright (C) 2004-2010, 2011, 2012, 2013, 2014, 2015 the NetworkManager-Applet CopyRight Holder
+# Copyright (C) 2004-2010, 2011, 2012, 2013, 2014, 2015, 2016 the NetworkManager-Applet CopyRight Holder
 # This file is distributed under the same license as the NetworkManager-Applet package.
 #
 # Note:
@@ -10,14 +10,15 @@
 #
 # Francesco Marletta <francesco.marletta@tiscali.it>, 2004, 2005, 2006, 2007, 2008, 2009, 2010.
 # Gianvito Cavasoli <gianvito@gmx.it>, 2011.
-# Milo Casagrande <milo@milo.name>, 2011, 2012, 2013, 2014, 2015.
+# Milo Casagrande <milo@milo.name>, 2011, 2012, 2013, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 14:02+0200\n"
-"PO-Revision-Date: 2016-03-18 09:33+0100\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-05-05 13:56+0000\n"
+"PO-Revision-Date: 2016-05-08 12:42+0200\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -28,7 +29,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-03-09 08:20+0000\n"
 "X-Generator: Poedit 1.8.7\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3097
 msgid "Network"
 msgstr "Rete"
 
@@ -144,8 +145,8 @@ msgid "NetworkManager"
 msgstr "NetworkManager"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-msgid "NetworkManager for GNOME"
-msgstr "NetworkManager per GNOME"
+msgid "NetworkManager connection editor"
+msgstr "Editor connessione NetworkManager"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
 msgid ""
@@ -163,6 +164,10 @@ msgstr ""
 "Il programma nm-connection-editor funziona con NetworkManager per creare e "
 "modificare profili di connessioni per NetworkManager."
 
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:5
+msgid "The NetworkManager Developers"
+msgstr "Gli sviluppatori di NetworkManager"
+
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticazione 802.1X"
@@ -394,146 +399,147 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1280
+#: ../src/applet.c:1284
 msgid "device not ready (firmware missing)"
 msgstr "dispositivo non pronto (manca il firmware)"
 
-#: ../src/applet.c:1282
+#: ../src/applet.c:1286
 msgid "device not ready"
 msgstr "dispositivo non pronto"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1296 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "disconnessi"
 
-#: ../src/applet.c:1308
+#: ../src/applet.c:1312
 msgid "Disconnect"
 msgstr "Disconnetti"
 
-#: ../src/applet.c:1322
+#: ../src/applet.c:1326
 msgid "device not managed"
 msgstr "dispositivo non gestito"
 
 # [NdT] qui ho tradotto appositamente device con dispositivo
-#: ../src/applet.c:1395
+#: ../src/applet.c:1399
 msgid "No network devices available"
 msgstr "Nessun dispositivo di rete disponibile"
 
-#: ../src/applet.c:1449
+#: ../src/applet.c:1453
 msgid "_VPN Connections"
 msgstr "Connessioni _VPN"
 
-#: ../src/applet.c:1503
+#: ../src/applet.c:1497
 msgid "_Configure VPN..."
 msgstr "_Configura VPN..."
 
-#: ../src/applet.c:1508
-msgid "_Disconnect VPN"
-msgstr "_Disconnetti VPN"
+#: ../src/applet.c:1500
+#| msgid "Export VPN connection..."
+msgid "_Add a VPN connection..."
+msgstr "A_ggiungi connessione VPN..."
 
-#: ../src/applet.c:1615
+#: ../src/applet.c:1606
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager non è in esecuzione..."
 
-#: ../src/applet.c:1620 ../src/applet.c:2612
+#: ../src/applet.c:1611 ../src/applet.c:2603
 msgid "Networking disabled"
 msgstr "Funzionalità di rete disabilitate"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1830
+#: ../src/applet.c:1821
 msgid "Enable _Networking"
 msgstr "Abilita funzionalità di _rete"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1839
+#: ../src/applet.c:1830
 msgid "Enable _Wi-Fi"
 msgstr "Abilita _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1848
+#: ../src/applet.c:1839
 msgid "Enable _Mobile Broadband"
 msgstr "Abilita rete a banda larga _mobile"
 
 #. Toggle notifications item
-#: ../src/applet.c:1860
+#: ../src/applet.c:1851
 msgid "Enable N_otifications"
 msgstr "Abilita n_otifiche"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1872
+#: ../src/applet.c:1863
 msgid "Connection _Information"
 msgstr "Informazioni _connessione"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1880
+#: ../src/applet.c:1871
 msgid "Edit Connections..."
 msgstr "Modifica connessioni..."
 
-#: ../src/applet.c:1894
+#: ../src/applet.c:1885
 msgid "_About"
 msgstr "I_nformazioni"
 
-#: ../src/applet.c:2179
+#: ../src/applet.c:2170
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Attualmente connessi a «%s»."
 
-#: ../src/applet.c:2222
+#: ../src/applet.c:2213
 msgid "Disconnected"
 msgstr "Disconnessi"
 
 #
-#: ../src/applet.c:2223
+#: ../src/applet.c:2214
 msgid "The network connection has been disconnected."
 msgstr "La connessione di rete è stata terminata."
 
-#: ../src/applet.c:2474
+#: ../src/applet.c:2465
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Preparazione della connessione di rete «%s»..."
 
-#: ../src/applet.c:2477
+#: ../src/applet.c:2468
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Richiesta autenticazione utente per la connessione di rete «%s»..."
 
-#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2471 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Richiesta di un indirizzo di rete per «%s»..."
 
-#: ../src/applet.c:2483
+#: ../src/applet.c:2474
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Connessione di rete «%s» attiva"
 
-#: ../src/applet.c:2557
+#: ../src/applet.c:2548
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Avvio della connessione VPN «%s»..."
 
-#: ../src/applet.c:2560
+#: ../src/applet.c:2551
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Richiesta autenticazione utente per la connessione VPN «%s»..."
 
-#: ../src/applet.c:2563
+#: ../src/applet.c:2554
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Richiesta di un indirizzo VPN per «%s»..."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2557
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "Connessione VPN «%s» attiva"
+msgid "VPN connection active"
+msgstr "Connessione VPN attiva"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2607
 msgid "No network connection"
 msgstr "Nessuna connessione di rete"
 
-#: ../src/applet.c:3204
+#: ../src/applet.c:3196
 msgid "NetworkManager Applet"
 msgstr "Applet NetworkManager"
 
@@ -1665,9 +1671,8 @@ msgid "De_fault"
 msgstr "_Predefinito"
 
 #: ../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"
@@ -2408,24 +2413,24 @@ msgstr "Elimina la connessione selezionata"
 msgid "Authenticate to delete the selected connection"
 msgstr "Autenticarsi per eliminare la connessione selezionata"
 
-#: ../src/connection-editor/nm-connection-list.c:929
+#: ../src/connection-editor/nm-connection-list.c:912
 msgid "No VPN plugins are installed."
 msgstr "Non risulta installato alcun plugin VPN."
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/nm-connection-list.c:914
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Impossibile creare la connessione «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:916
 msgid "Error creating connection"
 msgstr "Errore nel creare la connessione"
 
-#: ../src/connection-editor/nm-connection-list.c:955
+#: ../src/connection-editor/nm-connection-list.c:938
 msgid "Error editing connection"
 msgstr "Errore nel modificare la connessione"
 
-#: ../src/connection-editor/nm-connection-list.c:956
+#: ../src/connection-editor/nm-connection-list.c:939
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Non è possibile trovare una connessione con l'UUID «%s»"
@@ -3927,6 +3932,12 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Tipo:"
 
+#~ msgid "NetworkManager for GNOME"
+#~ msgstr "NetworkManager per GNOME"
+
+#~ msgid "_Disconnect VPN"
+#~ msgstr "_Disconnetti VPN"
+
 #~ msgid "_Help"
 #~ msgstr "A_iuto"
 
diff --git a/po/pl.po b/po/pl.po
index 809f4d89..d691028e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-13 15:44+0200\n"
-"PO-Revision-Date: 2016-04-13 15:45+0200\n"
+"POT-Creation-Date: 2016-04-26 18:50+0200\n"
+"PO-Revision-Date: 2016-04-26 18:51+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -26,7 +26,7 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3097
 msgid "Network"
 msgstr "Sieć"
 
@@ -388,144 +388,144 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1280
+#: ../src/applet.c:1284
 msgid "device not ready (firmware missing)"
 msgstr "urządzenie nie jest gotowe (brak oprogramowania sprzętowego)"
 
-#: ../src/applet.c:1282
+#: ../src/applet.c:1286
 msgid "device not ready"
 msgstr "urządzenie nie jest gotowe"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1296 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "rozłączone"
 
-#: ../src/applet.c:1308
+#: ../src/applet.c:1312
 msgid "Disconnect"
 msgstr "Rozłącz"
 
-#: ../src/applet.c:1322
+#: ../src/applet.c:1326
 msgid "device not managed"
 msgstr "urządzenie nieobsługiwane"
 
-#: ../src/applet.c:1395
+#: ../src/applet.c:1399
 msgid "No network devices available"
 msgstr "Brak dostępnych urządzeń sieciowych"
 
-#: ../src/applet.c:1449
+#: ../src/applet.c:1453
 msgid "_VPN Connections"
 msgstr "Połączenia _VPN"
 
-#: ../src/applet.c:1503
+#: ../src/applet.c:1497
 msgid "_Configure VPN..."
 msgstr "S_konfiguruj VPN…"
 
-#: ../src/applet.c:1508
-msgid "_Disconnect VPN"
-msgstr "_Rozłącz VPN"
+#: ../src/applet.c:1500
+msgid "_Add a VPN connection..."
+msgstr "_Dodaj połączenie VPN…"
 
-#: ../src/applet.c:1615
+#: ../src/applet.c:1606
 msgid "NetworkManager is not running..."
 msgstr "Usługa NetworkManager nie jest uruchomiona…"
 
-#: ../src/applet.c:1620 ../src/applet.c:2612
+#: ../src/applet.c:1611 ../src/applet.c:2603
 msgid "Networking disabled"
 msgstr "Sieć jest wyłączona"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1830
+#: ../src/applet.c:1821
 msgid "Enable _Networking"
 msgstr "_Sieć"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1839
+#: ../src/applet.c:1830
 msgid "Enable _Wi-Fi"
 msgstr "Sieć _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1848
+#: ../src/applet.c:1839
 msgid "Enable _Mobile Broadband"
 msgstr "Sieć _komórkowa"
 
 #. Toggle notifications item
-#: ../src/applet.c:1860
+#: ../src/applet.c:1851
 msgid "Enable N_otifications"
 msgstr "P_owiadomienia"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1872
+#: ../src/applet.c:1863
 msgid "Connection _Information"
 msgstr "I_nformacje o połączeniu"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1880
+#: ../src/applet.c:1871
 msgid "Edit Connections..."
 msgstr "Modyfikuj połączenia…"
 
-#: ../src/applet.c:1894
+#: ../src/applet.c:1885
 msgid "_About"
 msgstr "_O programie"
 
-#: ../src/applet.c:2179
+#: ../src/applet.c:2170
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Połączono z „%s”."
 
-#: ../src/applet.c:2222
+#: ../src/applet.c:2213
 msgid "Disconnected"
 msgstr "Rozłączony"
 
-#: ../src/applet.c:2223
+#: ../src/applet.c:2214
 msgid "The network connection has been disconnected."
 msgstr "Połączenie sieciowe zostało rozłączone."
 
-#: ../src/applet.c:2474
+#: ../src/applet.c:2465
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Przygotowywanie połączenia sieciowego „%s”…"
 
-#: ../src/applet.c:2477
+#: ../src/applet.c:2468
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Wymagane uwierzytelnienie dla połączenia sieciowego „%s”…"
 
-#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2471 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Żądanie adresu sieciowego dla „%s”…"
 
-#: ../src/applet.c:2483
+#: ../src/applet.c:2474
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Nawiązano połączenie sieciowe „%s”"
 
-#: ../src/applet.c:2557
+#: ../src/applet.c:2548
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Nawiązywanie połączenia VPN „%s”…"
 
-#: ../src/applet.c:2560
+#: ../src/applet.c:2551
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Wymagane uwierzytelnienie dla połączenia VPN „%s”…"
 
-#: ../src/applet.c:2563
+#: ../src/applet.c:2554
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Żądanie adresu VPN dla „%s”…"
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2557
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "Nawiązano połączenie VPN „%s”"
+msgid "VPN connection active"
+msgstr "Nawiązano połączenie VPN"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2607
 msgid "No network connection"
 msgstr "Brak połączenia sieciowego"
 
-#: ../src/applet.c:3204
+#: ../src/applet.c:3196
 msgid "NetworkManager Applet"
 msgstr "Aplet NetworkManager"
 
@@ -2391,24 +2391,24 @@ msgstr "Usunięcie zaznaczonego połączenia"
 msgid "Authenticate to delete the selected connection"
 msgstr "Należy się uwierzytelnić, aby usunąć zaznaczone połączenie"
 
-#: ../src/connection-editor/nm-connection-list.c:929
+#: ../src/connection-editor/nm-connection-list.c:912
 msgid "No VPN plugins are installed."
 msgstr "Żadna wtyczka VPN nie jest zainstalowana."
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/nm-connection-list.c:914
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Nie wiadomo, jak utworzyć połączenia „%s”"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:916
 msgid "Error creating connection"
 msgstr "Błąd podczas tworzenia połączenia"
 
-#: ../src/connection-editor/nm-connection-list.c:955
+#: ../src/connection-editor/nm-connection-list.c:938
 msgid "Error editing connection"
 msgstr "Błąd podczas modyfikowania połączenia"
 
-#: ../src/connection-editor/nm-connection-list.c:956
+#: ../src/connection-editor/nm-connection-list.c:939
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Nie odnaleziono połączenia z UUID „%s”"
diff --git a/po/sv.po b/po/sv.po
index 50487867..0ada7d96 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: NetworkManagerApplet\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-13 01:33+0000\n"
-"PO-Revision-Date: 2016-04-13 12:27+0200\n"
+"POT-Creation-Date: 2016-04-27 01:26+0000\n"
+"PO-Revision-Date: 2016-04-27 12:59+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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:3097
 msgid "Network"
 msgstr "Nätverk"
 
@@ -392,144 +392,144 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1280
+#: ../src/applet.c:1284
 msgid "device not ready (firmware missing)"
 msgstr "enheten är inte redo (fast programvara saknas)"
 
-#: ../src/applet.c:1282
+#: ../src/applet.c:1286
 msgid "device not ready"
 msgstr "enheten är inte redo"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1296 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "frånkopplad"
 
-#: ../src/applet.c:1308
+#: ../src/applet.c:1312
 msgid "Disconnect"
 msgstr "Koppla från"
 
-#: ../src/applet.c:1322
+#: ../src/applet.c:1326
 msgid "device not managed"
 msgstr "enheten hanteras inte"
 
-#: ../src/applet.c:1395
+#: ../src/applet.c:1399
 msgid "No network devices available"
 msgstr "Inga nätverksenheter finns tillgängliga"
 
-#: ../src/applet.c:1449
+#: ../src/applet.c:1453
 msgid "_VPN Connections"
 msgstr "_VPN-anslutningar"
 
-#: ../src/applet.c:1503
+#: ../src/applet.c:1497
 msgid "_Configure VPN..."
 msgstr "_Konfigurera VPN…"
 
-#: ../src/applet.c:1508
-msgid "_Disconnect VPN"
-msgstr "Koppla _från VPN"
+#: ../src/applet.c:1500
+msgid "_Add a VPN connection..."
+msgstr "_Lägg till en VPN-anslutning…"
 
-#: ../src/applet.c:1615
+#: ../src/applet.c:1606
 msgid "NetworkManager is not running..."
 msgstr "Nätverkshanteraren är inte igång…"
 
-#: ../src/applet.c:1620 ../src/applet.c:2612
+#: ../src/applet.c:1611 ../src/applet.c:2603
 msgid "Networking disabled"
 msgstr "Nätverk inaktiverat"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1830
+#: ../src/applet.c:1821
 msgid "Enable _Networking"
 msgstr "Aktivera _nätverk"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1839
+#: ../src/applet.c:1830
 msgid "Enable _Wi-Fi"
 msgstr "A_ktivera trådlöst nätverk"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1848
+#: ../src/applet.c:1839
 msgid "Enable _Mobile Broadband"
 msgstr "Aktivera _mobilt bredband"
 
 #. Toggle notifications item
-#: ../src/applet.c:1860
+#: ../src/applet.c:1851
 msgid "Enable N_otifications"
 msgstr "Aktivera a_viseringar"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1872
+#: ../src/applet.c:1863
 msgid "Connection _Information"
 msgstr "Anslutnings_information"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1880
+#: ../src/applet.c:1871
 msgid "Edit Connections..."
 msgstr "Redigera anslutningar…"
 
-#: ../src/applet.c:1894
+#: ../src/applet.c:1885
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2179
+#: ../src/applet.c:2170
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Du är nu ansluten till ”%s”."
 
-#: ../src/applet.c:2222
+#: ../src/applet.c:2213
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: ../src/applet.c:2223
+#: ../src/applet.c:2214
 msgid "The network connection has been disconnected."
 msgstr "Nätverksanslutningen har kopplats från."
 
-#: ../src/applet.c:2474
+#: ../src/applet.c:2465
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Förbereder nätverksanslutningen ”%s”…"
 
-#: ../src/applet.c:2477
+#: ../src/applet.c:2468
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Användarautentisering krävs för nätverksanslutningen ”%s”…"
 
-#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2471 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Begär en nätverksadress för ”%s”…"
 
-#: ../src/applet.c:2483
+#: ../src/applet.c:2474
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Nätverksanslutningen ”%s” är aktiv"
 
-#: ../src/applet.c:2557
+#: ../src/applet.c:2548
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Startar VPN-anslutningen ”%s”…"
 
-#: ../src/applet.c:2560
+#: ../src/applet.c:2551
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Användarautentisering krävs för VPN-anslutningen ”%s”…"
 
-#: ../src/applet.c:2563
+#: ../src/applet.c:2554
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Begär en VPN-adress för ”%s”…"
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2557
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN-anslutningen ”%s” är aktiv"
+msgid "VPN connection active"
+msgstr "VPN-anslutning aktiv"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2607
 msgid "No network connection"
 msgstr "Ingen nätverksanslutning"
 
-#: ../src/applet.c:3204
+#: ../src/applet.c:3196
 msgid "NetworkManager Applet"
 msgstr "Miniprogram för nätverkshantering"
 
@@ -2386,24 +2386,24 @@ msgstr "Ta bort den markerade anslutningen"
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentisera för att ta bort den markerade anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:929
+#: ../src/connection-editor/nm-connection-list.c:912
 msgid "No VPN plugins are installed."
 msgstr "Inga VPN-insticksmoduler är installerade."
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/nm-connection-list.c:914
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Vet inte hur man skapar ”%s”-anslutningar"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:916
 msgid "Error creating connection"
 msgstr "Fel vid skapande av anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:955
+#: ../src/connection-editor/nm-connection-list.c:938
 msgid "Error editing connection"
 msgstr "Fel vid redigering av anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:956
+#: ../src/connection-editor/nm-connection-list.c:939
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Kunde inte hitta en anslutning med UUID ”%s”"
@@ -3877,6 +3877,9 @@ msgstr "ogiltig wpa-psk: kan inte tolka nyckel med 64 byte som hexadecimal"
 msgid "_Type:"
 msgstr "_Typ:"
 
+#~ msgid "_Disconnect VPN"
+#~ msgstr "Koppla _från VPN"
+
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Nätverkshanteraren för GNOME"
 
diff --git a/src/applet.c b/src/applet.c
index 0fe14e75..72ac5c96 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -1007,8 +1007,6 @@ activate_vpn_cb (GObject *client,
 	g_free (info);
 }
 
-static void nma_menu_disconnect_vpn_item_activate (GtkMenuItem *item, gpointer user_data);
-
 static void
 nma_menu_vpn_item_clicked (GtkMenuItem *item, gpointer user_data)
 {
@@ -1018,23 +1016,22 @@ nma_menu_vpn_item_clicked (GtkMenuItem *item, gpointer user_data)
 	NMActiveConnection *active;
 	NMDevice *device = NULL;
 
-	active = applet_get_default_active_connection (applet, &device);
-	if (!active || !device) {
-		g_warning ("%s: no active connection or device.", __func__);
-		return;
-	}
-
 	connection = NM_CONNECTION (g_object_get_data (G_OBJECT (item), "connection"));
 	if (!connection) {
 		g_warning ("%s: no connection associated with menu item!", __func__);
 		return;
 	}
 
-	if (applet_get_active_for_connection (applet, connection)) {
-		if (INDICATOR_ENABLED (applet))
-			nma_menu_disconnect_vpn_item_activate (item, applet);
+	active = applet_get_active_for_connection (applet, connection);
+	if (active) {
+		/* Connection already active; disconnect it */
+		nm_client_deactivate_connection (applet->nm_client, active, NULL, NULL);
+		return;
+	}
 
-		/* Connection already active; do nothing */
+	active = applet_get_default_active_connection (applet, &device);
+	if (!active || !device) {
+		g_warning ("%s: no active connection or device.", __func__);
 		return;
 	}
 
@@ -1072,11 +1069,34 @@ nma_menu_configure_vpn_item_activate (GtkMenuItem *item, gpointer user_data)
 //	nmi_dbus_signal_user_interface_activated (applet->connection);
 }
 
+/*
+ * nma_menu_add_vpn_item_activate
+ *
+ * Signal function called when user clicks "Add a VPN connection..."
+ *
+ */
+static void
+nma_menu_add_vpn_item_activate (GtkMenuItem *item, gpointer user_data)
+{
+	const char *argv[] = { BINDIR "/nm-connection-editor", "--create", "--type", NM_SETTING_VPN_SETTING_NAME, NULL};
+
+	g_spawn_async (NULL, (gchar **) argv, NULL, 0, NULL, NULL, NULL, NULL);
+}
+
+/*
+ * applet_get_active_vpn_connection:
+ *
+ * Gets a VPN connection along with its state. If there are more, ones that
+ * are not yet fully activated are preferred.
+ *
+ */
 static NMActiveConnection *
-applet_get_first_active_vpn_connection (NMApplet *applet,
+applet_get_active_vpn_connection (NMApplet *applet,
                                         NMVpnConnectionState *out_state)
 {
 	const GPtrArray *active_list;
+	NMActiveConnection *ret = NULL;
+	NMVpnConnectionState state;
 	int i;
 
 	active_list = nm_client_get_active_connections (applet->nm_client);
@@ -1095,34 +1115,18 @@ applet_get_first_active_vpn_connection (NMApplet *applet,
 		g_assert (s_con);
 
 		if (!strcmp (nm_setting_connection_get_connection_type (s_con), NM_SETTING_VPN_SETTING_NAME)) {
-			if (out_state)
-				*out_state = nm_vpn_connection_get_vpn_state (NM_VPN_CONNECTION (candidate));
-			return candidate;
+			ret = candidate;
+			state = nm_vpn_connection_get_vpn_state (NM_VPN_CONNECTION (candidate));
+
+			if (state != NM_VPN_CONNECTION_STATE_ACTIVATED)
+				break;
 		}
 	}
 
-	return NULL;
-}
-
-/*
- * nma_menu_disconnect_vpn_item_activate
- *
- * Signal function called when user clicks "Disconnect VPN"
- *
- */
-static void
-nma_menu_disconnect_vpn_item_activate (GtkMenuItem *item, gpointer user_data)
-{
-	NMApplet *applet = NM_APPLET (user_data);
-	NMActiveConnection *active_vpn = NULL;
-	NMVpnConnectionState state = NM_VPN_CONNECTION_STATE_UNKNOWN;
+	if (ret && out_state)
+		*out_state = state;
 
-	active_vpn = applet_get_first_active_vpn_connection (applet, &state);
-	if (active_vpn)
-		nm_client_deactivate_connection (applet->nm_client, active_vpn, NULL, NULL);
-	else
-		g_warning ("%s: deactivate clicked but no active VPN connection could be found.", __func__);
-//	nmi_dbus_signal_user_interface_activated (applet->connection);
+	return ret;
 }
 
 /*
@@ -1440,7 +1444,7 @@ nma_menu_add_vpn_submenu (GtkWidget *menu, NMApplet *applet)
 	GtkMenu *vpn_menu;
 	GtkMenuItem *item;
 	GPtrArray *list;
-	int i, num_vpn_active = 0;
+	int i;
 
 	nma_menu_add_separator_item (menu);
 
@@ -1454,13 +1458,6 @@ nma_menu_add_vpn_submenu (GtkWidget *menu, NMApplet *applet)
 	list = get_vpn_connections (applet);
 	for (i = 0; i < list->len; i++) {
 		NMConnection *connection = NM_CONNECTION (list->pdata[i]);
-
-		if (applet_get_active_for_connection (applet, connection))
-			num_vpn_active++;
-	}
-
-	for (i = 0; i < list->len; i++) {
-		NMConnection *connection = NM_CONNECTION (list->pdata[i]);
 		NMActiveConnection *active;
 		const char *name;
 		NMState state;
@@ -1480,10 +1477,8 @@ nma_menu_add_vpn_submenu (GtkWidget *menu, NMApplet *applet)
 		    && state != NM_STATE_CONNECTED_SITE
 		    && state != NM_STATE_CONNECTED_GLOBAL)
 			gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
-		else if ((num_vpn_active == 0) || active)
-			gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
 		else
-			gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
+			gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
 
 		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), !!active);
 
@@ -1497,19 +1492,15 @@ nma_menu_add_vpn_submenu (GtkWidget *menu, NMApplet *applet)
 	}
 
 	/* Draw a separator, but only if we have VPN connections above it */
-	if (list->len)
+	if (list->len) {
 		nma_menu_add_separator_item (GTK_WIDGET (vpn_menu));
-
-	item = GTK_MENU_ITEM (gtk_menu_item_new_with_mnemonic (_("_Configure VPN...")));
-	g_signal_connect (item, "activate", G_CALLBACK (nma_menu_configure_vpn_item_activate), applet);
-	gtk_menu_shell_append (GTK_MENU_SHELL (vpn_menu), GTK_WIDGET (item));
-	gtk_widget_show (GTK_WIDGET (item));
-
-	item = GTK_MENU_ITEM (gtk_menu_item_new_with_mnemonic (_("_Disconnect VPN")));
-	g_signal_connect (item, "activate", G_CALLBACK (nma_menu_disconnect_vpn_item_activate), applet);
+		item = GTK_MENU_ITEM (gtk_menu_item_new_with_mnemonic (_("_Configure VPN...")));
+		g_signal_connect (item, "activate", G_CALLBACK (nma_menu_configure_vpn_item_activate), applet);
+	} else {
+		item = GTK_MENU_ITEM (gtk_menu_item_new_with_mnemonic (_("_Add a VPN connection...")));
+		g_signal_connect (item, "activate", G_CALLBACK (nma_menu_add_vpn_item_activate), applet);
+	}
 	gtk_menu_shell_append (GTK_MENU_SHELL (vpn_menu), GTK_WIDGET (item));
-	if (num_vpn_active == 0)
-		gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
 	gtk_widget_show (GTK_WIDGET (item));
 
 	g_ptr_array_unref (list);
@@ -2563,7 +2554,7 @@ get_tip_for_vpn (NMActiveConnection *active, NMVpnConnectionState state, NMApple
 		tip = g_strdup_printf (_("Requesting a VPN address for '%s'..."), id);
 		break;
 	case NM_VPN_CONNECTION_STATE_ACTIVATED:
-		tip = g_strdup_printf (_("VPN connection '%s' active"), id);
+		tip = g_strdup_printf (_("VPN connection active"));
 		break;
 	default:
 		break;
@@ -2628,7 +2619,7 @@ applet_update_icon (gpointer user_data)
 	g_clear_pointer (&icon_name_free, g_free);
 
 	/* VPN state next */
-	active_vpn = applet_get_first_active_vpn_connection (applet, &vpn_state);
+	active_vpn = applet_get_active_vpn_connection (applet, &vpn_state);
 	if (active_vpn) {
 		switch (vpn_state) {
 		case NM_VPN_CONNECTION_STATE_ACTIVATED:
@@ -2904,6 +2895,7 @@ applet_agent_cancel_secrets_cb (AppletAgent *agent,
 		if (req->reqid == request_id) {
 			/* cancel and free this password request */
 			applet_secrets_request_free (req);
+			break;
 		}
 	}
 }
diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c
index c561f666..7f2b3c7c 100644
--- a/src/connection-editor/nm-connection-list.c
+++ b/src/connection-editor/nm-connection-list.c
@@ -836,10 +836,6 @@ NMConnectionList *
 nm_connection_list_new (void)
 {
 	NMConnectionList *list;
-	GtkTreePath *path;
-	GtkTreeIter iter;
-	const GPtrArray *all_cons;
-	int i;
 	GError *error = NULL;
 	const char *objects[] = { "NMConnectionList", NULL };
 
@@ -873,19 +869,6 @@ nm_connection_list_new (void)
 	initialize_treeview (list);
 	add_connection_buttons (list);
 
-	/* Fill the treeview initially */
-	all_cons = nm_client_get_connections (list->client);
-	for (i = 0; i < all_cons->len; i++)
-		connection_added (list->client, all_cons->pdata[i], list);
-
-	if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->sortable), &iter)) {
-		path = gtk_tree_model_get_path (GTK_TREE_MODEL (list->sortable), &iter);
-		gtk_tree_view_scroll_to_cell (list->connection_list,
-		                              path, NULL,
-		                              FALSE, 0, 0);
-		gtk_tree_path_free (path);
-	}
-
 	list->dialog = GTK_WIDGET (gtk_builder_get_object (list->gui, "NMConnectionList"));
 	if (!list->dialog)
 		goto error;
@@ -975,14 +958,31 @@ list_close_cb (GtkDialog *dialog, gpointer user_data)
 void
 nm_connection_list_present (NMConnectionList *list)
 {
+	const GPtrArray *all_cons;
+	GtkTreePath *path;
+	GtkTreeIter iter;
+	int i;
+
 	g_return_if_fail (NM_IS_CONNECTION_LIST (list));
 
-	if (!list->signals_connected) {
+	if (!list->populated) {
+		/* Fill the treeview initially */
+		all_cons = nm_client_get_connections (list->client);
+		for (i = 0; i < all_cons->len; i++)
+			connection_added (list->client, all_cons->pdata[i], list);
+		if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->sortable), &iter)) {
+			path = gtk_tree_model_get_path (GTK_TREE_MODEL (list->sortable), &iter);
+			gtk_tree_view_scroll_to_cell (list->connection_list,
+			                              path, NULL,
+			                              FALSE, 0, 0);
+			gtk_tree_path_free (path);
+		}
+
 		g_signal_connect (G_OBJECT (list->dialog), "response",
 			              G_CALLBACK (list_response_cb), list);
 		g_signal_connect (G_OBJECT (list->dialog), "close",
 			              G_CALLBACK (list_close_cb), list);
-		list->signals_connected = TRUE;
+		list->populated = TRUE;
 	}
 
 	gtk_window_present (GTK_WINDOW (list->dialog));
diff --git a/src/connection-editor/nm-connection-list.h b/src/connection-editor/nm-connection-list.h
index 32cc648d..046f2e3f 100644
--- a/src/connection-editor/nm-connection-list.h
+++ b/src/connection-editor/nm-connection-list.h
@@ -48,7 +48,7 @@ typedef struct {
 	GtkBuilder *gui;
 	GtkWidget *dialog;
 
-	gboolean signals_connected;
+	gboolean populated;
 } NMConnectionList;
 
 typedef struct {