diff --git a/CHANGELOG b/CHANGELOG
index 4c66851..0217931 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
Ver.1.3.0
---------
+* all:
+ * some bug fixes and refactoring
* dataengine:
+ add new sources: intIp6, extIp6, netctlAutoStatus
* rewrite to use [tasks](https://github.com/mhogomchungu/tasks) (see #7)
@@ -8,11 +10,19 @@ Ver.1.3.0
* change internal IP definition
* gui:
+ add 3rd party license information
- + add system tray icon
- + add dbus interface org.netctlgui.netctlgui
+ + add system tray icon as an alternative to the plasmoid
+ + add DBus session interface org.netctlgui.netctlgui
+ add dynamic settings load
+ + add support of openvswitch
+ + add security notes and API descriptions
+ + add ability to use helper
+ + add ability to start minimized/maximized/daemonized
+ * more correct actions into SettingsWindow
* update to library changes
* rewrite tables to use toolTip
+* helper:
+ + create daemon DBus system interface org.netctlgui.helper to the library:
+ self control slots, netctl control slots and netctl information slots
* library:
+ add custom structures netctlWifiInfo and netctlProfileInfo
+ add methods getActiveProfile(), autoGetActiveProfile()
@@ -23,8 +33,11 @@ Ver.1.3.0
- remove SleepThread class
* plasmoid:
+ add 3rd party license information
+ + allow plasmoid to use system tray
+ + add ability to use helper
* change all running processes to detached (see #7)
* rewrite text label to use tags
+ * update to dataengine changes
***
diff --git a/sources/gui/src/generalwidget.ui b/sources/gui/src/generalwidget.ui
index a2f16d0..0bda687 100644
--- a/sources/gui/src/generalwidget.ui
+++ b/sources/gui/src/generalwidget.ui
@@ -6,8 +6,8 @@
0
0
- 427
- 533
+ 425
+ 531
@@ -125,7 +125,7 @@
-
- openvswitch
+ openvswitch
diff --git a/sources/gui/src/main.cpp b/sources/gui/src/main.cpp
index bb805b6..6e5e8ac 100644
--- a/sources/gui/src/main.cpp
+++ b/sources/gui/src/main.cpp
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -138,6 +139,9 @@ int main(int argc, char *argv[])
// reread translations according to flags
QString language = Language::defineLanguage(args[QString("config")].toString(),
args[QString("options")].toString());
+ QTranslator qtTranslator;
+ qtTranslator.load(QString("qt_") + language, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+ a.installTranslator(&qtTranslator);
QTranslator translator;
translator.load(QString(":/translations/") + language);
a.installTranslator(&translator);
@@ -162,6 +166,6 @@ int main(int argc, char *argv[])
// check if exists
if (restoreExistSession())
return 0;
- MainWindow w(0, args, &translator);
+ MainWindow w(0, args, &qtTranslator, &translator);
return a.exec();
}
diff --git a/sources/gui/src/mainpublicslots.cpp b/sources/gui/src/mainpublicslots.cpp
index f84e446..973a427 100644
--- a/sources/gui/src/mainpublicslots.cpp
+++ b/sources/gui/src/mainpublicslots.cpp
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
#include
@@ -321,6 +322,8 @@ void MainWindow::updateConfiguration(const QMap args)
qApp->removeTranslator(translator);
QString language = Language::defineLanguage(configPath,
args[QString("options")].toString());
+ qtTranslator->load(QString("qt_") + language, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+ qApp->installTranslator(qtTranslator);
translator->load(QString(":/translations/") + language);
qApp->installTranslator(translator);
diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp
index 3400ef9..88b480f 100644
--- a/sources/gui/src/mainwindow.cpp
+++ b/sources/gui/src/mainwindow.cpp
@@ -47,10 +47,12 @@
MainWindow::MainWindow(QWidget *parent,
const QMap args,
+ QTranslator *qtAppTranslator,
QTranslator *appTranslator)
: QMainWindow(parent),
configPath(args[QString("config")].toString()),
debug(args[QString("debug")].toBool()),
+ qtTranslator(qtAppTranslator),
translator(appTranslator)
{
if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "about" << args[QString("about")].toBool();
@@ -294,6 +296,8 @@ bool MainWindow::checkHelperStatus()
QList(), true, debug);
if (isHelperServiceActive())
configuration[QString("CLOSE_HELPER")] = QString("false");
+
+ return useHelper;
}
diff --git a/sources/gui/src/mainwindow.h b/sources/gui/src/mainwindow.h
index 4953ce1..8ff3a92 100644
--- a/sources/gui/src/mainwindow.h
+++ b/sources/gui/src/mainwindow.h
@@ -54,6 +54,7 @@ class MainWindow : public QMainWindow
public:
explicit MainWindow(QWidget *parent = 0,
const QMap args = QMap(),
+ QTranslator *qtAppTranslator = 0,
QTranslator *appTranslator = 0);
~MainWindow();
QStringList printInformation();
@@ -162,6 +163,7 @@ private:
bool hiddenNetwork;
bool isDaemon = false;
bool useHelper = true;
+ QTranslator *qtTranslator = nullptr;
QTranslator *translator = nullptr;
// configuration
QMap configuration;
diff --git a/sources/gui/src/settingswindow.cpp b/sources/gui/src/settingswindow.cpp
index dfa0bd2..8fd11ca 100644
--- a/sources/gui/src/settingswindow.cpp
+++ b/sources/gui/src/settingswindow.cpp
@@ -52,8 +52,9 @@ void SettingsWindow::createActions()
if (debug) qDebug() << "[SettingsWindow]" << "[createActions]";
connect(ui->buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked(bool)), this, SLOT(close()));
- connect(ui->buttonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked(bool)), this, SLOT(setDefault()));
connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(closeWindow()));
+ connect(ui->buttonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked(bool)), this, SLOT(restoreSettings()));
+ connect(ui->buttonBox->button(QDialogButtonBox::RestoreDefaults), SIGNAL(clicked(bool)), this, SLOT(setDefault()));
connect(ui->checkBox_enableTray, SIGNAL(stateChanged(int)), this, SLOT(setTray()));
connect(ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
this, SLOT(changePage(QTreeWidgetItem *, QTreeWidgetItem *)));
@@ -143,12 +144,21 @@ void SettingsWindow::setTray()
}
+void SettingsWindow::restoreSettings()
+{
+ if (debug) qDebug() << "[SettingsWindow]" << "[restoreSettings]";
+
+ setSettings(getSettings());
+}
+
+
void SettingsWindow::setDefault()
{
if (debug) qDebug() << "[SettingsWindow]" << "[setDefault]";
setSettings(getDefault());
- saveSettings();
+ if (sender() != ui->buttonBox->button(QDialogButtonBox::Reset))
+ saveSettings();
}
diff --git a/sources/gui/src/settingswindow.h b/sources/gui/src/settingswindow.h
index 6465bbc..a84706b 100644
--- a/sources/gui/src/settingswindow.h
+++ b/sources/gui/src/settingswindow.h
@@ -43,6 +43,7 @@ public:
public slots:
void closeWindow();
+ void restoreSettings();
void setDefault();
void showWindow();
diff --git a/sources/gui/src/settingswindow.ui b/sources/gui/src/settingswindow.ui
index 01be9c0..8662711 100644
--- a/sources/gui/src/settingswindow.ui
+++ b/sources/gui/src/settingswindow.ui
@@ -6,8 +6,8 @@
0
0
- 682
- 399
+ 680
+ 397
@@ -136,8 +136,8 @@
0
0
- 466
- 338
+ 464
+ 336
@@ -211,8 +211,8 @@
0
0
- 466
- 338
+ 397
+ 322
@@ -845,8 +845,8 @@
0
0
- 466
- 338
+ 436
+ 103
@@ -962,7 +962,7 @@
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset|QDialogButtonBox::RestoreDefaults
diff --git a/sources/helper/src/main.cpp b/sources/helper/src/main.cpp
index a118a60..a7dfee1 100644
--- a/sources/helper/src/main.cpp
+++ b/sources/helper/src/main.cpp
@@ -20,7 +20,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
args[QString("nodaemon")] = true;
// check euid
if (geteuid() != 0) {
- cout << QCoreApplication::translate("NetctlHelper", "The helper is running with EUID %1. Functions will not be available.")
+ cout << QCoreApplication::translate("NetctlHelper", "The helper is running with EUID %1. Some functions will not be available.")
.arg(QString::number(geteuid())).toUtf8().data() << endl;
cout << QCoreApplication::translate("NetctlHelper", "See security notes for more details.")
.toUtf8().data() << endl;
@@ -94,6 +94,9 @@ int main(int argc, char *argv[])
// reread translations according to flags
QString language = Language::defineLanguage(args[QString("config")].toString(),
args[QString("options")].toString());
+ QTranslator qtTranslator;
+ qtTranslator.load(QString("qt_") + language, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+ a.installTranslator(&qtTranslator);
QTranslator translator;
translator.load(QString(":/translations-helper/") + language);
a.installTranslator(&translator);
diff --git a/sources/plasmoid/po/en.po b/sources/plasmoid/po/en.po
index 3e78a5b..ca68003 100644
--- a/sources/plasmoid/po/en.po
+++ b/sources/plasmoid/po/en.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n"
-"POT-Creation-Date: 2014-08-10 22:32+0400\n"
+"POT-Creation-Date: 2014-08-12 00:24+0400\n"
"PO-Revision-Date: 2014-08-10 22:32+0400\n"
"Last-Translator: Evgeniy Alekseev \n"
"Language-Team: Russian \n"
@@ -18,95 +18,95 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
-#: netctl.cpp:299
+#: netctl.cpp:294
msgid "Set profile %1 disabled"
msgstr "Set profile %1 disabled"
-#: netctl.cpp:303
+#: netctl.cpp:297
msgid "Set profile %1 enabled"
msgstr "Set profile %1 enabled"
-#: netctl.cpp:325
+#: netctl.cpp:318
msgid "Restart profile %1"
msgstr "Restart profile %1"
-#: netctl.cpp:347
+#: netctl.cpp:339
msgid "Start profile %1"
msgstr "Start profile %1"
-#: netctl.cpp:374
+#: netctl.cpp:365
msgid "Stop profile %1"
msgstr "Stop profile %1"
-#: netctl.cpp:397
+#: netctl.cpp:387
msgid "Switch to profile %1"
msgstr "Switch to profile %1"
-#: netctl.cpp:460
+#: netctl.cpp:449
msgid "Start another profile"
msgstr "Start another profile"
-#: netctl.cpp:461
+#: netctl.cpp:450
msgid "Stop %1"
msgstr "Stop %1"
-#: netctl.cpp:462
+#: netctl.cpp:451
msgid "Restart %1"
msgstr "Restart %1"
-#: netctl.cpp:464
+#: netctl.cpp:453
msgid "Disable %1"
msgstr "Disable %1"
-#: netctl.cpp:466
+#: netctl.cpp:455
msgid "Enable %1"
msgstr "Enable %1"
-#: netctl.cpp:469 netctl.cpp:492
+#: netctl.cpp:458 netctl.cpp:481
msgid "Start profile"
msgstr "Start profile"
-#: netctl.cpp:500
+#: netctl.cpp:489
msgid "Stop profile"
msgstr "Stop profile"
-#: netctl.cpp:505
+#: netctl.cpp:494
msgid "Switch to profile"
msgstr "Switch to profile"
-#: netctl.cpp:513
+#: netctl.cpp:502
msgid "Restart profile"
msgstr "Restart profile"
-#: netctl.cpp:518
+#: netctl.cpp:507
msgid "Enable profile"
msgstr "Enable profile"
-#: netctl.cpp:522
+#: netctl.cpp:511
msgid "Show netctl-gui"
msgstr "Show netctl-gui"
-#: netctl.cpp:527
+#: netctl.cpp:516
msgid "Show WiFi menu"
msgstr "Show WiFi menu"
-#: netctl.cpp:554
+#: netctl.cpp:543
msgid "Start GUI"
msgstr "Start GUI"
-#: netctl.cpp:565
+#: netctl.cpp:554
msgid "Start WiFi menu"
msgstr "Start WiFi menu"
-#: netctl.cpp:629
+#: netctl.cpp:610
msgid "Network is up"
msgstr "Network is up"
-#: netctl.cpp:634
+#: netctl.cpp:614
msgid "Network is down"
msgstr "Network is down"
-#: netctl.cpp:808
+#: netctl.cpp:786
msgid ""
"Version %1\n"
"(build date %2)"
@@ -114,59 +114,59 @@ msgstr ""
"Version %1\n"
"(build date %2)"
-#: netctl.cpp:809
+#: netctl.cpp:787
msgid "KDE widget which interacts with netctl."
msgstr "KDE widget which interacts with netctl."
-#: netctl.cpp:810
+#: netctl.cpp:788
msgid "Translators: %1"
msgstr "Translators: %1"
-#: netctl.cpp:811
+#: netctl.cpp:789
msgid "Links:"
msgstr "Links:"
-#: netctl.cpp:812
+#: netctl.cpp:790
msgid "Homepage"
msgstr "Homepage"
-#: netctl.cpp:813
+#: netctl.cpp:791
msgid "Repository"
msgstr "Repository"
-#: netctl.cpp:814
+#: netctl.cpp:792
msgid "Bugtracker"
msgstr "Bugtracker"
-#: netctl.cpp:815
+#: netctl.cpp:793
msgid "Translation issue"
msgstr "Translation issue"
-#: netctl.cpp:816
+#: netctl.cpp:794
msgid "AUR packages"
msgstr "AUR packages"
-#: netctl.cpp:818
+#: netctl.cpp:796
msgid "This software is licensed under %1"
msgstr "This software is licensed under %1"
-#: netctl.cpp:819
+#: netctl.cpp:797
msgid "This software uses: %1"
msgstr "This software uses: %1"
-#: netctl.cpp:821
+#: netctl.cpp:799
msgid "Netctl plasmoid"
msgstr "Netctl plasmoid"
-#: netctl.cpp:822
+#: netctl.cpp:800
msgid "Appearance"
msgstr "Appearance"
-#: netctl.cpp:823
+#: netctl.cpp:801
msgid "DataEngine"
msgstr "DataEngine"
-#: netctl.cpp:824
+#: netctl.cpp:802
msgid "About"
msgstr "About"
diff --git a/sources/plasmoid/po/plasma_applet_netctl.pot b/sources/plasmoid/po/plasma_applet_netctl.pot
index 0a8c2eb..a94822d 100644
--- a/sources/plasmoid/po/plasma_applet_netctl.pot
+++ b/sources/plasmoid/po/plasma_applet_netctl.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n"
-"POT-Creation-Date: 2014-08-10 22:32+0400\n"
+"POT-Creation-Date: 2014-08-12 00:24+0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,153 +17,153 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: netctl.cpp:299
+#: netctl.cpp:294
msgid "Set profile %1 disabled"
msgstr ""
-#: netctl.cpp:303
+#: netctl.cpp:297
msgid "Set profile %1 enabled"
msgstr ""
-#: netctl.cpp:325
+#: netctl.cpp:318
msgid "Restart profile %1"
msgstr ""
-#: netctl.cpp:347
+#: netctl.cpp:339
msgid "Start profile %1"
msgstr ""
-#: netctl.cpp:374
+#: netctl.cpp:365
msgid "Stop profile %1"
msgstr ""
-#: netctl.cpp:397
+#: netctl.cpp:387
msgid "Switch to profile %1"
msgstr ""
-#: netctl.cpp:460
+#: netctl.cpp:449
msgid "Start another profile"
msgstr ""
-#: netctl.cpp:461
+#: netctl.cpp:450
msgid "Stop %1"
msgstr ""
-#: netctl.cpp:462
+#: netctl.cpp:451
msgid "Restart %1"
msgstr ""
-#: netctl.cpp:464
+#: netctl.cpp:453
msgid "Disable %1"
msgstr ""
-#: netctl.cpp:466
+#: netctl.cpp:455
msgid "Enable %1"
msgstr ""
-#: netctl.cpp:469 netctl.cpp:492
+#: netctl.cpp:458 netctl.cpp:481
msgid "Start profile"
msgstr ""
-#: netctl.cpp:500
+#: netctl.cpp:489
msgid "Stop profile"
msgstr ""
-#: netctl.cpp:505
+#: netctl.cpp:494
msgid "Switch to profile"
msgstr ""
-#: netctl.cpp:513
+#: netctl.cpp:502
msgid "Restart profile"
msgstr ""
-#: netctl.cpp:518
+#: netctl.cpp:507
msgid "Enable profile"
msgstr ""
-#: netctl.cpp:522
+#: netctl.cpp:511
msgid "Show netctl-gui"
msgstr ""
-#: netctl.cpp:527
+#: netctl.cpp:516
msgid "Show WiFi menu"
msgstr ""
-#: netctl.cpp:554
+#: netctl.cpp:543
msgid "Start GUI"
msgstr ""
-#: netctl.cpp:565
+#: netctl.cpp:554
msgid "Start WiFi menu"
msgstr ""
-#: netctl.cpp:629
+#: netctl.cpp:610
msgid "Network is up"
msgstr ""
-#: netctl.cpp:634
+#: netctl.cpp:614
msgid "Network is down"
msgstr ""
-#: netctl.cpp:808
+#: netctl.cpp:786
msgid ""
"Version %1\n"
"(build date %2)"
msgstr ""
-#: netctl.cpp:809
+#: netctl.cpp:787
msgid "KDE widget which interacts with netctl."
msgstr ""
-#: netctl.cpp:810
+#: netctl.cpp:788
msgid "Translators: %1"
msgstr ""
-#: netctl.cpp:811
+#: netctl.cpp:789
msgid "Links:"
msgstr ""
-#: netctl.cpp:812
+#: netctl.cpp:790
msgid "Homepage"
msgstr ""
-#: netctl.cpp:813
+#: netctl.cpp:791
msgid "Repository"
msgstr ""
-#: netctl.cpp:814
+#: netctl.cpp:792
msgid "Bugtracker"
msgstr ""
-#: netctl.cpp:815
+#: netctl.cpp:793
msgid "Translation issue"
msgstr ""
-#: netctl.cpp:816
+#: netctl.cpp:794
msgid "AUR packages"
msgstr ""
-#: netctl.cpp:818
+#: netctl.cpp:796
msgid "This software is licensed under %1"
msgstr ""
-#: netctl.cpp:819
+#: netctl.cpp:797
msgid "This software uses: %1"
msgstr ""
-#: netctl.cpp:821
+#: netctl.cpp:799
msgid "Netctl plasmoid"
msgstr ""
-#: netctl.cpp:822
+#: netctl.cpp:800
msgid "Appearance"
msgstr ""
-#: netctl.cpp:823
+#: netctl.cpp:801
msgid "DataEngine"
msgstr ""
-#: netctl.cpp:824
+#: netctl.cpp:802
msgid "About"
msgstr ""
diff --git a/sources/plasmoid/po/ru.po b/sources/plasmoid/po/ru.po
index a03c93b..f5a9006 100644
--- a/sources/plasmoid/po/ru.po
+++ b/sources/plasmoid/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n"
-"POT-Creation-Date: 2014-08-10 22:32+0400\n"
+"POT-Creation-Date: 2014-08-12 00:24+0400\n"
"PO-Revision-Date: 2014-08-10 22:33+0400\n"
"Last-Translator: Evgeniy Alekseev \n"
"Language-Team: Russian \n"
@@ -18,95 +18,95 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
-#: netctl.cpp:299
+#: netctl.cpp:294
msgid "Set profile %1 disabled"
msgstr "Выключение автозагрузки профиля %1"
-#: netctl.cpp:303
+#: netctl.cpp:297
msgid "Set profile %1 enabled"
msgstr "Включение автозагрузки профиля %1"
-#: netctl.cpp:325
+#: netctl.cpp:318
msgid "Restart profile %1"
msgstr "Перезапуск профиля %1"
-#: netctl.cpp:347
+#: netctl.cpp:339
msgid "Start profile %1"
msgstr "Запуск профиля %1"
-#: netctl.cpp:374
+#: netctl.cpp:365
msgid "Stop profile %1"
msgstr "Остановка профиля %1"
-#: netctl.cpp:397
+#: netctl.cpp:387
msgid "Switch to profile %1"
msgstr "Переключение на профиль %1"
-#: netctl.cpp:460
+#: netctl.cpp:449
msgid "Start another profile"
msgstr "Запустить другой профиль"
-#: netctl.cpp:461
+#: netctl.cpp:450
msgid "Stop %1"
msgstr "Остановить %1"
-#: netctl.cpp:462
+#: netctl.cpp:451
msgid "Restart %1"
msgstr "Перезапустить %1"
-#: netctl.cpp:464
+#: netctl.cpp:453
msgid "Disable %1"
msgstr "Отключить %1"
-#: netctl.cpp:466
+#: netctl.cpp:455
msgid "Enable %1"
msgstr "Включить %1"
-#: netctl.cpp:469 netctl.cpp:492
+#: netctl.cpp:458 netctl.cpp:481
msgid "Start profile"
msgstr "Запустить профиль"
-#: netctl.cpp:500
+#: netctl.cpp:489
msgid "Stop profile"
msgstr "Остановить профиль"
-#: netctl.cpp:505
+#: netctl.cpp:494
msgid "Switch to profile"
msgstr "Переключить профиль"
-#: netctl.cpp:513
+#: netctl.cpp:502
msgid "Restart profile"
msgstr "Перезапустить профиль"
-#: netctl.cpp:518
+#: netctl.cpp:507
msgid "Enable profile"
msgstr "Включить профиль"
-#: netctl.cpp:522
+#: netctl.cpp:511
msgid "Show netctl-gui"
msgstr "Показать netctl-gui"
-#: netctl.cpp:527
+#: netctl.cpp:516
msgid "Show WiFi menu"
msgstr "Запустить WiFi-menu"
-#: netctl.cpp:554
+#: netctl.cpp:543
msgid "Start GUI"
msgstr "Запуск GUI"
-#: netctl.cpp:565
+#: netctl.cpp:554
msgid "Start WiFi menu"
msgstr "Запуск WiFi-menu"
-#: netctl.cpp:629
+#: netctl.cpp:610
msgid "Network is up"
msgstr "Сеть работает"
-#: netctl.cpp:634
+#: netctl.cpp:614
msgid "Network is down"
msgstr "Сеть не работает"
-#: netctl.cpp:808
+#: netctl.cpp:786
msgid ""
"Version %1\n"
"(build date %2)"
@@ -114,59 +114,59 @@ msgstr ""
"Версия %1\n"
"(дата сборки %2)"
-#: netctl.cpp:809
+#: netctl.cpp:787
msgid "KDE widget which interacts with netctl."
msgstr "Виджет KDE, который взаимодействует с netctl."
-#: netctl.cpp:810
+#: netctl.cpp:788
msgid "Translators: %1"
msgstr "Переводчики: %1"
-#: netctl.cpp:811
+#: netctl.cpp:789
msgid "Links:"
msgstr "Ссылки:"
-#: netctl.cpp:812
+#: netctl.cpp:790
msgid "Homepage"
msgstr "Домашняя страница"
-#: netctl.cpp:813
+#: netctl.cpp:791
msgid "Repository"
msgstr "Репозиторий"
-#: netctl.cpp:814
+#: netctl.cpp:792
msgid "Bugtracker"
msgstr "Багтрекер"
-#: netctl.cpp:815
+#: netctl.cpp:793
msgid "Translation issue"
msgstr "Тикет перевода"
-#: netctl.cpp:816
+#: netctl.cpp:794
msgid "AUR packages"
msgstr "Пакеты в AUR"
-#: netctl.cpp:818
+#: netctl.cpp:796
msgid "This software is licensed under %1"
msgstr "Данное приложение лицензировано под %1"
-#: netctl.cpp:819
+#: netctl.cpp:797
msgid "This software uses: %1"
msgstr "Данное приложение использует: %1"
-#: netctl.cpp:821
+#: netctl.cpp:799
msgid "Netctl plasmoid"
msgstr "Netctl plasmoid"
-#: netctl.cpp:822
+#: netctl.cpp:800
msgid "Appearance"
msgstr "Внешний вид"
-#: netctl.cpp:823
+#: netctl.cpp:801
msgid "DataEngine"
msgstr "DataEngine"
-#: netctl.cpp:824
+#: netctl.cpp:802
msgid "About"
msgstr "О программе"
diff --git a/sources/resources/translations-helper/en.ts b/sources/resources/translations-helper/en.ts
index 30bc79b..5c7d41f 100644
--- a/sources/resources/translations-helper/en.ts
+++ b/sources/resources/translations-helper/en.ts
@@ -90,5 +90,19 @@
License
License
+
+ The helper is running with EUID %1. Functions will not be available.
+ The helper is running with EUID %1. Functions will not be available.
+
+
+
+ The helper is running with EUID %1. Some functions will not be available.
+ The helper is running with EUID %1. Some functions will not be available.
+
+
+
+ See security notes for more details.
+ See security notes for more details.
+
diff --git a/sources/resources/translations-helper/netctlgui-helper.ts b/sources/resources/translations-helper/netctlgui-helper.ts
index 9cc59e3..75849e7 100644
--- a/sources/resources/translations-helper/netctlgui-helper.ts
+++ b/sources/resources/translations-helper/netctlgui-helper.ts
@@ -89,5 +89,15 @@
License
+
+
+ The helper is running with EUID %1. Some functions will not be available.
+
+
+
+
+ See security notes for more details.
+
+
diff --git a/sources/resources/translations-helper/ru.ts b/sources/resources/translations-helper/ru.ts
index 0478233..1a8c588 100644
--- a/sources/resources/translations-helper/ru.ts
+++ b/sources/resources/translations-helper/ru.ts
@@ -90,5 +90,15 @@
License
Лицензия
+
+
+ The helper is running with EUID %1. Some functions will not be available.
+ Хелпер запущен с EUID %1. Некоторые функции не будут доступны.
+
+
+
+ See security notes for more details.
+ Смотри примечания о безопасности для более подробной информации.
+
diff --git a/sources/resources/translations/en.ts b/sources/resources/translations/en.ts
index eb08883..93db437 100644
--- a/sources/resources/translations/en.ts
+++ b/sources/resources/translations/en.ts
@@ -1824,6 +1824,10 @@
Close helper after exit (doesn't work while systemd service is active)
Close helper after exit (doesn't work while systemd service is active)
+
+ There are too binaries. `netctlgui-helper` should be running as root (for example from systemd), otherwise interface `/ctrl` will not be available. `netctlgui-helper-suid` may be running as normal user, but you should keep it in mind that it has SUID bit.
+ There are too binaries. `netctlgui-helper` should be running as root (for example from systemd), otherwise interface `/ctrl` will not be available. `netctlgui-helper-suid` may be running as normal user, but you should keep it in mind that it has SUID bit.
+
TrayIcon
diff --git a/sources/resources/translations/netctl-gui.ts b/sources/resources/translations/netctl-gui.ts
index dc86f56..09852da 100644
--- a/sources/resources/translations/netctl-gui.ts
+++ b/sources/resources/translations/netctl-gui.ts
@@ -315,19 +315,19 @@
-
+
Select wpa configuration file
-
+
Configuration files (*.conf)
-
+
Show advanced
@@ -335,114 +335,114 @@
GeneralWidget
-
+
Form
-
+
General
-
+
Description
-
+
<html><head/><body><p>A description of the profile</p></body></html>
-
+
Connection
-
+
The connection type used by the profile
-
+
Interface
-
+
The name of the associated network interface
-
+
Binds to interfaces
-
-
+
+
Add
-
+
An array of physical network interfaces that this profile needs before it can be started
-
+
Hide advanced
-
+
After
-
+
An array of profile names that should be started before this profile is started
-
+
Command after starting
-
+
A command that is executed after a connection is established
-
+
Command before stoping
-
+
A command that is executed before a connection is brought down
-
+
Set to ‘yes’ to force connecting even if the interface is up
-
+
Force connect
-
+
Debug mode
-
+
Show advanced
@@ -543,7 +543,7 @@
-
+
Hide advanced
@@ -703,7 +703,7 @@
-
+
Show advanced
@@ -749,22 +749,22 @@
-
-
+
+
Name
-
+
Description
-
-
+
+
@@ -784,9 +784,9 @@
-
-
-
+
+
+
Start
@@ -798,7 +798,7 @@
-
+
Profile
@@ -860,13 +860,13 @@
-
+
Signal
-
+
Security
@@ -907,35 +907,35 @@
-
-
-
+
+
+
Start profile
-
+
Restart profile
-
-
-
+
+
+
Enable profile
-
+
Edit profile
-
+
Remove profile
@@ -962,114 +962,114 @@
-
+
Ready
-
+
yes
-
+
no
-
-
-
-
+
+
+
+
Active
-
-
+
+
Enabled
-
-
-
+
+
+
Updated
-
-
+
+
Stop profile
-
-
+
+
Disable profile
-
-
+
+
Exists
-
+
ESSID
-
-
+
+
Stop WiFi
-
-
-
-
-
+
+
+
+
+
Start WiFi
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
Done
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
Error
-
-
+
+
Stop
@@ -1314,7 +1314,7 @@
-
+
Show advanced
@@ -1404,26 +1404,26 @@
-
+
Name
-
+
Description
-
-
+
+
Active
-
-
+
+
Disabled
@@ -1443,34 +1443,34 @@
-
+
Disable service
-
+
Enable service
-
+
netctl-auto is running
-
+
Stop service
-
+
Start service
-
+
netctl-auto is not running
@@ -1485,18 +1485,18 @@
-
+
Profile
-
+
Updated
-
+
Enable profile
@@ -1514,42 +1514,42 @@
-
-
+
+
Enable
-
-
+
+
Disable
-
-
-
-
-
-
-
+
+
+
+
+
+
+
Done
-
-
-
-
-
-
-
+
+
+
+
+
+
+
Error
-
+
Disable profile
@@ -1579,7 +1579,7 @@
-
+
ESSID
@@ -1643,7 +1643,7 @@
-
+
Show advanced
@@ -1788,350 +1788,350 @@
SettingsWindow
-
+
Settings
-
+
General
-
+
Language
-
+
Select a language
-
+
netctl
-
+
netctl path
-
+
Path to netctl
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
Browse
-
+
Profile path
-
+
Path to profile directory
-
+
sudo
-
+
sudo path
-
+
Path to sudo
-
+
wpa_supplicant
-
+
Helper
-
+
Enable system tray
-
+
Minimize to tray instead of closing
-
+
Start minimized to tray
-
+
It is recommended to use systemd integration. See `man 1 netctlgui-helper` for more details.
-
+
Helper status
-
+
Use helper
-
+
Force use sudo in helper
-
- Helper command
-
-
-
-
- Helper service
-
-
-
-
- Name of netctlgui-helper service
-
-
-
-
- systemctl path
+
+ There are too binaries. `netctlgui-helper` should be running as root (for example from systemd), otherwise interface `/ctrl` will not be available. `netctlgui-helper-suid` may be running as normal user, but you should keep it in mind that it has SUID bit.
- Path to systemctl
+ Helper command
+
+
+
+
+ Helper service
+
+
+
+
+ Name of netctlgui-helper service
+
+
+
+
+ systemctl path
+ Path to systemctl
+
+
+
+
netctl-auto path
-
+
Path to netctl-auto
-
+
netctl-auto service
-
+
Name of netctl-auto systemd service
-
+
wpa_supplicant path
-
+
Path to wpa_supplicant
-
+
wpa_cli path
-
+
Path to wpa_cli
-
+
PID file
-
+
wpa_supplicant PID file
-
+
wpa_supplicant drivers
-
+
wpa_supplicant drivers comma separated
-
+
ctrl_interface directory
-
+
Path to control directory
-
+
ctrl_interface group
-
+
Group of control directory
-
+
Other
-
+
Close helper after exit (doesn't work while systemd service is active)
-
+
Path to interface list
-
+
Path to directory which contains network devices
-
+
Path to rfkill device list
-
+
Path to directory which contains rfkill devices
-
-
+
+
Prefered wireless interface
-
+
Select path to directory with interfaces
-
+
Select netctl command
-
-
-
-
-
-
-
+
All files (*)
-
+
+
Select helper command
-
+
Select netctl-auto command
-
+
Select path to profile directory
-
+
Select path to directory with rfkill devices
-
+
Select sudo command
-
+
Select systemctl command
-
+
Select wpa_cli command
-
+
Select wpa_supplicant command
-
+
Active (systemd)
-
+
Active
-
-
+
+
Stop
-
+
Inactive
-
-
+
+
Start
@@ -2156,96 +2156,96 @@
-
+
(netctl-auto)
-
+
(enabled)
-
+
(static)
-
+
Start another profile
-
+
Stop %1
-
+
Restart %1
-
+
Disable %1
-
+
Enable %1
-
-
+
+
Start profile
-
+
Stop profile
-
+
Switch to profile
-
+
Restart profile
-
+
Enable profile
-
+
Quit
-
-
+
+
Show
-
+
Show netctl-auto
-
+
Status
-
+
Hide
@@ -2524,7 +2524,7 @@
-
+
Show advanced
@@ -2631,7 +2631,7 @@
-
+
Hide advanced
diff --git a/sources/resources/translations/ru.ts b/sources/resources/translations/ru.ts
index 41a47c1..2f556a2 100644
--- a/sources/resources/translations/ru.ts
+++ b/sources/resources/translations/ru.ts
@@ -1823,6 +1823,10 @@
Close helper after exit (doesn't work while systemd service is active)
Закрыть хелпер после выхода (не работает, если запущен сервис systemd)
+
+ There are too binaries. `netctlgui-helper` should be running as root (for example from systemd), otherwise interface `/ctrl` will not be available. `netctlgui-helper-suid` may be running as normal user, but you should keep it in mind that it has SUID bit.
+ Существует два бинарных файла. `netctlgui-helper` должен быть запущен от root'а (например, через systemd), в противном случае интерфейс `/ctrl` не будет доступен. `netctlgui-helper-suid` может быть запущен от обычного пользователя, однако Вы должны иметь в виду, что он имеет SUID бит.
+
TrayIcon