release 1.0.0

2025-04-24 15:37:23 +00:00 · 2014-03-25 11:00:50 +04:00 · 2014-03-25 11:00:50 +04:00 · 6132de0951
commit 6132de0951
parent 80e4b3e3d3
15 changed files with 757 additions and 45 deletions
--- a/2
+++ b/2
@ -18,7 +18,7 @@ optdepends=('kdebase-runtime: sudo support'
            'wpa_supplicant: wifi support')
 source=("https://github.com/arcan1s/netctlplasmoid/releases/download/V.${pkgver}/${pkgname}-${pkgver}-src.tar.xz")
 install="${pkgname}.install"
-md5sums=('5e7573643d528f770fca2dc3e2122e69')
+md5sums=('bc727268cdc3b9ab7d567a2fe9ad3330')

 # flags
 _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release"
--- a/netctl-gui.install
+++ b/netctl-gui.install
@ -1,6 +1,11 @@
 post_install() {
  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
  update-desktop-database -q
+  cat << EOF
+Not to enter a root password you may add following lines to /etc/sudoers:
+    USERNAME ALL=NOPASSWD: /usr/bin/netctl-gui-netctl
+    USERNAME ALL=NOPASSWD: /usr/bin/netctl-gui-wpa_supplicant
+EOF
 }

 post_upgrade() {
--- a/sources/gui/src/settingswindow.cpp
+++ b/sources/gui/src/settingswindow.cpp
@ -246,14 +246,14 @@ QMap<QString, QString> SettingsWindow::getDefault()
    settings[QString("CTRL_GROUP")] = QString("users");
    settings[QString("IFACE_DIR")] = QString("/sys/class/net/");
    settings[QString("LANGUAGE")] = QString("english");
-    settings[QString("NETCTL_PATH")] = QString("/usr/bin/netctl");
+    settings[QString("NETCTL_PATH")] = QString("/usr/bin/netctl-gui-netctl");
    settings[QString("PID_FILE")] = QString("/run/wpa_supplicant_netctl-gui.pid");
    settings[QString("PREFERED_IFACE")] = QString("");
    settings[QString("PROFILE_DIR")] = QString("/etc/netctl/");
    settings[QString("RFKILL_DIR")] = QString("/sys/class/rfkill/");
    settings[QString("SUDO_PATH")] = QString("/usr/bin/kdesu");
    settings[QString("WPACLI_PATH")] = QString("/usr/bin/wpa_cli");
-    settings[QString("WPASUP_PATH")] = QString("/usr/bin/wpa_supplicant");
+    settings[QString("WPASUP_PATH")] = QString("/usr/bin/netctl-gui-wpa_supplicant");
    settings[QString("WPA_DRIVERS")] = QString("nl80211,wext");

    for (int i=0; i<settings.keys().count(); i++)
--- a/sources/plasmoid/CMakeLists.txt
+++ b/sources/plasmoid/CMakeLists.txt
@ -9,6 +9,8 @@ include (KDE4Defaults)
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../)

+add_subdirectory (po)
+
 # set sources
 set (PLUGIN_NAME ${SUBPROJECT})
 file (GLOB SUBPROJECT_DESKTOP_IN *.desktop)
--- a/sources/plasmoid/configwindow.ui
+++ b/sources/plasmoid/configwindow.ui
@ -23,7 +23,7 @@
   <item row="0" column="0">
    <widget class="QTabWidget" name="tabWidget">
     <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
     </property>
     <widget class="QWidget" name="tabConfiguration">
      <attribute name="title">
--- a/sources/plasmoid/netctl.cpp
+++ b/sources/plasmoid/netctl.cpp
@ -43,17 +43,15 @@ Netctl::Netctl(QObject *parent, const QVariantList &args)

 Netctl::~Netctl()
 {
-    delete startProfileMenu;
-    delete startProfile;
-    delete stopProfile;
-    delete restartProfile;
-    delete enableProfileAutoload;
+//    delete startProfileMenu;
+//    delete startProfile;
+//    delete stopProfile;
+//    delete restartProfile;
+//    delete enableProfileAutoload;

-    delete iconWidget;
-    delete iconFrame;
-    delete textFrame;
+//    delete iconWidget;

-    delete netctlEngine;
+//    delete netctlEngine;
 }


@ -68,38 +66,32 @@ void Netctl::init()

    // frames
    // icon
