added flag --config

updated translations

CHANGELOG

@@ -12,6 +12,7 @@ Ver.1.2.0:
 + [gui] added workaround for wireless-wep example
 + [lib] detached backend from frontend
 + [lib] added error checking
++ [lib] added doxygen documentation
 + [plasmoid] added dataengine configuration
 + [plasmoid] added about window
 * [all] changes in the project architecture

PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgbase=netctl-gui
 pkgname=('netctl-gui' 'netctl-gui-qt4' 'kdeplasma-applets-netctl-gui')
-pkgver=1.1.0
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Qt4/Qt5 GUI for netctl. Also provides a widget for KDE"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ optdepends=('kdebase-runtime: sudo support'
             'wpa_supplicant: wifi support')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
 install="${pkgbase}.install"
-md5sums=('229e11efda0a94bed44ea79b3deabf7c')
+md5sums=('4d52513623e2501d8dd9a531327c01a7')
 
 prepare() {
   rm -rf "${srcdir}/"{build-plasmoid,build-qt4,build-qt5}

create_archive.sh

@@ -17,9 +17,5 @@ tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}"
 rm -rf "${ARCHIVE}"
 # update md5sum
 MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}')
-sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD-qt4
-sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD-qt4
-sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD-qt5
-sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD-qt5
-sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD-widget
-sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD-widget
+sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD
+sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD

sources/gui/netctl-gui.1

@@ -6,8 +6,8 @@ netctl-gui is a graphical interface for netctl
 [ --about ] [ --netctl-auto ] [ --settings ]
            [ -e ESSID | --essid ESSID ] [ -o PROFILE | --open PROFILE ]
            [ -s PROFILE | --select PROFILE ]
-           [ -d | --debug ] [ --default ] [ --set-opts OPTIONS ]
-           [ -t NUM | --tab NUM ]
+           [ --config FILE ] [ -d | --debug ] [ --default ]
+           [ --set-opts OPTIONS ] [ -t NUM | --tab NUM ]
            [ -v | --version ] [ -i | --info ] [ -h | --help]
 .SH DESCRIPTION
 Graphical user interface for netctl written on C++ using Qt toolkit. Provides shared library for interaction with netctl and Plasmoid and DataEngine for KDE.
@@ -31,6 +31,9 @@ open profile PROFILE. This option will set tab to 2 automatically
 -s, --select PROFILE
 select profile PROFILE. This option will set tab to 1 automatically
 .TP
+--config FILE
+read configuration from file FILE
+.TP
 -d, --debug
 print debug information
 .TP

sources/gui/src/main.cpp

@@ -102,6 +102,11 @@ int main(int argc, char *argv[])
             i++;
         }
         // additional functions
+        // config path
+        else if (QString(argv[i]) == QString("--config")) {
+            configPath = QString(argv[i+1]);
+            i++;
+        }
         // debug
         else if ((QString(argv[i]) == QString("-d")) || (QString(argv[i]) == QString("--debug"))) {
             debug = true;
@@ -157,8 +162,8 @@ int main(int argc, char *argv[])
     helpMessage += QString("netctl-gui [ --about ] [ --netctl-auto ] [ --settings ]\n");
     helpMessage += QString("           [ -e ESSID | --essid ESSID ] [ -o PROFILE | --open PROFILE ]\n");
     helpMessage += QString("           [ -s PROFILE | --select PROFILE ]\n");
-    helpMessage += QString("           [ -d | --debug ] [ --default ] [ --set-opts OPTIONS ]\n");
-    helpMessage += QString("           [ -t NUM | --tab NUM ]\n");
+    helpMessage += QString("           [ --config FILE ] [ -d | --debug ] [ --default ]\n");
+    helpMessage += QString("           [ --set-opts OPTIONS ] [ -t NUM | --tab NUM ]\n");
     helpMessage += QString("           [ -v | --version ] [ -i | --info ] [ -h | --help]\n\n");
     helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Parametrs:"));
     // windows
@@ -254,7 +259,7 @@ int main(int argc, char *argv[])
     MainWindow w(0,
                  showAbout, showNetctlAuto, showSettings,
                  selectEssid, openProfile, selectProfile,
-                 debug, defaultSettings, options, tabNumber);
+                 configPath, debug, defaultSettings, options, tabNumber);
     w.show();
     return a.exec();
 }

sources/gui/src/mainwindow.cpp

