Commit 85f085c9 authored by Lukáš Tinkl's avatar Lukáš Tinkl
Browse files

Merge remote-tracking branch 'origin/master' into mm1port

parents 117c1e86 5c4a36c9
[Desktop Entry]
Name=Plasma Networkmanagement module
Name[cs]=Modul Plasma Networkmanagement
Name[da]=Plasma netværkshåndteringsmodul
Name[nl]=Plasma module voor netwerkbeheer
Name[pt]=Módulo de Gestão de Rede do Plasma
Name[pt_BR]=Módulo do Networkmanagement para o Plasma
Name[sv]=Plasma nätverkshanteringsmodul
Name[uk]=Модуль керування мережею Плазми
Name[x-test]=xxPlasma Networkmanagement modulexx
Comment=Provides secrets to the NetworkManager daemon
Comment[cs]=Poskytuje přihlašovací informace pro službu NetworkManageru
Comment[da]=Giver hemmeligheder til NetworkManager-dæmonen
......
[Global]
IconName=applications-internet
Name=networkmanagement
Name[cs]=networkmanagement
Name[da]=netværkshåndtering
Name[nl]=netwerkbeheer
Name[pt]=Gestão de Rede
Name[pt_BR]=networkmanagement
Name[sv]=nätverkshantering
Name[uk]=Керування мережею
Name[x-test]=xxnetworkmanagementxx
Comment=Notifies about network errors
Comment[bs]=Obavještava o mrežnim greškama
Comment[cs]=Oznamuje chyby sítě
......@@ -45,6 +53,8 @@ Action=Popup
[Event/AcStateChanged]
Name=Active connection state changed
Name[cs]=Stav aktivního spojení byl změněn
Name[da]=Tilstand ændret for aktiv forbindelse
Name[de]=Active-Verbindungsstatus wurde geändert
Name[nl]=Actieve verbindingsstatus is gewijzigd
Name[pt]=O estado da ligação activa mudou
......@@ -57,6 +67,8 @@ Action=Popup
[Event/VpnStateChanged]
Name=VPN connection state changed
Name[cs]=Stav spojení VPN byl změněn
Name[da]=Tilstand ændret for VPN-forbindelse
Name[de]=VPN-Verbindungsstatus wurde geändert
Name[nl]=Verbindingsstatus van VPN is gewijzigd
Name[pt]=O estado da ligação VPN mudou
......
......@@ -306,7 +306,7 @@ void Notification::stateChanged(NetworkManager::Device::State newstate, NetworkM
void Notification::addActiveConnection(const QString &path)
{
NetworkManager::ActiveConnection::Ptr ac = NetworkManager::findActiveConnection(path);
if (ac->isValid()) {
if (ac && ac->isValid()) {
addActiveConnection(ac);
}
}
......@@ -402,7 +402,7 @@ void Notification::onVpnConnectionStateChanged(NetworkManager::VpnConnection::St
text = i18n("A timeout occurred while starting the service providing the VPN connection.");
break;
case NetworkManager::VpnConnection::ServiceStartFailedReason:
text = i18n("Starting the service starting the service providing the VPN connection failed.");
text = i18n("Starting the service providing the VPN connection failed.");
break;
case NetworkManager::VpnConnection::NoSecretsReason:
text = i18n("Necessary secrets for the VPN connection were not provided.");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment