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

Bug#857938: unblock: plasma-nm/4:5.8.6-1



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear release team,

KDE Plasma 5.8 is an LTS release that I consider fit to be updated in stretch. 
This particular request is for plasma-nm 5.8.6.

The changes in the 5.8.6 version include:
 + Translation updates
 + Fix crash caused by notifications use-after-free (a19794a)
 + OpenVPN: Remove previously configured secrets to avoid passing them back
   (30226c5)
 + Set captive portal detection url to http://networkcheck.kde.org (407cb2c
   7defc68)

No changes worth mentioning on the Debian side.

The full debdiff is about 1.1M, almost everything are changes in the po 
files, to avoid sending this to the list I'm attaching a "poless" debdiff 
which is 18K and the upstream gitlog (31K). And I'm making the full debdiff 
available in 
 https://freak.gnuservers.com.ar/~maxy/debian/plasma-nm_5.8.6_unblock

I haven't uploaded plasma-nm 4:5.8.6-1 yet, but I would like to upload it if 
this gets approved.

Please unblock package plasma-nm

Happy hacking,

unblock plasma-nm/4:5.8.6-1

-- System Information:
Debian Release: 9.0
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf

Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)
diff -Nru --exclude po plasma-nm-5.8.4/CMakeLists.txt plasma-nm-5.8.6/CMakeLists.txt
--- plasma-nm-5.8.4/CMakeLists.txt	2016-11-22 11:25:02.000000000 +0100
+++ plasma-nm-5.8.6/CMakeLists.txt	2017-02-21 13:12:15.000000000 +0100
@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 set(QT_MIN_VERSION "5.4.0")
 
-set(PROJECT_VERSION "5.8.4")
+set(PROJECT_VERSION "5.8.6")
 set(PROJECT_VERSION_MAJOR 5)
 set(PLASMANM_VERSION_STRING ${PROJECT_VERSION} )
 
diff -Nru --exclude po plasma-nm-5.8.4/debian/changelog plasma-nm-5.8.6/debian/changelog
--- plasma-nm-5.8.4/debian/changelog	2016-11-23 18:38:04.000000000 +0100
+++ plasma-nm-5.8.6/debian/changelog	2017-03-16 14:15:39.000000000 +0100
@@ -1,3 +1,15 @@
+plasma-nm (4:5.8.6-1) unstable; urgency=medium
+
+  * New upstream release (5.8.6)
+
+ -- Maximiliano Curia <maxy@debian.org>  Thu, 16 Mar 2017 14:15:39 +0100
+
+plasma-nm (4:5.8.5-1) experimental; urgency=medium
+
+  * New upstream release (5.8.5).
+
+ -- Maximiliano Curia <maxy@debian.org>  Fri, 30 Dec 2016 18:46:21 +0100
+
 plasma-nm (4:5.8.4-1) unstable; urgency=medium
 
   * New upstream release (5.8.4)
diff -Nru --exclude po plasma-nm-5.8.4/kded/networkmanagement.notifyrc plasma-nm-5.8.6/kded/networkmanagement.notifyrc
--- plasma-nm-5.8.4/kded/networkmanagement.notifyrc	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/kded/networkmanagement.notifyrc	2017-02-21 13:11:32.000000000 +0100
@@ -614,6 +614,7 @@
 Name[es]=La obtención de claves secretas ha fallado
 Name[et]=Saladuste hankimine nurjus
 Name[fi]=Salaisuuksien saaminen epäonnistui
+Name[fr]=Impossible d'obtenir les informations secrètes
 Name[gl]=Non foi posíbel obter os segredos
 Name[hu]=Nem sikerült megszerezni a titkos adatokat
 Name[ia]=Il falleva obtener secretos
@@ -749,6 +750,7 @@
 Name[es]=Ya no está conectado a una red
 Name[et]=Pole enam võrku ühendatud
 Name[fi]=Ei enää yhteydessä verkkoon
+Name[fr]=Vous n'êtes plus connecté à un réseau
 Name[gl]=Xa non está conectado a unha rede
 Name[he]=לא מחובר יותר לרשת
 Name[it]=Non più connesso a una rete
@@ -780,9 +782,12 @@
 Name[ca]=S'ha detectat un portal captiu
 Name[ca@valencia]=S'ha detectat un portal captiu
 Name[da]=Captive portal detekteret
+Name[de]=Captive-Portal erkannt
 Name[en_GB]=Captive portal detected
 Name[es]=Se ha detectado un portal cautivo
+Name[et]=Tuvastati pääsuleht
 Name[fi]=Verkon kirjautumissivu havaittu
+Name[fr]=Portail captif détecté
 Name[it]=Captive portal rilevato
 Name[ko]=인증 포털 감지됨
 Name[nl]=Vangstportaal gedetecteerd
@@ -792,6 +797,10 @@
 Name[ru]=Обнаружено подключение, требующее дополнительной аутентификации.
 Name[sk]=Zistil sa zajatý portál
 Name[sl]=Zaznan prijavni portal
+Name[sr]=Откривен приступни портал
+Name[sr@ijekavian]=Откривен приступни портал
+Name[sr@ijekavianlatin]=Otkriven pristupni portal
+Name[sr@latin]=Otkriven pristupni portal
 Name[sv]=Captive portal detekterades
 Name[uk]=Виявлено керований портал
 Name[x-test]=xxCaptive portal detectedxx
diff -Nru --exclude po plasma-nm-5.8.4/kded/notification.cpp plasma-nm-5.8.6/kded/notification.cpp
--- plasma-nm-5.8.4/kded/notification.cpp	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/kded/notification.cpp	2017-02-21 13:11:32.000000000 +0100
@@ -344,7 +344,9 @@
         notify->setTitle(identifier);
         notify->setText(text);
         notify->sendEvent();
-        m_notifications[device->uni()] = notify;
+        if (notify->id() != -1) {
+                m_notifications[device->uni()] = notify;
+        }
     }
 }
 
@@ -457,7 +459,9 @@
     notify->setTitle(acName);
     notify->setText(text);
     notify->sendEvent();
-    m_notifications[connectionId] = notify;
+    if (notify->id() != -1) {
+        m_notifications[connectionId] = notify;
+    }
 }
 
 void Notification::onVpnConnectionStateChanged(NetworkManager::VpnConnection::State state, NetworkManager::VpnConnection::StateChangeReason reason)
@@ -531,7 +535,9 @@
     notify->setTitle(vpnName);
     notify->setText(text);
     notify->sendEvent();
-    m_notifications[connectionId] = notify;
+    if (notify->id() != -1) {
+        m_notifications[connectionId] = notify;
+    }
 }
 
 void Notification::notificationClosed()
@@ -598,5 +604,7 @@
     notify->setTitle(i18n("No Network Connection"));
     notify->setText(i18n("You are no longer connected to a network."));
     notify->sendEvent();
-    m_notifications[uni] = notify;
+    if (notify->id() != -1) {
+        m_notifications[uni] = notify;
+    }
 }
diff -Nru --exclude po plasma-nm-5.8.4/kded/portalmonitor.cpp plasma-nm-5.8.6/kded/portalmonitor.cpp
--- plasma-nm-5.8.4/kded/portalmonitor.cpp	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/kded/portalmonitor.cpp	2017-02-21 13:11:32.000000000 +0100
@@ -57,7 +57,7 @@
         notification->setText(i18n("You need to log in to this network"));
         notification->sendEvent();
         connect(notification, &KNotification::action1Activated, this, [] () {
-            QDesktopServices::openUrl(QUrl("https://kde.org";));
+            QDesktopServices::openUrl(QUrl("http://networkcheck.kde.org";));
         });
     }
 }
diff -Nru --exclude po plasma-nm-5.8.4/vpn/l2tp/plasmanetworkmanagement_l2tpui.desktop plasma-nm-5.8.6/vpn/l2tp/plasmanetworkmanagement_l2tpui.desktop
--- plasma-nm-5.8.4/vpn/l2tp/plasmanetworkmanagement_l2tpui.desktop	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/vpn/l2tp/plasmanetworkmanagement_l2tpui.desktop	2017-02-21 13:11:32.000000000 +0100
@@ -22,6 +22,7 @@
 Name[es]=Protocolo de túneles de capa 2 (L2TP)
 Name[et]=Layer 2 Tunneling Protocol (L2TP)
 Name[fi]=Tason 2 tunnelointiyhteyskäytäntö (L2TP)
+Name[fr]=Protocole tunnel niveau 2 (L2TP)
 Name[gl]=Protocolo de canalización da segunda capa (L2TP)
 Name[it]=Layer 2 Tunneling Protocol (L2TP)
 Name[ko]=레이어 2 터널링 프로토콜(L2TP)
@@ -53,6 +54,7 @@
 Comment[es]=Compatible con servidores VPN de L2TP
 Comment[et]=Ühildub L2TP VPN-serveritega
 Comment[fi]=Yhteensopiva L2TP-VPN-palvelinten kanssa
+Comment[fr]=Compatible avec les serveurs VPN L2TP
 Comment[gl]=Compatíbel con servidores de VPN que usen L2TP.
 Comment[he]=תאימות עם שרתי  L2TP VPN
 Comment[it]=Compatibile con i server VPN L2TP
diff -Nru --exclude po plasma-nm-5.8.4/vpn/openconnect/plasmanetworkmanagement_openconnectui.desktop plasma-nm-5.8.6/vpn/openconnect/plasmanetworkmanagement_openconnectui.desktop
--- plasma-nm-5.8.4/vpn/openconnect/plasmanetworkmanagement_openconnectui.desktop	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/vpn/openconnect/plasmanetworkmanagement_openconnectui.desktop	2017-02-21 13:11:32.000000000 +0100
@@ -23,6 +23,7 @@
 Name[es]=VPN compatible con Cisco AnyConnect (openconnect)
 Name[et]=Cisco AnyConnectiga ühilduv VPN (openconnect)
 Name[fi]=Cisco AnyConnect -yhteensopiva VPN (openconnect)
+Name[fr]=VPN compatible Cisco AnyConnect (openconnect)
 Name[gl]=VPN compatíbel con Cisco AnyConnect (openconnect)
 Name[it]=VPN compatibile Cisco AnyConnect (openconnect)
 Name[ko]=Cisco AnyConnect 호환 VPN(openconnect)
@@ -54,6 +55,7 @@
 Comment[es]=VPN compatible con Cisco AnyConnect SSL
 Comment[et]=Ühildub Cisco AnyConnect SSL VPN-iga
 Comment[fi]=Yhteensopiva Cisco Anyconnect -SSL-VPN:n kanssa
+Comment[fr]=Compatible avec les VPN SSL Cisco AnyConnect
 Comment[gl]=Compatíbel con servidores VPN de Cisco AnyConnect que usen SSL.
 Comment[he]=תאימות עם Cisco AnyConnect SSL VPN
 Comment[it]=Compatibile con Cisco AnyConnect SSL VPN
diff -Nru --exclude po plasma-nm-5.8.4/vpn/openswan/plasmanetworkmanagement_openswanui.desktop plasma-nm-5.8.6/vpn/openswan/plasmanetworkmanagement_openswanui.desktop
--- plasma-nm-5.8.4/vpn/openswan/plasmanetworkmanagement_openswanui.desktop	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/vpn/openswan/plasmanetworkmanagement_openswanui.desktop	2017-02-21 13:11:32.000000000 +0100
@@ -24,6 +24,7 @@
 Name[es]=VPN basada en IPsec (openswan)
 Name[et]=IPseci põhine VPN (openswan)
 Name[fi]=IPsec-pohjainen VPN (openswan)
+Name[fr]=VPN utilisant IPsec (openswan)
 Name[gl]=VPN baseada en IPsec (openswan)
 Name[it]=VPN basata su IPsec (openswan)
 Name[ko]=IPSec 기반 VPN(openswan)
@@ -54,6 +55,7 @@
 Comment[es]=VPN basada en IPsec, IKEv1 e IKEv2
 Comment[et]=IPsec, IKEv1, IKEv2 põhine VPN
 Comment[fi]=IPsec-, IKEv1-, IKEv2-pohjainen VPN
+Comment[fr]=VPN utilisant IPsec, IKEv1, IKEv2
 Comment[gl]=VPN baseada en IPsec, IKEv1 e IKEv2.
 Comment[it]=VPN basata su IPsec, IKEv1, IKEv2
 Comment[ko]=IPSec, IKEv1, IKEv2 기반 VPN
diff -Nru --exclude po plasma-nm-5.8.4/vpn/openvpn/openvpnwidget.cpp plasma-nm-5.8.6/vpn/openvpn/openvpnwidget.cpp
--- plasma-nm-5.8.4/vpn/openvpn/openvpnwidget.cpp	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/vpn/openvpn/openvpnwidget.cpp	2017-02-21 13:11:32.000000000 +0100
@@ -196,6 +196,8 @@
         // key password
         if (!d->ui.x509KeyPassword->text().isEmpty()) {
             secretData.insert(QLatin1String(NM_OPENVPN_KEY_CERTPASS), d->ui.x509KeyPassword->text());
+        } else {
+            secretData.remove(QLatin1String(NM_OPENVPN_KEY_CERTPASS));
         }
         handleOnePasswordType(d->ui.x509KeyPassword, QLatin1String(NM_OPENVPN_KEY_CERTPASS"-flags"), data);
         break;
@@ -221,10 +223,14 @@
         // username
         if (!d->ui.passUserName->text().isEmpty()) {
             data.insert(QLatin1String(NM_OPENVPN_KEY_USERNAME), d->ui.passUserName->text());
+        } else {
+            data.remove(QLatin1String(NM_OPENVPN_KEY_USERNAME));
         }
         // password
         if (!d->ui.passPassword->text().isEmpty()) {
-            secretData.insert(QLatin1String(NM_OPENVPN_KEY_PASSWORD ), d->ui.passPassword->text());
+            secretData.insert(QLatin1String(NM_OPENVPN_KEY_PASSWORD), d->ui.passPassword->text());
+        } else {
+            secretData.remove(QLatin1String(NM_OPENVPN_KEY_PASSWORD));
         }
         handleOnePasswordType(d->ui.passPassword, QLatin1String(NM_OPENVPN_KEY_PASSWORD"-flags"), data);
         // ca
@@ -235,6 +241,8 @@
         // username
         if (!d->ui.x509PassUsername->text().isEmpty()) {
             data.insert(QLatin1String(NM_OPENVPN_KEY_USERNAME), d->ui.x509PassUsername->text());
+        } else {
+            data.remove(QLatin1String(NM_OPENVPN_KEY_USERNAME));
         }
         // ca
         data.insert(QLatin1String(NM_OPENVPN_KEY_CA), d->ui.x509PassCaFile->url().toLocalFile());
@@ -245,11 +253,15 @@
         // key password
         if (!d->ui.x509PassKeyPassword->text().isEmpty()) {
             secretData.insert(QLatin1String(NM_OPENVPN_KEY_CERTPASS), d->ui.x509PassKeyPassword->text());
+        } else {
+            secretData.remove(QLatin1String(NM_OPENVPN_KEY_CERTPASS));
         }
         handleOnePasswordType(d->ui.x509PassKeyPassword, QLatin1String(NM_OPENVPN_KEY_CERTPASS"-flags"), data);
         // password
         if (!d->ui.x509PassPassword->text().isEmpty()) {
             secretData.insert(QLatin1String(NM_OPENVPN_KEY_PASSWORD), d->ui.x509PassPassword->text());
+        } else {
+            secretData.remove(QLatin1String(NM_OPENVPN_KEY_PASSWORD));
         }
         handleOnePasswordType(d->ui.x509PassPassword, QLatin1String(NM_OPENVPN_KEY_PASSWORD"-flags"), data);
         break;
