arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-04-24 15:37:23 +00:00
Code Issues Projects Releases Wiki Activity

update changelog and some translations fixes

Browse Source
This commit is contained in:
arcan1s 2014-08-12 00:59:56 +04:00
parent 3e0ae6d4cc
commit f4e3848fa7
19 changed files with 470 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CHANGELOG
View File

@ -1,5 +1,7 @@
Ver.1.3.0 Ver.1.3.0
--------- ---------
* all:
* some bug fixes and refactoring
* dataengine: * dataengine:
+ add new sources: intIp6, extIp6, netctlAutoStatus + add new sources: intIp6, extIp6, netctlAutoStatus
* rewrite to use [tasks](https://github.com/mhogomchungu/tasks) (see #7) * rewrite to use [tasks](https://github.com/mhogomchungu/tasks) (see #7)
@ -8,11 +10,19 @@ Ver.1.3.0
* change internal IP definition * change internal IP definition
* gui: * gui:
+ add 3rd party license information + add 3rd party license information
+ add system tray icon + add system tray icon as an alternative to the plasmoid
+ add dbus interface org.netctlgui.netctlgui + add DBus session interface org.netctlgui.netctlgui
+ add dynamic settings load + 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 * update to library changes
* rewrite tables to use toolTip * 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: * library:
+ add custom structures netctlWifiInfo and netctlProfileInfo + add custom structures netctlWifiInfo and netctlProfileInfo
+ add methods getActiveProfile(), autoGetActiveProfile() + add methods getActiveProfile(), autoGetActiveProfile()
@ -23,8 +33,11 @@ Ver.1.3.0
- remove SleepThread class - remove SleepThread class
* plasmoid: * plasmoid:
+ add 3rd party license information + add 3rd party license information
+ allow plasmoid to use system tray
+ add ability to use helper
* change all running processes to detached (see #7) * change all running processes to detached (see #7)
* rewrite text label to use tags * rewrite text label to use tags
* update to dataengine changes
*** ***

6
sources/gui/src/generalwidget.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>427</width> <width>425</width>
<height>533</height> <height>531</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -125,7 +125,7 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>openvswitch</string> <string notr="true">openvswitch</string>
</property> </property>
</item> </item>
</widget> </widget>

6
sources/gui/src/main.cpp
View File

@ -20,6 +20,7 @@
#include <QDBusConnection> #include <QDBusConnection>
#include <QDBusMessage> #include <QDBusMessage>
#include <QDir> #include <QDir>
#include <QLibraryInfo>
#include <QTranslator> #include <QTranslator>
#include <iostream> #include <iostream>
#include <unistd.h> #include <unistd.h>
@ -138,6 +139,9 @@ int main(int argc, char *argv[])
// reread translations according to flags // reread translations according to flags
QString language = Language::defineLanguage(args[QString("config")].toString(), QString language = Language::defineLanguage(args[QString("config")].toString(),
args[QString("options")].toString()); args[QString("options")].toString());
QTranslator qtTranslator;
qtTranslator.load(QString("qt_") + language, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
a.installTranslator(&qtTranslator);
QTranslator translator; QTranslator translator;
translator.load(QString(":/translations/") + language); translator.load(QString(":/translations/") + language);
a.installTranslator(&translator); a.installTranslator(&translator);
@ -162,6 +166,6 @@ int main(int argc, char *argv[])
// check if exists // check if exists
if (restoreExistSession()) if (restoreExistSession())
return 0; return 0;
MainWindow w(0, args, &translator); MainWindow w(0, args, &qtTranslator, &translator);
return a.exec(); return a.exec();
} }

3
sources/gui/src/mainpublicslots.cpp
View File

@ -20,6 +20,7 @@
#include <QDebug> #include <QDebug>
#include <QDesktopServices> #include <QDesktopServices>
#include <QLibraryInfo>
#include <QTranslator> #include <QTranslator>
#include <QUrl> #include <QUrl>
@ -321,6 +322,8 @@ void MainWindow::updateConfiguration(const QMap<QString, QVariant> args)
qApp->removeTranslator(translator); qApp->removeTranslator(translator);
QString language = Language::defineLanguage(configPath, QString language = Language::defineLanguage(configPath,
args[QString("options")].toString()); args[QString("options")].toString());
qtTranslator->load(QString("qt_") + language, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
qApp->installTranslator(qtTranslator);
translator->load(QString(":/translations/") + language); translator->load(QString(":/translations/") + language);
qApp->installTranslator(translator); qApp->installTranslator(translator);

4
sources/gui/src/mainwindow.cpp
View File

@ -47,10 +47,12 @@
MainWindow::MainWindow(QWidget *parent, MainWindow::MainWindow(QWidget *parent,
const QMap<QString, QVariant> args, const QMap<QString, QVariant> args,
QTranslator *qtAppTranslator,
QTranslator *appTranslator) QTranslator *appTranslator)
: QMainWindow(parent), : QMainWindow(parent),
configPath(args[QString("config")].toString()), configPath(args[QString("config")].toString()),
debug(args[QString("debug")].toBool()), debug(args[QString("debug")].toBool()),
qtTranslator(qtAppTranslator),
translator(appTranslator) translator(appTranslator)
{ {
if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "about" << args[QString("about")].toBool(); if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "about" << args[QString("about")].toBool();
@ -294,6 +296,8 @@ bool MainWindow::checkHelperStatus()
QList<QVariant>(), true, debug); QList<QVariant>(), true, debug);
if (isHelperServiceActive()) if (isHelperServiceActive())
configuration[QString("CLOSE_HELPER")] = QString("false"); configuration[QString("CLOSE_HELPER")] = QString("false");
return useHelper;
} }