-    iconFrame = new Plasma::Frame();
-    QGraphicsLinearLayout *iconLayout = new QGraphicsLinearLayout();
    iconWidget = new Plasma::IconWidget(KIcon(""), QString(), this);
-    iconWidget->setPreferredWidth(30);
-    iconWidget->setPreferredHeight(30);
-    iconWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+    iconWidget->setPreferredSize(30, 30);
    connect(iconWidget, SIGNAL(doubleClicked()), this, SLOT(showGui()));
-    iconFrame->setLayout(iconLayout);
-    iconLayout->addItem(iconWidget);
-    fullSpaceLayout->addItem(iconFrame);
+    fullSpaceLayout->addItem(iconWidget);
    // text
-    textFrame = new Plasma::Frame();
-    QGraphicsLinearLayout *textLayout = new QGraphicsLinearLayout();
    textLabel = new Plasma::Label();
    textLabel->setPreferredHeight(30);
-    textLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
-    textLayout->addItem(textLabel);
-    textFrame->setLayout(textLayout);
-    fullSpaceLayout->addItem(textFrame);
-    textFrame->hide();
-    // stretch
-    fullSpaceLayout->addStretch(1);
+    fullSpaceLayout->addItem(textLabel);

    // read variables
    configChanged();
 }


-void Netctl::updateWidget()
+void Netctl::updateInterface(bool setShown)
 {
-    update();
-    resize(0, 0);
+    if (setShown) {
+        textLabel->show();
+        fullSpaceLayout->updateGeometry();
+        updateGeometry();
+    }
+    else {
+        textLabel->hide();
+        fullSpaceLayout->updateGeometry();
+        updateGeometry();
+    }
 }


@ -241,6 +233,7 @@ void Netctl::connectToEngine()
    netctlEngine->connectSource(QString("statusBool"), this, autoUpdateInterval);
    netctlEngine->connectSource(QString("currentProfile"), this, autoUpdateInterval);
    netctlEngine->connectSource(QString("statusString"), this, autoUpdateInterval);
+    updateInterface(false);
    if (showBigInterface) {
        if (showExtIp)
            netctlEngine->connectSource(QString("extIp"), this, autoUpdateInterval);
@ -248,9 +241,8 @@ void Netctl::connectToEngine()
            netctlEngine->connectSource(QString("intIp"), this, autoUpdateInterval);
        if (showNetDev)
            netctlEngine->connectSource(QString("interfaces"), this, autoUpdateInterval);
-        textFrame->show();
+        updateInterface(true);
    }
-    updateWidget();
 }


@ -267,9 +259,8 @@ void Netctl::disconnectFromEngine()
            netctlEngine->disconnectSource(QString("intIp"), this);
        if (showNetDev)
            netctlEngine->disconnectSource(QString("interfaces"), this);
-        textFrame->hide();
    }
-    updateWidget();
+    updateInterface(false);
 }


@ -293,8 +284,8 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da
            text.append(extIp);
        if (showNetDev)
            text.append(interfaces);