diff -Nru --exclude po plasma-nm-5.8.4/vpn/openvpn/plasmanetworkmanagement_openvpnui.desktop plasma-nm-5.8.6/vpn/openvpn/plasmanetworkmanagement_openvpnui.desktop
--- plasma-nm-5.8.4/vpn/openvpn/plasmanetworkmanagement_openvpnui.desktop	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/vpn/openvpn/plasmanetworkmanagement_openvpnui.desktop	2017-02-21 13:11:32.000000000 +0100
@@ -68,6 +68,7 @@
 Comment[es]=Compatible con el servidor de OpenVPN
 Comment[et]=Ühildub OpenVPN-serveritega
 Comment[fi]=Yhteensopiva OpenVPN-palvelimen kanssa
+Comment[fr]=Compatible avec le serveur OpenVPN
 Comment[gl]=Compatíbel con servidores OpenVPN.
 Comment[he]=תואימות עם שרתי OpenVPN
 Comment[it]=Compatibile con il server OpenVPN
diff -Nru --exclude po plasma-nm-5.8.4/vpn/pptp/plasmanetworkmanagement_pptpui.desktop plasma-nm-5.8.6/vpn/pptp/plasmanetworkmanagement_pptpui.desktop
--- plasma-nm-5.8.4/vpn/pptp/plasmanetworkmanagement_pptpui.desktop	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/vpn/pptp/plasmanetworkmanagement_pptpui.desktop	2017-02-21 13:11:32.000000000 +0100
@@ -22,6 +22,7 @@
 Name[es]=Protocolo de túneles punto a punto (PPTP)
 Name[et]=Point-to-Point Tunneling Protocol (PPTP)
 Name[fi]=Point-to-Point-tunnelointiyhteyskäytäntö (PPTP)
+Name[fr]=Protocole de tunnel point à point (PPTP)
 Name[gl]=Protocolo de canalización punto a punto (PPTP)
 Name[it]=Point-to-Point Tunneling Protocol (PPTP)
 Name[ko]=지점 대 지점 터널링 프로토콜(PPTP)
@@ -52,6 +53,7 @@
 Comment[es]=Compatible con Microsoft y otros servidores PPTP VPN
 Comment[et]=Ühildub Microsofti ja teiste PPTP VPN-serveritega
 Comment[fi]=Yhteensopiva Microsoftin ja muiden PPTP-VPN-palvelinten kanssa
+Comment[fr]=Compatible avec les serveurs Microsoft et autres VPN PPTP
 Comment[gl]=Compatíbel con servidores de VPN de Microsoft e outros servidores de VPN que usen PPTP.
 Comment[he]=תאימות עם שרתי מיקרוסופט המשתמשים ב־PPTP VPN
 Comment[it]=Compatibile con Microsoft e altri server VPN PPTP
diff -Nru --exclude po plasma-nm-5.8.4/vpn/ssh/plasmanetworkmanagement_sshui.desktop plasma-nm-5.8.6/vpn/ssh/plasmanetworkmanagement_sshui.desktop
--- plasma-nm-5.8.4/vpn/ssh/plasmanetworkmanagement_sshui.desktop	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/vpn/ssh/plasmanetworkmanagement_sshui.desktop	2017-02-21 13:11:32.000000000 +0100
@@ -25,6 +25,7 @@
 Name[es]=SSH
 Name[et]=SSH
 Name[fi]=SSH
+Name[fr]=SSH
 Name[gl]=SSH
 Name[it]=SSH
 Name[ko]=SSH
@@ -59,6 +60,7 @@
 Comment[es]=Compatible con el servidor SSH
 Comment[et]=Ühildub SSH-serveritega
 Comment[fi]=Yhteensopiva SSH-palvelimen kanssa
+Comment[fr]=Compatible avec le serveur SSH
 Comment[gl]=Compatíbel con servidores de SSH.
 Comment[he]=תאימות עם שרתי SSL
 Comment[it]=Compatibile con il server SSH
diff -Nru --exclude po plasma-nm-5.8.4/vpn/sstp/plasmanetworkmanagement_sstpui.desktop plasma-nm-5.8.6/vpn/sstp/plasmanetworkmanagement_sstpui.desktop
--- plasma-nm-5.8.4/vpn/sstp/plasmanetworkmanagement_sstpui.desktop	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/vpn/sstp/plasmanetworkmanagement_sstpui.desktop	2017-02-21 13:11:32.000000000 +0100
@@ -23,6 +23,7 @@
 Name[es]=Protocolo de túneles de conexiones seguras (SSTP)
 Name[et]=Secure Socket Tunneling Protocol (SSTP)
 Name[fi]=Secure Socket -tunnelointiyhteyskäytäntö (SSTP)
+Name[fr]=Protocole tunnel socket sécurisé (SSTP)
 Name[gl]=Protocolo de canalización de sócket seguro (SSTP)
 Name[it]=Secure Socket Tunneling Protocol (SSTP)
 Name[ko]=보안 소켓 터널링 프로토콜(SSTP)
@@ -53,6 +54,7 @@
 Comment[es]=Compatible con Microsoft y otros servidores SSTP VPN
 Comment[et]=Ühildub Microsofti ja teiste SSTP VPN-serveritega
 Comment[fi]=Yhteensopiva Microsoftin ja muiden SSTP-VPN-palvelinten kanssa
+Comment[fr]=Compatible avec les serveurs Microsoft et autres VPN SSTP
 Comment[gl]=Compatíbel con servidores de VPN de Microsoft e outros servidores de VPN que usen SSTP.
 Comment[it]=Compatibile con server VPN SSTP di Microsoft e altri
 Comment[ko]=Microsoft 및 기타 SSTP VPN 서버와 호환됨
diff -Nru --exclude po plasma-nm-5.8.4/vpn/strongswan/plasmanetworkmanagement_strongswanui.desktop plasma-nm-5.8.6/vpn/strongswan/plasmanetworkmanagement_strongswanui.desktop
--- plasma-nm-5.8.4/vpn/strongswan/plasmanetworkmanagement_strongswanui.desktop	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/vpn/strongswan/plasmanetworkmanagement_strongswanui.desktop	2017-02-21 13:11:32.000000000 +0100
@@ -24,6 +24,7 @@
 Name[es]=VPN basada en IPsec (strongswan)
 Name[et]=IPseci põhine VPN (strongswan)
 Name[fi]=IPsec-pohjainen VPN (strongswan)
+Name[fr]=VPN utilisant IPsec (strongswan)
 Name[gl]=VPN baseada en IPsec (strongswan)
 Name[it]=VPN basata su IPsec (strongswan)
 Name[ko]=IPSec 기반 VPN(strongswan)
@@ -54,6 +55,7 @@
 Comment[es]=VPN basada en IPsec, IKEv1 e IKEv2
 Comment[et]=IPsec, IKEv1, IKEv2 põhine VPN
 Comment[fi]=IPsec-, IKEv1-, IKEv2-pohjainen VPN
+Comment[fr]=VPN utilisant IPsec, IKEv1, IKEv2
 Comment[gl]=VPN baseada en IPsec, IKEv1 e IKEv2.
 Comment[it]=VPN basata su IPsec, IKEv1, IKEv2
 Comment[ko]=IPSec, IKEv1, IKEv2 기반 VPN
