Commit 134ea9dc authored by Alf Gaida's avatar Alf Gaida

Cherry-picked new upstream release 0.4.2

parent 6804f1ed
......@@ -3,7 +3,7 @@ project(nm-tray)
cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
cmake_policy(SET CMP0071 NEW)
set(NM_TRAY_VERSION "0.4.1")
set(NM_TRAY_VERSION "0.4.2")
set(QT_MIN_VERSION "5.4.0")
set(KF5_MIN_VERSION "5.36.0")
......
......@@ -19,10 +19,15 @@ This software is licensed under [GNU GPLv2 or later](https://www.gnu.org/license
## Packages
### arch
For [arch users](https://www.archlinux.org/) there is an AUR package [nm-tray-git](https://aur.archlinux.org/packages/nm-tray-git/) (thanks to [pmattern](https://github.com/pmattern)).
### openSUSE
nm-tray is in the official repository of [openSUSE](https://www.opensuse.org/) since Leap 15.0. There is a also a [git package](https://build.opensuse.org/package/show/X11:LXQt:git/nm-tray) in the [X11:LXQt:git](https://build.opensuse.org/project/show/X11:LXQt:git) devel project of OBS.
### debian
Thanks to [agaida](https://github.com/agaida) nm-tray is now in official debian repositories ([nm-tray](https://packages.debian.org/sid/nm-tray)).
## Translations
Thanks to [Weblate](https://weblate.org/) anyone can help us to localize nm-tray by using the [hosted weblate service](https://hosted.weblate.org/projects/nm-tray/translations/).
nm-tray (0.4.2-1) unstable; urgency=medium
* Cherry-picked new upstream release 0.4.2
-- Alf Gaida <agaida@siduction.org> Sat, 20 Oct 2018 12:52:26 +0200
nm-tray (0.4.1-1) unstable; urgency=medium
* Cherry-picked new upstream release 0.4.1
......
......@@ -334,6 +334,22 @@ NetworkManager::WirelessNetwork::Ptr NmModelPrivate::findWifiNetwork(QString con
return mWifiNets.cend() == i ? NetworkManager::WirelessNetwork::Ptr{} : *i;
}
void NmModelPrivate::requestScan(NetworkManager::WirelessDevice * dev)
{
qCDebug(NM_TRAY) << __FUNCTION__ << dev->interfaceName();
QDBusPendingReply<> reply = dev->requestScan();
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, dev);
connect(watcher, &QDBusPendingCallWatcher::finished, [dev] (QDBusPendingCallWatcher * watcher) {
if (watcher->isError() || !watcher->isValid())
{
//TODO: in what form should we output the warning messages
qCWarning(NM_TRAY).noquote() << QStringLiteral("requestScan on device '%1' failed: %3").arg(dev->interfaceName())
.arg(watcher->error().message());
}
watcher->deleteLater();
});
}
void NmModelPrivate::onConnectionUpdated()
{
emit connectionUpdate(qobject_cast<NetworkManager::Connection *>(sender()));
......@@ -1580,3 +1596,34 @@ qCDebug(NM_TRAY) << __FUNCTION__ << active->path();
watcher->deleteLater();
});
}
void NmModel::requestScan(QModelIndex const & index) const
{
if (!isValidDataIndex(index) || ITEM_DEVICE != static_cast<ItemId>(index.internalId()))
{
//TODO: in what form should we output the warning messages
qCWarning(NM_TRAY).noquote() << "got invalid index for scanning request" << index;
return;
}
auto const & dev = d->mDevices[index.row()];
auto spec_dev = dev->as<NetworkManager::WirelessDevice>();
if (nullptr == spec_dev)
{
//TODO: in what form should we output the warning messages
qCWarning(NM_TRAY).noquote() << "dropping request for scan on non wireles device " << dev->interfaceName();
return;
}
d->requestScan(spec_dev);
}
void NmModel::requestAllWifiScan() const
{
for (auto const & dev : d->mDevices)
{
auto spec_dev = dev->as<NetworkManager::WirelessDevice>();
if (nullptr != spec_dev)
d->requestScan(spec_dev);
}
}
......@@ -84,6 +84,8 @@ public Q_SLOTS:
//NetworkManager management methods
void activateConnection(QModelIndex const & index);
void deactivateConnection(QModelIndex const & index);
void requestScan(QModelIndex const & index) const;
void requestAllWifiScan() const;
private:
bool isValidDataIndex(const QModelIndex & index) const;
......
......@@ -61,6 +61,8 @@ public:
NetworkManager::Device::Ptr findDeviceInterface(QString const & interfaceName);
NetworkManager::WirelessNetwork::Ptr findWifiNetwork(QString const & ssid, QString const & devUni);
void requestScan(NetworkManager::WirelessDevice * dev);
Q_SIGNALS:
void connectionAdd(NetworkManager::Connection::Ptr conn);
void connectionUpdate(NetworkManager::Connection * conn);
......
......@@ -64,6 +64,7 @@ public:
QAction * mActEnableWifi;
QAction * mActConnInfo;
QAction * mActDebugInfo;
QAction * mRequestScan;
NmModel mNmModel;
NmProxy mActiveConnections;
QPersistentModelIndex mPrimaryConnection;
......@@ -256,6 +257,7 @@ Tray::Tray(QObject *parent/* = nullptr*/)
d->mContextMenu.addSeparator();
d->mActConnInfo = d->mContextMenu.addAction(QIcon::fromTheme(QStringLiteral("dialog-information")), Tray::tr("Connection information"));
d->mActDebugInfo = d->mContextMenu.addAction(QIcon::fromTheme(QStringLiteral("dialog-information")), Tray::tr("Debug information"));
d->mRequestScan = d->mContextMenu.addAction(QIcon::fromTheme(QStringLiteral("view-refresh")), Tray::tr("Wifi - request scan"));
connect(d->mContextMenu.addAction(QIcon::fromTheme(QStringLiteral("document-edit")), Tray::tr("Edit connections...")), &QAction::triggered
, this, &Tray::onEditConnectionsTriggered);
d->mContextMenu.addSeparator();
......@@ -270,10 +272,10 @@ Tray::Tray(QObject *parent/* = nullptr*/)
d->mActEnableWifi->setCheckable(true);
enable_notifications->setCheckable(true);
enable_notifications->setChecked(d->mEnableNotifications);
connect(d->mActEnableNetwork, &QAction::triggered, [this] (bool checked) { NetworkManager::setNetworkingEnabled(checked); });
connect(d->mActEnableWifi, &QAction::triggered, [this] (bool checked) { NetworkManager::setWirelessEnabled(checked); });
connect(enable_notifications, &QAction::triggered, [this] (bool checked) { d->mEnableNotifications = checked; QSettings{}.setValue(ENABLE_NOTIFICATIONS, checked); });
connect(d->mActConnInfo, &QAction::triggered, [this] (bool ) {
connect(d->mActEnableNetwork, &QAction::triggered, [] (bool checked) { NetworkManager::setNetworkingEnabled(checked); });
connect(d->mActEnableWifi, &QAction::triggered, [] (bool checked) { NetworkManager::setWirelessEnabled(checked); });
connect(enable_notifications, &QAction::triggered, this, [this] (bool checked) { d->mEnableNotifications = checked; QSettings{}.setValue(ENABLE_NOTIFICATIONS, checked); });
connect(d->mActConnInfo, &QAction::triggered, this, [this] (bool ) {
if (d->mInfoDialog.isNull())
{
d->mInfoDialog.reset(new ConnectionInfo{&d->mNmModel});
......@@ -283,7 +285,7 @@ Tray::Tray(QObject *parent/* = nullptr*/)
}
d->openCloseDialog(d->mInfoDialog.data());
});
connect(d->mActDebugInfo, &QAction::triggered, [this] (bool ) {
connect(d->mActDebugInfo, &QAction::triggered, this, [this] (bool ) {
if (d->mConnDialog.isNull())
{
d->mConnDialog.reset(new NmList{Tray::tr("nm-tray info"), &d->mNmModel});
......@@ -293,6 +295,7 @@ Tray::Tray(QObject *parent/* = nullptr*/)
}
d->openCloseDialog(d->mConnDialog.data());
});
connect(d->mRequestScan, &QAction::triggered, &d->mNmModel, &NmModel::requestAllWifiScan);
// Note: Force all the updates as the NetworkManager::Notifier signals aren't
// emitted at application startup.
......@@ -414,7 +417,9 @@ void Tray::setActionsStates()
d->mActEnableNetwork->setChecked(net_enabled);
d->mActEnableWifi->setChecked(NetworkManager::isWirelessEnabled());
d->mActEnableWifi->setEnabled(NetworkManager::isNetworkingEnabled() && NetworkManager::isWirelessHardwareEnabled());
const bool wifi_enabled = NetworkManager::isNetworkingEnabled() && NetworkManager::isWirelessHardwareEnabled();
d->mActEnableWifi->setEnabled(wifi_enabled);
d->mRequestScan->setEnabled(wifi_enabled);
d->mActConnInfo->setEnabled(net_enabled);
}
......
......@@ -45,115 +45,115 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="728"/>
<location filename="../src/nmmodel.cpp" line="744"/>
<source>root</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="730"/>
<location filename="../src/nmmodel.cpp" line="746"/>
<source>active connection(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="732"/>
<location filename="../src/nmmodel.cpp" line="748"/>
<source>connection(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="734"/>
<location filename="../src/nmmodel.cpp" line="750"/>
<source>device(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="736"/>
<location filename="../src/nmmodel.cpp" line="752"/>
<source>wifi network(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1027"/>
<location filename="../src/nmmodel.cpp" line="1043"/>
<source>unknown</source>
<comment>hardware address</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1130"/>
<location filename="../src/nmmodel.cpp" line="1151"/>
<source>General</source>
<comment>Active connection information</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1131"/>
<location filename="../src/nmmodel.cpp" line="1152"/>
<source>Interface</source>
<comment>Active connection information</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1133"/>
<location filename="../src/nmmodel.cpp" line="1154"/>
<source>Hardware Address</source>
<comment>Active connection information</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1135"/>
<location filename="../src/nmmodel.cpp" line="1156"/>
<source>Driver</source>
<comment>Active connection information</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1137"/>
<location filename="../src/nmmodel.cpp" line="1158"/>
<source>Speed</source>
<comment>Active connection information</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1139"/>
<location filename="../src/nmmodel.cpp" line="1160"/>
<source> Kb/s</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1141"/>
<location filename="../src/nmmodel.cpp" line="1162"/>
<source>unknown</source>
<comment>Speed</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1145"/>
<location filename="../src/nmmodel.cpp" line="1166"/>
<source>Security</source>
<comment>Active connection information</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1149"/>
<location filename="../src/nmmodel.cpp" line="1170"/>
<source>IPv4</source>
<comment>Active connection information</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1150"/>
<location filename="../src/nmmodel.cpp" line="1171"/>
<source>IPv6</source>
<comment>Active connection information</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1161"/>
<location filename="../src/nmmodel.cpp" line="1182"/>
<source>IP Address</source>
<comment>Active connection information</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1163"/>
<location filename="../src/nmmodel.cpp" line="1184"/>
<source>Subnet Mask</source>
<comment>Active connection information</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1172"/>
<location filename="../src/nmmodel.cpp" line="1193"/>
<source>Default route</source>
<comment>Active connection information</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1178"/>
<location filename="../src/nmmodel.cpp" line="1199"/>
<source>DNS(%1)</source>
<comment>Active connection information</comment>
<translation type="unfinished"></translation>
......@@ -223,31 +223,36 @@
</message>
<message>
<location filename="../src/tray.cpp" line="260"/>
<source>Wifi - request scan</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tray.cpp" line="261"/>
<source>Edit connections...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tray.cpp" line="263"/>
<location filename="../src/tray.cpp" line="264"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tray.cpp" line="265"/>
<location filename="../src/tray.cpp" line="266"/>
<source>Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tray.cpp" line="290"/>
<location filename="../src/tray.cpp" line="291"/>
<source>nm-tray info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tray.cpp" line="382"/>
<location filename="../src/tray.cpp" line="384"/>
<source>%1 about</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tray.cpp" line="383"/>
<location filename="../src/tray.cpp" line="385"/>
<source>&lt;strong&gt;&lt;a href=&quot;https://github.com/palinek/nm-tray&quot;&gt;nm-tray&lt;/a&gt;&lt;/strong&gt; is a simple Qt based frontend for &lt;a href=&quot;https://wiki.gnome.org/Projects/NetworkManager&quot;&gt;NetworkManager&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;Version: %1</source>
<translation type="unfinished"></translation>
</message>
......
......@@ -45,115 +45,115 @@
<translation>Cal una contrasenya per a la connexió a «%1»:</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="728"/>
<location filename="../src/nmmodel.cpp" line="744"/>
<source>root</source>
<translation>arrel</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="730"/>
<location filename="../src/nmmodel.cpp" line="746"/>
<source>active connection(s)</source>
<translation>connexions actives</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="732"/>
<location filename="../src/nmmodel.cpp" line="748"/>
<source>connection(s)</source>
<translation>connexions</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="734"/>
<location filename="../src/nmmodel.cpp" line="750"/>
<source>device(s)</source>
<translation>dispositius</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="736"/>
<location filename="../src/nmmodel.cpp" line="752"/>
<source>wifi network(s)</source>
<translation>xarxes wifi</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1027"/>
<location filename="../src/nmmodel.cpp" line="1043"/>
<source>unknown</source>
<comment>hardware address</comment>
<translation>desconeguda</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1130"/>
<location filename="../src/nmmodel.cpp" line="1151"/>
<source>General</source>
<comment>Active connection information</comment>
<translation></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1131"/>
<location filename="../src/nmmodel.cpp" line="1152"/>
<source>Interface</source>
<comment>Active connection information</comment>
<translation>Interfície</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1133"/>
<location filename="../src/nmmodel.cpp" line="1154"/>
<source>Hardware Address</source>
<comment>Active connection information</comment>
<translation>Adreça de maquinari</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1135"/>
<location filename="../src/nmmodel.cpp" line="1156"/>
<source>Driver</source>
<comment>Active connection information</comment>
<translation>Controlador</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1137"/>
<location filename="../src/nmmodel.cpp" line="1158"/>
<source>Speed</source>
<comment>Active connection information</comment>
<translation>Velocitat</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1139"/>
<location filename="../src/nmmodel.cpp" line="1160"/>
<source> Kb/s</source>
<translation></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1141"/>
<location filename="../src/nmmodel.cpp" line="1162"/>
<source>unknown</source>
<comment>Speed</comment>
<translation>desconeguda</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1145"/>
<location filename="../src/nmmodel.cpp" line="1166"/>
<source>Security</source>
<comment>Active connection information</comment>
<translation>Seguretat</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1149"/>
<location filename="../src/nmmodel.cpp" line="1170"/>
<source>IPv4</source>
<comment>Active connection information</comment>
<translation></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1150"/>
<location filename="../src/nmmodel.cpp" line="1171"/>
<source>IPv6</source>
<comment>Active connection information</comment>
<translation></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1161"/>
<location filename="../src/nmmodel.cpp" line="1182"/>
<source>IP Address</source>
<comment>Active connection information</comment>
<translation>Adreça IP</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1163"/>
<location filename="../src/nmmodel.cpp" line="1184"/>
<source>Subnet Mask</source>
<comment>Active connection information</comment>
<translation>Màscara de subxarxa</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1172"/>
<location filename="../src/nmmodel.cpp" line="1193"/>
<source>Default route</source>
<comment>Active connection information</comment>
<translation>Encaminament predeterminat</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1178"/>
<location filename="../src/nmmodel.cpp" line="1199"/>
<source>DNS(%1)</source>
<comment>Active connection information</comment>
<translation></translation>
......@@ -223,31 +223,36 @@
</message>
<message>
<location filename="../src/tray.cpp" line="260"/>
<source>Wifi - request scan</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tray.cpp" line="261"/>
<source>Edit connections...</source>
<translation>Edita les connexions...</translation>
</message>
<message>
<location filename="../src/tray.cpp" line="263"/>
<location filename="../src/tray.cpp" line="264"/>
<source>About</source>
<translation>Quant a</translation>
</message>
<message>
<location filename="../src/tray.cpp" line="265"/>
<location filename="../src/tray.cpp" line="266"/>
<source>Quit</source>
<translation>Surt</translation>
</message>
<message>
<location filename="../src/tray.cpp" line="290"/>
<location filename="../src/tray.cpp" line="291"/>
<source>nm-tray info</source>
<translation>Informació de nm-tray</translation>
</message>
<message>
<location filename="../src/tray.cpp" line="382"/>
<location filename="../src/tray.cpp" line="384"/>
<source>%1 about</source>
<translation>Quant a %1</translation>
</message>
<message>
<location filename="../src/tray.cpp" line="383"/>
<location filename="../src/tray.cpp" line="385"/>
<source>&lt;strong&gt;&lt;a href=&quot;https://github.com/palinek/nm-tray&quot;&gt;nm-tray&lt;/a&gt;&lt;/strong&gt; is a simple Qt based frontend for &lt;a href=&quot;https://wiki.gnome.org/Projects/NetworkManager&quot;&gt;NetworkManager&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;Version: %1</source>
<translation>&lt;strong&gt;&lt;a href=&quot;https://github.com/palinek/nm-tray&quot;&gt;nm-tray&lt;/a&gt;&lt;/strong&gt; és un frontal en Qt senzill per &lt;a href=&quot;https://wiki.gnome.org/Projects/NetworkManager&quot;&gt;NetworkManager&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;Versió: %1</translation>
</message>
......
......@@ -45,115 +45,115 @@
<translation>Pro připojení k %1 je třeba heslo:</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="728"/>
<location filename="../src/nmmodel.cpp" line="744"/>
<source>root</source>
<translation></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="730"/>
<location filename="../src/nmmodel.cpp" line="746"/>
<source>active connection(s)</source>
<translation>aktivní spojení</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="732"/>
<location filename="../src/nmmodel.cpp" line="748"/>
<source>connection(s)</source>
<translation>spojení</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="734"/>
<location filename="../src/nmmodel.cpp" line="750"/>
<source>device(s)</source>
<translation>zařízení</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="736"/>
<location filename="../src/nmmodel.cpp" line="752"/>
<source>wifi network(s)</source>
<translation>WiFi sítě</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1027"/>
<location filename="../src/nmmodel.cpp" line="1043"/>
<source>unknown</source>
<comment>hardware address</comment>
<translation>neznámé</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1130"/>
<location filename="../src/nmmodel.cpp" line="1151"/>
<source>General</source>
<comment>Active connection information</comment>
<translation>Obecné</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1131"/>
<location filename="../src/nmmodel.cpp" line="1152"/>
<source>Interface</source>
<comment>Active connection information</comment>
<translation>Rozhraní</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1133"/>
<location filename="../src/nmmodel.cpp" line="1154"/>
<source>Hardware Address</source>
<comment>Active connection information</comment>
<translation>Hardwarová (MAC) adresa</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1135"/>
<location filename="../src/nmmodel.cpp" line="1156"/>
<source>Driver</source>
<comment>Active connection information</comment>
<translation>Ovladač</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1137"/>
<location filename="../src/nmmodel.cpp" line="1158"/>
<source>Speed</source>
<comment>Active connection information</comment>
<translation>Rychlost</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1139"/>
<location filename="../src/nmmodel.cpp" line="1160"/>
<source> Kb/s</source>
<translation></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1141"/>
<location filename="../src/nmmodel.cpp" line="1162"/>
<source>unknown</source>
<comment>Speed</comment>
<translation>neznámá</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1145"/>
<location filename="../src/nmmodel.cpp" line="1166"/>
<source>Security</source>
<comment>Active connection information</comment>
<translation>Zabezpečení</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1149"/>
<location filename="../src/nmmodel.cpp" line="1170"/>
<source>IPv4</source>
<comment>Active connection information</comment>
<translation></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1150"/>
<location filename="../src/nmmodel.cpp" line="1171"/>
<source>IPv6</source>
<comment>Active connection information</comment>
<translation></translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1161"/>
<location filename="../src/nmmodel.cpp" line="1182"/>
<source>IP Address</source>
<comment>Active connection information</comment>
<translation>IP Adresa</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1163"/>
<location filename="../src/nmmodel.cpp" line="1184"/>
<source>Subnet Mask</source>
<comment>Active connection information</comment>
<translation>Maska sítě</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1172"/>
<location filename="../src/nmmodel.cpp" line="1193"/>
<source>Default route</source>
<comment>Active connection information</comment>
<translation>Výchozí trasa</translation>
</message>
<message>
<location filename="../src/nmmodel.cpp" line="1178"/>
<location filename="../src/nmmodel.cpp" line="1199"/>
<source>DNS(%1)</source>
<comment>Active connection information</comment>
<translation></translation>
......@@ -223,31 +223,36 @@
</message>
<message>
<location filename="../src/tray.cpp" line="260"/>
<source>Wifi - request scan</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tray.cpp" line="261"/>
<source>Edit connections...</source>
<translation>Upravit připojení…</translation>
</message>
<message>
<location filename="../src/tray.cpp" line="263"/>
<location filename="../src/tray.cpp" line="264"/>
<source>About</source>
<translation>O aplikaci</translation>
</message>
<message>
<location filename="../src/tray.cpp" line="265"/>
<location filename="../src/tray.cpp" line="266"/>
<source>Quit</source>
<translation>Ukončit</translation>
</message>
<message>
<location filename="../src/tray.cpp" line="290"/>
<location filename="../src/tray.cpp" line="291"/>
<source>nm-tray info</source>
<translation>nm-tray informace</translation>