release 1.4.1

CHANGELOG

@@ -1,3 +1,53 @@
+Ver.1.4.1
+---------
+* all
+    + some Easter eggs
+    + add _DEFAULT_SOURCE to avoid gcc warnings
+    * refactoring
+    * fix cppcheck warnings
+    * update 3rdparty components
+    * fix language defilition
+    * replace General section to Common in settings (see http://doc.qt.io/qt-5/qsettings.html#Format-enum)
+* gui
+    + allow to change helper control group from UI (#36)
+    + allow to open profile in an external editor (#38)
+    + add IP validators (#34)
+    + add toolbar configuration
+    + add notification on hidding to tray
+    + add returnPressed() signal to lineEdits
+    + implement needToBeConfigured() signal
+    - remove margins
+    - fix bug with segfault on updating UI with KF5
+    * rewrite ErrorWindow class
+    * split MainWindow class
+    * update WiFi menu to new library functions
+    * improve UI (#25, #28)
+    * more correct component checking (#29, #37)
+    * more correct callbacks with exceptions
+* dataengine
+    + add desktop reconfiguration (#30)
+    * improve performance
+* helper
+    + add /interface interface
+    + add /ctrl/{CurrentWiFi,VerboseWiFi} calls
+    + add /netctl/VerboseProfiles call
+    + add /netctl/{netctlActiveProfile,netctlProfileList,netctlVerboseProfileList) calls
+* library
+    + add NetctlInterface class
+    + add WpaSup::CurrentWiFi method
+    + append structures some additional information
+    + mark Netctl::getProfileDescription() as deprecated
+    + now WpaSup can connect to already created session (by default)
+    * improve performance
+* plasmoid
+    + add desktop reconfiguration (#30)
+    - remove legacy functions from KDE4 plasmoid
+    * improve performance of KF5 plasmoid (#26)
+* test
+    * fix netctl tests
+
+***
+
 Ver.1.4.0
 ---------
 * all
@@ -6,9 +56,9 @@ Ver.1.4.0
     + create package for KF5
     * change NETCTLGUI_DEBUG=yes to DEBUG=yes
     * update url
-* gui:
+* gui
     + add workarounds to #22 and #23
-* plasmoid:
+* plasmoid
     + create package and plugin for KF5
     * change NETCTLGUI_DEBUG=yes to DEBUG=yes
     * update url
@@ -33,10 +83,10 @@ Ver.1.3.2
 
 Ver.1.3.1
 ---------
-* gui:
+* gui
     * more correct calls of boolean DBus methods
     * edit helper icon
-* helper:
+* helper
     * more correct calls of boolean DBus methods
     * more correct systemd service
     * add ability to create session bus
@@ -45,18 +95,18 @@ Ver.1.3.1
 
 Ver.1.3.0
 ---------
-* all:
+* all
     + add processes error messages
     + add support of several active profiles
     * some bug fixes and refactoring
     * rewrite debug messages
-* dataengine:
+* dataengine
     + add new sources: intIp6, extIp6, netctlAutoStatus
     * rewrite to use [tasks](https://github.com/mhogomchungu/tasks) (see #7)
     * change default command to define external IP
     * change interface list definition
     * change internal IP definition
-* gui:
+* gui
     + add 3rd party license information
     + add system tray icon as an alternative to the plasmoid
     + add DBus session interface org.netctlgui.netctlgui
@@ -73,11 +123,11 @@ Ver.1.3.0
     * rewrite tables to use toolTip
     * edit about window
     * change menuBar
-* helper:
+* helper
     + create daemon DBus system interface org.netctlgui.helper to the library:
       self control slots, netctl control slots and netctl information slots
     + add tests
-* library:
+* library
     + add custom structures netctlWifiInfo and netctlProfileInfo
     + add methods getActiveProfile(), autoGetActiveProfile()
     + add slot switchToProfile()
@@ -92,7 +142,7 @@ Ver.1.3.0
     * rewrite to use [tasks](https://github.com/mhogomchungu/tasks) (see #7)
     * rename getInterfaceList() to getWirelessInterfaceList()
     * change temporary directory from $HOME/.cache to system one
-* plasmoid:
+* plasmoid
     + add 3rd party license information
     + allow plasmoid to use system tray
     + add ability to use helper
@@ -105,14 +155,14 @@ Ver.1.3.0
 
 Ver.1.2.0
 ---------
-* all:
+* all
     + add icons
     + add support of netctl-auto
     * changes in the project architecture
     * refactoring
-* dataengine:
+* dataengine
     + add debug information (NETCTLGUI_DEBUG=yes)
-* gui:
+* gui
     + add support of macvlan
     + add ability to remove profile
     + add support of hidden wifi network
@@ -130,13 +180,13 @@ Ver.1.2.0
     * refactoring of configuration interface
     * change setting of the interface to profile tab
     * rewrite ErrorWindow class
-* library:
+* library
     + detach backend from frontend
     + add error checking
     + add doxygen documentation
     * more debug information
     * rewrite getSettingsFromProfile() function
-* plasmoid:
+* plasmoid
     + add dataengine configuration
     + add about window
     + add debug information (NETCTLGUI_DEBUG=yes)
@@ -148,26 +198,26 @@ Ver.1.2.0
 
 Ver.1.1.0 (netctl-1.7 update)
 -----------------------------
-* dataengine:
+* dataengine
     * change definition if profile is enabled
-* gui:
+* gui
     + add frequency
     * change definition if profile is enabled
-* plasmoid:
+* plasmoid
     + add menu title
 
 ***
 
 Ver.1.0.6
 ---------
-* gui:
+* gui
     * fix error checking
 
 ***
 
 Ver.1.0.5
 ---------
-* plasmoid:
+* plasmoid
     + add "Start WiFi menu" function
     * refactoring
     * edit icon
@@ -176,9 +226,9 @@ Ver.1.0.5
 
 Ver.1.0.4
 ---------
-* gui:
+* gui
     + add Qt5 gui (by default)
-* plasmoid:
+* plasmoid
     + add notifications
     * fix run command with sudo from plasmoid
 
@@ -186,23 +236,23 @@ Ver.1.0.4
 
 Ver.1.0.3
 ---------
-* all:
+* all
     * refactoring
-* plasmoid:
+* plasmoid
     + edit russian translation
 
 ***
 
 Ver.1.0.2
 ---------
-* plasmoid:
+* plasmoid
     - fix layout margins
 
 ***
 
 Ver.1.0.1
 ---------
-* all:
+* all
     - remove scripts
 
 ***

arch/PKGBUILD

@@ -3,7 +3,7 @@
 pkgbase=netctl-gui
 pkgname=('libnetctlgui' 'netctlgui-helper' 'netctl-gui'
          'plasma5-applet-netctl-gui')
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="Qt4/Qt5 GUI for netctl. Also provides a widget for KDE"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://arcanis.name/projects/netctl-gui"
 license=('GPL3')
 makedepends=('cmake' 'extra-cmake-modules' 'plasma-framework' 'qt5-tools')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
-md5sums=('172fff4b59c15c991b016db35971eca1')
+md5sums=('f93be4d72fa63007f39d3b5516ccd3e4')
 
 
 prepare() {

arch/PKGBUILD-qt4

@@ -3,7 +3,7 @@
 pkgbase=netctl-gui-qt4
 pkgname=('libnetctlgui-qt4' 'netctlgui-helper-qt4' 'netctl-gui-qt4'
          'kdeplasma-applets-netctl-gui')
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="Qt4 GUI for netctl. Also provides a widget for KDE4"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://arcanis.name/projects/netctl-gui"
 license=('GPL3')
 makedepends=('automoc4' 'cmake' 'kdelibs')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
-md5sums=('172fff4b59c15c991b016db35971eca1')
+md5sums=('f93be4d72fa63007f39d3b5516ccd3e4')
 
 
 prepare() {

sources/.kdev4/sources.kdev4

@@ -8,7 +8,7 @@ ProjectRootRelative=./
 
 [CMake][CMake Build Directory 0]
 Build Directory Path=file:///home/arcanis/Documents/github/netctl-gui/build
-Build Type=Release
+Build Type=Debug
 CMake Binary=file:///usr/bin/cmake
 Environment Profile=
 Extra Arguments=

sources/dataengine/netctl.cpp

@@ -92,7 +92,7 @@ QString Netctl::getCmdOutput(const QString cmd)
     if (process.exitCode != 0)
         if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
 
-    return QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
+    return QTextCodec::codecForMib(106)->toUnicode(process.output);
 }
 
 
@@ -140,7 +140,7 @@ QString Netctl::getExtIp(const QString cmd)
     // test network connection
     if (!isNetworkActive()) return QString("N\\A");
 
-    return getCmdOutput(cmd);
+    return getCmdOutput(cmd).trimmed();
 }
 
 
@@ -203,6 +203,7 @@ QStringList Netctl::getProfileList(const QString cmdNetctl, const QString cmdNet
         output = getCmdOutput(QString("%1 list").arg(cmdNetctl));
         netctlAutoStatus = false;
     }
+    qDebug() << output;
 
     // parse
     QStringList currentProfiles;

sources/plasmoid-kde4/netctl.cpp

@@ -124,6 +124,8 @@ void Netctl::init()
     layout->addWidget(iconLabel);
     textLabel = new QLabel(graphicsWidget);
     layout->addWidget(textLabel);
+    graphicsWidget->adjustSize();
+    resize(0, 0);
     // read variables
     configChanged();
 }
@@ -209,20 +211,6 @@ void Netctl::updateIcon()
 }
 
 
-void Netctl::updateInterface(bool setShown)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "State" << setShown;
-
-    if (setShown)
-        layout->addWidget(textLabel);
-    else
-        layout->removeWidget(textLabel);
-    graphicsWidget->adjustSize();
-    resize(0, 0);
-}
-
-
 // context menu
 void Netctl::enableProfileSlot()
 {
@@ -439,11 +427,12 @@ void Netctl::createActions()
     menuActions.clear();
 
     contextMenu[QString("title")] = new QAction(QString("netctl-gui"), this);
+    connect(contextMenu[QString("title")], SIGNAL(triggered(bool)), this, SLOT(showGui()));
     menuActions.append(contextMenu[QString("title")]);
 
     contextMenu[QString("start")] = new QAction(i18n("Start profile"), this);
     contextMenu[QString("start")]->setIcon(QIcon::fromTheme("dialog-apply"));
-    startProfileMenu = new QMenu(NULL);
+    startProfileMenu = new QMenu(nullptr);
     contextMenu[QString("start")]->setMenu(startProfileMenu);
     connect(startProfileMenu, SIGNAL(triggered(QAction *)), this,
             SLOT(startProfileSlot(QAction *)));
@@ -461,7 +450,7 @@ void Netctl::createActions()
 
     contextMenu[QString("switch")] = new QAction(i18n("Switch to profile"), this);
     contextMenu[QString("switch")]->setIcon(QIcon::fromTheme("dialog-apply"));
-    switchToProfileMenu = new QMenu(NULL);
+    switchToProfileMenu = new QMenu(nullptr);
     contextMenu[QString("switch")]->setMenu(switchToProfileMenu);
     connect(switchToProfileMenu, SIGNAL(triggered(QAction *)), this,
             SLOT(switchToProfileSlot(QAction *)));
@@ -476,11 +465,6 @@ void Netctl::createActions()
     connect(contextMenu[QString("enable")], SIGNAL(triggered(bool)), this, SLOT(enableProfileSlot()));
     menuActions.append(contextMenu[QString("enable")]);
 
-    contextMenu[QString("gui")] = new QAction(i18n("Show netctl-gui"), this);
-    contextMenu[QString("gui")]->setIcon(QIcon(":icon"));
-    connect(contextMenu[QString("gui")], SIGNAL(triggered(bool)), this, SLOT(showGui()));
-    menuActions.append(contextMenu[QString("gui")]);
-
     contextMenu[QString("wifi")] = new QAction(i18n("Show WiFi menu"), this);
     contextMenu[QString("wifi")]->setIcon(QIcon(":wifi"));
     connect(contextMenu[QString("wifi")], SIGNAL(triggered(bool)), this, SLOT(showWifi()));
@@ -541,7 +525,6 @@ void Netctl::connectToEngine()
     netctlEngine->connectSource(QString("intip6"), this, autoUpdateInterval);
     netctlEngine->connectSource(QString("profiles"), this, autoUpdateInterval);
     netctlEngine->connectSource(QString("status"), this, autoUpdateInterval);
-    updateInterface(bigInterface);
 }
 
 
@@ -577,7 +560,6 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da
     } else if (sourceName == QString("info")) {
         info[QString("info")] = value;
         // update text
-        if (bigInterface)
         textLabel->setText(formatLine[0] + parsePattern(textPattern) + formatLine[1]);
     } else if (sourceName == QString("interfaces")) {
         info[QString("interfaces")] = value;
@@ -610,8 +592,6 @@ void Netctl::disconnectFromEngine()
     netctlEngine->disconnectSource(QString("profiles"), this);
     netctlEngine->disconnectSource(QString("statusBool"), this);
     netctlEngine->disconnectSource(QString("statusString"), this);
-
-    updateInterface(false);
 }
 
 
@@ -708,13 +688,8 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent)
         uiWidConfig.checkBox_wifi->setCheckState(Qt::Unchecked);
     uiWidConfig.lineEdit_wifi->setText(paths[QString("wifi")]);
     setWifi();
-    if (bigInterface)
-        uiWidConfig.checkBox_showBigInterface->setCheckState(Qt::Checked);
-    else
-        uiWidConfig.checkBox_showBigInterface->setCheckState(Qt::Unchecked);
     QString pattern = textPattern;
     uiWidConfig.textEdit->setPlainText(pattern.replace(QString("<br>"), QString("\n")));
-    setBigInterface();
 
     KConfigGroup cg = config();
     QString textAlign = cg.readEntry("textAlign", "center");
@@ -784,8 +759,6 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent)
     parent->addPage(aboutWidget, i18n("About"), QString("help-about"));
 
     connect(uiWidConfig.checkBox_helper, SIGNAL(stateChanged(int)), this, SLOT(setHelper()));
-    connect(uiWidConfig.checkBox_showBigInterface, SIGNAL(stateChanged(int)), this,
-            SLOT(setBigInterface()));
     connect(uiWidConfig.checkBox_sudo, SIGNAL(stateChanged(int)), this, SLOT(setSudo()));
     connect(uiWidConfig.checkBox_wifi, SIGNAL(stateChanged(int)), this, SLOT(setWifi()));
     connect(uiDEConfig.checkBox_extIp4, SIGNAL(stateChanged(int)), this, SLOT(setDataEngineExternalIp4()));
@@ -826,7 +799,6 @@ void Netctl::configAccepted()
     cg.writeEntry("sudoPath", uiWidConfig.lineEdit_sudo->text());
     cg.writeEntry("useWifi", (uiWidConfig.checkBox_wifi->checkState() != 0));
     cg.writeEntry("wifiPath", uiWidConfig.lineEdit_wifi->text());
-    cg.writeEntry("showBigInterface", (uiWidConfig.checkBox_showBigInterface->checkState() != 0));
     QString pattern = uiWidConfig.textEdit->toPlainText();
     pattern.replace(QString("\n"), QString("<br>"));
     cg.writeEntry("textPattern", pattern);
@@ -872,7 +844,6 @@ void Netctl::configChanged()
     paths[QString("wifi")] = cg.readEntry("wifiPath", "/usr/bin/netctl-gui -t 3");
     useSudo = cg.readEntry("useSudo", true);
     useWifi = cg.readEntry("useWifi", false);
-    bigInterface = cg.readEntry("showBigInterface", true);
     useHelper = cg.readEntry("useHelper", true);
     textPattern = cg.readEntry("textPattern", "$info<br>IPv4: $intip4<br>IPv6: $intip6");
 
@@ -904,14 +875,6 @@ void Netctl::configChanged()
 }
 
 
-void Netctl::setBigInterface()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    uiWidConfig.textEdit->setDisabled(uiWidConfig.checkBox_showBigInterface->checkState() == 0);
-}
-
-
 void Netctl::setDataEngineExternalIp4()
 {
     if (debug) qDebug() << PDEBUG;

sources/plasmoid-kde4/netctl.h

@@ -68,7 +68,6 @@ public slots:
     // configuration interface
     void configAccepted();
     void configChanged();
-    void setBigInterface();
     void setDataEngineExternalIp4();
     void setDataEngineExternalIp6();
     void setHelper();
@@ -78,7 +77,6 @@ public slots:
 private slots:
     // ui
     void updateIcon();
-    void updateInterface(bool setHidden);
     // configuration interface
     void selectAbstractSomething();
     // context menu
@@ -124,7 +122,6 @@ private:
     Ui::About uiAboutConfig;
     // configuration
     int autoUpdateInterval = 1000;
-    bool bigInterface = true;
     bool debug = false;
     QString textPattern = QString();
     QStringList formatLine;

sources/plasmoid-kde4/widget.ui

@@ -329,36 +329,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="layout_showBigInterface">
-     <item>
-      <widget class="QLabel" name="label_showBigInterface">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>1</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="checkBox_showBigInterface">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>2</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Show more detailed interface</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item>
     <widget class="QPlainTextEdit" name="textEdit">
      <property name="toolTip">

sources/resources/translations-plasmoid/en.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/netctl-gui/issues\n"
-"POT-Creation-Date: 2015-03-17 12:48+0300\n"
+"POT-Creation-Date: 2015-03-19 23:07+0300\n"
 "PO-Revision-Date: 2015-03-17 12:49+0300\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -18,103 +18,99 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: plasmoid-kde4/netctl.cpp:234 plasmoid-kf5/plugin/netctladds.cpp:194
+#: plasmoid-kde4/netctl.cpp:222 plasmoid-kf5/plugin/netctladds.cpp:194
 msgid "Set profile %1 disabled"
 msgstr "Set profile %1 disabled"
 
-#: plasmoid-kde4/netctl.cpp:237 plasmoid-kf5/plugin/netctladds.cpp:197
+#: plasmoid-kde4/netctl.cpp:225 plasmoid-kf5/plugin/netctladds.cpp:197
 msgid "Set profile %1 enabled"
 msgstr "Set profile %1 enabled"
 
-#: plasmoid-kde4/netctl.cpp:257 plasmoid-kf5/plugin/netctladds.cpp:215
+#: plasmoid-kde4/netctl.cpp:245 plasmoid-kf5/plugin/netctladds.cpp:215
 msgid "Restart profile %1"
 msgstr "Restart profile %1"
 
-#: plasmoid-kde4/netctl.cpp:277 plasmoid-kf5/plugin/netctladds.cpp:238
+#: plasmoid-kde4/netctl.cpp:265 plasmoid-kf5/plugin/netctladds.cpp:238
 msgid "Start profile %1"
 msgstr "Start profile %1"
 
-#: plasmoid-kde4/netctl.cpp:302 plasmoid-kf5/plugin/netctladds.cpp:262
+#: plasmoid-kde4/netctl.cpp:290 plasmoid-kf5/plugin/netctladds.cpp:262
 msgid "Stop profile %1"
 msgstr "Stop profile %1"
 
-#: plasmoid-kde4/netctl.cpp:321 plasmoid-kde4/netctl.cpp:457
+#: plasmoid-kde4/netctl.cpp:309 plasmoid-kde4/netctl.cpp:446
 #: plasmoid-kf5/package/contents/ui/main.qml:106
 #: plasmoid-kf5/plugin/netctladds.cpp:279
 msgid "Stop all profiles"
 msgstr "Stop all profiles"
 
-#: plasmoid-kde4/netctl.cpp:340 plasmoid-kf5/plugin/netctladds.cpp:300
+#: plasmoid-kde4/netctl.cpp:328 plasmoid-kf5/plugin/netctladds.cpp:300
 msgid "Switch to profile %1"
 msgstr "Switch to profile %1"
 
-#: plasmoid-kde4/netctl.cpp:412 plasmoid-kf5/package/contents/ui/main.qml:183
+#: plasmoid-kde4/netctl.cpp:400 plasmoid-kf5/package/contents/ui/main.qml:183
 msgid "Start another profile"
 msgstr "Start another profile"
 
-#: plasmoid-kde4/netctl.cpp:413 plasmoid-kf5/package/contents/ui/main.qml:184
+#: plasmoid-kde4/netctl.cpp:401 plasmoid-kf5/package/contents/ui/main.qml:184
 msgid "Stop %1"
 msgstr "Stop %1"
 
-#: plasmoid-kde4/netctl.cpp:414 plasmoid-kf5/package/contents/ui/main.qml:185
+#: plasmoid-kde4/netctl.cpp:402 plasmoid-kf5/package/contents/ui/main.qml:185
 msgid "Restart %1"
 msgstr "Restart %1"
 
-#: plasmoid-kde4/netctl.cpp:416 plasmoid-kf5/package/contents/ui/main.qml:187
+#: plasmoid-kde4/netctl.cpp:404 plasmoid-kf5/package/contents/ui/main.qml:187
 msgid "Disable %1"
 msgstr "Disable %1"
 
-#: plasmoid-kde4/netctl.cpp:418 plasmoid-kf5/package/contents/ui/main.qml:189
+#: plasmoid-kde4/netctl.cpp:406 plasmoid-kf5/package/contents/ui/main.qml:189
 msgid "Enable %1"
 msgstr "Enable %1"
 
-#: plasmoid-kde4/netctl.cpp:421 plasmoid-kde4/netctl.cpp:444
+#: plasmoid-kde4/netctl.cpp:409 plasmoid-kde4/netctl.cpp:433
 #: plasmoid-kf5/package/contents/ui/main.qml:104
 #: plasmoid-kf5/package/contents/ui/main.qml:191
 msgid "Start profile"
 msgstr "Start profile"
 
-#: plasmoid-kde4/netctl.cpp:452 plasmoid-kf5/package/contents/ui/main.qml:105
+#: plasmoid-kde4/netctl.cpp:441 plasmoid-kf5/package/contents/ui/main.qml:105
 msgid "Stop profile"
 msgstr "Stop profile"
 
-#: plasmoid-kde4/netctl.cpp:462 plasmoid-kf5/package/contents/ui/main.qml:107
+#: plasmoid-kde4/netctl.cpp:451 plasmoid-kf5/package/contents/ui/main.qml:107
 msgid "Switch to profile"
 msgstr "Switch to profile"
 
-#: plasmoid-kde4/netctl.cpp:470 plasmoid-kf5/package/contents/ui/main.qml:108
+#: plasmoid-kde4/netctl.cpp:459 plasmoid-kf5/package/contents/ui/main.qml:108
 msgid "Restart profile"
 msgstr "Restart profile"
 
-#: plasmoid-kde4/netctl.cpp:475 plasmoid-kf5/package/contents/ui/main.qml:109
+#: plasmoid-kde4/netctl.cpp:464 plasmoid-kf5/package/contents/ui/main.qml:109
 msgid "Enable profile"
 msgstr "Enable profile"
 
-#: plasmoid-kde4/netctl.cpp:479
+#: plasmoid-kde4/netctl.cpp:468 plasmoid-kf5/package/contents/ui/main.qml:110
-msgid "Show netctl-gui"
-msgstr "Show netctl-gui"
-
-#: plasmoid-kde4/netctl.cpp:484 plasmoid-kf5/package/contents/ui/main.qml:110
 msgid "Show WiFi menu"
 msgstr "Show WiFi menu"
 
-#: plasmoid-kde4/netctl.cpp:511
+#: plasmoid-kde4/netctl.cpp:495
 msgid "Start GUI"
 msgstr "Start GUI"
 
-#: plasmoid-kde4/netctl.cpp:522
+#: plasmoid-kde4/netctl.cpp:506
 msgid "Start WiFi menu"
 msgstr "Start WiFi menu"
 
-#: plasmoid-kde4/netctl.cpp:563
+#: plasmoid-kde4/netctl.cpp:546
 msgid "Network is up"
 msgstr "Network is up"
 
-#: plasmoid-kde4/netctl.cpp:567
+#: plasmoid-kde4/netctl.cpp:550
 msgid "Network is down"
 msgstr "Network is down"
 
-#: plasmoid-kde4/netctl.cpp:754
+#: plasmoid-kde4/netctl.cpp:729
 msgid ""
 "Version %1\n"
 "(build date %2)"
@@ -122,41 +118,41 @@ msgstr ""
 "Version %1\n"
 "(build date %2)"
 
-#: plasmoid-kde4/netctl.cpp:755 plasmoid-kf5/plugin/netctladds.cpp:88
+#: plasmoid-kde4/netctl.cpp:730 plasmoid-kf5/plugin/netctladds.cpp:88
 msgid "KDE widget which interacts with netctl."
 msgstr "KDE widget which interacts with netctl."
 
-#: plasmoid-kde4/netctl.cpp:756 plasmoid-kf5/plugin/netctladds.cpp:90
+#: plasmoid-kde4/netctl.cpp:731 plasmoid-kf5/plugin/netctladds.cpp:90
 msgid "Links:"
 msgstr "Links:"
 
-#: plasmoid-kde4/netctl.cpp:769 plasmoid-kf5/plugin/netctladds.cpp:99
+#: plasmoid-kde4/netctl.cpp:744 plasmoid-kf5/plugin/netctladds.cpp:99
 msgid "This software is licensed under %1"
 msgstr "This software is licensed under %1"
 
-#: plasmoid-kde4/netctl.cpp:778 plasmoid-kf5/plugin/netctladds.cpp:102
+#: plasmoid-kde4/netctl.cpp:753 plasmoid-kf5/plugin/netctladds.cpp:102
 msgid "Translators: %1"
 msgstr "Translators: %1"
 
-#: plasmoid-kde4/netctl.cpp:779 plasmoid-kf5/plugin/netctladds.cpp:110
+#: plasmoid-kde4/netctl.cpp:754 plasmoid-kf5/plugin/netctladds.cpp:110
 msgid "This software uses: %1"
 msgstr "This software uses: %1"
 
-#: plasmoid-kde4/netctl.cpp:781
+#: plasmoid-kde4/netctl.cpp:756
 msgid "Netctl plasmoid"
 msgstr "Netctl plasmoid"
 
-#: plasmoid-kde4/netctl.cpp:782
+#: plasmoid-kde4/netctl.cpp:757
 #: plasmoid-kf5/package/contents/config/config.qml:31
 msgid "Appearance"
 msgstr "Appearance"
 
-#: plasmoid-kde4/netctl.cpp:783
+#: plasmoid-kde4/netctl.cpp:758
 #: plasmoid-kf5/package/contents/config/config.qml:37
 msgid "DataEngine"
 msgstr "DataEngine"
 
-#: plasmoid-kde4/netctl.cpp:784
+#: plasmoid-kde4/netctl.cpp:759
 #: plasmoid-kf5/package/contents/config/config.qml:43
 #: plasmoid-kf5/package/contents/ui/about.qml:41
 msgid "About"
@@ -524,15 +520,9 @@ msgstr "Set font family"
 msgid "Set text align"
 msgstr "Set text align"
 
-#. i18n: file: plasmoid-kde4/widget.ui:353
+#. i18n: file: plasmoid-kde4/widget.ui:343
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface)
-#: resources/translations-plasmoid/rc.cpp:114 rc.cpp:114
-msgid "Show more detailed interface"
-msgstr "Show more detailed interface"
-
-#. i18n: file: plasmoid-kde4/widget.ui:373
 #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit)
-#: resources/translations-plasmoid/rc.cpp:117 rc.cpp:117
+#: resources/translations-plasmoid/rc.cpp:114 rc.cpp:114
 msgid ""
 "$info - active profile information\n"
 "$current - current profile name\n"
@@ -554,16 +544,22 @@ msgstr ""
 "$profiles - list of the netctl profiles\n"
 "$status - current profile status (static/enabled)"
 
-#: resources/translations-plasmoid/rc.cpp:126 rc.cpp:126
+#: resources/translations-plasmoid/rc.cpp:123 rc.cpp:123
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Evgeniy Alekseev"
 
-#: resources/translations-plasmoid/rc.cpp:127 rc.cpp:127
+#: resources/translations-plasmoid/rc.cpp:124 rc.cpp:124
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "Show netctl-gui"
+#~ msgstr "Show netctl-gui"
+
+#~ msgid "Show more detailed interface"
+#~ msgstr "Show more detailed interface"
+
 #~ msgid "inactive"
 #~ msgstr "inactive"
 

sources/resources/translations-plasmoid/ja.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/netctl-gui/issues\n"
-"POT-Creation-Date: 2015-03-17 12:48+0300\n"
+"POT-Creation-Date: 2015-03-19 23:07+0300\n"
 "PO-Revision-Date: 2014-10-13 16:37+0900\n"
 "Last-Translator: NOGISAKA Sadata <ngsksdt@gmail.com>\n"
 "Language-Team: Japanese <kde-i18n-doc@kde.org>\n"
@@ -17,103 +17,99 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: plasmoid-kde4/netctl.cpp:234 plasmoid-kf5/plugin/netctladds.cpp:194
+#: plasmoid-kde4/netctl.cpp:222 plasmoid-kf5/plugin/netctladds.cpp:194
 msgid "Set profile %1 disabled"
 msgstr "プロファイル %1 を無効にする"
 
-#: plasmoid-kde4/netctl.cpp:237 plasmoid-kf5/plugin/netctladds.cpp:197
+#: plasmoid-kde4/netctl.cpp:225 plasmoid-kf5/plugin/netctladds.cpp:197
 msgid "Set profile %1 enabled"
 msgstr "プロファイル %1 を有効にする"
 
-#: plasmoid-kde4/netctl.cpp:257 plasmoid-kf5/plugin/netctladds.cpp:215
+#: plasmoid-kde4/netctl.cpp:245 plasmoid-kf5/plugin/netctladds.cpp:215
 msgid "Restart profile %1"
 msgstr "プロファイル %1 の利用を再開"
 
-#: plasmoid-kde4/netctl.cpp:277 plasmoid-kf5/plugin/netctladds.cpp:238
+#: plasmoid-kde4/netctl.cpp:265 plasmoid-kf5/plugin/netctladds.cpp:238
 msgid "Start profile %1"
 msgstr "プロファイル %1 の利用を開始"
 
-#: plasmoid-kde4/netctl.cpp:302 plasmoid-kf5/plugin/netctladds.cpp:262
+#: plasmoid-kde4/netctl.cpp:290 plasmoid-kf5/plugin/netctladds.cpp:262
 msgid "Stop profile %1"
 msgstr "プロファイル %1 の利用を停止する"
 
-#: plasmoid-kde4/netctl.cpp:321 plasmoid-kde4/netctl.cpp:457
+#: plasmoid-kde4/netctl.cpp:309 plasmoid-kde4/netctl.cpp:446
 #: plasmoid-kf5/package/contents/ui/main.qml:106
 #: plasmoid-kf5/plugin/netctladds.cpp:279
 msgid "Stop all profiles"
 msgstr "全てのプロファイルの利用を停止する"
 
-#: plasmoid-kde4/netctl.cpp:340 plasmoid-kf5/plugin/netctladds.cpp:300
+#: plasmoid-kde4/netctl.cpp:328 plasmoid-kf5/plugin/netctladds.cpp:300
 msgid "Switch to profile %1"
 msgstr "プロファイルを %1 へ切り替える"
 
-#: plasmoid-kde4/netctl.cpp:412 plasmoid-kf5/package/contents/ui/main.qml:183
+#: plasmoid-kde4/netctl.cpp:400 plasmoid-kf5/package/contents/ui/main.qml:183
 msgid "Start another profile"
 msgstr "他のプロファイルの利用を開始"
 
-#: plasmoid-kde4/netctl.cpp:413 plasmoid-kf5/package/contents/ui/main.qml:184
+#: plasmoid-kde4/netctl.cpp:401 plasmoid-kf5/package/contents/ui/main.qml:184
 msgid "Stop %1"
 msgstr "%1 を停止"
 
-#: plasmoid-kde4/netctl.cpp:414 plasmoid-kf5/package/contents/ui/main.qml:185
+#: plasmoid-kde4/netctl.cpp:402 plasmoid-kf5/package/contents/ui/main.qml:185
 msgid "Restart %1"
 msgstr "%1 を再開"
 
-#: plasmoid-kde4/netctl.cpp:416 plasmoid-kf5/package/contents/ui/main.qml:187
+#: plasmoid-kde4/netctl.cpp:404 plasmoid-kf5/package/contents/ui/main.qml:187
 msgid "Disable %1"
 msgstr "%1 を無効にする"
 
-#: plasmoid-kde4/netctl.cpp:418 plasmoid-kf5/package/contents/ui/main.qml:189
+#: plasmoid-kde4/netctl.cpp:406 plasmoid-kf5/package/contents/ui/main.qml:189
 msgid "Enable %1"
 msgstr "%1 を有効にする"
 
-#: plasmoid-kde4/netctl.cpp:421 plasmoid-kde4/netctl.cpp:444
+#: plasmoid-kde4/netctl.cpp:409 plasmoid-kde4/netctl.cpp:433
 #: plasmoid-kf5/package/contents/ui/main.qml:104
 #: plasmoid-kf5/package/contents/ui/main.qml:191
 msgid "Start profile"
 msgstr "プロファイルの利用を開始"
 
-#: plasmoid-kde4/netctl.cpp:452 plasmoid-kf5/package/contents/ui/main.qml:105
+#: plasmoid-kde4/netctl.cpp:441 plasmoid-kf5/package/contents/ui/main.qml:105
 msgid "Stop profile"
 msgstr "プロファイルの利用を停止する"
 
-#: plasmoid-kde4/netctl.cpp:462 plasmoid-kf5/package/contents/ui/main.qml:107
+#: plasmoid-kde4/netctl.cpp:451 plasmoid-kf5/package/contents/ui/main.qml:107
 msgid "Switch to profile"
 msgstr "プロファイルを切り替える"
 
-#: plasmoid-kde4/netctl.cpp:470 plasmoid-kf5/package/contents/ui/main.qml:108
+#: plasmoid-kde4/netctl.cpp:459 plasmoid-kf5/package/contents/ui/main.qml:108
 msgid "Restart profile"
 msgstr "プロファイルの利用を再開"
 
-#: plasmoid-kde4/netctl.cpp:475 plasmoid-kf5/package/contents/ui/main.qml:109
+#: plasmoid-kde4/netctl.cpp:464 plasmoid-kf5/package/contents/ui/main.qml:109
 msgid "Enable profile"
 msgstr "プロファイルを有効にする"
 
-#: plasmoid-kde4/netctl.cpp:479
+#: plasmoid-kde4/netctl.cpp:468 plasmoid-kf5/package/contents/ui/main.qml:110
-msgid "Show netctl-gui"
-msgstr "netctl-gui を表示"
-
-#: plasmoid-kde4/netctl.cpp:484 plasmoid-kf5/package/contents/ui/main.qml:110
 msgid "Show WiFi menu"
 msgstr "WiFi メニューを表示"
 
-#: plasmoid-kde4/netctl.cpp:511
+#: plasmoid-kde4/netctl.cpp:495
 msgid "Start GUI"
 msgstr "GUI を開始"
 
-#: plasmoid-kde4/netctl.cpp:522
+#: plasmoid-kde4/netctl.cpp:506
 msgid "Start WiFi menu"
 msgstr "WiFi メニューを開始"
 
-#: plasmoid-kde4/netctl.cpp:563
+#: plasmoid-kde4/netctl.cpp:546
 msgid "Network is up"
 msgstr "ネットワークは有効です"
 
-#: plasmoid-kde4/netctl.cpp:567
+#: plasmoid-kde4/netctl.cpp:550
 msgid "Network is down"
 msgstr "ネットワークは無効です"
 
-#: plasmoid-kde4/netctl.cpp:754
+#: plasmoid-kde4/netctl.cpp:729
 msgid ""
 "Version %1\n"
 "(build date %2)"
@@ -121,41 +117,41 @@ msgstr ""
 "バージョン：%1\n"
 "（ビルド日時：%2）"
 
-#: plasmoid-kde4/netctl.cpp:755 plasmoid-kf5/plugin/netctladds.cpp:88
+#: plasmoid-kde4/netctl.cpp:730 plasmoid-kf5/plugin/netctladds.cpp:88
 msgid "KDE widget which interacts with netctl."
 msgstr "netctl と連携する KDE ウィジェット"
 
-#: plasmoid-kde4/netctl.cpp:756 plasmoid-kf5/plugin/netctladds.cpp:90
+#: plasmoid-kde4/netctl.cpp:731 plasmoid-kf5/plugin/netctladds.cpp:90
 msgid "Links:"
 msgstr "リンク："
 
-#: plasmoid-kde4/netctl.cpp:769 plasmoid-kf5/plugin/netctladds.cpp:99
+#: plasmoid-kde4/netctl.cpp:744 plasmoid-kf5/plugin/netctladds.cpp:99
 msgid "This software is licensed under %1"
 msgstr "このソフトウェアは %1 の下で許諾されます"
 
-#: plasmoid-kde4/netctl.cpp:778 plasmoid-kf5/plugin/netctladds.cpp:102
+#: plasmoid-kde4/netctl.cpp:753 plasmoid-kf5/plugin/netctladds.cpp:102
 msgid "Translators: %1"
 msgstr "翻訳者：%1"
 
-#: plasmoid-kde4/netctl.cpp:779 plasmoid-kf5/plugin/netctladds.cpp:110
+#: plasmoid-kde4/netctl.cpp:754 plasmoid-kf5/plugin/netctladds.cpp:110
 msgid "This software uses: %1"
 msgstr "このソフトウェアは次を利用しています：%1"
 
-#: plasmoid-kde4/netctl.cpp:781
+#: plasmoid-kde4/netctl.cpp:756
 msgid "Netctl plasmoid"
 msgstr "Netctl plasmoid"
 
-#: plasmoid-kde4/netctl.cpp:782
+#: plasmoid-kde4/netctl.cpp:757
 #: plasmoid-kf5/package/contents/config/config.qml:31
 msgid "Appearance"
 msgstr "外観"
 
-#: plasmoid-kde4/netctl.cpp:783
+#: plasmoid-kde4/netctl.cpp:758
 #: plasmoid-kf5/package/contents/config/config.qml:37
 msgid "DataEngine"
 msgstr "DataEngine"
 
-#: plasmoid-kde4/netctl.cpp:784
+#: plasmoid-kde4/netctl.cpp:759
 #: plasmoid-kf5/package/contents/config/config.qml:43
 #: plasmoid-kf5/package/contents/ui/about.qml:41
 msgid "About"
@@ -527,15 +523,9 @@ msgstr "フォントを設定する"
 msgid "Set text align"
 msgstr "テキストの位置を設定する"
 
-#. i18n: file: plasmoid-kde4/widget.ui:353
+#. i18n: file: plasmoid-kde4/widget.ui:343
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface)
-#: resources/translations-plasmoid/rc.cpp:114 rc.cpp:114
-msgid "Show more detailed interface"
-msgstr "インターフェースについての詳細を表示"
-
-#. i18n: file: plasmoid-kde4/widget.ui:373
 #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit)
-#: resources/translations-plasmoid/rc.cpp:117 rc.cpp:117
+#: resources/translations-plasmoid/rc.cpp:114 rc.cpp:114
 msgid ""
 "$info - active profile information\n"
 "$current - current profile name\n"
@@ -557,16 +547,22 @@ msgstr ""
 "$profiles - プロファイルの一覧\n"
 "$status - 現在のプロファイルの状態（静的/有効）"
 
-#: resources/translations-plasmoid/rc.cpp:126 rc.cpp:126
+#: resources/translations-plasmoid/rc.cpp:123 rc.cpp:123
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "NOGISAKA Sadata"
 
-#: resources/translations-plasmoid/rc.cpp:127 rc.cpp:127
+#: resources/translations-plasmoid/rc.cpp:124 rc.cpp:124
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "ngsksdt@gmail.com "
 
+#~ msgid "Show netctl-gui"
+#~ msgstr "netctl-gui を表示"
+
+#~ msgid "Show more detailed interface"
+#~ msgstr "インターフェースについての詳細を表示"
+
 #, fuzzy
 #~ msgid "inactive"
 #~ msgstr "非アクティブ時のアイコン"

sources/resources/translations-plasmoid/plasma_applet_netctl.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/netctl-gui/issues\n"
-"POT-Creation-Date: 2015-03-17 12:48+0300\n"
+"POT-Creation-Date: 2015-03-19 23:07+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,143 +17,139 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plasmoid-kde4/netctl.cpp:234 plasmoid-kf5/plugin/netctladds.cpp:194
+#: plasmoid-kde4/netctl.cpp:222 plasmoid-kf5/plugin/netctladds.cpp:194
 msgid "Set profile %1 disabled"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:237 plasmoid-kf5/plugin/netctladds.cpp:197
+#: plasmoid-kde4/netctl.cpp:225 plasmoid-kf5/plugin/netctladds.cpp:197
 msgid "Set profile %1 enabled"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:257 plasmoid-kf5/plugin/netctladds.cpp:215
+#: plasmoid-kde4/netctl.cpp:245 plasmoid-kf5/plugin/netctladds.cpp:215
 msgid "Restart profile %1"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:277 plasmoid-kf5/plugin/netctladds.cpp:238
+#: plasmoid-kde4/netctl.cpp:265 plasmoid-kf5/plugin/netctladds.cpp:238
 msgid "Start profile %1"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:302 plasmoid-kf5/plugin/netctladds.cpp:262
+#: plasmoid-kde4/netctl.cpp:290 plasmoid-kf5/plugin/netctladds.cpp:262
 msgid "Stop profile %1"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:321 plasmoid-kde4/netctl.cpp:457
+#: plasmoid-kde4/netctl.cpp:309 plasmoid-kde4/netctl.cpp:446
 #: plasmoid-kf5/package/contents/ui/main.qml:106
 #: plasmoid-kf5/plugin/netctladds.cpp:279
 msgid "Stop all profiles"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:340 plasmoid-kf5/plugin/netctladds.cpp:300
+#: plasmoid-kde4/netctl.cpp:328 plasmoid-kf5/plugin/netctladds.cpp:300
 msgid "Switch to profile %1"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:412 plasmoid-kf5/package/contents/ui/main.qml:183
+#: plasmoid-kde4/netctl.cpp:400 plasmoid-kf5/package/contents/ui/main.qml:183
 msgid "Start another profile"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:413 plasmoid-kf5/package/contents/ui/main.qml:184
+#: plasmoid-kde4/netctl.cpp:401 plasmoid-kf5/package/contents/ui/main.qml:184
 msgid "Stop %1"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:414 plasmoid-kf5/package/contents/ui/main.qml:185
+#: plasmoid-kde4/netctl.cpp:402 plasmoid-kf5/package/contents/ui/main.qml:185
 msgid "Restart %1"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:416 plasmoid-kf5/package/contents/ui/main.qml:187
+#: plasmoid-kde4/netctl.cpp:404 plasmoid-kf5/package/contents/ui/main.qml:187
 msgid "Disable %1"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:418 plasmoid-kf5/package/contents/ui/main.qml:189
+#: plasmoid-kde4/netctl.cpp:406 plasmoid-kf5/package/contents/ui/main.qml:189
 msgid "Enable %1"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:421 plasmoid-kde4/netctl.cpp:444
+#: plasmoid-kde4/netctl.cpp:409 plasmoid-kde4/netctl.cpp:433
 #: plasmoid-kf5/package/contents/ui/main.qml:104
 #: plasmoid-kf5/package/contents/ui/main.qml:191
 msgid "Start profile"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:452 plasmoid-kf5/package/contents/ui/main.qml:105
+#: plasmoid-kde4/netctl.cpp:441 plasmoid-kf5/package/contents/ui/main.qml:105
 msgid "Stop profile"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:462 plasmoid-kf5/package/contents/ui/main.qml:107
+#: plasmoid-kde4/netctl.cpp:451 plasmoid-kf5/package/contents/ui/main.qml:107
 msgid "Switch to profile"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:470 plasmoid-kf5/package/contents/ui/main.qml:108
+#: plasmoid-kde4/netctl.cpp:459 plasmoid-kf5/package/contents/ui/main.qml:108
 msgid "Restart profile"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:475 plasmoid-kf5/package/contents/ui/main.qml:109
+#: plasmoid-kde4/netctl.cpp:464 plasmoid-kf5/package/contents/ui/main.qml:109
 msgid "Enable profile"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:479
+#: plasmoid-kde4/netctl.cpp:468 plasmoid-kf5/package/contents/ui/main.qml:110
-msgid "Show netctl-gui"
-msgstr ""
-
-#: plasmoid-kde4/netctl.cpp:484 plasmoid-kf5/package/contents/ui/main.qml:110
 msgid "Show WiFi menu"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:511
+#: plasmoid-kde4/netctl.cpp:495
 msgid "Start GUI"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:522
+#: plasmoid-kde4/netctl.cpp:506
 msgid "Start WiFi menu"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:563
+#: plasmoid-kde4/netctl.cpp:546
 msgid "Network is up"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:567
+#: plasmoid-kde4/netctl.cpp:550
 msgid "Network is down"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:754
+#: plasmoid-kde4/netctl.cpp:729
 msgid ""
 "Version %1\n"
 "(build date %2)"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:755 plasmoid-kf5/plugin/netctladds.cpp:88
+#: plasmoid-kde4/netctl.cpp:730 plasmoid-kf5/plugin/netctladds.cpp:88
 msgid "KDE widget which interacts with netctl."
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:756 plasmoid-kf5/plugin/netctladds.cpp:90
+#: plasmoid-kde4/netctl.cpp:731 plasmoid-kf5/plugin/netctladds.cpp:90
 msgid "Links:"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:769 plasmoid-kf5/plugin/netctladds.cpp:99
+#: plasmoid-kde4/netctl.cpp:744 plasmoid-kf5/plugin/netctladds.cpp:99
 msgid "This software is licensed under %1"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:778 plasmoid-kf5/plugin/netctladds.cpp:102
+#: plasmoid-kde4/netctl.cpp:753 plasmoid-kf5/plugin/netctladds.cpp:102
 msgid "Translators: %1"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:779 plasmoid-kf5/plugin/netctladds.cpp:110
+#: plasmoid-kde4/netctl.cpp:754 plasmoid-kf5/plugin/netctladds.cpp:110
 msgid "This software uses: %1"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:781
+#: plasmoid-kde4/netctl.cpp:756
 msgid "Netctl plasmoid"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:782
+#: plasmoid-kde4/netctl.cpp:757
 #: plasmoid-kf5/package/contents/config/config.qml:31
 msgid "Appearance"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:783
+#: plasmoid-kde4/netctl.cpp:758
 #: plasmoid-kf5/package/contents/config/config.qml:37
 msgid "DataEngine"
 msgstr ""
 
-#: plasmoid-kde4/netctl.cpp:784
+#: plasmoid-kde4/netctl.cpp:759
 #: plasmoid-kf5/package/contents/config/config.qml:43
 #: plasmoid-kf5/package/contents/ui/about.qml:41
 msgid "About"
@@ -521,15 +517,9 @@ msgstr ""
 msgid "Set text align"
 msgstr ""
 
-#. i18n: file: plasmoid-kde4/widget.ui:353
+#. i18n: file: plasmoid-kde4/widget.ui:343
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface)
-#: resources/translations-plasmoid/rc.cpp:114 rc.cpp:114
-msgid "Show more detailed interface"
-msgstr ""
-
-#. i18n: file: plasmoid-kde4/widget.ui:373
 #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit)
-#: resources/translations-plasmoid/rc.cpp:117 rc.cpp:117
+#: resources/translations-plasmoid/rc.cpp:114 rc.cpp:114
 msgid ""
 "$info - active profile information\n"
 "$current - current profile name\n"
@@ -542,12 +532,12 @@ msgid ""
 "$status - current profile status (static/enabled)"
 msgstr ""
 
-#: resources/translations-plasmoid/rc.cpp:126 rc.cpp:126
+#: resources/translations-plasmoid/rc.cpp:123 rc.cpp:123
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 
-#: resources/translations-plasmoid/rc.cpp:127 rc.cpp:127
+#: resources/translations-plasmoid/rc.cpp:124 rc.cpp:124
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ""

sources/resources/translations-plasmoid/ru.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/netctl-gui/issues\n"
-"POT-Creation-Date: 2015-03-17 12:48+0300\n"
+"POT-Creation-Date: 2015-03-19 23:07+0300\n"
 "PO-Revision-Date: 2015-03-17 12:49+0300\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -18,103 +18,99 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: plasmoid-kde4/netctl.cpp:234 plasmoid-kf5/plugin/netctladds.cpp:194
+#: plasmoid-kde4/netctl.cpp:222 plasmoid-kf5/plugin/netctladds.cpp:194
 msgid "Set profile %1 disabled"
 msgstr "Выключение автозагрузки профиля %1"
 
-#: plasmoid-kde4/netctl.cpp:237 plasmoid-kf5/plugin/netctladds.cpp:197
+#: plasmoid-kde4/netctl.cpp:225 plasmoid-kf5/plugin/netctladds.cpp:197
 msgid "Set profile %1 enabled"
 msgstr "Включение автозагрузки профиля %1"
 
-#: plasmoid-kde4/netctl.cpp:257 plasmoid-kf5/plugin/netctladds.cpp:215
+#: plasmoid-kde4/netctl.cpp:245 plasmoid-kf5/plugin/netctladds.cpp:215
 msgid "Restart profile %1"
 msgstr "Перезапуск профиля %1"
 
-#: plasmoid-kde4/netctl.cpp:277 plasmoid-kf5/plugin/netctladds.cpp:238
+#: plasmoid-kde4/netctl.cpp:265 plasmoid-kf5/plugin/netctladds.cpp:238
 msgid "Start profile %1"
 msgstr "Запуск профиля %1"
 
-#: plasmoid-kde4/netctl.cpp:302 plasmoid-kf5/plugin/netctladds.cpp:262
+#: plasmoid-kde4/netctl.cpp:290 plasmoid-kf5/plugin/netctladds.cpp:262
 msgid "Stop profile %1"
 msgstr "Остановка профиля %1"
 
-#: plasmoid-kde4/netctl.cpp:321 plasmoid-kde4/netctl.cpp:457
+#: plasmoid-kde4/netctl.cpp:309 plasmoid-kde4/netctl.cpp:446
 #: plasmoid-kf5/package/contents/ui/main.qml:106
 #: plasmoid-kf5/plugin/netctladds.cpp:279
 msgid "Stop all profiles"
 msgstr "Остановить все профили"
 
-#: plasmoid-kde4/netctl.cpp:340 plasmoid-kf5/plugin/netctladds.cpp:300
+#: plasmoid-kde4/netctl.cpp:328 plasmoid-kf5/plugin/netctladds.cpp:300
 msgid "Switch to profile %1"
 msgstr "Переключение на профиль %1"
 
-#: plasmoid-kde4/netctl.cpp:412 plasmoid-kf5/package/contents/ui/main.qml:183
+#: plasmoid-kde4/netctl.cpp:400 plasmoid-kf5/package/contents/ui/main.qml:183
 msgid "Start another profile"
 msgstr "Запустить другой профиль"
 
-#: plasmoid-kde4/netctl.cpp:413 plasmoid-kf5/package/contents/ui/main.qml:184
+#: plasmoid-kde4/netctl.cpp:401 plasmoid-kf5/package/contents/ui/main.qml:184
 msgid "Stop %1"
 msgstr "Остановить %1"
 
-#: plasmoid-kde4/netctl.cpp:414 plasmoid-kf5/package/contents/ui/main.qml:185
+#: plasmoid-kde4/netctl.cpp:402 plasmoid-kf5/package/contents/ui/main.qml:185
 msgid "Restart %1"
 msgstr "Перезапустить %1"
 
-#: plasmoid-kde4/netctl.cpp:416 plasmoid-kf5/package/contents/ui/main.qml:187
+#: plasmoid-kde4/netctl.cpp:404 plasmoid-kf5/package/contents/ui/main.qml:187
 msgid "Disable %1"
 msgstr "Отключить %1"
 
-#: plasmoid-kde4/netctl.cpp:418 plasmoid-kf5/package/contents/ui/main.qml:189
+#: plasmoid-kde4/netctl.cpp:406 plasmoid-kf5/package/contents/ui/main.qml:189
 msgid "Enable %1"
 msgstr "Включить %1"
 
-#: plasmoid-kde4/netctl.cpp:421 plasmoid-kde4/netctl.cpp:444
+#: plasmoid-kde4/netctl.cpp:409 plasmoid-kde4/netctl.cpp:433
 #: plasmoid-kf5/package/contents/ui/main.qml:104
 #: plasmoid-kf5/package/contents/ui/main.qml:191
 msgid "Start profile"
 msgstr "Запустить профиль"
 
-#: plasmoid-kde4/netctl.cpp:452 plasmoid-kf5/package/contents/ui/main.qml:105
+#: plasmoid-kde4/netctl.cpp:441 plasmoid-kf5/package/contents/ui/main.qml:105
 msgid "Stop profile"
 msgstr "Остановить профиль"
 
-#: plasmoid-kde4/netctl.cpp:462 plasmoid-kf5/package/contents/ui/main.qml:107
+#: plasmoid-kde4/netctl.cpp:451 plasmoid-kf5/package/contents/ui/main.qml:107
 msgid "Switch to profile"
 msgstr "Переключить профиль"
 
-#: plasmoid-kde4/netctl.cpp:470 plasmoid-kf5/package/contents/ui/main.qml:108
+#: plasmoid-kde4/netctl.cpp:459 plasmoid-kf5/package/contents/ui/main.qml:108
 msgid "Restart profile"
 msgstr "Перезапустить профиль"
 
-#: plasmoid-kde4/netctl.cpp:475 plasmoid-kf5/package/contents/ui/main.qml:109
+#: plasmoid-kde4/netctl.cpp:464 plasmoid-kf5/package/contents/ui/main.qml:109
 msgid "Enable profile"
 msgstr "Включить профиль"
 
-#: plasmoid-kde4/netctl.cpp:479
+#: plasmoid-kde4/netctl.cpp:468 plasmoid-kf5/package/contents/ui/main.qml:110
-msgid "Show netctl-gui"
-msgstr "Показать netctl-gui"
-
-#: plasmoid-kde4/netctl.cpp:484 plasmoid-kf5/package/contents/ui/main.qml:110
 msgid "Show WiFi menu"
 msgstr "Запустить WiFi-menu"
 
-#: plasmoid-kde4/netctl.cpp:511
+#: plasmoid-kde4/netctl.cpp:495
 msgid "Start GUI"
 msgstr "Запуск GUI"
 
-#: plasmoid-kde4/netctl.cpp:522
+#: plasmoid-kde4/netctl.cpp:506
 msgid "Start WiFi menu"
 msgstr "Запуск WiFi-menu"
 
-#: plasmoid-kde4/netctl.cpp:563
+#: plasmoid-kde4/netctl.cpp:546
 msgid "Network is up"
 msgstr "Сеть работает"
 
-#: plasmoid-kde4/netctl.cpp:567
+#: plasmoid-kde4/netctl.cpp:550
 msgid "Network is down"
 msgstr "Сеть не работает"
 
-#: plasmoid-kde4/netctl.cpp:754
+#: plasmoid-kde4/netctl.cpp:729
 msgid ""
 "Version %1\n"
 "(build date %2)"
@@ -122,41 +118,41 @@ msgstr ""
 "Версия %1\n"
 "(дата сборки %2)"
 
-#: plasmoid-kde4/netctl.cpp:755 plasmoid-kf5/plugin/netctladds.cpp:88
+#: plasmoid-kde4/netctl.cpp:730 plasmoid-kf5/plugin/netctladds.cpp:88
 msgid "KDE widget which interacts with netctl."
 msgstr "Виджет KDE, который взаимодействует с netctl."
 
-#: plasmoid-kde4/netctl.cpp:756 plasmoid-kf5/plugin/netctladds.cpp:90
+#: plasmoid-kde4/netctl.cpp:731 plasmoid-kf5/plugin/netctladds.cpp:90
 msgid "Links:"
 msgstr "Ссылки:"
 
-#: plasmoid-kde4/netctl.cpp:769 plasmoid-kf5/plugin/netctladds.cpp:99
+#: plasmoid-kde4/netctl.cpp:744 plasmoid-kf5/plugin/netctladds.cpp:99
 msgid "This software is licensed under %1"
 msgstr "Данное приложение лицензировано под %1"
 
-#: plasmoid-kde4/netctl.cpp:778 plasmoid-kf5/plugin/netctladds.cpp:102
+#: plasmoid-kde4/netctl.cpp:753 plasmoid-kf5/plugin/netctladds.cpp:102
 msgid "Translators: %1"
 msgstr "Переводчики: %1"
 
-#: plasmoid-kde4/netctl.cpp:779 plasmoid-kf5/plugin/netctladds.cpp:110
+#: plasmoid-kde4/netctl.cpp:754 plasmoid-kf5/plugin/netctladds.cpp:110
 msgid "This software uses: %1"
 msgstr "Данное приложение использует: %1"
 
-#: plasmoid-kde4/netctl.cpp:781
+#: plasmoid-kde4/netctl.cpp:756
 msgid "Netctl plasmoid"
 msgstr "Netctl plasmoid"
 
-#: plasmoid-kde4/netctl.cpp:782
+#: plasmoid-kde4/netctl.cpp:757
 #: plasmoid-kf5/package/contents/config/config.qml:31
 msgid "Appearance"
 msgstr "Внешний вид"
 
-#: plasmoid-kde4/netctl.cpp:783
+#: plasmoid-kde4/netctl.cpp:758
 #: plasmoid-kf5/package/contents/config/config.qml:37
 msgid "DataEngine"
 msgstr "DataEngine"
 
-#: plasmoid-kde4/netctl.cpp:784
+#: plasmoid-kde4/netctl.cpp:759
 #: plasmoid-kf5/package/contents/config/config.qml:43
 #: plasmoid-kf5/package/contents/ui/about.qml:41
 msgid "About"
@@ -524,15 +520,9 @@ msgstr "Укажите шрифт"
 msgid "Set text align"
 msgstr "Установите выравнивание текста"
 
-#. i18n: file: plasmoid-kde4/widget.ui:353
+#. i18n: file: plasmoid-kde4/widget.ui:343
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface)
-#: resources/translations-plasmoid/rc.cpp:114 rc.cpp:114
-msgid "Show more detailed interface"
-msgstr "Показать более детальный интерфейс"
-
-#. i18n: file: plasmoid-kde4/widget.ui:373
 #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit)
-#: resources/translations-plasmoid/rc.cpp:117 rc.cpp:117
+#: resources/translations-plasmoid/rc.cpp:114 rc.cpp:114
 msgid ""
 "$info - active profile information\n"
 "$current - current profile name\n"
@@ -554,16 +544,22 @@ msgstr ""
 "$profiles - список профилей netctl\n"
 "$status - статус текущего профиля (static/enabled)"
 
-#: resources/translations-plasmoid/rc.cpp:126 rc.cpp:126
+#: resources/translations-plasmoid/rc.cpp:123 rc.cpp:123
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Evgeniy Alekseev"
 
-#: resources/translations-plasmoid/rc.cpp:127 rc.cpp:127
+#: resources/translations-plasmoid/rc.cpp:124 rc.cpp:124
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "Show netctl-gui"
+#~ msgstr "Показать netctl-gui"
+
+#~ msgid "Show more detailed interface"
+#~ msgstr "Показать более детальный интерфейс"
+
 #~ msgid "inactive"
 #~ msgstr "неактивен"