diff -Nru --exclude po plasma-nm-5.8.4/vpn/vpnc/plasmanetworkmanagement_vpncui.desktop plasma-nm-5.8.6/vpn/vpnc/plasmanetworkmanagement_vpncui.desktop
--- plasma-nm-5.8.4/vpn/vpnc/plasmanetworkmanagement_vpncui.desktop	2016-11-22 11:24:11.000000000 +0100
+++ plasma-nm-5.8.6/vpn/vpnc/plasmanetworkmanagement_vpncui.desktop	2017-02-21 13:11:32.000000000 +0100
@@ -23,6 +23,7 @@
 Name[es]=VPN compatible con Cisco (vpnc)
 Name[et]=Ciscoga ühilduv VPN (vpnc)
 Name[fi]=Cisco-yhteensopiva VPN (vpnc)
+Name[fr]=VPN compatible Cisco (vpnc)
 Name[gl]=VPN compatíbel con Cisco (vpnc)
 Name[it]=VPN compatibile Cisco (vpnc)
 Name[ko]=Cisco 호환 VPN(vpnc)
@@ -54,6 +55,7 @@
 Comment[es]=Compatible con diversas puertas de enlace VPN de Cisco, Juniper, Netscreen y Sonicwall basadas en IPsec
 Comment[et]=Ühildub erinevate Cisco, Juniperi, Netscreeni ja Sonicwalli IPseci põhiste VPN-lüüsidega
 Comment[fi]=Yhteensopiva Ciscon, Juniperin, Netscreenin ja Sonicwallin eri IPsec-pohjaisten VPN-yhdyskäytävien kanssa
+Comment[fr]=Compatible avec diverses passerelles VPN Cisco, Juniper, Netscreen et Sonicwall utilisant IPsec
 Comment[gl]=Compatíbel coas seguintes pasarelas de VPN baseadas en IPsec: Cisco, Juniper, Netscreen e Sonicwall.
 Comment[it]=Compatibile con diversi gateway VPN Cisco, Juniper, Netscreen e Sonicwall basati su IPsec
 Comment[ko]=Cisco, Juniper, Netscreen, Sonicwall IPSec 기반 VPN 게이트웨이와 호환됨
commit 2b105c960827acb8fd444b2cd4dd54503d36575c
Author: Jonathan Riddell <jr@jriddell.org>
Date:   Tue Feb 21 11:46:16 2017 +0000

    Update version number for 5.8.6
    GIT_SILENT

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 752f3d77..62a81f8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(plasma-networkmanagement)
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 set(QT_MIN_VERSION "5.4.0")
 
-set(PROJECT_VERSION "5.8.5")
+set(PROJECT_VERSION "5.8.6")
 set(PROJECT_VERSION_MAJOR 5)
 set(PLASMANM_VERSION_STRING ${PROJECT_VERSION} )
 

commit a19794a3efd4642a9475753bef034a3f5ee6602b
Author: Dmitry Osipenko <digetx@gmail.com>
Date:   Fri Jan 20 18:38:41 2017 +0300

    Fix crash caused by notifications use-after-free
    
    The KNotification could be deferenced on sendEvent(), so additional checks
    are required.

diff --git a/kded/notification.cpp b/kded/notification.cpp
index daf9be83..4612073f 100644
--- a/kded/notification.cpp
+++ b/kded/notification.cpp
@@ -344,7 +344,9 @@ void Notification::stateChanged(NetworkManager::Device::State newstate, NetworkM
         notify->setTitle(identifier);
         notify->setText(text);
         notify->sendEvent();
-        m_notifications[device->uni()] = notify;
+        if (notify->id() != -1) {
+                m_notifications[device->uni()] = notify;
+        }
     }
 }
 
@@ -457,7 +459,9 @@ void Notification::onActiveConnectionStateChanged(NetworkManager::ActiveConnecti
     notify->setTitle(acName);
     notify->setText(text);
     notify->sendEvent();
-    m_notifications[connectionId] = notify;
+    if (notify->id() != -1) {
+        m_notifications[connectionId] = notify;
+    }
 }
 
 void Notification::onVpnConnectionStateChanged(NetworkManager::VpnConnection::State state, NetworkManager::VpnConnection::StateChangeReason reason)
@@ -531,7 +535,9 @@ void Notification::onVpnConnectionStateChanged(NetworkManager::VpnConnection::St
     notify->setTitle(vpnName);
     notify->setText(text);
     notify->sendEvent();
-    m_notifications[connectionId] = notify;
+    if (notify->id() != -1) {
+        m_notifications[connectionId] = notify;
+    }
 }
 
 void Notification::notificationClosed()
@@ -598,5 +604,7 @@ void Notification::onCheckActiveConnectionOnResume()
     notify->setTitle(i18n("No Network Connection"));
     notify->setText(i18n("You are no longer connected to a network."));
     notify->sendEvent();
-    m_notifications[uni] = notify;
+    if (notify->id() != -1) {
+        m_notifications[uni] = notify;
+    }
 }

commit 30226c538ff9b0c1e353a9303b873548ca3dfbff
Author: Jan Grulich <jgrulich@redhat.com>
Date:   Tue Jan 17 11:46:55 2017 +0100

    OpenVPN: Remove previously configured secrets to avoid passing them back
    
    BUG:375170

diff --git a/vpn/openvpn/openvpnwidget.cpp b/vpn/openvpn/openvpnwidget.cpp
index 52418832..cebaa01b 100644
--- a/vpn/openvpn/openvpnwidget.cpp
+++ b/vpn/openvpn/openvpnwidget.cpp
@@ -196,6 +196,8 @@ QVariantMap OpenVpnSettingWidget::setting() const
         // key password
         if (!d->ui.x509KeyPassword->text().isEmpty()) {
             secretData.insert(QLatin1String(NM_OPENVPN_KEY_CERTPASS), d->ui.x509KeyPassword->text());
+        } else {
+            secretData.remove(QLatin1String(NM_OPENVPN_KEY_CERTPASS));
         }
         handleOnePasswordType(d->ui.x509KeyPassword, QLatin1String(NM_OPENVPN_KEY_CERTPASS"-flags"), data);
         break;
@@ -221,10 +223,14 @@ QVariantMap OpenVpnSettingWidget::setting() const
         // username
         if (!d->ui.passUserName->text().isEmpty()) {
             data.insert(QLatin1String(NM_OPENVPN_KEY_USERNAME), d->ui.passUserName->text());
+        } else {
+            data.remove(QLatin1String(NM_OPENVPN_KEY_USERNAME));
         }
         // password
         if (!d->ui.passPassword->text().isEmpty()) {
-            secretData.insert(QLatin1String(NM_OPENVPN_KEY_PASSWORD ), d->ui.passPassword->text());
+            secretData.insert(QLatin1String(NM_OPENVPN_KEY_PASSWORD), d->ui.passPassword->text());
+        } else {
+            secretData.remove(QLatin1String(NM_OPENVPN_KEY_PASSWORD));
         }
         handleOnePasswordType(d->ui.passPassword, QLatin1String(NM_OPENVPN_KEY_PASSWORD"-flags"), data);
         // ca
@@ -235,6 +241,8 @@ QVariantMap OpenVpnSettingWidget::setting() const
         // username
         if (!d->ui.x509PassUsername->text().isEmpty()) {
             data.insert(QLatin1String(NM_OPENVPN_KEY_USERNAME), d->ui.x509PassUsername->text());
+        } else {
+            data.remove(QLatin1String(NM_OPENVPN_KEY_USERNAME));
         }
         // ca
         data.insert(QLatin1String(NM_OPENVPN_KEY_CA), d->ui.x509PassCaFile->url().toLocalFile());