2
sources/gui/src/mainwindow.h
View File

@ -54,6 +54,7 @@ class MainWindow : public QMainWindow
public: public:
explicit MainWindow(QWidget *parent = 0, explicit MainWindow(QWidget *parent = 0,
const QMap<QString, QVariant> args = QMap<QString, QVariant>(), const QMap<QString, QVariant> args = QMap<QString, QVariant>(),
QTranslator *qtAppTranslator = 0,
QTranslator *appTranslator = 0); QTranslator *appTranslator = 0);
~MainWindow(); ~MainWindow();
QStringList printInformation(); QStringList printInformation();
@ -162,6 +163,7 @@ private:
bool hiddenNetwork; bool hiddenNetwork;
bool isDaemon = false; bool isDaemon = false;
bool useHelper = true; bool useHelper = true;
QTranslator *qtTranslator = nullptr;
QTranslator *translator = nullptr; QTranslator *translator = nullptr;
// configuration // configuration
QMap<QString, QString> configuration; QMap<QString, QString> configuration;

14
sources/gui/src/settingswindow.cpp
View File

@ -52,8 +52,9 @@ void SettingsWindow::createActions()
if (debug) qDebug() << "[SettingsWindow]" << "[createActions]"; if (debug) qDebug() << "[SettingsWindow]" << "[createActions]";
connect(ui->buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked(bool)), this, SLOT(close())); 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::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->checkBox_enableTray, SIGNAL(stateChanged(int)), this, SLOT(setTray()));
connect(ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), connect(ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
this, SLOT(changePage(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() void SettingsWindow::setDefault()
{ {
if (debug) qDebug() << "[SettingsWindow]" << "[setDefault]"; if (debug) qDebug() << "[SettingsWindow]" << "[setDefault]";
setSettings(getDefault()); setSettings(getDefault());
saveSettings(); if (sender() != ui->buttonBox->button(QDialogButtonBox::Reset))
saveSettings();
} }

1
sources/gui/src/settingswindow.h
View File

@ -43,6 +43,7 @@ public:
public slots: public slots:
void closeWindow(); void closeWindow();
void restoreSettings();
void setDefault(); void setDefault();
void showWindow(); void showWindow();

18
sources/gui/src/settingswindow.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>682</width> <width>680</width>
<height>399</height> <height>397</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -136,8 +136,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>466</width> <width>464</width>
<height>338</height> <height>336</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="verticalLayout_7">
@ -211,8 +211,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>466</width> <width>397</width>
<height>338</height> <height>322</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_13"> <layout class="QVBoxLayout" name="verticalLayout_13">
@ -845,8 +845,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>466</width> <width>436</width>
<height>338</height> <height>103</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_11"> <layout class="QVBoxLayout" name="verticalLayout_11">
@ -962,7 +962,7 @@
<item> <item>
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons"> <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset|QDialogButtonBox::RestoreDefaults</set>
</property> </property>
</widget> </widget>
</item> </item>

7
sources/helper/src/main.cpp
View File

@ -20,7 +20,7 @@
#include <QDBusConnection> #include <QDBusConnection>
#include <QDBusMessage> #include <QDBusMessage>
#include <QDir> #include <QDir>
#include <QDebug> #include <QLibraryInfo>
#include <QTranslator> #include <QTranslator>
#include <iostream> #include <iostream>
#include <unistd.h> #include <unistd.h>
@ -81,7 +81,7 @@ int main(int argc, char *argv[])
args[QString("nodaemon")] = true; args[QString("nodaemon")] = true;
// check euid // check euid
if (geteuid() != 0) { 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; .arg(QString::number(geteuid())).toUtf8().data() << endl;
cout << QCoreApplication::translate("NetctlHelper", "See security notes for more details.") cout << QCoreApplication::translate("NetctlHelper", "See security notes for more details.")
.toUtf8().data() << endl; .toUtf8().data() << endl;
@ -94,6 +94,9 @@ int main(int argc, char *argv[])
// reread translations according to flags // reread translations according to flags
QString language = Language::defineLanguage(args[QString("config")].toString(), QString language = Language::defineLanguage(args[QString("config")].toString(),
args[QString("options")].toString()); args[QString("options")].toString());
QTranslator qtTranslator;
qtTranslator.load(QString("qt_") + language, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
a.installTranslator(&qtTranslator);
QTranslator translator; QTranslator translator;
translator.load(QString(":/translations-helper/") + language); translator.load(QString(":/translations-helper/") + language);
a.installTranslator(&translator); a.installTranslator(&translator);

76
sources/plasmoid/po/en.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\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" "PO-Revision-Date: 2014-08-10 22:32+0400\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n" "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@ -18,95 +18,95 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n" "X-Generator: Lokalize 1.5\n"
#: netctl.cpp:299 #: netctl.cpp:294
msgid "Set profile %1 disabled" msgid "Set profile %1 disabled"
msgstr "Set profile %1 disabled" msgstr "Set profile %1 disabled"
#: netctl.cpp:303 #: netctl.cpp:297
msgid "Set profile %1 enabled" msgid "Set profile %1 enabled"
msgstr "Set profile %1 enabled" msgstr "Set profile %1 enabled"
#: netctl.cpp:325 #: netctl.cpp:318
msgid "Restart profile %1" msgid "Restart profile %1"
msgstr "Restart profile %1" msgstr "Restart profile %1"
#: netctl.cpp:347 #: netctl.cpp:339
msgid "Start profile %1" msgid "Start profile %1"
msgstr "Start profile %1" msgstr "Start profile %1"
#: netctl.cpp:374 #: netctl.cpp:365
msgid "Stop profile %1" msgid "Stop profile %1"
msgstr "Stop profile %1" msgstr "Stop profile %1"
#: netctl.cpp:397 #: netctl.cpp:387
msgid "Switch to profile %1" msgid "Switch to profile %1"
msgstr "Switch to profile %1" msgstr "Switch to profile %1"
#: netctl.cpp:460 #: netctl.cpp:449
msgid "Start another profile" msgid "Start another profile"
msgstr "Start another profile" msgstr "Start another profile"
#: netctl.cpp:461 #: netctl.cpp:450
msgid "Stop %1" msgid "Stop %1"
msgstr "Stop %1" msgstr "Stop %1"
#: netctl.cpp:462 #: netctl.cpp:451
msgid "Restart %1" msgid "Restart %1"
msgstr "Restart %1" msgstr "Restart %1"
#: netctl.cpp:464 #: netctl.cpp:453
msgid "Disable %1" msgid "Disable %1"
msgstr "Disable %1" msgstr "Disable %1"
#: netctl.cpp:466 #: netctl.cpp:455
msgid "Enable %1" msgid "Enable %1"
msgstr "Enable %1" msgstr "Enable %1"
#: netctl.cpp:469 netctl.cpp:492 #: netctl.cpp:458 netctl.cpp:481
msgid "Start profile" msgid "Start profile"
msgstr "Start profile" msgstr "Start profile"
#: netctl.cpp:500 #: netctl.cpp:489
msgid "Stop profile" msgid "Stop profile"
msgstr "Stop profile" msgstr "Stop profile"
#: netctl.cpp:505 #: netctl.cpp:494
msgid "Switch to profile" msgid "Switch to profile"
msgstr "Switch to profile" msgstr "Switch to profile"
#: netctl.cpp:513 #: netctl.cpp:502
msgid "Restart profile" msgid "Restart profile"
msgstr "Restart profile" msgstr "Restart profile"
#: netctl.cpp:518 #: netctl.cpp:507
msgid "Enable profile" msgid "Enable profile"
msgstr "Enable profile" msgstr "Enable profile"
#: netctl.cpp:522 #: netctl.cpp:511
msgid "Show netctl-gui" msgid "Show netctl-gui"
msgstr "Show netctl-gui" msgstr "Show netctl-gui"
#: netctl.cpp:527 #: netctl.cpp:516
msgid "Show WiFi menu" msgid "Show WiFi menu"
msgstr "Show WiFi menu" msgstr "Show WiFi menu"
#: netctl.cpp:554 #: netctl.cpp:543
msgid "Start GUI" msgid "Start GUI"
msgstr "Start GUI" msgstr "Start GUI"
#: netctl.cpp:565 #: netctl.cpp:554
msgid "Start WiFi menu" msgid "Start WiFi menu"
msgstr "Start WiFi menu" msgstr "Start WiFi menu"
#: netctl.cpp:629 #: netctl.cpp:610
msgid "Network is up" msgid "Network is up"
msgstr "Network is up" msgstr "Network is up"
#: netctl.cpp:634 #: netctl.cpp:614
msgid "Network is down" msgid "Network is down"
msgstr "Network is down" msgstr "Network is down"
#: netctl.cpp:808 #: netctl.cpp:786
msgid "" msgid ""
"Version %1\n" "Version %1\n"
"(build date %2)" "(build date %2)"
@ -114,59 +114,59 @@ msgstr ""
"Version %1\n" "Version %1\n"
"(build date %2)" "(build date %2)"
#: netctl.cpp:809 #: netctl.cpp:787
msgid "KDE widget which interacts with netctl." msgid "KDE widget which interacts with netctl."
msgstr "KDE widget which interacts with netctl." msgstr "KDE widget which interacts with netctl."
#: netctl.cpp:810 #: netctl.cpp:788
msgid "Translators: %1" msgid "Translators: %1"
msgstr "Translators: %1" msgstr "Translators: %1"
#: netctl.cpp:811 #: netctl.cpp:789
msgid "Links:" msgid "Links:"
msgstr "Links:" msgstr "Links:"
#: netctl.cpp:812 #: netctl.cpp:790
msgid "Homepage" msgid "Homepage"
msgstr "Homepage" msgstr "Homepage"
#: netctl.cpp:813 #: netctl.cpp:791
msgid "Repository" msgid "Repository"
msgstr "Repository" msgstr "Repository"
#: netctl.cpp:814 #: netctl.cpp:792
msgid "Bugtracker" msgid "Bugtracker"
msgstr "Bugtracker" msgstr "Bugtracker"
#: netctl.cpp:815 #: netctl.cpp:793
msgid "Translation issue" msgid "Translation issue"
msgstr "Translation issue" msgstr "Translation issue"
#: netctl.cpp:816 #: netctl.cpp:794
msgid "AUR packages" msgid "AUR packages"
msgstr "AUR packages" msgstr "AUR packages"
#: netctl.cpp:818 #: netctl.cpp:796
msgid "This software is licensed under %1" msgid "This software is licensed under %1"
msgstr "This software is licensed under %1" msgstr "This software is licensed under %1"
#: netctl.cpp:819 #: netctl.cpp:797
msgid "This software uses: %1" msgid "This software uses: %1"
msgstr "This software uses: %1" msgstr "This software uses: %1"
#: netctl.cpp:821 #: netctl.cpp:799
msgid "Netctl plasmoid" msgid "Netctl plasmoid"
msgstr "Netctl plasmoid" msgstr "Netctl plasmoid"
#: netctl.cpp:822 #: netctl.cpp:800
msgid "Appearance" msgid "Appearance"
msgstr "Appearance" msgstr "Appearance"
#: netctl.cpp:823 #: netctl.cpp:801
msgid "DataEngine" msgid "DataEngine"
msgstr "DataEngine" msgstr "DataEngine"
#: netctl.cpp:824 #: netctl.cpp:802
msgid "About" msgid "About"
msgstr "About" msgstr "About"

76
sources/plasmoid/po/plasma_applet_netctl.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,153 +17,153 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n" "Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: netctl.cpp:299 #: netctl.cpp:294
msgid "Set profile %1 disabled" msgid "Set profile %1 disabled"
msgstr "" msgstr ""
#: netctl.cpp:303 #: netctl.cpp:297
msgid "Set profile %1 enabled" msgid "Set profile %1 enabled"
msgstr "" msgstr ""
#: netctl.cpp:325 #: netctl.cpp:318
msgid "Restart profile %1" msgid "Restart profile %1"
msgstr "" msgstr ""
#: netctl.cpp:347 #: netctl.cpp:339
msgid "Start profile %1" msgid "Start profile %1"
msgstr "" msgstr ""
#: netctl.cpp:374 #: netctl.cpp:365
msgid "Stop profile %1" msgid "Stop profile %1"
msgstr "" msgstr ""
#: netctl.cpp:397 #: netctl.cpp:387
msgid "Switch to profile %1" msgid "Switch to profile %1"
msgstr "" msgstr ""
#: netctl.cpp:460 #: netctl.cpp:449
msgid "Start another profile" msgid "Start another profile"
msgstr "" msgstr ""
#: netctl.cpp:461 #: netctl.cpp:450
msgid "Stop %1" msgid "Stop %1"
msgstr "" msgstr ""
#: netctl.cpp:462 #: netctl.cpp:451
msgid "Restart %1" msgid "Restart %1"
msgstr "" msgstr ""
#: netctl.cpp:464 #: netctl.cpp:453
msgid "Disable %1" msgid "Disable %1"
msgstr "" msgstr ""
#: netctl.cpp:466 #: netctl.cpp:455
msgid "Enable %1" msgid "Enable %1"
msgstr "" msgstr ""
#: netctl.cpp:469 netctl.cpp:492 #: netctl.cpp:458 netctl.cpp:481
msgid "Start profile" msgid "Start profile"
msgstr "" msgstr ""
#: netctl.cpp:500 #: netctl.cpp:489
msgid "Stop profile" msgid "Stop profile"
msgstr "" msgstr ""
#: netctl.cpp:505 #: netctl.cpp:494
msgid "Switch to profile" msgid "Switch to profile"
msgstr "" msgstr ""
#: netctl.cpp:513 #: netctl.cpp:502
msgid "Restart profile" msgid "Restart profile"
msgstr "" msgstr ""
#: netctl.cpp:518 #: netctl.cpp:507
msgid "Enable profile" msgid "Enable profile"
msgstr "" msgstr ""
#: netctl.cpp:522 #: netctl.cpp:511
msgid "Show netctl-gui" msgid "Show netctl-gui"
msgstr "" msgstr ""
#: netctl.cpp:527 #: netctl.cpp:516
msgid "Show WiFi menu" msgid "Show WiFi menu"
msgstr "" msgstr ""
#: netctl.cpp:554 #: netctl.cpp:543
msgid "Start GUI" msgid "Start GUI"
msgstr "" msgstr ""
#: netctl.cpp:565 #: netctl.cpp:554
msgid "Start WiFi menu" msgid "Start WiFi menu"
msgstr "" msgstr ""
#: netctl.cpp:629 #: netctl.cpp:610
msgid "Network is up" msgid "Network is up"
msgstr "" msgstr ""
#: netctl.cpp:634 #: netctl.cpp:614
msgid "Network is down" msgid "Network is down"
msgstr "" msgstr ""
#: netctl.cpp:808 #: netctl.cpp:786
msgid "" msgid ""
"Version %1\n" "Version %1\n"
"(build date %2)" "(build date %2)"
msgstr "" msgstr ""
#: netctl.cpp:809 #: netctl.cpp:787
msgid "KDE widget which interacts with netctl." msgid "KDE widget which interacts with netctl."
msgstr "" msgstr ""
#: netctl.cpp:810 #: netctl.cpp:788
msgid "Translators: %1" msgid "Translators: %1"
msgstr "" msgstr ""
#: netctl.cpp:811 #: netctl.cpp:789
msgid "Links:" msgid "Links:"
msgstr "" msgstr ""
#: netctl.cpp:812 #: netctl.cpp:790
msgid "Homepage" msgid "Homepage"
msgstr "" msgstr ""
#: netctl.cpp:813 #: netctl.cpp:791
msgid "Repository" msgid "Repository"
msgstr "" msgstr ""
#: netctl.cpp:814 #: netctl.cpp:792
msgid "Bugtracker" msgid "Bugtracker"
msgstr "" msgstr ""
#: netctl.cpp:815 #: netctl.cpp:793
msgid "Translation issue" msgid "Translation issue"
msgstr "" msgstr ""
#: netctl.cpp:816 #: netctl.cpp:794
msgid "AUR packages" msgid "AUR packages"
msgstr "" msgstr ""
#: netctl.cpp:818 #: netctl.cpp:796
msgid "This software is licensed under %1" msgid "This software is licensed under %1"
msgstr "" msgstr ""
#: netctl.cpp:819 #: netctl.cpp:797
msgid "This software uses: %1" msgid "This software uses: %1"
msgstr "" msgstr ""
#: netctl.cpp:821 #: netctl.cpp:799
msgid "Netctl plasmoid" msgid "Netctl plasmoid"
msgstr "" msgstr ""
#: netctl.cpp:822 #: netctl.cpp:800
msgid "Appearance" msgid "Appearance"
msgstr "" msgstr ""
#: netctl.cpp:823 #: netctl.cpp:801
msgid "DataEngine" msgid "DataEngine"
msgstr "" msgstr ""
#: netctl.cpp:824 #: netctl.cpp:802
msgid "About" msgid "About"
msgstr "" msgstr ""

76
sources/plasmoid/po/ru.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\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" "PO-Revision-Date: 2014-08-10 22:33+0400\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n" "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@ -18,95 +18,95 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n" "X-Generator: Lokalize 1.5\n"
#: netctl.cpp:299 #: netctl.cpp:294
msgid "Set profile %1 disabled" msgid "Set profile %1 disabled"
msgstr "Выключение автозагрузки профиля %1" msgstr "Выключение автозагрузки профиля %1"
#: netctl.cpp:303 #: netctl.cpp:297
msgid "Set profile %1 enabled" msgid "Set profile %1 enabled"
msgstr "Включение автозагрузки профиля %1" msgstr "Включение автозагрузки профиля %1"
#: netctl.cpp:325 #: netctl.cpp:318
msgid "Restart profile %1" msgid "Restart profile %1"
msgstr "Перезапуск профиля %1" msgstr "Перезапуск профиля %1"
#: netctl.cpp:347 #: netctl.cpp:339
msgid "Start profile %1" msgid "Start profile %1"
msgstr "Запуск профиля %1" msgstr "Запуск профиля %1"
#: netctl.cpp:374 #: netctl.cpp:365
msgid "Stop profile %1" msgid "Stop profile %1"
msgstr "Остановка профиля %1" msgstr "Остановка профиля %1"
#: netctl.cpp:397 #: netctl.cpp:387
msgid "Switch to profile %1" msgid "Switch to profile %1"
msgstr "Переключение на профиль %1" msgstr "Переключение на профиль %1"
#: netctl.cpp:460 #: netctl.cpp:449
msgid "Start another profile" msgid "Start another profile"
msgstr "Запустить другой профиль" msgstr "Запустить другой профиль"
#: netctl.cpp:461 #: netctl.cpp:450
msgid "Stop %1" msgid "Stop %1"
msgstr "Остановить %1" msgstr "Остановить %1"
#: netctl.cpp:462 #: netctl.cpp:451
msgid "Restart %1" msgid "Restart %1"
msgstr "Перезапустить %1" msgstr "Перезапустить %1"
#: netctl.cpp:464 #: netctl.cpp:453
msgid "Disable %1" msgid "Disable %1"
msgstr "Отключить %1" msgstr "Отключить %1"
#: netctl.cpp:466 #: netctl.cpp:455
msgid "Enable %1" msgid "Enable %1"
msgstr "Включить %1" msgstr "Включить %1"
#: netctl.cpp:469 netctl.cpp:492 #: netctl.cpp:458 netctl.cpp:481
msgid "Start profile" msgid "Start profile"
msgstr "Запустить профиль" msgstr "Запустить профиль"
#: netctl.cpp:500 #: netctl.cpp:489
msgid "Stop profile" msgid "Stop profile"
msgstr "Остановить профиль" msgstr "Остановить профиль"
#: netctl.cpp:505 #: netctl.cpp:494
msgid "Switch to profile" msgid "Switch to profile"
msgstr "Переключить профиль" msgstr "Переключить профиль"
#: netctl.cpp:513 #: netctl.cpp:502
msgid "Restart profile" msgid "Restart profile"
msgstr "Перезапустить профиль" msgstr "Перезапустить профиль"
#: netctl.cpp:518 #: netctl.cpp:507
msgid "Enable profile" msgid "Enable profile"
msgstr "Включить профиль" msgstr "Включить профиль"
#: netctl.cpp:522 #: netctl.cpp:511
msgid "Show netctl-gui" msgid "Show netctl-gui"
msgstr "Показать netctl-gui" msgstr "Показать netctl-gui"
#: netctl.cpp:527 #: netctl.cpp:516
msgid "Show WiFi menu" msgid "Show WiFi menu"
msgstr "Запустить WiFi-menu" msgstr "Запустить WiFi-menu"
#: netctl.cpp:554 #: netctl.cpp:543
msgid "Start GUI" msgid "Start GUI"
msgstr "Запуск GUI" msgstr "Запуск GUI"
#: netctl.cpp:565 #: netctl.cpp:554
msgid "Start WiFi menu" msgid "Start WiFi menu"
msgstr "Запуск WiFi-menu" msgstr "Запуск WiFi-menu"
#: netctl.cpp:629 #: netctl.cpp:610
msgid "Network is up" msgid "Network is up"
msgstr "Сеть работает" msgstr "Сеть работает"
#: netctl.cpp:634 #: netctl.cpp:614
msgid "Network is down" msgid "Network is down"
msgstr "Сеть не работает" msgstr "Сеть не работает"
#: netctl.cpp:808 #: netctl.cpp:786
msgid "" msgid ""
"Version %1\n" "Version %1\n"
"(build date %2)" "(build date %2)"
@ -114,59 +114,59 @@ msgstr ""
"Версия %1\n" "Версия %1\n"
"(дата сборки %2)" "(дата сборки %2)"
#: netctl.cpp:809 #: netctl.cpp:787
msgid "KDE widget which interacts with netctl." msgid "KDE widget which interacts with netctl."
msgstr "Виджет KDE, который взаимодействует с netctl." msgstr "Виджет KDE, который взаимодействует с netctl."
#: netctl.cpp:810 #: netctl.cpp:788
msgid "Translators: %1" msgid "Translators: %1"
msgstr "Переводчики: %1" msgstr "Переводчики: %1"
#: netctl.cpp:811 #: netctl.cpp:789
msgid "Links:" msgid "Links:"
msgstr "Ссылки:" msgstr "Ссылки:"
#: netctl.cpp:812 #: netctl.cpp:790
msgid "Homepage" msgid "Homepage"
msgstr "Домашняя страница" msgstr "Домашняя страница"
#: netctl.cpp:813 #: netctl.cpp:791
msgid "Repository" msgid "Repository"
msgstr "Репозиторий" msgstr "Репозиторий"
#: netctl.cpp:814 #: netctl.cpp:792
msgid "Bugtracker" msgid "Bugtracker"
msgstr "Багтрекер" msgstr "Багтрекер"
#: netctl.cpp:815 #: netctl.cpp:793
msgid "Translation issue" msgid "Translation issue"
msgstr "Тикет перевода" msgstr "Тикет перевода"
#: netctl.cpp:816 #: netctl.cpp:794
msgid "AUR packages" msgid "AUR packages"
msgstr "Пакеты в AUR" msgstr "Пакеты в AUR"
#: netctl.cpp:818 #: netctl.cpp:796
msgid "This software is licensed under %1" msgid "This software is licensed under %1"
msgstr "Данное приложение лицензировано под %1" msgstr "Данное приложение лицензировано под %1"
#: netctl.cpp:819 #: netctl.cpp:797
msgid "This software uses: %1" msgid "This software uses: %1"
msgstr "Данное приложение использует: %1" msgstr "Данное приложение использует: %1"
#: netctl.cpp:821 #: netctl.cpp:799
msgid "Netctl plasmoid" msgid "Netctl plasmoid"
msgstr "Netctl plasmoid" msgstr "Netctl plasmoid"
#: netctl.cpp:822 #: netctl.cpp:800
msgid "Appearance" msgid "Appearance"
msgstr "Внешний вид" msgstr "Внешний вид"
#: netctl.cpp:823 #: netctl.cpp:801
msgid "DataEngine" msgid "DataEngine"
msgstr "DataEngine" msgstr "DataEngine"
#: netctl.cpp:824 #: netctl.cpp:802
msgid "About" msgid "About"
msgstr "О программе" msgstr "О программе"

14
sources/resources/translations-helper/en.ts
View File

@ -90,5 +90,19 @@
<source>License</source> <source>License</source>
<translation>License</translation> <translation>License</translation>
</message> </message>
<message>
<source>The helper is running with EUID %1. Functions will not be available.</source>
<translation type="vanished">The helper is running with EUID %1. Functions will not be available.</translation>
</message>
<message>
<location filename="../../helper/src/main.cpp" line="84"/>
<source>The helper is running with EUID %1. Some functions will not be available.</source>
<translation>The helper is running with EUID %1. Some functions will not be available.</translation>
</message>
<message>
<location filename="../../helper/src/main.cpp" line="86"/>
<source>See security notes for more details.</source>
<translation>See security notes for more details.</translation>
</message>
</context> </context>
</TS> </TS>

10
sources/resources/translations-helper/netctlgui-helper.ts
View File

@ -89,5 +89,15 @@
<source>License</source> <source>License</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../../helper/src/main.cpp" line="84"/>
<source>The helper is running with EUID %1. Some functions will not be available.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../helper/src/main.cpp" line="86"/>
<source>See security notes for more details.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

10
sources/resources/translations-helper/ru.ts
View File

@ -90,5 +90,15 @@
<source>License</source> <source>License</source>
<translation>Лицензия</translation> <translation>Лицензия</translation>
</message> </message>
<message>
<location filename="../../helper/src/main.cpp" line="84"/>
<source>The helper is running with EUID %1. Some functions will not be available.</source>
<translation>Хелпер запущен с EUID %1. Некоторые функции не будут доступны.</translation>
</message>
<message>
<location filename="../../helper/src/main.cpp" line="86"/>
<source>See security notes for more details.</source>
<translation>Смотри примечания о безопасности для более подробной информации.</translation>
</message>
</context> </context>
</TS> </TS>

4
sources/resources/translations/en.ts
View File

@ -1824,6 +1824,10 @@
<source>Close helper after exit (doesn&apos;t work while systemd service is active)</source> <source>Close helper after exit (doesn&apos;t work while systemd service is active)</source>
<translation>Close helper after exit (doesn&apos;t work while systemd service is active)</translation> <translation>Close helper after exit (doesn&apos;t work while systemd service is active)</translation>
</message> </message>
<message>
<source>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.</source>
<translation>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.</translation>
</message>
</context> </context>
<context> <context>
<name>TrayIcon</name> <name>TrayIcon</name>

510
sources/resources/translations/netctl-gui.ts
View File

File diff suppressed because it is too large Load Diff

4
sources/resources/translations/ru.ts
View File

@ -1823,6 +1823,10 @@
<source>Close helper after exit (doesn&apos;t work while systemd service is active)</source> <source>Close helper after exit (doesn&apos;t work while systemd service is active)</source>
<translation>Закрыть хелпер после выхода (не работает, если запущен сервис systemd)</translation> <translation>Закрыть хелпер после выхода (не работает, если запущен сервис systemd)</translation>
</message> </message>
<message>
<source>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.</source>
<translation>Существует два бинарных файла. `netctlgui-helper` должен быть запущен от root&apos;а (например, через systemd), в противном случае интерфейс `/ctrl` не будет доступен. `netctlgui-helper-suid` может быть запущен от обычного пользователя, однако Вы должны иметь в виду, что он имеет SUID бит.</translation>
</message>
</context> </context>
<context> <context>
<name>TrayIcon</name> <name>TrayIcon</name>