-        textLabel->setText(formatLine[0] + text.join(QString("<br>")) + formatLine[1]);
-        updateWidget();
+        if (showBigInterface)
+            textLabel->setText(formatLine[0] + text.join(QString("<br>")) + formatLine[1]);
    }
    else if (sourceName == QString("extIp")) {
        extIp = value;
@ -465,12 +456,12 @@ void Netctl::configChanged()

    autoUpdateInterval = cg.readEntry("autoUpdateInterval", 1000);
    guiPath = cg.readEntry("guiPath", "/usr/bin/netctl-gui");
-    netctlPath = cg.readEntry("netctlPath", "/usr/bin/netctl");
+    netctlPath = cg.readEntry("netctlPath", "/usr/bin/netctl-gui-netctl");
    useSudo = cg.readEntry("useSudo", true);
    sudoPath = cg.readEntry("sudoPath", "/usr/bin/kdesu -c");
    showBigInterface = cg.readEntry("showBigInterface", true);
    showNetDev = cg.readEntry("showNetDev", true);
-    showExtIp = cg.readEntry("showExtIp", true);
+    showExtIp = cg.readEntry("showExtIp", false);
    showIntIp = cg.readEntry("showIntIp", true);

    fontFamily = cg.readEntry("fontFamily", "Terminus");
--- a/sources/plasmoid/netctl.h
+++ b/sources/plasmoid/netctl.h
@ -52,8 +52,8 @@ public slots:
    void setSudo();

 private slots:
-    // main interface
-    void updateWidget();
+    // ui
+    void updateInterface(bool setHidden);
    // configuration interface
    void selectGuiExe();
    void selectNetctlExe();
@ -73,10 +73,8 @@ private:
    // ui
    QGraphicsLinearLayout *fullSpaceLayout;
    // icon
-    Plasma::Frame *iconFrame;
    Plasma::IconWidget *iconWidget;
    // text
-    Plasma::Frame *textFrame;
    Plasma::Label *textLabel;
    bool status;
    QString profileName;
--- a/sources/plasmoid/po/CMakeLists.txt
+++ b/sources/plasmoid/po/CMakeLists.txt
@ -0,0 +1,24 @@
+find_package(KDE4 REQUIRED)
+find_package(Gettext REQUIRED)
+
+if (NOT GETTEXT_MSGFMT_EXECUTABLE)
+   message(FATAL_ERROR "Please install the msgfmt binary")
+endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
+
+file (GLOB _po_files *.po)
+
+set (_gmoFiles)
+
+foreach (_current_PO_FILE ${_po_files})
+  get_filename_component (_lang ${_current_PO_FILE} NAME_WE)
+   set (_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
+   add_custom_command (OUTPUT ${_gmoFile}
+         COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_current_PO_FILE}
+         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+         DEPENDS ${_current_PO_FILE}
+      )
+
+   install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES/ RENAME plasma_applet_netctl.mo)
+   list (APPEND _gmoFiles ${_gmoFile})
+endforeach (_current_PO_FILE)
+add_custom_target (pofiles ALL DEPENDS ${_gmoFiles})
--- a/sources/plasmoid/po/background.list
+++ b/sources/plasmoid/po/background.list
--- a/sources/plasmoid/po/create_list_files.sh
+++ b/sources/plasmoid/po/create_list_files.sh
@ -0,0 +1,15 @@
+#!/bin/sh
+
+WDIR=`pwd` # working dir
+SATELLITE_LIST=satellite.list
+BACKGROUND_LIST=background.list
+
+# Background list
+cd "$WDIR"
+cd ../images
+ls -1 background_* | sed -e "s/background_//g" | sed -e "s/_/ /g" | sed -e "s/\.jpg//g" | sed -e "s/\.png//g" | sed -e "s/\.gif//g" | grep -v '^$' | sort --unique --ignore-leading-blanks > "$WDIR/background.list"
+
+# Satellite list
+cd "$WDIR"
+cd ../data
+cat satellite_images.xml | grep image\ name | sed -e "s/.*<image name=\"\([^\"]*\).*/\1/" | sed -e "s/\&amp;/\&/g" | sed -e "s/\&apos;/'/g" | sed -e "s/\&quot;/\"/g" | sed -e "s/\&lt;/</g" | sed -e "s/\&gt;/>/g" | grep -v '^$' | sort --unique --ignore-leading-blanks > "$WDIR/satellite.list"
--- a/sources/plasmoid/po/en.po
+++ b/sources/plasmoid/po/en.po
@ -0,0 +1,199 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Evgeniy Alekseev <esalexeev@gmail.com>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n"
+"POT-Creation-Date: 2014-03-25 10:52+0400\n"
+"PO-Revision-Date: 2014-03-25 10:54+0400\n"
+"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
+"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
+"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: netctl.cpp:398
+msgid "Netctl plasmoid"
+msgstr "Netctl plasmoid"
+
+#. i18n: file: configwindow.ui:30
+#. i18n: ectx: attribute (title), widget (QWidget, tabConfiguration)
+#: po/rc.cpp:3 rc.cpp:3
+msgid "Configuration"
+msgstr "Configuration"
+
+#. i18n: file: configwindow.ui:54
+#. i18n: ectx: property (text), widget (QLabel, label_autoUpdate)
+#: po/rc.cpp:6 rc.cpp:6
+msgid "Auto update interval, msec"
+msgstr "Auto update interval, msec"
+
+#. i18n: file: configwindow.ui:112
+#. i18n: ectx: property (text), widget (QLabel, label_gui)
+#: po/rc.cpp:9 rc.cpp:9
+msgid "Path to GUI"
+msgstr "Path to GUI"
+
+#. i18n: file: configwindow.ui:128
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
+#. i18n: file: configwindow.ui:164
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
+#. i18n: file: configwindow.ui:578
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
+#. i18n: file: configwindow.ui:614
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
+#. i18n: file: configwindow.ui:128
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
+#. i18n: file: configwindow.ui:164
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
+#. i18n: file: configwindow.ui:578
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
+#. i18n: file: configwindow.ui:614
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
+#: po/rc.cpp:12 po/rc.cpp:18 po/rc.cpp:78 po/rc.cpp:84 rc.cpp:12 rc.cpp:18
+#: rc.cpp:78 rc.cpp:84
+msgid "Browse"
+msgstr "Browse"
+
+#. i18n: file: configwindow.ui:148
+#. i18n: ectx: property (text), widget (QLabel, label_netctl)
+#: po/rc.cpp:15 rc.cpp:15
+msgid "Path to netctl"
+msgstr "Path to netctl"
+
+#. i18n: file: configwindow.ui:184
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo)
+#: po/rc.cpp:21 rc.cpp:21
+msgid "Use sudo for netctl"
+msgstr "Use sudo for netctl"
+
+#. i18n: file: configwindow.ui:199
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface)
+#: po/rc.cpp:24 rc.cpp:24
+msgid "Show more detailed interface"
+msgstr "Show more detailed interface"
+
+#. i18n: file: configwindow.ui:209
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showNetDev)
+#: po/rc.cpp:27 rc.cpp:27
+msgid "Show network devices"
+msgstr "Show network devices"
+
+#. i18n: file: configwindow.ui:219
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showExtIp)
+#: po/rc.cpp:30 rc.cpp:30
+msgid "Show external IP"
+msgstr "Show external IP"
+
+#. i18n: file: configwindow.ui:229
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showIntIp)
+#: po/rc.cpp:33 rc.cpp:33
+msgid "Show internal IP"
+msgstr "Show internal IP"
+
+#. i18n: file: configwindow.ui:253
+#. i18n: ectx: attribute (title), widget (QWidget, tabAppearance)
+#: po/rc.cpp:36 rc.cpp:36
+msgid "Appearance"
+msgstr "Appearance"
+
+#. i18n: file: configwindow.ui:267
+#. i18n: ectx: property (text), widget (QLabel, label_font)
+#: po/rc.cpp:39 rc.cpp:39
+msgid "Font"
+msgstr "Font"
+
+#. i18n: file: configwindow.ui:299
+#. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font)
+#: po/rc.cpp:42 rc.cpp:42
+msgid "Set font family"
+msgstr "Set font family"
+
+#. i18n: file: configwindow.ui:316
+#. i18n: ectx: property (text), widget (QLabel, label_fontSize)
+#: po/rc.cpp:45 rc.cpp:45
+msgid "Font size"
+msgstr "Font size"
+
+#. i18n: file: configwindow.ui:348
+#. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize)
+#: po/rc.cpp:48 rc.cpp:48
+msgid "Set font size"
+msgstr "Set font size"
+
+#. i18n: file: configwindow.ui:377
+#. i18n: ectx: property (text), widget (QLabel, label_fontColor)
+#: po/rc.cpp:51 rc.cpp:51
+msgid "Font color"
+msgstr "Font color"
+
+#. i18n: file: configwindow.ui:409
+#. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor)
+#: po/rc.cpp:54 rc.cpp:54
+msgid "Set font color"
+msgstr "Set font color"
+
+#. i18n: file: configwindow.ui:426
+#. i18n: ectx: property (text), widget (QLabel, label_fontWeight)
+#: po/rc.cpp:57 rc.cpp:57
+msgid "Font weight"
+msgstr "Font weight"
+
+#. i18n: file: configwindow.ui:458
+#. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight)
+#: po/rc.cpp:60 rc.cpp:60
+msgid "Set font weight"
+msgstr "Set font weight"
+
+#. i18n: file: configwindow.ui:490
+#. i18n: ectx: property (text), widget (QLabel, label_fontStyle)
+#: po/rc.cpp:63 rc.cpp:63
+msgid "Font style"
+msgstr "Font style"
+
+#. i18n: file: configwindow.ui:522
+#. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle)
+#: po/rc.cpp:66 rc.cpp:66
+msgid "Set font style"
+msgstr "Set font style"
+
+#. i18n: file: configwindow.ui:526
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle)
+#: po/rc.cpp:69 rc.cpp:69
+msgid "normal"
+msgstr "normal"
+
+#. i18n: file: configwindow.ui:531
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle)
+#: po/rc.cpp:72 rc.cpp:72
+msgid "italic"
+msgstr "italic"
+
+#. i18n: file: configwindow.ui:562
+#. i18n: ectx: property (text), widget (QLabel, label_activeIcon)
+#: po/rc.cpp:75 rc.cpp:75
+msgid "Active icon"
+msgstr "Active icon"
+
+#. i18n: file: configwindow.ui:598
+#. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon)
+#: po/rc.cpp:81 rc.cpp:81
+msgid "Inactive icon"
+msgstr "Inactive icon"
+
+#: po/rc.cpp:85 rc.cpp:85
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Evgeniy Alekseev"
+
+#: po/rc.cpp:86 rc.cpp:86
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "esalexeev@gmail.com"
+
--- a/sources/plasmoid/po/extract_messages.sh
+++ b/sources/plasmoid/po/extract_messages.sh
@ -0,0 +1,81 @@
+#!/bin/sh
+BASEDIR="../" # root of translatable sources
+PROJECT="plasma_applet_netctl" # project name
+BUGADDR="http://kde-look.org/content/show.php?content=98925" # MSGID-Bugs
+WDIR=`pwd` # working dir
+SATELLITE_LIST=satellite.list
+BACKGROUND_LIST=background.list
+
+add_list()
+{
+  LIST=$1
+
+  if [ -z "$LIST" ]
+  then
+    echo ">>ERR<< add_list() - missing parameter LIST - exiting"
+    return
+  fi
+
+  if [ -f "$LIST" ]
+  then
+    cat $LIST | while read ROW
+    do
+      echo "tr2i18n(\"${ROW}\")" >> ${WDIR}/rc.cpp
+    done
+  else
+    echo ">>ERR<< add_list() - file $LIST does not exist."
+  fi
+
+}
+
+echo "Preparing rc files"
+cd ${BASEDIR}
+# we use simple sorting to make sure the lines do not jump around too much from system to system
+find . -name '*.rc' -o -name '*.ui' -o -name '*.kcfg' | sort > ${WDIR}/rcfiles.list
+xargs --arg-file=${WDIR}/rcfiles.list extractrc > ${WDIR}/rc.cpp
+
+# additional string for KAboutData
+echo 'i18nc("NAME OF TRANSLATORS","Your names");' >> ${WDIR}/rc.cpp
+echo 'i18nc("EMAIL OF TRANSLATORS","Your emails");' >> ${WDIR}/rc.cpp
+
+cd ${WDIR}
+
+# Add Satellite list
+add_list "$SATELLITE_LIST"
+
+# Add Background list
+add_list "$BACKGROUND_LIST"
+
+echo "Done preparing rc files"
+
+
+echo "Extracting messages"
+cd ${BASEDIR}
+# see above on sorting
+find . -name '*.cpp' -o -name '*.h' -o -name '*.c' | sort > ${WDIR}/infiles.list
+echo "rc.cpp" >> ${WDIR}/infiles.list
+cd ${WDIR}
+xgettext --from-code=UTF-8 -C -kde -ci18n -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 -ktr2i18n:1 \
+-kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -kaliasLocale -kki18n:1 -kki18nc:1c,2 -kki18np:1,2 -kki18ncp:1c,2,3 \
+--msgid-bugs-address="${BUGADDR}" \
+--files-from=infiles.list -D ${BASEDIR} -D ${WDIR} -o ${PROJECT}.pot || { echo "error while calling xgettext. aborting."; exit 1; }
+echo "Done extracting messages"
+
+
+echo "Merging translations"
+catalogs=`find . -name '*.po'`
+for cat in $catalogs; do
+echo $cat
+msgmerge -o $cat.new $cat ${PROJECT}.pot
+mv $cat.new $cat
+done
+echo "Done merging translations"
+
+
+echo "Cleaning up"
+cd ${WDIR}
+rm rcfiles.list
+rm infiles.list
+rm rc.cpp
+echo "Done"
+
--- a/sources/plasmoid/po/plasma_applet_netctl.pot
+++ b/sources/plasmoid/po/plasma_applet_netctl.pot
@ -0,0 +1,197 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n"
+"POT-Creation-Date: 2014-03-25 10:52+0400\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: netctl.cpp:398
+msgid "Netctl plasmoid"
+msgstr ""
+
+#. i18n: file: configwindow.ui:30
+#. i18n: ectx: attribute (title), widget (QWidget, tabConfiguration)
+#: po/rc.cpp:3 rc.cpp:3
+msgid "Configuration"
+msgstr ""
+
+#. i18n: file: configwindow.ui:54
+#. i18n: ectx: property (text), widget (QLabel, label_autoUpdate)
+#: po/rc.cpp:6 rc.cpp:6
+msgid "Auto update interval, msec"
+msgstr ""
+
+#. i18n: file: configwindow.ui:112
+#. i18n: ectx: property (text), widget (QLabel, label_gui)
+#: po/rc.cpp:9 rc.cpp:9
+msgid "Path to GUI"
+msgstr ""
+
+#. i18n: file: configwindow.ui:128
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
+#. i18n: file: configwindow.ui:164
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
+#. i18n: file: configwindow.ui:578
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
+#. i18n: file: configwindow.ui:614
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
+#. i18n: file: configwindow.ui:128
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
+#. i18n: file: configwindow.ui:164
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
+#. i18n: file: configwindow.ui:578
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
+#. i18n: file: configwindow.ui:614
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
+#: po/rc.cpp:12 po/rc.cpp:18 po/rc.cpp:78 po/rc.cpp:84 rc.cpp:12 rc.cpp:18
+#: rc.cpp:78 rc.cpp:84
+msgid "Browse"
+msgstr ""
+
+#. i18n: file: configwindow.ui:148
+#. i18n: ectx: property (text), widget (QLabel, label_netctl)
+#: po/rc.cpp:15 rc.cpp:15
+msgid "Path to netctl"
+msgstr ""
+
+#. i18n: file: configwindow.ui:184
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo)
+#: po/rc.cpp:21 rc.cpp:21
+msgid "Use sudo for netctl"
+msgstr ""
+
+#. i18n: file: configwindow.ui:199
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface)
+#: po/rc.cpp:24 rc.cpp:24
+msgid "Show more detailed interface"
+msgstr ""
+
+#. i18n: file: configwindow.ui:209
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showNetDev)
+#: po/rc.cpp:27 rc.cpp:27
+msgid "Show network devices"
+msgstr ""
+
+#. i18n: file: configwindow.ui:219
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showExtIp)
+#: po/rc.cpp:30 rc.cpp:30
+msgid "Show external IP"
+msgstr ""
+
+#. i18n: file: configwindow.ui:229
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showIntIp)
+#: po/rc.cpp:33 rc.cpp:33
+msgid "Show internal IP"
+msgstr ""
+
+#. i18n: file: configwindow.ui:253
+#. i18n: ectx: attribute (title), widget (QWidget, tabAppearance)
+#: po/rc.cpp:36 rc.cpp:36
+msgid "Appearance"
+msgstr ""
+
+#. i18n: file: configwindow.ui:267
+#. i18n: ectx: property (text), widget (QLabel, label_font)
+#: po/rc.cpp:39 rc.cpp:39
+msgid "Font"
+msgstr ""
+
+#. i18n: file: configwindow.ui:299
+#. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font)
+#: po/rc.cpp:42 rc.cpp:42
+msgid "Set font family"
+msgstr ""
+
+#. i18n: file: configwindow.ui:316
+#. i18n: ectx: property (text), widget (QLabel, label_fontSize)
+#: po/rc.cpp:45 rc.cpp:45
+msgid "Font size"
+msgstr ""
+
+#. i18n: file: configwindow.ui:348
+#. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize)
+#: po/rc.cpp:48 rc.cpp:48
+msgid "Set font size"
+msgstr ""
+
+#. i18n: file: configwindow.ui:377
+#. i18n: ectx: property (text), widget (QLabel, label_fontColor)
+#: po/rc.cpp:51 rc.cpp:51
+msgid "Font color"
+msgstr ""
+
+#. i18n: file: configwindow.ui:409
+#. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor)
+#: po/rc.cpp:54 rc.cpp:54
+msgid "Set font color"
+msgstr ""
+
+#. i18n: file: configwindow.ui:426
+#. i18n: ectx: property (text), widget (QLabel, label_fontWeight)
+#: po/rc.cpp:57 rc.cpp:57
+msgid "Font weight"
+msgstr ""
+
+#. i18n: file: configwindow.ui:458
+#. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight)
+#: po/rc.cpp:60 rc.cpp:60
+msgid "Set font weight"
+msgstr ""
+
+#. i18n: file: configwindow.ui:490
+#. i18n: ectx: property (text), widget (QLabel, label_fontStyle)
+#: po/rc.cpp:63 rc.cpp:63
+msgid "Font style"
+msgstr ""
+
+#. i18n: file: configwindow.ui:522
+#. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle)
+#: po/rc.cpp:66 rc.cpp:66
+msgid "Set font style"
+msgstr ""
+
+#. i18n: file: configwindow.ui:526
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle)
+#: po/rc.cpp:69 rc.cpp:69
+msgid "normal"
+msgstr ""
+
+#. i18n: file: configwindow.ui:531
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle)
+#: po/rc.cpp:72 rc.cpp:72
+msgid "italic"
+msgstr ""
+
+#. i18n: file: configwindow.ui:562
+#. i18n: ectx: property (text), widget (QLabel, label_activeIcon)
+#: po/rc.cpp:75 rc.cpp:75
+msgid "Active icon"
+msgstr ""
+
+#. i18n: file: configwindow.ui:598
+#. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon)
+#: po/rc.cpp:81 rc.cpp:81
+msgid "Inactive icon"
+msgstr ""
+
+#: po/rc.cpp:85 rc.cpp:85
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr ""
+
+#: po/rc.cpp:86 rc.cpp:86
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr ""
--- a/sources/plasmoid/po/ru.po
+++ b/sources/plasmoid/po/ru.po
@ -0,0 +1,200 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Evgeniy Alekseev <esalexeev@gmail.com>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n"
+"POT-Creation-Date: 2014-03-25 10:52+0400\n"
+"PO-Revision-Date: 2014-03-25 10:58+0400\n"
+"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
+"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
+"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: netctl.cpp:398
+msgid "Netctl plasmoid"
+msgstr "Netctl plasmoid"
+
+#. i18n: file: configwindow.ui:30
+#. i18n: ectx: attribute (title), widget (QWidget, tabConfiguration)
+#: po/rc.cpp:3 rc.cpp:3
+msgid "Configuration"
+msgstr "Настройка"
+
+#. i18n: file: configwindow.ui:54
+#. i18n: ectx: property (text), widget (QLabel, label_autoUpdate)
+#: po/rc.cpp:6 rc.cpp:6
+msgid "Auto update interval, msec"
+msgstr "Интервал автообновления, мсек"
+
+#. i18n: file: configwindow.ui:112
+#. i18n: ectx: property (text), widget (QLabel, label_gui)
+#: po/rc.cpp:9 rc.cpp:9
+msgid "Path to GUI"
+msgstr "Путь к GUI"
+
+#. i18n: file: configwindow.ui:128
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
+#. i18n: file: configwindow.ui:164
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
+#. i18n: file: configwindow.ui:578
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
+#. i18n: file: configwindow.ui:614
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
+#. i18n: file: configwindow.ui:128
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
+#. i18n: file: configwindow.ui:164
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
+#. i18n: file: configwindow.ui:578
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
+#. i18n: file: configwindow.ui:614
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
+#: po/rc.cpp:12 po/rc.cpp:18 po/rc.cpp:78 po/rc.cpp:84 rc.cpp:12 rc.cpp:18
+#: rc.cpp:78 rc.cpp:84
+msgid "Browse"
+msgstr "Обзор"
+
+#. i18n: file: configwindow.ui:148
+#. i18n: ectx: property (text), widget (QLabel, label_netctl)
+#: po/rc.cpp:15 rc.cpp:15
+msgid "Path to netctl"
+msgstr "Путь к netctl"
+
+#. i18n: file: configwindow.ui:184
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo)
+#: po/rc.cpp:21 rc.cpp:21
+msgid "Use sudo for netctl"
+msgstr "Использовать sudo для netctl"
+
+#. i18n: file: configwindow.ui:199
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface)
+#: po/rc.cpp:24 rc.cpp:24
+msgid "Show more detailed interface"
+msgstr "Показать более детальный интерфейс"
+
+#. i18n: file: configwindow.ui:209
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showNetDev)
+#: po/rc.cpp:27 rc.cpp:27
+msgid "Show network devices"
+msgstr "Показать сетевые устройства"
+
+#. i18n: file: configwindow.ui:219
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showExtIp)
+#: po/rc.cpp:30 rc.cpp:30
+msgid "Show external IP"
+msgstr "Показать внешний IP"
+
+#. i18n: file: configwindow.ui:229
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showIntIp)
+#: po/rc.cpp:33 rc.cpp:33
+msgid "Show internal IP"
+msgstr "Показать внутренний IP"
+
+#. i18n: file: configwindow.ui:253
+#. i18n: ectx: attribute (title), widget (QWidget, tabAppearance)
+#: po/rc.cpp:36 rc.cpp:36
+msgid "Appearance"
+msgstr "Внешний вид"
+
+#. i18n: file: configwindow.ui:267
+#. i18n: ectx: property (text), widget (QLabel, label_font)
+#: po/rc.cpp:39 rc.cpp:39
+msgid "Font"
+msgstr "Шрифт"
+
+#. i18n: file: configwindow.ui:299
+#. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font)
+#: po/rc.cpp:42 rc.cpp:42
+msgid "Set font family"
+msgstr "Укажите шрифт"
+
+#. i18n: file: configwindow.ui:316
+#. i18n: ectx: property (text), widget (QLabel, label_fontSize)
+#: po/rc.cpp:45 rc.cpp:45
+msgid "Font size"
+msgstr "Размер шрифта"
+
+#. i18n: file: configwindow.ui:348
+#. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize)
+#: po/rc.cpp:48 rc.cpp:48
+msgid "Set font size"
+msgstr "Укажите размер шрифта"
+
+#. i18n: file: configwindow.ui:377
+#. i18n: ectx: property (text), widget (QLabel, label_fontColor)
+#: po/rc.cpp:51 rc.cpp:51
+msgid "Font color"
+msgstr "Цвет шрифта"
+
+#. i18n: file: configwindow.ui:409
+#. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor)
+#: po/rc.cpp:54 rc.cpp:54
+msgid "Set font color"
+msgstr "Укажите цвет шрифта"
+
+#. i18n: file: configwindow.ui:426
+#. i18n: ectx: property (text), widget (QLabel, label_fontWeight)
+#: po/rc.cpp:57 rc.cpp:57
+msgid "Font weight"
+msgstr "Толщина шрифта"
+
+#. i18n: file: configwindow.ui:458
+#. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight)
+#: po/rc.cpp:60 rc.cpp:60
+msgid "Set font weight"
+msgstr "Укажите ширину шрифта"
+
+#. i18n: file: configwindow.ui:490
+#. i18n: ectx: property (text), widget (QLabel, label_fontStyle)
+#: po/rc.cpp:63 rc.cpp:63
+msgid "Font style"
+msgstr "Стиль шрифта"
+
+#. i18n: file: configwindow.ui:522
+#. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle)
+#: po/rc.cpp:66 rc.cpp:66
+msgid "Set font style"
+msgstr "Укажите стиль шрифта"
+
+#. i18n: file: configwindow.ui:526
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle)
+#: po/rc.cpp:69 rc.cpp:69
+msgid "normal"
+msgstr "normal"
+
+#. i18n: file: configwindow.ui:531
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle)
+#: po/rc.cpp:72 rc.cpp:72
+msgid "italic"
+msgstr "italic"
+
+#. i18n: file: configwindow.ui:562
+#. i18n: ectx: property (text), widget (QLabel, label_activeIcon)
+#: po/rc.cpp:75 rc.cpp:75
+msgid "Active icon"
+msgstr "Иконка активного подключения"
+
+#. i18n: file: configwindow.ui:598
+#. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon)
+#: po/rc.cpp:81 rc.cpp:81
+msgid "Inactive icon"
+msgstr "Иконка неактивного подключения"
+
+#: po/rc.cpp:85 rc.cpp:85
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Evgeniy Alekseev"
+
+#: po/rc.cpp:86 rc.cpp:86
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "esalexeev@gmail.com"
+
+
--- a/sources/plasmoid/po/satellite.list
+++ b/sources/plasmoid/po/satellite.list