@@ -245,11 +253,15 @@ QVariantMap OpenVpnSettingWidget::setting() const
         // key password
         if (!d->ui.x509PassKeyPassword->text().isEmpty()) {
             secretData.insert(QLatin1String(NM_OPENVPN_KEY_CERTPASS), d->ui.x509PassKeyPassword->text());
+        } else {
+            secretData.remove(QLatin1String(NM_OPENVPN_KEY_CERTPASS));
         }
         handleOnePasswordType(d->ui.x509PassKeyPassword, QLatin1String(NM_OPENVPN_KEY_CERTPASS"-flags"), data);
         // password
         if (!d->ui.x509PassPassword->text().isEmpty()) {
             secretData.insert(QLatin1String(NM_OPENVPN_KEY_PASSWORD), d->ui.x509PassPassword->text());
+        } else {
+            secretData.remove(QLatin1String(NM_OPENVPN_KEY_PASSWORD));
         }
         handleOnePasswordType(d->ui.x509PassPassword, QLatin1String(NM_OPENVPN_KEY_PASSWORD"-flags"), data);
         break;

commit c16df241abb875e00c796d14da4ee1313bc245e3
Author: l10n daemon script <scripty@kde.org>
Date:   Thu Jan 12 08:05:51 2017 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/kded/networkmanagement.notifyrc b/kded/networkmanagement.notifyrc
index c390ffb7..20a4389b 100644
--- a/kded/networkmanagement.notifyrc
+++ b/kded/networkmanagement.notifyrc
@@ -782,6 +782,7 @@ Name=Captive portal detected
 Name[ca]=S'ha detectat un portal captiu
 Name[ca@valencia]=S'ha detectat un portal captiu
 Name[da]=Captive portal detekteret
+Name[de]=Captive-Portal erkannt
 Name[en_GB]=Captive portal detected
 Name[es]=Se ha detectado un portal cautivo
 Name[et]=Tuvastati pääsuleht

commit 3799e113ab0698febd95eba547ab90d89a245185
Author: l10n daemon script <scripty@kde.org>
Date:   Thu Jan 12 07:38:09 2017 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/kded/networkmanagement.notifyrc b/kded/networkmanagement.notifyrc
index 20a4389b..c390ffb7 100644
--- a/kded/networkmanagement.notifyrc
+++ b/kded/networkmanagement.notifyrc
@@ -782,7 +782,6 @@ Name=Captive portal detected
 Name[ca]=S'ha detectat un portal captiu
 Name[ca@valencia]=S'ha detectat un portal captiu
 Name[da]=Captive portal detekteret
-Name[de]=Captive-Portal erkannt
 Name[en_GB]=Captive portal detected
 Name[es]=Se ha detectado un portal cautivo
 Name[et]=Tuvastati pääsuleht

commit 87ea9985685f70d0af6500029c6924e6fd3c9d2b
Author: l10n daemon script <scripty@kde.org>
Date:   Wed Jan 11 08:00:07 2017 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/kded/networkmanagement.notifyrc b/kded/networkmanagement.notifyrc
index c390ffb7..20a4389b 100644
--- a/kded/networkmanagement.notifyrc
+++ b/kded/networkmanagement.notifyrc
@@ -782,6 +782,7 @@ Name=Captive portal detected
 Name[ca]=S'ha detectat un portal captiu
 Name[ca@valencia]=S'ha detectat un portal captiu
 Name[da]=Captive portal detekteret
+Name[de]=Captive-Portal erkannt
 Name[en_GB]=Captive portal detected
 Name[es]=Se ha detectado un portal cautivo
 Name[et]=Tuvastati pääsuleht

commit 55cb636f74ad94a1a2fdcac027c4f65ba61b7a58
Author: l10n daemon script <scripty@kde.org>
Date:   Wed Jan 11 07:32:15 2017 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/kded/networkmanagement.notifyrc b/kded/networkmanagement.notifyrc
index 20a4389b..c390ffb7 100644
--- a/kded/networkmanagement.notifyrc
+++ b/kded/networkmanagement.notifyrc
@@ -782,7 +782,6 @@ Name=Captive portal detected
 Name[ca]=S'ha detectat un portal captiu
 Name[ca@valencia]=S'ha detectat un portal captiu
 Name[da]=Captive portal detekteret
-Name[de]=Captive-Portal erkannt
 Name[en_GB]=Captive portal detected
 Name[es]=Se ha detectado un portal cautivo
 Name[et]=Tuvastati pääsuleht

commit 7244120cbf8c417e733990e6d5c947efca7873fb
Author: l10n daemon script <scripty@kde.org>
Date:   Tue Jan 10 14:54:48 2017 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/kded/networkmanagement.notifyrc b/kded/networkmanagement.notifyrc
index c390ffb7..20a4389b 100644
--- a/kded/networkmanagement.notifyrc
+++ b/kded/networkmanagement.notifyrc
@@ -782,6 +782,7 @@ Name=Captive portal detected
 Name[ca]=S'ha detectat un portal captiu
 Name[ca@valencia]=S'ha detectat un portal captiu
 Name[da]=Captive portal detekteret
+Name[de]=Captive-Portal erkannt
 Name[en_GB]=Captive portal detected
 Name[es]=Se ha detectado un portal cautivo
 Name[et]=Tuvastati pääsuleht

commit 416d4377440870fb3474313b08617bf45c188abb
Author: l10n daemon script <scripty@kde.org>
Date:   Tue Jan 10 14:27:55 2017 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/kded/networkmanagement.notifyrc b/kded/networkmanagement.notifyrc
index 20a4389b..c390ffb7 100644
--- a/kded/networkmanagement.notifyrc
+++ b/kded/networkmanagement.notifyrc
@@ -782,7 +782,6 @@ Name=Captive portal detected
 Name[ca]=S'ha detectat un portal captiu
 Name[ca@valencia]=S'ha detectat un portal captiu
 Name[da]=Captive portal detekteret
-Name[de]=Captive-Portal erkannt
 Name[en_GB]=Captive portal detected
 Name[es]=Se ha detectado un portal cautivo
 Name[et]=Tuvastati pääsuleht

commit dc9b974b8acb8e6347c50cf4d74526fa7df726fe
Author: l10n daemon script <scripty@kde.org>
Date:   Mon Jan 9 08:11:47 2017 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/kded/networkmanagement.notifyrc b/kded/networkmanagement.notifyrc
index c390ffb7..20a4389b 100644
--- a/kded/networkmanagement.notifyrc
+++ b/kded/networkmanagement.notifyrc
@@ -782,6 +782,7 @@ Name=Captive portal detected
 Name[ca]=S'ha detectat un portal captiu
 Name[ca@valencia]=S'ha detectat un portal captiu
 Name[da]=Captive portal detekteret
+Name[de]=Captive-Portal erkannt
 Name[en_GB]=Captive portal detected
 Name[es]=Se ha detectado un portal cautivo
 Name[et]=Tuvastati pääsuleht

commit ab46b15133a2f3aac9d491767fc46e2a4660f42f
Author: l10n daemon script <scripty@kde.org>
Date:   Mon Jan 9 07:44:06 2017 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/kded/networkmanagement.notifyrc b/kded/networkmanagement.notifyrc
index 20a4389b..c390ffb7 100644
--- a/kded/networkmanagement.notifyrc
+++ b/kded/networkmanagement.notifyrc
@@ -782,7 +782,6 @@ Name=Captive portal detected
 Name[ca]=S'ha detectat un portal captiu
 Name[ca@valencia]=S'ha detectat un portal captiu
 Name[da]=Captive portal detekteret
-Name[de]=Captive-Portal erkannt
 Name[en_GB]=Captive portal detected
 Name[es]=Se ha detectado un portal cautivo
 Name[et]=Tuvastati pääsuleht

commit 806eec7c289229f1ceaf9f774bf2a4743fdbfd15
Author: l10n daemon script <scripty@kde.org>
Date:   Sun Jan 8 08:28:41 2017 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/kded/networkmanagement.notifyrc b/kded/networkmanagement.notifyrc
index c390ffb7..20a4389b 100644
--- a/kded/networkmanagement.notifyrc
+++ b/kded/networkmanagement.notifyrc
@@ -782,6 +782,7 @@ Name=Captive portal detected
 Name[ca]=S'ha detectat un portal captiu
 Name[ca@valencia]=S'ha detectat un portal captiu
 Name[da]=Captive portal detekteret