@@ -52,6 +52,7 @@ MainWindow::MainWindow(QWidget *parent,
                        const QString selectEssid,
                        const QString openProfile,
                        const QString selectProfile,
+                       const QString configPath,
                        const bool debugCmd,
                        const bool defaultSettings,
                        const QString options,
@@ -72,8 +73,6 @@ MainWindow::MainWindow(QWidget *parent,
     if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "tabNum" << tabNum;
 
     // reading configuration
-    QString configPath = QDir::homePath() + QDir::separator() + QString(".config") +
-            QDir::separator() + QString("netctl-gui.conf");
     settingsWin = new SettingsWindow(this, debug, configPath);
     if (defaultSettings)
         settingsWin->setDefault();
@@ -403,8 +402,11 @@ void MainWindow::updateMainTab()
     ui->tableWidget_main->setRowCount(profiles.count());
 
     // create header
-    ui->tableWidget_main->setHorizontalHeaderLabels(QApplication::translate("MainWindow", "Name==Description==Status")
-                                                    .split(QString("==")));
+    QStringList headerList;
+    headerList.append(QApplication::translate("MainWindow", "Name"));
+    headerList.append(QApplication::translate("MainWindow", "Description"));
+    headerList.append(QApplication::translate("MainWindow", "Status"));
+    ui->tableWidget_main->setHorizontalHeaderLabels(headerList);
     // create items
     for (int i=0; i<profiles.count(); i++) {
         // name
@@ -513,8 +515,12 @@ void MainWindow::updateWifiTab()
     ui->tableWidget_wifi->setRowCount(scanResults.count());
 
     // create header
-    ui->tableWidget_wifi->setHorizontalHeaderLabels(QApplication::translate("MainWindow", "Name==Status==Signal==Security")
-                                                    .split(QString("==")));
+    QStringList headerList;
+    headerList.append(QApplication::translate("MainWindow", "Name"));
+    headerList.append(QApplication::translate("MainWindow", "Status"));
+    headerList.append(QApplication::translate("MainWindow", "Signal"));
+    headerList.append(QApplication::translate("MainWindow", "Security"));
+    ui->tableWidget_wifi->setHorizontalHeaderLabels(headerList);
     // create items
     for (int i=0; i<scanResults.count(); i++) {
         // name

sources/gui/src/mainwindow.h

@@ -59,6 +59,7 @@ public:
                         const QString selectEssid = QString("ESSID"),
                         const QString openProfile = QString("PROFILE"),
                         const QString selectProfile = QString("PROFILE"),
+                        const QString configPath = QString(""),
                         const bool debugCmd = false,
                         const bool defaultSettings = false,
                         const QString options = QString("OPTIONS"),

sources/gui/src/netctlautowindow.cpp

@@ -116,8 +116,12 @@ void NetctlAutoWindow::netctlAutoUpdateTable()
     ui->tableWidget->setRowCount(profiles.count());
 
     // create header
-    ui->tableWidget->setHorizontalHeaderLabels(QApplication::translate("NetctlAutoWindow", "Name==Description==Active==Disabled")
-                                               .split(QString("==")));
+    QStringList headerList;
+    headerList.append(QApplication::translate("NetctlAutoWindow", "Name"));
+    headerList.append(QApplication::translate("NetctlAutoWindow", "Description"));
+    headerList.append(QApplication::translate("NetctlAutoWindow", "Active"));
+    headerList.append(QApplication::translate("NetctlAutoWindow", "Disabled"));
+    ui->tableWidget->setHorizontalHeaderLabels(headerList);
     // create items
     for (int i=0; i<profiles.count(); i++) {
         // name

sources/gui/src/netctlautowindow.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>netctl-auto</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
@@ -78,7 +78,9 @@
          <string>Refresh</string>
         </property>
         <property name="icon">
-         <iconset theme="stock-refresh"/>
+         <iconset theme="stock-refresh">
+          <normaloff/>
+         </iconset>
         </property>
        </widget>
       </item>
@@ -114,7 +116,9 @@
          <string>Switch</string>
         </property>
         <property name="icon">
-         <iconset theme="dialog-apply"/>
+         <iconset theme="dialog-apply">
+          <normaloff/>
+         </iconset>
         </property>
        </widget>
       </item>
@@ -187,7 +191,9 @@
   </action>
   <action name="actionEnableAll">
    <property name="icon">
-    <iconset theme="edit-add"/>
+    <iconset theme="edit-add">
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Enable all profiles</string>
@@ -195,7 +201,9 @@
   </action>
   <action name="actionDisableAll">
    <property name="icon">
-    <iconset theme="edit-delete"/>
+    <iconset theme="edit-delete">
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Disable all profiles</string>
@@ -218,7 +226,9 @@
   </action>
   <action name="actionRefresh">
    <property name="icon">
-    <iconset theme="stock-refresh"/>
+    <iconset theme="stock-refresh">
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Refresh</string>

sources/resources/translations/en.ts

@@ -1,6 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="en">
+<context>
+    <name>AboutWindow</name>
+    <message>
+        <source>Version %1
+(build date %2)</source>
+        <translation>Version %1
+(build date %2)</translation>
+    </message>
+    <message>
+        <source>Qt-based graphical interface for netctl.</source>
+        <translation>Qt-based graphical interface for netctl.</translation>
+    </message>
+    <message>
+        <source>Links:</source>
+        <translation>Links:</translation>
+    </message>
+    <message>
+        <source>Homepage</source>
+        <translation>Homepage</translation>
+    </message>
+    <message>
+        <source>Repository</source>
+        <translation>Repository</translation>
+    </message>
+    <message>
+        <source>Bugtracker</source>
+        <translation>Bugtracker</translation>
+    </message>
+    <message>
+        <source>Translation issue</source>
+        <translation>Translation issue</translation>
+    </message>
+    <message>
+        <source>AUR packages</source>
+        <translation>AUR packages</translation>
+    </message>
+    <message>
+        <source>This software is licensed under %1</source>
+        <translation>This software is licensed under %1</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>About</translation>
+    </message>
+</context>
 <context>
     <name>BridgeWidget</name>
     <message>
@@ -88,15 +133,31 @@
     </message>
     <message>
         <source>Error</source>
-        <translation>Error</translation>
+        <translation type="vanished">Error</translation>
     </message>
     <message>
         <source>Error text</source>
-        <translation>Error text</translation>
+        <translation type="vanished">Error text</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="vanished">Ok</translation>
+    </message>
+    <message>
+        <source>Error!</source>
+        <translation>Error!</translation>
+    </message>
+    <message>
+        <source>Could not find profile</source>
+        <translation>Could not find profile</translation>
+    </message>
+    <message>
+        <source>Could not find ESSID</source>
+        <translation>Could not find ESSID</translation>
+    </message>
+    <message>
+        <source>Sender : %1</source>
+        <translation>Sender : %1</translation>
     </message>
 </context>
 <context>
@@ -556,33 +617,33 @@
     <message>
         <source>                                    Netctl GUI
 </source>
-        <translation>                                    Netctl GUI
+        <translation type="vanished">                                    Netctl GUI
 </translation>
     </message>
     <message>
         <source>Version : %1                                                  License : GPLv3
 </source>
-        <translation>Version : %1                                                  License : GPLv3
+        <translation type="vanished">Version : %1                                                  License : GPLv3
 </translation>
     </message>
     <message>
         <source>                                                    Evgeniy Alekseev aka arcanis
 </source>
-        <translation>                                                    Evgeniy Alekseev aka arcanis
+        <translation type="vanished">                                                    Evgeniy Alekseev aka arcanis
 </translation>
     </message>
     <message>
         <source>                                                    E-mail : esalexeev@gmail.com
 
 </source>
-        <translation>                                                    E-mail : esalexeev@gmail.com
+        <translation type="vanished">                                                    E-mail : esalexeev@gmail.com
 
 </translation>
     </message>
     <message>
         <source>Usage:
 </source>
-        <translation>Usage:
+        <translation type="vanished">Usage:
 </translation>
     </message>
     <message>
@@ -596,25 +657,25 @@
     <message>
         <source>Parametrs:
 </source>
-        <translation>Parametrs:
+        <translation type="vanished">Parametrs:
 </translation>
     </message>
     <message>
         <source>           --default    - start with default settings
 </source>
-        <translation>           --default    - start with default settings
+        <translation type="vanished">           --default    - start with default settings
 </translation>
     </message>
     <message>
         <source>  -t NUM   --tab NUM    - open a tab with number NUM
 </source>
-        <translation>  -t NUM   --tab NUM    - open a tab with number NUM
+        <translation type="vanished">  -t NUM   --tab NUM    - open a tab with number NUM
 </translation>
     </message>
     <message>
         <source>  -h       --help       - show this help and exit
 </source>
-        <translation>  -h       --help       - show this help and exit
+        <translation type="vanished">  -h       --help       - show this help and exit
 </translation>
     </message>
     <message>
@@ -711,11 +772,11 @@
     </message>
     <message>
         <source>Name Status Signal Security</source>
-        <translation>Name Status Signal Security</translation>
+        <translation type="vanished">Name Status Signal Security</translation>
     </message>
     <message>
         <source>Name Description Status</source>
-        <translation>Name Description Status</translation>
+        <translation type="vanished">Name Description Status</translation>
     </message>
     <message>
         <source>Remove</source>
@@ -723,70 +784,191 @@
     </message>
     <message>
         <source>Stop profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Stop profile</translation>
     </message>
     <message>
         <source>Start profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Start profile</translation>
     </message>
     <message>
         <source>Disable profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Disable profile</translation>
     </message>
     <message>
         <source>Enable profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Enable profile</translation>
     </message>
     <message>
         <source>Stop WiFi</source>
-        <translation type="unfinished"></translation>
+        <translation>Stop WiFi</translation>
     </message>
     <message>
         <source>Start WiFi</source>
-        <translation type="unfinished"></translation>
+        <translation>Start WiFi</translation>
     </message>
     <message>
         <source>Restart profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Restart profile</translation>
     </message>
     <message>
         <source>Edit profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Edit profile</translation>
     </message>
     <message>
         <source>Remove profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>netctl-gui [ --default ] [ -d | --debug ] [ -t NUM | --tab NUM ] [ -h | --help]
-
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  -d       --debug      - print debug information
-</source>
-        <translation type="unfinished"></translation>
+        <translation>Remove profile</translation>
     </message>
     <message>
         <source>Load profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Load profile</translation>
     </message>
     <message>
         <source>Save profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Save profile</translation>
     </message>
     <message>
         <source>Start Wi-Fi</source>
-        <translation type="unfinished"></translation>
+        <translation>Start Wi-Fi</translation>
     </message>
     <message>
         <source>netctl-auto</source>
-        <translation type="unfinished"></translation>
+        <translation>netctl-auto</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Actions</translation>
+    </message>
+    <message>
+        <source>Name==Description==Status</source>
+        <translation type="vanished">Name==Description==Status</translation>
+    </message>
+    <message>
+        <source>Name==Status==Signal==Security</source>
+        <translation type="vanished">Name==Status==Signal==Security</translation>
+    </message>
+    <message>
+        <source>Unknown flag
+</source>
+        <translation>Unknown flag
+</translation>
+    </message>
+    <message>
+        <source>Usage:</source>
+        <translation>Usage:</translation>
+    </message>
+    <message>
+        <source>Parametrs:</source>
+        <translation>Parametrs:</translation>
+    </message>
+    <message>
+        <source>Open window:</source>
+        <translation>Open window:</translation>
+    </message>
+    <message>
+        <source>show about window</source>
+        <translation>show about window</translation>
+    </message>
+    <message>
+        <source>show netctl-auto window</source>
+        <translation>show netctl-auto window</translation>
+    </message>
+    <message>
+        <source>show settings window</source>
+        <translation>show settings window</translation>
+    </message>
+    <message>
+        <source>Functions:</source>
+        <translation>Functions:</translation>
+    </message>
+    <message>
+        <source>select ESSID %1</source>
+        <translation>select ESSID %1</translation>
+    </message>
+    <message>
+        <source>open profile %1</source>
+        <translation>open profile %1</translation>
+    </message>
+    <message>
+        <source>select profile %1</source>
+        <translation>select profile %1</translation>
+    </message>
+    <message>
+        <source>Additional flags:</source>
+        <translation>Additional flags:</translation>
+    </message>
+    <message>
+        <source>print debug information</source>
+        <translation>print debug information</translation>
+    </message>
+    <message>
+        <source>start with default settings</source>
+        <translation>start with default settings</translation>
+    </message>
+    <message>
+        <source>set options for this run, comma separated</source>
+        <translation>set options for this run, comma separated</translation>
+    </message>
+    <message>
+        <source>open a tab with number %1</source>
+        <translation>open a tab with number %1</translation>
+    </message>
+    <message>
+        <source>Show messages:</source>
+        <translation>Show messages:</translation>
+    </message>
+    <message>
+        <source>show version and exit</source>
+        <translation>show version and exit</translation>
+    </message>
+    <message>
+        <source>show build information and exit</source>
+        <translation>show build information and exit</translation>
+    </message>
+    <message>
+        <source>show this help and exit</source>
+        <translation>show this help and exit</translation>
+    </message>
+    <message>
+        <source>Build date: %1</source>
+        <translation>Build date: %1</translation>
+    </message>
+    <message>
+        <source>cmake flags:</source>
+        <translation>cmake flags:</translation>
+    </message>
+    <message>
+        <source>Version : %1
+</source>
+        <translation>Version : %1
+</translation>
+    </message>
+    <message>
+        <source>Author : %1
+</source>
+        <translation>Author : %1
+</translation>
+    </message>
+    <message>
+        <source>License : %1
+</source>
+        <translation>License : %1
+</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>About</translation>
+    </message>
+    <message>
+        <source>netctl-auto is running</source>
+        <translation>netctl-auto is running</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>Show</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Help</translation>
     </message>
 </context>
 <context>
@@ -912,31 +1094,127 @@
     <name>NetctlAutoWindow</name>
     <message>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">MainWindow</translation>
     </message>
     <message>
         <source>Enable profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Enable profile</translation>
     </message>
     <message>
         <source>Switch to profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Switch to profile</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Available profiles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Active profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Close</translation>
     </message>
     <message>
         <source>Menu</source>
-        <translation type="unfinished">Menu</translation>
+        <translation>Menu</translation>
+    </message>
+    <message>
+        <source>Ready</source>
+        <translation>Ready</translation>
+    </message>
+    <message>
+        <source>Disable service</source>
+        <translation>Disable service</translation>
+    </message>
+    <message>
+        <source>Enable service</source>
+        <translation>Enable service</translation>
+    </message>
+    <message>
+        <source>netctl-auto is running</source>
+        <translation>netctl-auto is running</translation>
+    </message>
+    <message>
+        <source>Stop service</source>
+        <translation>Stop service</translation>
+    </message>
+    <message>
+        <source>Start service</source>
+        <translation>Start service</translation>
+    </message>
+    <message>
+        <source>netctl-auto is not running</source>
+        <translation>netctl-auto is not running</translation>
+    </message>
+    <message>
+        <source>Name==Description==Active==Disabled</source>
+        <translation type="vanished">Name==Description==Active==Disabled</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>yes</translation>
+    </message>
+    <message>
+        <source>Updated</source>
+        <translation>Updated</translation>
+    </message>
+    <message>
+        <source>Enable all profiles</source>
+        <translation>Enable all profiles</translation>
+    </message>
+    <message>
+        <source>Disable all profiles</source>
+        <translation>Disable all profiles</translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation>Enable</translation>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Disable</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Done</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Disable profile</source>
+        <translation>Disable profile</translation>
+    </message>
+    <message>
+        <source>Esc</source>
+        <translation>Esc</translation>
+    </message>
+    <message>
+        <source>Restart service</source>
+        <translation>Restart service</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Refresh</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation>Description</translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation>Active</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Disabled</translation>
+    </message>
+    <message>
+        <source>Switch</source>
+        <translation>Switch</translation>
+    </message>
+    <message>
+        <source>netctl-auto</source>
+        <translation>netctl-auto</translation>
     </message>
 </context>
 <context>
@@ -1279,6 +1557,50 @@
         <source>Other</source>
         <translation>Other</translation>
     </message>
+    <message>
+        <source>Select netctl-auto command</source>
+        <translation>Select netctl-auto command</translation>
+    </message>
+    <message>
+        <source>Select systemctl command</source>
+        <translation>Select systemctl command</translation>
+    </message>
+    <message>
+        <source>Select wpa_actiond command</source>
+        <translation>Select wpa_actiond command</translation>
+    </message>
+    <message>
+        <source>systemctl path</source>
+        <translation>systemctl path</translation>
+    </message>
+    <message>
+        <source>Path to systemctl</source>
+        <translation>Path to systemctl</translation>
+    </message>
+    <message>
+        <source>netctl-auto path</source>
+        <translation>netctl-auto path</translation>
+    </message>
+    <message>
+        <source>Path to netctl-auto</source>
+        <translation>Path to netctl-auto</translation>
+    </message>
+    <message>
+        <source>netctl-auto service</source>
+        <translation>netctl-auto service</translation>
+    </message>
+    <message>
+        <source>Name of netctl-auto systemd service</source>
+        <translation>Name of netctl-auto systemd service</translation>
+    </message>
+    <message>
+        <source>wpa_actiond path</source>
+        <translation>wpa_actiond path</translation>
+    </message>
+    <message>
+        <source>Path to wpa_actiond</source>
+        <translation>Path to wpa_actiond</translation>
+    </message>
 </context>
 <context>
     <name>TunnelWidget</name>

sources/resources/translations/ru.ts

@@ -1,6 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ru">
+<context>
+    <name>AboutWindow</name>
+    <message>
+        <source>Version %1
+(build date %2)</source>
+        <translation>Версия: %1
+(дата сборки %2)</translation>
+    </message>
+    <message>
+        <source>Qt-based graphical interface for netctl.</source>
+        <translation>Графический интерфейс для netctl, использующий Qt.</translation>
+    </message>
+    <message>
+        <source>Links:</source>
+        <translation>Ссылки:</translation>
+    </message>
+    <message>
+        <source>Homepage</source>
+        <translation>Домашняя страница</translation>
+    </message>
+    <message>
+        <source>Repository</source>
+        <translation>Репозиторий</translation>
+    </message>
+    <message>
+        <source>Bugtracker</source>
+        <translation>Багтрекер</translation>
+    </message>
+    <message>
+        <source>Translation issue</source>
+        <translation>Тикет перевода</translation>
+    </message>
+    <message>
+        <source>AUR packages</source>
+        <translation>Пакеты в AUR</translation>
+    </message>
+    <message>
+        <source>This software is licensed under %1</source>
+        <translation>Данной программное обеспечение лицензировано под %1</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>О программе</translation>
+    </message>
+</context>
 <context>
     <name>BridgeWidget</name>
     <message>
@@ -88,15 +133,31 @@
     </message>
     <message>
         <source>Error</source>
-        <translation>Ошибка</translation>
+        <translation type="vanished">Ошибка</translation>
     </message>
     <message>
         <source>Error text</source>
-        <translation>Error text</translation>
+        <translation type="vanished">Error text</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="vanished">Ok</translation>
+    </message>
+    <message>
+        <source>Error!</source>
+        <translation>Ошибка!</translation>
+    </message>
+    <message>
+        <source>Could not find profile</source>
+        <translation>Не могу найти профиль</translation>
+    </message>
+    <message>
+        <source>Could not find ESSID</source>
+        <translation>Не могу найти ESSID</translation>
+    </message>
+    <message>
+        <source>Sender : %1</source>
+        <translation>Отправитель : %1</translation>
     </message>
 </context>
 <context>
@@ -556,33 +617,33 @@
     <message>
         <source>                                    Netctl GUI
 </source>
-        <translation>                                    Netctl GUI
+        <translation type="vanished">                                    Netctl GUI
 </translation>
     </message>
     <message>
         <source>Version : %1                                                  License : GPLv3
 </source>
-        <translation>Версия : %1                                                  Лицензия : GPLv3
+        <translation type="vanished">Версия : %1                                                  Лицензия : GPLv3
 </translation>
     </message>
     <message>
         <source>                                                    Evgeniy Alekseev aka arcanis
 </source>
-        <translation>                                                    Евгений Алексеев aka arcanis
+        <translation type="vanished">                                                    Евгений Алексеев aka arcanis
 </translation>
     </message>
     <message>
         <source>                                                    E-mail : esalexeev@gmail.com
 
 </source>
-        <translation>                                                    E-mail : esalexeev@gmail.com
+        <translation type="vanished">                                                    E-mail : esalexeev@gmail.com
 
 </translation>
     </message>
     <message>
         <source>Usage:
 </source>
-        <translation>Использование:
+        <translation type="vanished">Использование:
 </translation>
     </message>
     <message>
@@ -596,25 +657,25 @@
     <message>
         <source>Parametrs:
 </source>
-        <translation>Параметры:
+        <translation type="vanished">Параметры:
 </translation>
     </message>
     <message>
         <source>           --default    - start with default settings
 </source>
-        <translation>           --default    - запустить со стандартными настройками
+        <translation type="vanished">           --default    - запустить со стандартными настройками
 </translation>
     </message>
     <message>
         <source>  -t NUM   --tab NUM    - open a tab with number NUM
 </source>
-        <translation>  -t NUM   --tab NUM    - открыть вкладку с номером NUM
+        <translation type="vanished">  -t NUM   --tab NUM    - открыть вкладку с номером NUM
 </translation>
     </message>
     <message>
         <source>  -h       --help       - show this help and exit
 </source>
-        <translation>  -h       --help       - показать эту справку и выход
+        <translation type="vanished">  -h       --help       - показать эту справку и выход
 </translation>
     </message>
     <message>
@@ -711,11 +772,11 @@
     </message>
     <message>
         <source>Name Status Signal Security</source>
-        <translation>Имя Статус Сигнал Безопасность</translation>
+        <translation type="vanished">Имя Статус Сигнал Безопасность</translation>
     </message>
     <message>
         <source>Name Description Status</source>
-        <translation>Имя Описание Статус</translation>
+        <translation type="vanished">Имя Описание Статус</translation>
     </message>
     <message>
         <source>Remove</source>
@@ -723,70 +784,190 @@
     </message>
     <message>
         <source>Stop profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Остановить профиль</translation>
     </message>
     <message>
         <source>Start profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Запустить профиль</translation>
     </message>
     <message>
         <source>Disable profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Отключить профиль</translation>
     </message>
     <message>
         <source>Enable profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Включить профиль</translation>
     </message>
     <message>
         <source>Stop WiFi</source>
-        <translation type="unfinished"></translation>
+        <translation>Остановить WiFi</translation>
     </message>
     <message>
         <source>Start WiFi</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключить WiFi</translation>
     </message>
     <message>
         <source>Restart profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Перезапустить профиль</translation>
     </message>
     <message>
         <source>Edit profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Отредактировать профиль</translation>
     </message>
     <message>
         <source>Remove profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>netctl-gui [ --default ] [ -d | --debug ] [ -t NUM | --tab NUM ] [ -h | --help]
-
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  -d       --debug      - print debug information
-</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить профиль</translation>
     </message>
     <message>
         <source>Load profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузить профиль</translation>
     </message>
     <message>
         <source>Save profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить профиль</translation>
     </message>
     <message>
         <source>Start Wi-Fi</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключить WiFi</translation>
     </message>
     <message>
         <source>netctl-auto</source>
-        <translation type="unfinished"></translation>
+        <translation>netctl-auto</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Действия</translation>
+    </message>
+    <message>
+        <source>Name==Description==Status</source>
+        <translation type="vanished">Имя==Описание==Статус</translation>
+    </message>
+    <message>
+        <source>Name==Status==Signal==Security</source>
+        <translation type="vanished">Имя==Статус==Сигнал==Безопасность</translation>
+    </message>
+    <message>
+        <source>Unknown flag
+</source>
+        <translation>Неизвестный флаг</translation>
+    </message>
+    <message>
+        <source>Usage:</source>
+        <translation>Использование:</translation>
+    </message>
+    <message>
+        <source>Parametrs:</source>
+        <translation>Параметры:</translation>
+    </message>
+    <message>
+        <source>Open window:</source>
+        <translation>Открыть окно:</translation>
+    </message>
+    <message>
+        <source>show about window</source>
+        <translation>показать окно &quot;О программе&quot;</translation>
+    </message>
+    <message>
+        <source>show netctl-auto window</source>
+        <translation>показать окно netctl-auto</translation>
+    </message>
+    <message>
+        <source>show settings window</source>
+        <translation>показать окно настроек</translation>
+    </message>
+    <message>
+        <source>Functions:</source>
+        <translation>Функции:</translation>
+    </message>
+    <message>
+        <source>select ESSID %1</source>
+        <translation>выбрать ESSID %1</translation>
+    </message>
+    <message>
+        <source>open profile %1</source>
+        <translation>открыть профиль %1</translation>
+    </message>
+    <message>
+        <source>select profile %1</source>
+        <translation>выбрать профиль %1</translation>
+    </message>
+    <message>
+        <source>Additional flags:</source>
+        <translation>Дополнительные флаги:</translation>
+    </message>
+    <message>
+        <source>print debug information</source>
+        <translation>показать отладочную информацию</translation>
+    </message>
+    <message>
+        <source>start with default settings</source>
+        <translation>запустить со стандартными настройками</translation>
+    </message>
+    <message>
+        <source>set options for this run, comma separated</source>
+        <translation>установить опции для данного запуска, разделенные запятыми</translation>
+    </message>
+    <message>
+        <source>open a tab with number %1</source>
+        <translation>открыть вкладку с номером %1</translation>
+    </message>
+    <message>
+        <source>Show messages:</source>
+        <translation>Показать сообщения:</translation>
+    </message>
+    <message>
+        <source>show version and exit</source>
+        <translation>показать версию и выход</translation>
+    </message>
+    <message>
+        <source>show build information and exit</source>
+        <translation>показать информацию о сборке и выход</translation>
+    </message>
+    <message>
+        <source>show this help and exit</source>
+        <translation>показать справку и выход</translation>
+    </message>
+    <message>
+        <source>Build date: %1</source>
+        <translation>Дата сборки: %1</translation>
+    </message>
+    <message>
+        <source>cmake flags:</source>
+        <translation>Флаги cmake:</translation>
+    </message>
+    <message>
+        <source>Version : %1
+</source>
+        <translation>Версия : %1
+</translation>
+    </message>
+    <message>
+        <source>Author : %1
+</source>
+        <translation>Автор : %1
+</translation>
+    </message>
+    <message>
+        <source>License : %1
+</source>
+        <translation>Лицензия : %1
+</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>О программе</translation>
+    </message>
+    <message>
+        <source>netctl-auto is running</source>
+        <translation>netctl-auto запущен</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>Показать</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Справка</translation>
     </message>
 </context>
 <context>
@@ -912,31 +1093,127 @@
     <name>NetctlAutoWindow</name>
     <message>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">MainWindow</translation>
     </message>
     <message>
         <source>Enable profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Включить профиль</translation>
     </message>
     <message>
         <source>Switch to profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Переключиться на профиль</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Available profiles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Active profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Закрыть</translation>
     </message>
     <message>
         <source>Menu</source>
-        <translation type="unfinished">Меню</translation>
+        <translation>Меню</translation>
+    </message>
+    <message>
+        <source>Ready</source>
+        <translation>Готов</translation>
+    </message>
+    <message>
+        <source>Disable service</source>
+        <translation>Отключить сервис</translation>
+    </message>
+    <message>
+        <source>Enable service</source>
+        <translation>Включить сервис</translation>
+    </message>
+    <message>
+        <source>netctl-auto is running</source>
+        <translation>netctl-auto запущен</translation>
+    </message>
+    <message>
+        <source>Stop service</source>
+        <translation>Остановить сервис</translation>
+    </message>
+    <message>
+        <source>Start service</source>
+        <translation>Запустить сервис</translation>
+    </message>
+    <message>
+        <source>netctl-auto is not running</source>
+        <translation>netctl-auto не запущен</translation>
+    </message>
+    <message>
+        <source>Name==Description==Active==Disabled</source>
+        <translation type="vanished">Имя==Описание==Активен==Отключен</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>да</translation>
+    </message>
+    <message>
+        <source>Updated</source>
+        <translation>Обновлено</translation>
+    </message>
+    <message>
+        <source>Enable all profiles</source>
+        <translation>Включить все профили</translation>
+    </message>
+    <message>
+        <source>Disable all profiles</source>
+        <translation>Отключить все профили</translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation>Включить</translation>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Отключить</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Выполнено</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Ошибка</translation>
+    </message>
+    <message>
+        <source>Disable profile</source>
+        <translation>Отключить профиль</translation>
+    </message>
+    <message>
+        <source>Esc</source>
+        <translation>Esc</translation>
+    </message>
+    <message>
+        <source>Restart service</source>
+        <translation>Перезапустить сервис</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Обновить</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Имя</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation>Описание</translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation>Активен</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Отключен</translation>
+    </message>
+    <message>
+        <source>Switch</source>
+        <translation>Переключить</translation>
+    </message>
+    <message>
+        <source>netctl-auto</source>
+        <translation>netctl-auto</translation>
     </message>
 </context>
 <context>
@@ -1279,6 +1556,50 @@
         <source>Other</source>
         <translation>Прочее</translation>
     </message>
+    <message>
+        <source>Select netctl-auto command</source>
+        <translation>Путь к команде netctl-auto</translation>
+    </message>
+    <message>
+        <source>Select systemctl command</source>
+        <translation>Путь к команде systemctl</translation>
+    </message>
+    <message>
+        <source>Select wpa_actiond command</source>
+        <translation>Путь к команде wpa_actiond</translation>
+    </message>
+    <message>
+        <source>systemctl path</source>
+        <translation>Путь к systemctl</translation>
+    </message>
+    <message>
+        <source>Path to systemctl</source>
+        <translation>Путь к systemctl</translation>
+    </message>
+    <message>
+        <source>netctl-auto path</source>
+        <translation>Путь к netctl-auto</translation>
+    </message>
+    <message>
+        <source>Path to netctl-auto</source>
+        <translation>Путь к netctl-auto</translation>
+    </message>
+    <message>
+        <source>netctl-auto service</source>
+        <translation>Имя сервиса netctl-auto</translation>
+    </message>
+    <message>
+        <source>Name of netctl-auto systemd service</source>
+        <translation>Имя сервиса systemd для netctl-auto</translation>
+    </message>
+    <message>
+        <source>wpa_actiond path</source>
+        <translation>Путь к wpa_actiond</translation>
+    </message>
+    <message>
+        <source>Path to wpa_actiond</source>
+        <translation>Путь к wpa_actiond</translation>
+    </message>
 </context>
 <context>
     <name>TunnelWidget</name>