+Name[de]=Captive-Portal erkannt
 Name[en_GB]=Captive portal detected
 Name[es]=Se ha detectado un portal cautivo
 Name[et]=Tuvastati pääsuleht

commit 407cb2cffaf628af2ccd447ca12a582a6e592674
Author: Jan Grulich <jgrulich@redhat.com>
Date:   Mon Jan 2 09:04:04 2017 +0100

    Use KDE specific page for captive portal redirection
    
    BUG:374026

diff --git a/kded/portalmonitor.cpp b/kded/portalmonitor.cpp
index 4356753c..7dca60f7 100644
--- a/kded/portalmonitor.cpp
+++ b/kded/portalmonitor.cpp
@@ -57,7 +57,7 @@ void PortalMonitor::connectivityChanged(NetworkManager::Connectivity connectivit
         notification->setText(i18n("You need to log in to this network"));
         notification->sendEvent();
         connect(notification, &KNotification::action1Activated, this, [] () {
-            QDesktopServices::openUrl(QUrl("http://kde.org";));
+            QDesktopServices::openUrl(QUrl("http://networkcheck.kde.org";));
         });
     }
 }

commit b6d0a5861bfe849f76a7864cc5310b4fd0ef9837
Author: Jonathan Riddell <jr@jriddell.org>
Date:   Tue Dec 27 09:29:15 2016 +0000

    Update version number for 5.8.5
    GIT_SILENT

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4a49ca0..752f3d77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(plasma-networkmanagement)
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 set(QT_MIN_VERSION "5.4.0")
 
-set(PROJECT_VERSION "5.8.4")
+set(PROJECT_VERSION "5.8.5")
 set(PROJECT_VERSION_MAJOR 5)
 set(PLASMANM_VERSION_STRING ${PROJECT_VERSION} )
 

commit 7defc68b673b0e0718081f828cf9f6a06b6b9f33
Author: Jan Grulich <jgrulich@redhat.com>
Date:   Thu Dec 22 09:24:38 2016 +0100

    Some captive portals seems to have problem redirecting from https
    
    BUG:374026

diff --git a/kded/portalmonitor.cpp b/kded/portalmonitor.cpp
index 86fbfd9b..4356753c 100644
--- a/kded/portalmonitor.cpp
+++ b/kded/portalmonitor.cpp
@@ -57,7 +57,7 @@ void PortalMonitor::connectivityChanged(NetworkManager::Connectivity connectivit
         notification->setText(i18n("You need to log in to this network"));
         notification->sendEvent();
         connect(notification, &KNotification::action1Activated, this, [] () {
-            QDesktopServices::openUrl(QUrl("https://kde.org";));
+            QDesktopServices::openUrl(QUrl("http://kde.org";));
         });
     }
 }

commit f50334e4e1e57e56c2f0b972d5174af8580caa04
Author: l10n daemon script <scripty@kde.org>
Date:   Fri Dec 9 05:12:11 2016 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/kded/networkmanagement.notifyrc b/kded/networkmanagement.notifyrc
index b138b063..c390ffb7 100644
--- a/kded/networkmanagement.notifyrc
+++ b/kded/networkmanagement.notifyrc
@@ -784,6 +784,7 @@ Name[ca@valencia]=S'ha detectat un portal captiu
 Name[da]=Captive portal detekteret
 Name[en_GB]=Captive portal detected
 Name[es]=Se ha detectado un portal cautivo
+Name[et]=Tuvastati pääsuleht
 Name[fi]=Verkon kirjautumissivu havaittu
 Name[fr]=Portail captif détecté
 Name[it]=Captive portal rilevato

commit 2180f3582a0844404a8edad56daa6d0b5a4b151e
Author: Jan Grulich <jgrulich@redhat.com>
Date:   Wed Dec 7 14:20:52 2016 +0100

    Revert "Pass protocol type to openconnect"
    
    Openconnect Juniper support is in master only
    
    This reverts commit a51e9c5c2a2c32ef8d2f354af33532cbc35bfa9e.

diff --git a/vpn/openconnect/openconnectauth.cpp b/vpn/openconnect/openconnectauth.cpp
index eabe41be..1602fb86 100644
--- a/vpn/openconnect/openconnectauth.cpp
+++ b/vpn/openconnect/openconnectauth.cpp
@@ -193,10 +193,6 @@ void OpenconnectAuthWidget::readConfig()
             openconnect_passphrase_from_fsid(d->vpninfo);
         }
     }
-    if (!dataMap[NM_OPENCONNECT_KEY_PROTOCOL].isEmpty()) {
-        const QString protocol = dataMap[NM_OPENCONNECT_KEY_PROTOCOL] == "juniper" ? "nc" : "anyconnect";
-        openconnect_set_protocol(d->vpninfo, OC3DUP(protocol.toUtf8().data()));
-    }
 }
 
 void OpenconnectAuthWidget::readSecrets()

commit a51e9c5c2a2c32ef8d2f354af33532cbc35bfa9e
Author: Ian Whyman <thev00d00@gentoo.org>
Date:   Mon Dec 5 10:00:47 2016 +0100

    Pass protocol type to openconnect
    
    BUG:363917

diff --git a/vpn/openconnect/openconnectauth.cpp b/vpn/openconnect/openconnectauth.cpp
index 1602fb86..eabe41be 100644
--- a/vpn/openconnect/openconnectauth.cpp
+++ b/vpn/openconnect/openconnectauth.cpp
@@ -193,6 +193,10 @@ void OpenconnectAuthWidget::readConfig()
             openconnect_passphrase_from_fsid(d->vpninfo);
         }
     }
+    if (!dataMap[NM_OPENCONNECT_KEY_PROTOCOL].isEmpty()) {
+        const QString protocol = dataMap[NM_OPENCONNECT_KEY_PROTOCOL] == "juniper" ? "nc" : "anyconnect";
+        openconnect_set_protocol(d->vpninfo, OC3DUP(protocol.toUtf8().data()));
+    }
 }
 
 void OpenconnectAuthWidget::readSecrets()

commit 76072d5142d9346f41ff8464c7ab2a2eca9198b9
Author: l10n daemon script <scripty@kde.org>
Date:   Tue Nov 29 05:46:08 2016 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/kded/networkmanagement.notifyrc b/kded/networkmanagement.notifyrc
index bc112fd6..b138b063 100644
--- a/kded/networkmanagement.notifyrc
+++ b/kded/networkmanagement.notifyrc
@@ -795,6 +795,10 @@ Name[pt]=Foi detectado um portal captivo
 Name[ru]=Обнаружено подключение, требующее дополнительной аутентификации.
 Name[sk]=Zistil sa zajatý portál
 Name[sl]=Zaznan prijavni portal
+Name[sr]=Откривен приступни портал
+Name[sr@ijekavian]=Откривен приступни портал
+Name[sr@ijekavianlatin]=Otkriven pristupni portal
+Name[sr@latin]=Otkriven pristupni portal
 Name[sv]=Captive portal detekterades
 Name[uk]=Виявлено керований портал
 Name[x-test]=xxCaptive portal detectedxx

commit 906cd061817db385241a4711a2cbafb1772826b9
Author: l10n daemon script <scripty@kde.org>
Date:   Fri Nov 25 06:40:10 2016 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/kded/networkmanagement.notifyrc b/kded/networkmanagement.notifyrc
index 618babbd..bc112fd6 100644
--- a/kded/networkmanagement.notifyrc
+++ b/kded/networkmanagement.notifyrc
@@ -614,6 +614,7 @@ Name[en_GB]=Failed to get secrets
 Name[es]=La obtención de claves secretas ha fallado
 Name[et]=Saladuste hankimine nurjus
 Name[fi]=Salaisuuksien saaminen epäonnistui
+Name[fr]=Impossible d'obtenir les informations secrètes
 Name[gl]=Non foi posíbel obter os segredos
 Name[hu]=Nem sikerült megszerezni a titkos adatokat
 Name[ia]=Il falleva obtener secretos
@@ -749,6 +750,7 @@ Name[en_GB]=No longer connected to a network
 Name[es]=Ya no está conectado a una red
 Name[et]=Pole enam võrku ühendatud
 Name[fi]=Ei enää yhteydessä verkkoon
+Name[fr]=Vous n'êtes plus connecté à un réseau
 Name[gl]=Xa non está conectado a unha rede
 Name[he]=לא מחובר יותר לרשת
 Name[it]=Non più connesso a una rete
@@ -783,6 +785,7 @@ Name[da]=Captive portal detekteret
 Name[en_GB]=Captive portal detected
 Name[es]=Se ha detectado un portal cautivo
 Name[fi]=Verkon kirjautumissivu havaittu
+Name[fr]=Portail captif détecté
 Name[it]=Captive portal rilevato
 Name[ko]=인증 포털 감지됨
 Name[nl]=Vangstportaal gedetecteerd
diff --git a/vpn/l2tp/plasmanetworkmanagement_l2tpui.desktop b/vpn/l2tp/plasmanetworkmanagement_l2tpui.desktop
index fa34eb88..c95bcace 100644
--- a/vpn/l2tp/plasmanetworkmanagement_l2tpui.desktop
+++ b/vpn/l2tp/plasmanetworkmanagement_l2tpui.desktop
@@ -22,6 +22,7 @@ Name[en_GB]=Layer 2 Tunneling Protocol (L2TP)
 Name[es]=Protocolo de túneles de capa 2 (L2TP)
 Name[et]=Layer 2 Tunneling Protocol (L2TP)
 Name[fi]=Tason 2 tunnelointiyhteyskäytäntö (L2TP)
+Name[fr]=Protocole tunnel niveau 2 (L2TP)
 Name[gl]=Protocolo de canalización da segunda capa (L2TP)
 Name[it]=Layer 2 Tunneling Protocol (L2TP)
 Name[ko]=레이어 2 터널링 프로토콜(L2TP)
@@ -53,6 +54,7 @@ Comment[en_GB]=Compatible with L2TP VPN servers
 Comment[es]=Compatible con servidores VPN de L2TP
 Comment[et]=Ühildub L2TP VPN-serveritega
 Comment[fi]=Yhteensopiva L2TP-VPN-palvelinten kanssa
+Comment[fr]=Compatible avec les serveurs VPN L2TP
 Comment[gl]=Compatíbel con servidores de VPN que usen L2TP.
 Comment[he]=תאימות עם שרתי  L2TP VPN
 Comment[it]=Compatibile con i server VPN L2TP
diff --git a/vpn/openconnect/plasmanetworkmanagement_openconnectui.desktop b/vpn/openconnect/plasmanetworkmanagement_openconnectui.desktop
index e62cb350..51d965fb 100644
--- a/vpn/openconnect/plasmanetworkmanagement_openconnectui.desktop
+++ b/vpn/openconnect/plasmanetworkmanagement_openconnectui.desktop
@@ -23,6 +23,7 @@ Name[en_GB]=Cisco AnyConnect Compatible VPN (openconnect)
 Name[es]=VPN compatible con Cisco AnyConnect (openconnect)
 Name[et]=Cisco AnyConnectiga ühilduv VPN (openconnect)
 Name[fi]=Cisco AnyConnect -yhteensopiva VPN (openconnect)
+Name[fr]=VPN compatible Cisco AnyConnect (openconnect)
 Name[gl]=VPN compatíbel con Cisco AnyConnect (openconnect)
 Name[it]=VPN compatibile Cisco AnyConnect (openconnect)
 Name[ko]=Cisco AnyConnect 호환 VPN(openconnect)
@@ -54,6 +55,7 @@ Comment[en_GB]=Compatible with Cisco AnyConnect SSL VPN
 Comment[es]=VPN compatible con Cisco AnyConnect SSL
 Comment[et]=Ühildub Cisco AnyConnect SSL VPN-iga
 Comment[fi]=Yhteensopiva Cisco Anyconnect -SSL-VPN:n kanssa
+Comment[fr]=Compatible avec les VPN SSL Cisco AnyConnect
 Comment[gl]=Compatíbel con servidores VPN de Cisco AnyConnect que usen SSL.
 Comment[he]=תאימות עם Cisco AnyConnect SSL VPN
 Comment[it]=Compatibile con Cisco AnyConnect SSL VPN
diff --git a/vpn/openswan/plasmanetworkmanagement_openswanui.desktop b/vpn/openswan/plasmanetworkmanagement_openswanui.desktop
index cba5f119..e9961b7f 100644
--- a/vpn/openswan/plasmanetworkmanagement_openswanui.desktop
+++ b/vpn/openswan/plasmanetworkmanagement_openswanui.desktop
@@ -24,6 +24,7 @@ Name[en_GB]=IPsec based VPN (openswan)
 Name[es]=VPN basada en IPsec (openswan)
 Name[et]=IPseci põhine VPN (openswan)
 Name[fi]=IPsec-pohjainen VPN (openswan)
+Name[fr]=VPN utilisant IPsec (openswan)
 Name[gl]=VPN baseada en IPsec (openswan)
 Name[it]=VPN basata su IPsec (openswan)
 Name[ko]=IPSec 기반 VPN(openswan)
@@ -54,6 +55,7 @@ Comment[en_GB]=IPsec, IKEv1, IKEv2 based VPN
 Comment[es]=VPN basada en IPsec, IKEv1 e IKEv2
 Comment[et]=IPsec, IKEv1, IKEv2 põhine VPN
 Comment[fi]=IPsec-, IKEv1-, IKEv2-pohjainen VPN
+Comment[fr]=VPN utilisant IPsec, IKEv1, IKEv2
 Comment[gl]=VPN baseada en IPsec, IKEv1 e IKEv2.
 Comment[it]=VPN basata su IPsec, IKEv1, IKEv2
 Comment[ko]=IPSec, IKEv1, IKEv2 기반 VPN
diff --git a/vpn/openvpn/plasmanetworkmanagement_openvpnui.desktop b/vpn/openvpn/plasmanetworkmanagement_openvpnui.desktop
index b6840138..f9e0db0f 100644
--- a/vpn/openvpn/plasmanetworkmanagement_openvpnui.desktop
+++ b/vpn/openvpn/plasmanetworkmanagement_openvpnui.desktop
@@ -68,6 +68,7 @@ Comment[en_GB]=Compatible with the OpenVPN server
 Comment[es]=Compatible con el servidor de OpenVPN
 Comment[et]=Ühildub OpenVPN-serveritega
 Comment[fi]=Yhteensopiva OpenVPN-palvelimen kanssa
+Comment[fr]=Compatible avec le serveur OpenVPN
 Comment[gl]=Compatíbel con servidores OpenVPN.
 Comment[he]=תואימות עם שרתי OpenVPN
 Comment[it]=Compatibile con il server OpenVPN
diff --git a/vpn/pptp/plasmanetworkmanagement_pptpui.desktop b/vpn/pptp/plasmanetworkmanagement_pptpui.desktop
index b91a1f1e..15753579 100644
--- a/vpn/pptp/plasmanetworkmanagement_pptpui.desktop
+++ b/vpn/pptp/plasmanetworkmanagement_pptpui.desktop
@@ -22,6 +22,7 @@ Name[en_GB]=Point-to-Point Tunneling Protocol (PPTP)
 Name[es]=Protocolo de túneles punto a punto (PPTP)
 Name[et]=Point-to-Point Tunneling Protocol (PPTP)
 Name[fi]=Point-to-Point-tunnelointiyhteyskäytäntö (PPTP)
+Name[fr]=Protocole de tunnel point à point (PPTP)
 Name[gl]=Protocolo de canalización punto a punto (PPTP)
 Name[it]=Point-to-Point Tunneling Protocol (PPTP)
 Name[ko]=지점 대 지점 터널링 프로토콜(PPTP)
@@ -52,6 +53,7 @@ Comment[en_GB]=Compatible with Microsoft and other PPTP VPN servers
 Comment[es]=Compatible con Microsoft y otros servidores PPTP VPN
 Comment[et]=Ühildub Microsofti ja teiste PPTP VPN-serveritega
 Comment[fi]=Yhteensopiva Microsoftin ja muiden PPTP-VPN-palvelinten kanssa
+Comment[fr]=Compatible avec les serveurs Microsoft et autres VPN PPTP
 Comment[gl]=Compatíbel con servidores de VPN de Microsoft e outros servidores de VPN que usen PPTP.
 Comment[he]=תאימות עם שרתי מיקרוסופט המשתמשים ב־PPTP VPN
 Comment[it]=Compatibile con Microsoft e altri server VPN PPTP
diff --git a/vpn/ssh/plasmanetworkmanagement_sshui.desktop b/vpn/ssh/plasmanetworkmanagement_sshui.desktop
index 4dd58631..8b55be12 100644
--- a/vpn/ssh/plasmanetworkmanagement_sshui.desktop
+++ b/vpn/ssh/plasmanetworkmanagement_sshui.desktop
@@ -25,6 +25,7 @@ Name[en_GB]=SSH
 Name[es]=SSH
 Name[et]=SSH
 Name[fi]=SSH
+Name[fr]=SSH
 Name[gl]=SSH
 Name[it]=SSH
 Name[ko]=SSH
@@ -59,6 +60,7 @@ Comment[en_GB]=Compatible with the SSH server
 Comment[es]=Compatible con el servidor SSH
 Comment[et]=Ühildub SSH-serveritega
 Comment[fi]=Yhteensopiva SSH-palvelimen kanssa
+Comment[fr]=Compatible avec le serveur SSH
 Comment[gl]=Compatíbel con servidores de SSH.
 Comment[he]=תאימות עם שרתי SSL
 Comment[it]=Compatibile con il server SSH
diff --git a/vpn/sstp/plasmanetworkmanagement_sstpui.desktop b/vpn/sstp/plasmanetworkmanagement_sstpui.desktop
index dcac1e2c..af86d687 100644
--- a/vpn/sstp/plasmanetworkmanagement_sstpui.desktop
+++ b/vpn/sstp/plasmanetworkmanagement_sstpui.desktop
@@ -23,6 +23,7 @@ Name[en_GB]=Secure Socket Tunneling Protocol (SSTP)
 Name[es]=Protocolo de túneles de conexiones seguras (SSTP)
 Name[et]=Secure Socket Tunneling Protocol (SSTP)
 Name[fi]=Secure Socket -tunnelointiyhteyskäytäntö (SSTP)
+Name[fr]=Protocole tunnel socket sécurisé (SSTP)
 Name[gl]=Protocolo de canalización de sócket seguro (SSTP)
 Name[it]=Secure Socket Tunneling Protocol (SSTP)
 Name[ko]=보안 소켓 터널링 프로토콜(SSTP)
@@ -53,6 +54,7 @@ Comment[en_GB]=Compatible with Microsoft and other SSTP VPN servers
 Comment[es]=Compatible con Microsoft y otros servidores SSTP VPN
 Comment[et]=Ühildub Microsofti ja teiste SSTP VPN-serveritega
 Comment[fi]=Yhteensopiva Microsoftin ja muiden SSTP-VPN-palvelinten kanssa
+Comment[fr]=Compatible avec les serveurs Microsoft et autres VPN SSTP
 Comment[gl]=Compatíbel con servidores de VPN de Microsoft e outros servidores de VPN que usen SSTP.
 Comment[it]=Compatibile con server VPN SSTP di Microsoft e altri
 Comment[ko]=Microsoft 및 기타 SSTP VPN 서버와 호환됨
diff --git a/vpn/strongswan/plasmanetworkmanagement_strongswanui.desktop b/vpn/strongswan/plasmanetworkmanagement_strongswanui.desktop
index d71543a2..7768fa29 100644
--- a/vpn/strongswan/plasmanetworkmanagement_strongswanui.desktop
+++ b/vpn/strongswan/plasmanetworkmanagement_strongswanui.desktop
@@ -24,6 +24,7 @@ Name[en_GB]=IPsec based VPN (strongswan)
 Name[es]=VPN basada en IPsec (strongswan)
 Name[et]=IPseci põhine VPN (strongswan)
 Name[fi]=IPsec-pohjainen VPN (strongswan)
+Name[fr]=VPN utilisant IPsec (strongswan)
 Name[gl]=VPN baseada en IPsec (strongswan)
 Name[it]=VPN basata su IPsec (strongswan)
 Name[ko]=IPSec 기반 VPN(strongswan)
@@ -54,6 +55,7 @@ Comment[en_GB]=IPsec, IKEv1, IKEv2 based VPN
 Comment[es]=VPN basada en IPsec, IKEv1 e IKEv2
 Comment[et]=IPsec, IKEv1, IKEv2 põhine VPN
 Comment[fi]=IPsec-, IKEv1-, IKEv2-pohjainen VPN
+Comment[fr]=VPN utilisant IPsec, IKEv1, IKEv2
 Comment[gl]=VPN baseada en IPsec, IKEv1 e IKEv2.
 Comment[it]=VPN basata su IPsec, IKEv1, IKEv2
 Comment[ko]=IPSec, IKEv1, IKEv2 기반 VPN
diff --git a/vpn/vpnc/plasmanetworkmanagement_vpncui.desktop b/vpn/vpnc/plasmanetworkmanagement_vpncui.desktop
index 27723a4b..871ed6cb 100644
--- a/vpn/vpnc/plasmanetworkmanagement_vpncui.desktop
+++ b/vpn/vpnc/plasmanetworkmanagement_vpncui.desktop
@@ -23,6 +23,7 @@ Name[en_GB]=Cisco Compatible VPN (vpnc)
 Name[es]=VPN compatible con Cisco (vpnc)
 Name[et]=Ciscoga ühilduv VPN (vpnc)
 Name[fi]=Cisco-yhteensopiva VPN (vpnc)
+Name[fr]=VPN compatible Cisco (vpnc)
 Name[gl]=VPN compatíbel con Cisco (vpnc)
 Name[it]=VPN compatibile Cisco (vpnc)
 Name[ko]=Cisco 호환 VPN(vpnc)
@@ -54,6 +55,7 @@ Comment[en_GB]=Compatible with various Cisco, Juniper, Netscreen and Sonicwall I
 Comment[es]=Compatible con diversas puertas de enlace VPN de Cisco, Juniper, Netscreen y Sonicwall basadas en IPsec
 Comment[et]=Ühildub erinevate Cisco, Juniperi, Netscreeni ja Sonicwalli IPseci põhiste VPN-lüüsidega
 Comment[fi]=Yhteensopiva Ciscon, Juniperin, Netscreenin ja Sonicwallin eri IPsec-pohjaisten VPN-yhdyskäytävien kanssa
+Comment[fr]=Compatible avec diverses passerelles VPN Cisco, Juniper, Netscreen et Sonicwall utilisant IPsec
 Comment[gl]=Compatíbel coas seguintes pasarelas de VPN baseadas en IPsec: Cisco, Juniper, Netscreen e Sonicwall.
 Comment[it]=Compatibile con diversi gateway VPN Cisco, Juniper, Netscreen e Sonicwall basati su IPsec
 Comment[ko]=Cisco, Juniper, Netscreen, Sonicwall IPSec 기반 VPN 게이트웨이와 호환됨

Reply to: