From 830bab7cb6b1099027e96bee412bf30f58b6a972 Mon Sep 17 00:00:00 2001
From: arcan1s <darkarcanis@mail.ru>
Date: Sun, 21 Sep 2014 20:19:57 +0400
Subject: [PATCH] add support of several $bat tags. Update translations

---
 CHANGELOG                                     |   4 +
 CHANGELOG-RU                                  |   4 +
 README.md                                     |  10 +-
 sources/CMakeLists.txt                        |   2 +-
 sources/awesome-widget/awesome-widget.cpp     |   4 +-
 sources/awesome-widget/configuration.cpp      |  11 +-
 sources/awesome-widget/deconfig.ui            |  60 +++-------
 sources/awesome-widget/deinteraction.cpp      |  22 ++--
 sources/awesome-widget/po/en.po               | 108 ++++++++---------
 sources/awesome-widget/po/es.po               | 106 +++++++++--------
 sources/awesome-widget/po/fr.po               | 106 +++++++++--------
 .../po/plasma_applet_awesome-widget.pot       | 106 ++++++++---------
 sources/awesome-widget/po/pt_BR.po            | 106 +++++++++--------
 sources/awesome-widget/po/ru.po               | 108 ++++++++---------
 sources/awesome-widget/po/uk.po               | 106 +++++++++--------
 sources/awesome-widget/po/zh.po               | 112 +++++++++---------
 sources/awesome-widget/reinit.cpp             |   1 -
 sources/ext-sysmon/extsysmon.conf             |   3 +-
 sources/ext-sysmon/extsysmon.cpp              |  47 +++++---
 sources/ext-sysmon/extsysmon.h                |   2 +-
 20 files changed, 524 insertions(+), 504 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2480c91..9ab1bca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Ver.2.0.3:
++ add support of several $bat tags
+* edit layout
+
 Ver.2.0.2:
 + add $fan* tags
 + add Chinese translation (thanks to @Lemueler)
diff --git a/CHANGELOG-RU b/CHANGELOG-RU
index af1d5d1..8a843ca 100644
--- a/CHANGELOG-RU
+++ b/CHANGELOG-RU
@@ -1,3 +1,7 @@
+Вер.2.0.3:
++ добавлена поддержка нескольких тегов $bat
+* отредактирована разметка
+
 Вер.2.0.2:
 + добавлены теги $fan*
 + добавлен китайский перевод (спасибо @Lemueler)
diff --git a/README.md b/README.md
index c45535f..cb2316c 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ For edited output you must open Settings window and setup output format in lines
 * tag `$down` - download speed, *KB/s*
 * tag `$up` - upload speed, *KB/s*
 * tag `$netdev` - current network device
-* tag `$bat` - battery charge, *%*
+* tag `$batN` - battery N charge, *%*. `$bat0` is average value
 * tag `$ac` - status AC device. Return (\*) if AC device is online or *( )* if offline
 * tag `$album` - current song album. One of supported music players must be installed
 * tag `$artist` - current song artist. One of supported music players must be installed
@@ -159,13 +159,9 @@ Since version 1.7.0 CPU, CPU clock, memory, swap and network labels support grap
 DataEngine settings
 -------------------
 
-**AC device**
+**ACPI path**
 
-File with AC information. File (`/sys/class/power_supply/AC/online` by default) must contain `1` if AC is online.
-
-**Battery device**
-
-File with battery information. File (`/sys/class/power_supply/BAT0/capacity` by default) should contain only battery charge in percent.
+Path to APCI devices. Default is `/sys/class/power_supply/`.
 
 **Custom command**
 
diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
index 7723fe9..13c4028 100644
--- a/sources/CMakeLists.txt
+++ b/sources/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_policy (SET CMP0015 NEW)
 project (awesome-widgets)
 set (PROJECT_VERSION_MAJOR 2)
 set (PROJECT_VERSION_MINOR 0)
-set (PROJECT_VERSION_PATCH 2)
+set (PROJECT_VERSION_PATCH 3)
 set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
 
diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp
index 3a35530..cc798e7 100644
--- a/sources/awesome-widget/awesome-widget.cpp
+++ b/sources/awesome-widget/awesome-widget.cpp
@@ -322,8 +322,10 @@ QStringList AwesomeWidget::getKeys()
     allKeys.append(QString("up"));
     allKeys.append(QString("netdev"));
     // battery
-    allKeys.append(QString("bat"));
     allKeys.append(QString("ac"));
+    allKeys.append(QString("bat0"));
+    for (int i=0; i<counts[QString("bat")]; i++)
+        allKeys.append(QString("bat") + QString::number(i+1));
     // player
     allKeys.append(QString("album"));
     allKeys.append(QString("artist"));
diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp
index 14ce72a..a099f9e 100644
--- a/sources/awesome-widget/configuration.cpp
+++ b/sources/awesome-widget/configuration.cpp
@@ -20,6 +20,7 @@
 #include <KConfigDialog>
 #include <KGlobal>
 #include <KStandardDirs>
+#include <QDir>
 #include <QMenu>
 #include <QNetworkInterface>
 #include <QTextCodec>
@@ -34,8 +35,7 @@ QMap<QString, QString> AwesomeWidget::readDataEngineConfiguration()
     if (debug) qDebug() << PDEBUG;
 
     QMap<QString, QString> rawConfig;
-    rawConfig[QString("AC")] = QString("/sys/class/power_supply/AC/online");
-    rawConfig[QString("BATTERY")] = QString("/sys/class/power_supply/BAT0/capacity");
+    rawConfig[QString("ACPIPATH")] = QString("/sys/class/power_supply/");
     rawConfig[QString("CUSTOM")] = QString("wget -qO- http://ifconfig.me/ip");
     rawConfig[QString("DESKTOPCMD")] = QString("qdbus org.kde.kwin /KWin currentDesktop");
     rawConfig[QString("GPUDEV")] = QString("auto");
@@ -355,8 +355,7 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
 
     // dataengine
     QMap<QString, QString> deSettings = readDataEngineConfiguration();
-    uiDEConfig.lineEdit_acdev->setText(deSettings[QString("AC")]);
-    uiDEConfig.lineEdit_batdev->setText(deSettings[QString("BATTERY")]);
+    uiDEConfig.lineEdit_acpi->setText(deSettings[QString("ACPIPATH")]);
     uiDEConfig.tableWidget_customCommand->clear();
     uiDEConfig.tableWidget_customCommand->setRowCount(deSettings[QString("CUSTOM")].split(QString("@@")).count() + 1);
     headerList.clear();
@@ -520,8 +519,7 @@ void AwesomeWidget::configAccepted()
 
     // dataengine
     QMap<QString, QString> deSettings;
-    deSettings[QString("AC")] = uiDEConfig.lineEdit_acdev->text();
-    deSettings[QString("BATTERY")] = uiDEConfig.lineEdit_batdev->text();
+    deSettings[QString("ACPIPATH")] = uiDEConfig.lineEdit_acpi->text();
     items.clear();
     for (int i=0; i<uiDEConfig.tableWidget_customCommand->rowCount(); i++)
         if (uiDEConfig.tableWidget_customCommand->item(i, 0) != 0)
@@ -643,6 +641,7 @@ void AwesomeWidget::configChanged()
 
     // counts
     QMap<QString, QString> deSettings = readDataEngineConfiguration();
+    counts[QString("bat")] = QDir(deSettings[QString("ACPIPATH")]).entryList(QDir::Dirs | QDir::NoDotAndDotDot).count();
     counts[QString("cpu")] = getNumberCpus();
     counts[QString("custom")] = deSettings[QString("CUSTOM")].split(QString("@@")).count();
     counts[QString("disk")] = configuration[QString("disk")].split(QString("@@")).count();
diff --git a/sources/awesome-widget/deconfig.ui b/sources/awesome-widget/deconfig.ui
index f9f7b18..b76cff6 100644
--- a/sources/awesome-widget/deconfig.ui
+++ b/sources/awesome-widget/deconfig.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>700</width>
-    <height>594</height>
+    <height>592</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -43,11 +43,11 @@
         <x>0</x>
         <y>0</y>
         <width>684</width>
-        <height>578</height>
+        <height>576</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout">
-       <item row="5" column="0">
+       <item row="4" column="0">
         <layout class="QHBoxLayout" name="layout_hdddev">
          <item>
           <widget class="QLabel" name="label_hdddev">
@@ -80,7 +80,7 @@
          </item>
         </layout>
        </item>
-       <item row="8" column="0">
+       <item row="7" column="0">
         <layout class="QHBoxLayout" name="layout_mpdport">
          <item>
           <widget class="QLabel" name="label_mpdport">
@@ -135,7 +135,7 @@
          </item>
         </layout>
        </item>
-       <item row="4" column="0">
+       <item row="3" column="0">
         <layout class="QHBoxLayout" name="layout_gpudev">
          <item>
           <widget class="QLabel" name="label_gpudev">
@@ -188,7 +188,7 @@
          </item>
         </layout>
        </item>
-       <item row="12" column="0">
+       <item row="11" column="0">
         <spacer name="spacer_dataengine">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -201,7 +201,7 @@
          </property>
         </spacer>
        </item>
-       <item row="6" column="0">
+       <item row="5" column="0">
         <layout class="QHBoxLayout" name="layout_hddtempCmd">
          <item>
           <widget class="QLabel" name="label_hddtempCmd">
@@ -225,7 +225,7 @@
          </item>
         </layout>
        </item>
-       <item row="10" column="0">
+       <item row="9" column="0">
         <layout class="QHBoxLayout" name="layout_playerSelect">
          <item>
           <widget class="QLabel" name="label_playerSelect">
@@ -268,7 +268,7 @@
          </item>
         </layout>
        </item>
-       <item row="7" column="0">
+       <item row="6" column="0">
         <layout class="QHBoxLayout" name="layout_mpdaddress">
          <item>
           <widget class="QLabel" name="label_mpdaddress">
@@ -292,7 +292,7 @@
          </item>
         </layout>
        </item>
-       <item row="3" column="0">
+       <item row="2" column="0">
         <layout class="QHBoxLayout" name="layout_desktopCmd">
          <item>
           <widget class="QLabel" name="label_desktopCmd">
@@ -316,7 +316,7 @@
          </item>
         </layout>
        </item>
-       <item row="9" column="0">
+       <item row="8" column="0">
         <layout class="QVBoxLayout" name="layout_mpris">
          <item>
           <widget class="QLabel" name="label_mprisInfo">
@@ -406,7 +406,7 @@
          </item>
         </layout>
        </item>
-       <item row="11" column="0">
+       <item row="10" column="0">
         <layout class="QVBoxLayout" name="layout_pkgCommand">
          <item>
           <widget class="QTableWidget" name="tableWidget_pkgCommand">
@@ -440,7 +440,7 @@ del - remove item</string>
          </item>
         </layout>
        </item>
-       <item row="2" column="0">
+       <item row="1" column="0">
         <widget class="QTableWidget" name="tableWidget_customCommand">
          <property name="contextMenuPolicy">
           <enum>Qt::CustomContextMenu</enum>
@@ -462,34 +462,10 @@ del - remove item</string>
          </column>
         </widget>
        </item>
-       <item row="1" column="0">
-        <layout class="QHBoxLayout" name="layout_batdev">
-         <item>
-          <widget class="QLabel" name="label_batdev">
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Battery device</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="lineEdit_batdev">
-           <property name="toolTip">
-            <string>&quot;/sys/class/power_supply/BAT0/capacity&quot; by default</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
        <item row="0" column="0">
-        <layout class="QHBoxLayout" name="layout_acdev">
+        <layout class="QHBoxLayout" name="layout_acpi">
          <item>
-          <widget class="QLabel" name="label_acdev">
+          <widget class="QLabel" name="label_acpi">
            <property name="minimumSize">
             <size>
              <width>200</width>
@@ -497,14 +473,14 @@ del - remove item</string>
             </size>
            </property>
            <property name="text">
-            <string>AC device</string>
+            <string>ACPI path</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QLineEdit" name="lineEdit_acdev">
+          <widget class="QLineEdit" name="lineEdit_acpi">
            <property name="toolTip">
-            <string>&quot;/sys/class/power_supply/AC/online&quot; by default</string>
+            <string>&quot;/sys/class/power_supply/&quot; by default</string>
            </property>
           </widget>
          </item>
diff --git a/sources/awesome-widget/deinteraction.cpp b/sources/awesome-widget/deinteraction.cpp
index b753c8f..1a0cc33 100644
--- a/sources/awesome-widget/deinteraction.cpp
+++ b/sources/awesome-widget/deinteraction.cpp
@@ -29,7 +29,7 @@ void AwesomeWidget::connectToEngine()
     QRegExp regExp;
 
     // battery
-    regExp = QRegExp(QString("(ac|bat)"));
+    regExp = QRegExp(QString("(ac|bat.*)"));
     if ((foundKeys.indexOf(regExp) > -1) ||
             (configuration[QString("batteryTooltip")].toInt() == 2))
         extsysmonEngine->connectSource(QString("battery"),
@@ -188,19 +188,23 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng
 
     if (data.keys().isEmpty()) return;
     if (sourceName == QString("battery")) {
-        if (data[QString("ac")].toBool())
-            values[QString("ac")] = configuration[QString("acOnline")];
-        else
-            values[QString("ac")] = configuration[QString("acOffline")];
-        values[QString("bat")] = QString("%1").arg(data[QString("bat")].toFloat(), 3, 'f', 0);
+        for (int i=0; i<data.keys().count(); i++) {
+            if (data.keys()[i] == QString("ac")) {
+                if (data[QString("ac")].toBool())
+                    values[QString("ac")] = configuration[QString("acOnline")];
+                else
+                    values[QString("ac")] = configuration[QString("acOffline")];
+            } else
+                values[data.keys()[i]] = QString("%1").arg(data[data.keys()[i]].toFloat(), 3, 'f', 0);
+        }
         if ((configuration[QString("batteryTooltip")].toInt() == 2) &&
-                (!isnan(data[QString("bat")].toFloat()))) {
+                (!isnan(data[QString("bat0")].toFloat()))) {
             if (tooltipValues[QString("bat")].count() > configuration[QString("tooltipNumber")].toInt())
                 tooltipValues[QString("bat")].takeFirst();
             if (data[QString("ac")].toBool())
-                tooltipValues[QString("bat")].append(data[QString("bat")].toFloat());
+                tooltipValues[QString("bat0")].append(data[QString("bat0")].toFloat());
             else
-                tooltipValues[QString("bat")].append(-data[QString("bat")].toFloat());
+                tooltipValues[QString("bat0")].append(-data[QString("bat0")].toFloat());
         }
     } else if (sourceName == QString("cpu/system/TotalLoad")) {
         values[QString("cpu")] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 1);
diff --git a/sources/awesome-widget/po/en.po b/sources/awesome-widget/po/en.po
index d9447a7..f8ae617 100644
--- a/sources/awesome-widget/po/en.po
+++ b/sources/awesome-widget/po/en.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-08 01:52+0400\n"
-"PO-Revision-Date: 2014-09-05 11:14+0400\n"
+"POT-Creation-Date: 2014-09-21 20:18+0400\n"
+"PO-Revision-Date: 2014-09-21 20:19+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: English <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -18,55 +18,55 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: awesome-widget.cpp:77
+#: awesome-widget.cpp:78
 msgid "Run ksysguard"
 msgstr "Run ksysguard"
 
-#: awesome-widget.cpp:80
+#: awesome-widget.cpp:81
 msgid "Show README"
 msgstr "Show README"
 
-#: awesome-widget.cpp:83
+#: awesome-widget.cpp:84
 msgid "Update text"
 msgstr "Update text"
 
-#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
+#: configuration.cpp:362 po/rc.cpp:151 rc.cpp:151
 msgid "Custom command"
 msgstr "Custom command"
 
-#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
+#: configuration.cpp:392 po/rc.cpp:141 rc.cpp:141
 msgid "Package manager"
 msgstr "Package manager"
 
-#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
+#: configuration.cpp:393 po/rc.cpp:144 rc.cpp:144
 msgid "Null lines"
 msgstr "Null lines"
 
-#: configuration.cpp:362
+#: configuration.cpp:405
 msgid "Widget"
 msgstr "Widget"
 
-#: configuration.cpp:363
+#: configuration.cpp:406
 msgid "Advanced"
 msgstr "Advanced"
 
-#: configuration.cpp:364
+#: configuration.cpp:407
 msgid "Tooltip"
 msgstr "Tooltip"
 
-#: configuration.cpp:365
+#: configuration.cpp:408
 msgid "Appearance"
 msgstr "Appearance"
 
-#: configuration.cpp:366
+#: configuration.cpp:409
 msgid "DataEngine"
 msgstr "DataEngine"
 
-#: configuration.cpp:645 configuration.cpp:659
+#: configuration.cpp:697 configuration.cpp:711
 msgid "Remove"
 msgstr "Remove"
 
-#: configuration.cpp:706
+#: configuration.cpp:766
 msgid "Select font"
 msgstr "Select font"
 
@@ -146,108 +146,112 @@ msgstr "Temperature units"
 msgid "Temperature devices"
 msgstr "Temperature devices"
 
-#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
-#: rc.cpp:59 rc.cpp:65
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 po/rc.cpp:71 rc.cpp:47
+#: rc.cpp:53 rc.cpp:59 rc.cpp:65 rc.cpp:71
 msgid "Editable"
 msgstr "Editable"
 
 #: po/rc.cpp:50 rc.cpp:50
+msgid "Fan devices"
+msgstr "Fan devices"
+
+#: po/rc.cpp:56 rc.cpp:56
 msgid "Mount points"
 msgstr "Mount points"
 
-#: po/rc.cpp:56 rc.cpp:56
+#: po/rc.cpp:62 rc.cpp:62
 msgid "HDD devices (speed)"
 msgstr "HDD (speed)"
 
-#: po/rc.cpp:62 rc.cpp:62
+#: po/rc.cpp:68 rc.cpp:68
 msgid "HDD devices (temp)"
 msgstr "HDD (temp)"
 
-#: po/rc.cpp:68 rc.cpp:68
+#: po/rc.cpp:74 rc.cpp:74
 msgid "Disable auto select device and set specified device"
 msgstr "Disable auto select device and set specified device"
 
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:77 rc.cpp:77
 msgid "Set network device"
 msgstr "Set network device"
 
-#: po/rc.cpp:74 rc.cpp:74
+#: po/rc.cpp:80 rc.cpp:80
 msgid "AC online tag"
 msgstr "AC online tag"
 
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:83 rc.cpp:83
 msgid "Line, which returns when AC is online"
 msgstr "Line, which returns when AC is online"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:86 rc.cpp:86
 msgid "AC offline tag"
 msgstr "AC offline tag"
 
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:89 rc.cpp:89
 msgid "Line, which returns when AC is offline"
 msgstr "Line, which returns when AC is offline"
 
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:92 rc.cpp:92
 msgid "Time interval"
 msgstr "Time interval"
 
-#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
+#: po/rc.cpp:95 po/rc.cpp:196 rc.cpp:95 rc.cpp:196
 msgid "Font"
 msgstr "Font"
 
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:98 rc.cpp:98
 msgid "Font size"
 msgstr "Font size"
 
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:101 rc.cpp:101
 msgid "Font color"
 msgstr "Font color"
 
-#: po/rc.cpp:98 rc.cpp:98
+#: po/rc.cpp:104 rc.cpp:104
 msgid "Font style"
 msgstr "Font style"
 
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:107 rc.cpp:107
 msgid "Font weight"
 msgstr "Font weight"
 
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:110 rc.cpp:110
 msgid "HDD"
 msgstr "HDD"
 
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:113 rc.cpp:113
 msgid "MPD port"
 msgstr "MPD port"
 
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:116 rc.cpp:116
 msgid "GPU device"
 msgstr "GPU device"
 
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:119 rc.cpp:119
 msgid "hddtemp cmd"
 msgstr "hddtemp cmd"
 
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:122 rc.cpp:122
 msgid "Music player"
 msgstr "Music player"
 
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:125 rc.cpp:125
 msgid "MPD address"
 msgstr "MPD address"
 
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:128 rc.cpp:128
 msgid "Desktop check cmd"
 msgstr "Desktop check cmd"
 
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:131 rc.cpp:131
 msgid "<b>NOTE:</b> Player DBus interface should be an active"
 msgstr "<b>NOTE:</b> Player DBus interface should be an active"
 
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:134 rc.cpp:134
 msgid "MPRIS player name"
 msgstr "MPRIS player name"
 
-#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
+#: po/rc.cpp:137 po/rc.cpp:147 rc.cpp:137 rc.cpp:147
 msgid ""
 "Editable\n"
 "del - remove item"
@@ -255,21 +259,13 @@ msgstr ""
 "Editable\n"
 "del - remove item"
 
-#: po/rc.cpp:148 rc.cpp:148
-msgid "Battery device"
-msgstr "Battery device"
-
-#: po/rc.cpp:151 rc.cpp:151
-msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
-msgstr "\"/sys/class/power_supply/BAT0/capacity\" by default"
-
 #: po/rc.cpp:154 rc.cpp:154
-msgid "AC device"
-msgstr "AC device"
+msgid "ACPI path"
+msgstr "ACPI path"
 
 #: po/rc.cpp:157 rc.cpp:157
-msgid "\"/sys/class/power_supply/AC/online\" by default"
-msgstr "\"/sys/class/power_supply/AC/online\" by default"
+msgid "\"/sys/class/power_supply/\" by default"
+msgstr "\"/sys/class/power_supply/\" by default"
 
 #: po/rc.cpp:160 rc.cpp:160
 msgid ""
@@ -353,6 +349,12 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "Battery device"
+#~ msgstr "Battery device"
+
+#~ msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
+#~ msgstr "\"/sys/class/power_supply/BAT0/capacity\" by default"
+
 #~ msgid "Vertical layout"
 #~ msgstr "Vertical layout"
 
diff --git a/sources/awesome-widget/po/es.po b/sources/awesome-widget/po/es.po
index 460cca5..f11a556 100644
--- a/sources/awesome-widget/po/es.po
+++ b/sources/awesome-widget/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-08 01:52+0400\n"
+"POT-Creation-Date: 2014-09-21 20:18+0400\n"
 "PO-Revision-Date: 2014-09-05 11:18+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Spanish <kde-russian@lists.kde.ru>\n"
@@ -18,55 +18,55 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: awesome-widget.cpp:77
+#: awesome-widget.cpp:78
 msgid "Run ksysguard"
 msgstr "Ejecutar ksysguard"
 
-#: awesome-widget.cpp:80
+#: awesome-widget.cpp:81
 msgid "Show README"
 msgstr "Mostrar el README"
 
-#: awesome-widget.cpp:83
+#: awesome-widget.cpp:84
 msgid "Update text"
 msgstr "Actualizar texto"
 
-#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
+#: configuration.cpp:362 po/rc.cpp:151 rc.cpp:151
 msgid "Custom command"
 msgstr "Comando personalizado"
 
-#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
+#: configuration.cpp:392 po/rc.cpp:141 rc.cpp:141
 msgid "Package manager"
 msgstr "Gestor de paquetes"
 
-#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
+#: configuration.cpp:393 po/rc.cpp:144 rc.cpp:144
 msgid "Null lines"
 msgstr "Número de líneas nulas"
 
-#: configuration.cpp:362
+#: configuration.cpp:405
 msgid "Widget"
 msgstr "Widget"
 
-#: configuration.cpp:363
+#: configuration.cpp:406
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: configuration.cpp:364
+#: configuration.cpp:407
 msgid "Tooltip"
 msgstr "Ventana emergente"
 
-#: configuration.cpp:365
+#: configuration.cpp:408
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: configuration.cpp:366
+#: configuration.cpp:409
 msgid "DataEngine"
 msgstr "DataEngine"
 
-#: configuration.cpp:645 configuration.cpp:659
+#: configuration.cpp:697 configuration.cpp:711
 msgid "Remove"
 msgstr "Eliminar"
 
-#: configuration.cpp:706
+#: configuration.cpp:766
 msgid "Select font"
 msgstr ""
 
@@ -146,108 +146,113 @@ msgstr "Unidades de temperatura"
 msgid "Temperature devices"
 msgstr "Dispositivos de temperatura"
 
-#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
-#: rc.cpp:59 rc.cpp:65
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 po/rc.cpp:71 rc.cpp:47
+#: rc.cpp:53 rc.cpp:59 rc.cpp:65 rc.cpp:71
 msgid "Editable"
 msgstr "Editable"
 
 #: po/rc.cpp:50 rc.cpp:50
+#, fuzzy
+msgid "Fan devices"
+msgstr "Dispositivo de alimentación"
+
+#: po/rc.cpp:56 rc.cpp:56
 msgid "Mount points"
 msgstr "Puntos de montaje"
 
-#: po/rc.cpp:56 rc.cpp:56
+#: po/rc.cpp:62 rc.cpp:62
 msgid "HDD devices (speed)"
 msgstr "Disco duro (velocidad)"
 
-#: po/rc.cpp:62 rc.cpp:62
+#: po/rc.cpp:68 rc.cpp:68
 msgid "HDD devices (temp)"
 msgstr "Disco duro (temperatura)"
 
-#: po/rc.cpp:68 rc.cpp:68
+#: po/rc.cpp:74 rc.cpp:74
 msgid "Disable auto select device and set specified device"
 msgstr "Inhabilitar selección automática del dispositivo y especificar uno"
 
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:77 rc.cpp:77
 msgid "Set network device"
 msgstr "Establecer dispositivo de red"
 
-#: po/rc.cpp:74 rc.cpp:74
+#: po/rc.cpp:80 rc.cpp:80
 msgid "AC online tag"
 msgstr "Etiqueta para alimentación conectada"
 
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:83 rc.cpp:83
 msgid "Line, which returns when AC is online"
 msgstr "Línea que devuelve si la alimentación está conectada"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:86 rc.cpp:86
 msgid "AC offline tag"
 msgstr "Etiqueta para la alimentación desconectada"
 
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:89 rc.cpp:89
 msgid "Line, which returns when AC is offline"
 msgstr "Línea que devuelve si la alimentación está desconectada"
 
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:92 rc.cpp:92
 msgid "Time interval"
 msgstr "Intervalo de tiempo"
 
-#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
+#: po/rc.cpp:95 po/rc.cpp:196 rc.cpp:95 rc.cpp:196
 msgid "Font"
 msgstr "Fuente"
 
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:98 rc.cpp:98
 msgid "Font size"
 msgstr "Tamaño de fuente"
 
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:101 rc.cpp:101
 msgid "Font color"
 msgstr "Color de fuente"
 
-#: po/rc.cpp:98 rc.cpp:98
+#: po/rc.cpp:104 rc.cpp:104
 msgid "Font style"
 msgstr "Estilo de fuente"
 
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:107 rc.cpp:107
 msgid "Font weight"
 msgstr "Grosor de la fuente"
 
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:110 rc.cpp:110
 msgid "HDD"
 msgstr "Disco duro"
 
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:113 rc.cpp:113
 msgid "MPD port"
 msgstr "Puerto de MPD"
 
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:116 rc.cpp:116
 msgid "GPU device"
 msgstr "Dispositivo de GPU"
 
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:119 rc.cpp:119
 msgid "hddtemp cmd"
 msgstr "Comando hddtemp"
 
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:122 rc.cpp:122
 msgid "Music player"
 msgstr "Reproductor de música"
 
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:125 rc.cpp:125
 msgid "MPD address"
 msgstr "Dirección de MPD"
 
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:128 rc.cpp:128
 msgid "Desktop check cmd"
 msgstr ""
 
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:131 rc.cpp:131
 msgid "<b>NOTE:</b> Player DBus interface should be an active"
 msgstr ""
 
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:134 rc.cpp:134
 msgid "MPRIS player name"
 msgstr ""
 
-#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
+#: po/rc.cpp:137 po/rc.cpp:147 rc.cpp:137 rc.cpp:147
 msgid ""
 "Editable\n"
 "del - remove item"
@@ -255,20 +260,13 @@ msgstr ""
 "Editable\n"
 "del - eliminar elemento"
 
-#: po/rc.cpp:148 rc.cpp:148
-msgid "Battery device"
-msgstr "Dispositivo de batería"
-
-#: po/rc.cpp:151 rc.cpp:151
-msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
-msgstr "\"/sys/class/power_supply/BAT0/capacity\" por defecto"
-
 #: po/rc.cpp:154 rc.cpp:154
-msgid "AC device"
-msgstr "Dispositivo de alimentación"
+msgid "ACPI path"
+msgstr ""
 
 #: po/rc.cpp:157 rc.cpp:157
-msgid "\"/sys/class/power_supply/AC/online\" by default"
+#, fuzzy
+msgid "\"/sys/class/power_supply/\" by default"
 msgstr "\"/sys/class/power_supply/AC/online\" por defecto"
 
 #: po/rc.cpp:160 rc.cpp:160
@@ -355,6 +353,12 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "Tus correos"
 
+#~ msgid "Battery device"
+#~ msgstr "Dispositivo de batería"
+
+#~ msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
+#~ msgstr "\"/sys/class/power_supply/BAT0/capacity\" por defecto"
+
 #~ msgid "Vertical layout"
 #~ msgstr "Orientación vertical"
 
diff --git a/sources/awesome-widget/po/fr.po b/sources/awesome-widget/po/fr.po
index 77ce5f6..bf17700 100644
--- a/sources/awesome-widget/po/fr.po
+++ b/sources/awesome-widget/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-08 01:52+0400\n"
+"POT-Creation-Date: 2014-09-21 20:18+0400\n"
 "PO-Revision-Date: 2014-09-05 11:20+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: French <kde-russian@lists.kde.ru>\n"
@@ -19,55 +19,55 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: awesome-widget.cpp:77
+#: awesome-widget.cpp:78
 msgid "Run ksysguard"
 msgstr "Lancer ksysguard"
 
-#: awesome-widget.cpp:80
+#: awesome-widget.cpp:81
 msgid "Show README"
 msgstr "Voir le README"
 
-#: awesome-widget.cpp:83
+#: awesome-widget.cpp:84
 msgid "Update text"
 msgstr "Mettre à jour le texte"
 
-#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
+#: configuration.cpp:362 po/rc.cpp:151 rc.cpp:151
 msgid "Custom command"
 msgstr "Commande personnalisée"
 
-#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
+#: configuration.cpp:392 po/rc.cpp:141 rc.cpp:141
 msgid "Package manager"
 msgstr "Gestionnaire de paquets"
 
-#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
+#: configuration.cpp:393 po/rc.cpp:144 rc.cpp:144
 msgid "Null lines"
 msgstr "Nombre d'éléments pour les conseils"
 
-#: configuration.cpp:362
+#: configuration.cpp:405
 msgid "Widget"
 msgstr "Widget"
 
-#: configuration.cpp:363
+#: configuration.cpp:406
 msgid "Advanced"
 msgstr "Avancé"
 
-#: configuration.cpp:364
+#: configuration.cpp:407
 msgid "Tooltip"
 msgstr "Conseil"
 
-#: configuration.cpp:365
+#: configuration.cpp:408
 msgid "Appearance"
 msgstr "Apparence"
 
-#: configuration.cpp:366
+#: configuration.cpp:409
 msgid "DataEngine"
 msgstr "Moteur de données"
 
-#: configuration.cpp:645 configuration.cpp:659
+#: configuration.cpp:697 configuration.cpp:711
 msgid "Remove"
 msgstr "Supprimer"
 
-#: configuration.cpp:706
+#: configuration.cpp:766
 msgid "Select font"
 msgstr ""
 
@@ -147,110 +147,115 @@ msgstr "Unités de température"
 msgid "Temperature devices"
 msgstr "Temperature des périphériques"
 
-#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
-#: rc.cpp:59 rc.cpp:65
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 po/rc.cpp:71 rc.cpp:47
+#: rc.cpp:53 rc.cpp:59 rc.cpp:65 rc.cpp:71
 msgid "Editable"
 msgstr "Modifiable"
 
 #: po/rc.cpp:50 rc.cpp:50
+#, fuzzy
+msgid "Fan devices"
+msgstr "Périphérique d'alimentation"
+
+#: po/rc.cpp:56 rc.cpp:56
 msgid "Mount points"
 msgstr "Points de montage"
 
-#: po/rc.cpp:56 rc.cpp:56
+#: po/rc.cpp:62 rc.cpp:62
 msgid "HDD devices (speed)"
 msgstr "Périphériques HDD (la vitesse)"
 
-#: po/rc.cpp:62 rc.cpp:62
+#: po/rc.cpp:68 rc.cpp:68
 msgid "HDD devices (temp)"
 msgstr "Périphériques HDD (température)"
 
-#: po/rc.cpp:68 rc.cpp:68
+#: po/rc.cpp:74 rc.cpp:74
 msgid "Disable auto select device and set specified device"
 msgstr ""
 "Désactiver la sélection automatique de périphériques et le sélectionner "
 "manuellement"
 
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:77 rc.cpp:77
 msgid "Set network device"
 msgstr "Sélectionner le périphérique réseau"
 
-#: po/rc.cpp:74 rc.cpp:74
+#: po/rc.cpp:80 rc.cpp:80
 msgid "AC online tag"
 msgstr "Tag alimentation branchée"
 
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:83 rc.cpp:83
 msgid "Line, which returns when AC is online"
 msgstr "Ligne qui est renvoyée lorsque l'alimentation est branchée"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:86 rc.cpp:86
 msgid "AC offline tag"
 msgstr "Tag alimentation débranchée"
 
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:89 rc.cpp:89
 msgid "Line, which returns when AC is offline"
 msgstr "Ligne, qui est renvoyée lorsque l'alimentation est débranchée"
 
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:92 rc.cpp:92
 msgid "Time interval"
 msgstr "Intervalle"
 
-#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
+#: po/rc.cpp:95 po/rc.cpp:196 rc.cpp:95 rc.cpp:196
 msgid "Font"
 msgstr "Police"
 
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:98 rc.cpp:98
 msgid "Font size"
 msgstr "Taille de la police"
 
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:101 rc.cpp:101
 msgid "Font color"
 msgstr "Couleur de la police"
 
-#: po/rc.cpp:98 rc.cpp:98
+#: po/rc.cpp:104 rc.cpp:104
 msgid "Font style"
 msgstr "Style de la police"
 
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:107 rc.cpp:107
 msgid "Font weight"
 msgstr "Épaisseur de la police"
 
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:110 rc.cpp:110
 msgid "HDD"
 msgstr "Disque dur"
 
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:113 rc.cpp:113
 msgid "MPD port"
 msgstr "Port MPD"
 
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:116 rc.cpp:116
 msgid "GPU device"
 msgstr "Périphérique graphique"
 
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:119 rc.cpp:119
 msgid "hddtemp cmd"
 msgstr "Commande de température HDD"
 
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:122 rc.cpp:122
 msgid "Music player"
 msgstr "Lecteur audio"
 
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:125 rc.cpp:125
 msgid "MPD address"
 msgstr "Adresse MPD"
 
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:128 rc.cpp:128
 msgid "Desktop check cmd"
 msgstr ""
 
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:131 rc.cpp:131
 msgid "<b>NOTE:</b> Player DBus interface should be an active"
 msgstr ""
 
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:134 rc.cpp:134
 msgid "MPRIS player name"
 msgstr ""
 
-#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
+#: po/rc.cpp:137 po/rc.cpp:147 rc.cpp:137 rc.cpp:147
 msgid ""
 "Editable\n"
 "del - remove item"
@@ -258,20 +263,13 @@ msgstr ""
 "Modifiable\n"
 "del - supprimer un élément"
 
-#: po/rc.cpp:148 rc.cpp:148
-msgid "Battery device"
-msgstr "Batterie"
-
-#: po/rc.cpp:151 rc.cpp:151
-msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
-msgstr "\"/sys/class/power_supply/BAT0/capacity\" par défaut"
-
 #: po/rc.cpp:154 rc.cpp:154
-msgid "AC device"
-msgstr "Périphérique d'alimentation"
+msgid "ACPI path"
+msgstr ""
 
 #: po/rc.cpp:157 rc.cpp:157
-msgid "\"/sys/class/power_supply/AC/online\" by default"
+#, fuzzy
+msgid "\"/sys/class/power_supply/\" by default"
 msgstr "\"/sys/class/power_supply/AC/online\" par défaut"
 
 #: po/rc.cpp:160 rc.cpp:160
@@ -358,6 +356,12 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "Battery device"
+#~ msgstr "Batterie"
+
+#~ msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
+#~ msgstr "\"/sys/class/power_supply/BAT0/capacity\" par défaut"
+
 #~ msgid "Vertical layout"
 #~ msgstr "Positionnement vertical"
 
diff --git a/sources/awesome-widget/po/plasma_applet_awesome-widget.pot b/sources/awesome-widget/po/plasma_applet_awesome-widget.pot
index 33f9cf8..474ec79 100644
--- a/sources/awesome-widget/po/plasma_applet_awesome-widget.pot
+++ b/sources/awesome-widget/po/plasma_applet_awesome-widget.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-08 01:52+0400\n"
+"POT-Creation-Date: 2014-09-21 20:18+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"
@@ -17,55 +17,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: awesome-widget.cpp:77
+#: awesome-widget.cpp:78
 msgid "Run ksysguard"
 msgstr ""
 
-#: awesome-widget.cpp:80
+#: awesome-widget.cpp:81
 msgid "Show README"
 msgstr ""
 
-#: awesome-widget.cpp:83
+#: awesome-widget.cpp:84
 msgid "Update text"
 msgstr ""
 
-#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
+#: configuration.cpp:362 po/rc.cpp:151 rc.cpp:151
 msgid "Custom command"
 msgstr ""
 
-#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
+#: configuration.cpp:392 po/rc.cpp:141 rc.cpp:141
 msgid "Package manager"
 msgstr ""
 
-#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
+#: configuration.cpp:393 po/rc.cpp:144 rc.cpp:144
 msgid "Null lines"
 msgstr ""
 
-#: configuration.cpp:362
+#: configuration.cpp:405
 msgid "Widget"
 msgstr ""
 
-#: configuration.cpp:363
+#: configuration.cpp:406
 msgid "Advanced"
 msgstr ""
 
-#: configuration.cpp:364
+#: configuration.cpp:407
 msgid "Tooltip"
 msgstr ""
 
-#: configuration.cpp:365
+#: configuration.cpp:408
 msgid "Appearance"
 msgstr ""
 
-#: configuration.cpp:366
+#: configuration.cpp:409
 msgid "DataEngine"
 msgstr ""
 
-#: configuration.cpp:645 configuration.cpp:659
+#: configuration.cpp:697 configuration.cpp:711
 msgid "Remove"
 msgstr ""
 
-#: configuration.cpp:706
+#: configuration.cpp:766
 msgid "Select font"
 msgstr ""
 
@@ -123,127 +123,123 @@ msgstr ""
 msgid "Temperature devices"
 msgstr ""
 
-#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
-#: rc.cpp:59 rc.cpp:65
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 po/rc.cpp:71 rc.cpp:47
+#: rc.cpp:53 rc.cpp:59 rc.cpp:65 rc.cpp:71
 msgid "Editable"
 msgstr ""
 
 #: po/rc.cpp:50 rc.cpp:50
-msgid "Mount points"
+msgid "Fan devices"
 msgstr ""
 
 #: po/rc.cpp:56 rc.cpp:56
-msgid "HDD devices (speed)"
+msgid "Mount points"
 msgstr ""
 
 #: po/rc.cpp:62 rc.cpp:62
-msgid "HDD devices (temp)"
+msgid "HDD devices (speed)"
 msgstr ""
 
 #: po/rc.cpp:68 rc.cpp:68
-msgid "Disable auto select device and set specified device"
-msgstr ""
-
-#: po/rc.cpp:71 rc.cpp:71
-msgid "Set network device"
+msgid "HDD devices (temp)"
 msgstr ""
 
 #: po/rc.cpp:74 rc.cpp:74
-msgid "AC online tag"
+msgid "Disable auto select device and set specified device"
 msgstr ""
 
 #: po/rc.cpp:77 rc.cpp:77
-msgid "Line, which returns when AC is online"
+msgid "Set network device"
 msgstr ""
 
 #: po/rc.cpp:80 rc.cpp:80
-msgid "AC offline tag"
+msgid "AC online tag"
 msgstr ""
 
 #: po/rc.cpp:83 rc.cpp:83
-msgid "Line, which returns when AC is offline"
+msgid "Line, which returns when AC is online"
 msgstr ""
 
 #: po/rc.cpp:86 rc.cpp:86
-msgid "Time interval"
+msgid "AC offline tag"
 msgstr ""
 
-#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
-msgid "Font"
+#: po/rc.cpp:89 rc.cpp:89
+msgid "Line, which returns when AC is offline"
 msgstr ""
 
 #: po/rc.cpp:92 rc.cpp:92
-msgid "Font size"
+msgid "Time interval"
 msgstr ""
 
-#: po/rc.cpp:95 rc.cpp:95
-msgid "Font color"
+#: po/rc.cpp:95 po/rc.cpp:196 rc.cpp:95 rc.cpp:196
+msgid "Font"
 msgstr ""
 
 #: po/rc.cpp:98 rc.cpp:98
-msgid "Font style"
+msgid "Font size"
 msgstr ""
 
 #: po/rc.cpp:101 rc.cpp:101
-msgid "Font weight"
+msgid "Font color"
 msgstr ""
 
 #: po/rc.cpp:104 rc.cpp:104
-msgid "HDD"
+msgid "Font style"
 msgstr ""
 
 #: po/rc.cpp:107 rc.cpp:107
-msgid "MPD port"
+msgid "Font weight"
 msgstr ""
 
 #: po/rc.cpp:110 rc.cpp:110
-msgid "GPU device"
+msgid "HDD"
 msgstr ""
 
 #: po/rc.cpp:113 rc.cpp:113
-msgid "hddtemp cmd"
+msgid "MPD port"
 msgstr ""
 
 #: po/rc.cpp:116 rc.cpp:116
-msgid "Music player"
+msgid "GPU device"
 msgstr ""
 
 #: po/rc.cpp:119 rc.cpp:119
-msgid "MPD address"
+msgid "hddtemp cmd"
 msgstr ""
 
 #: po/rc.cpp:122 rc.cpp:122
-msgid "Desktop check cmd"
+msgid "Music player"
 msgstr ""
 
 #: po/rc.cpp:125 rc.cpp:125
-msgid "<b>NOTE:</b> Player DBus interface should be an active"
+msgid "MPD address"
 msgstr ""
 
 #: po/rc.cpp:128 rc.cpp:128
+msgid "Desktop check cmd"
+msgstr ""
+
+#: po/rc.cpp:131 rc.cpp:131
+msgid "<b>NOTE:</b> Player DBus interface should be an active"
+msgstr ""
+
+#: po/rc.cpp:134 rc.cpp:134
 msgid "MPRIS player name"
 msgstr ""
 
-#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
+#: po/rc.cpp:137 po/rc.cpp:147 rc.cpp:137 rc.cpp:147
 msgid ""
 "Editable\n"
 "del - remove item"
 msgstr ""
 
-#: po/rc.cpp:148 rc.cpp:148
-msgid "Battery device"
-msgstr ""
-
-#: po/rc.cpp:151 rc.cpp:151
-msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
-msgstr ""
-
 #: po/rc.cpp:154 rc.cpp:154
-msgid "AC device"
+msgid "ACPI path"
 msgstr ""
 
 #: po/rc.cpp:157 rc.cpp:157
-msgid "\"/sys/class/power_supply/AC/online\" by default"
+msgid "\"/sys/class/power_supply/\" by default"
 msgstr ""
 
 #: po/rc.cpp:160 rc.cpp:160
diff --git a/sources/awesome-widget/po/pt_BR.po b/sources/awesome-widget/po/pt_BR.po
index 35e293d..e6eb6b9 100644
--- a/sources/awesome-widget/po/pt_BR.po
+++ b/sources/awesome-widget/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-08 01:52+0400\n"
+"POT-Creation-Date: 2014-09-21 20:18+0400\n"
 "PO-Revision-Date: 2014-09-05 11:21+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-russian@lists.kde.ru>\n"
@@ -17,55 +17,55 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: awesome-widget.cpp:77
+#: awesome-widget.cpp:78
 msgid "Run ksysguard"
 msgstr "Abrir ksysguard"
 
-#: awesome-widget.cpp:80
+#: awesome-widget.cpp:81
 msgid "Show README"
 msgstr "Mostrar README"
 
-#: awesome-widget.cpp:83
+#: awesome-widget.cpp:84
 msgid "Update text"
 msgstr "Atualizar texto"
 
-#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
+#: configuration.cpp:362 po/rc.cpp:151 rc.cpp:151
 msgid "Custom command"
 msgstr "Comando personalizado"
 
-#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
+#: configuration.cpp:392 po/rc.cpp:141 rc.cpp:141
 msgid "Package manager"
 msgstr "Gerenciador de pacotes"
 
-#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
+#: configuration.cpp:393 po/rc.cpp:144 rc.cpp:144
 msgid "Null lines"
 msgstr "Número de valores para dicas de contexto"
 
-#: configuration.cpp:362
+#: configuration.cpp:405
 msgid "Widget"
 msgstr "Widget"
 
-#: configuration.cpp:363
+#: configuration.cpp:406
 msgid "Advanced"
 msgstr "Avançado"
 
-#: configuration.cpp:364
+#: configuration.cpp:407
 msgid "Tooltip"
 msgstr "Dica de contexto"
 
-#: configuration.cpp:365
+#: configuration.cpp:408
 msgid "Appearance"
 msgstr "Aparência"
 
-#: configuration.cpp:366
+#: configuration.cpp:409
 msgid "DataEngine"
 msgstr "Engine de dados"
 
-#: configuration.cpp:645 configuration.cpp:659
+#: configuration.cpp:697 configuration.cpp:711
 msgid "Remove"
 msgstr "Remover"
 
-#: configuration.cpp:706
+#: configuration.cpp:766
 msgid "Select font"
 msgstr ""
 
@@ -143,109 +143,114 @@ msgstr "Unidades de temperatura"
 msgid "Temperature devices"
 msgstr "Dispositivos de temperatura"
 
-#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
-#: rc.cpp:59 rc.cpp:65
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 po/rc.cpp:71 rc.cpp:47
+#: rc.cpp:53 rc.cpp:59 rc.cpp:65 rc.cpp:71
 msgid "Editable"
 msgstr "Editável"
 
 #: po/rc.cpp:50 rc.cpp:50
+#, fuzzy
+msgid "Fan devices"
+msgstr "Dispositivo do carregador"
+
+#: po/rc.cpp:56 rc.cpp:56
 msgid "Mount points"
 msgstr "Pontos de montagem"
 
-#: po/rc.cpp:56 rc.cpp:56
+#: po/rc.cpp:62 rc.cpp:62
 msgid "HDD devices (speed)"
 msgstr "Dispositivos HDD (velocidade) "
 
-#: po/rc.cpp:62 rc.cpp:62
+#: po/rc.cpp:68 rc.cpp:68
 msgid "HDD devices (temp)"
 msgstr "Dispositivos HDD (temperatura)"
 
-#: po/rc.cpp:68 rc.cpp:68
+#: po/rc.cpp:74 rc.cpp:74
 msgid "Disable auto select device and set specified device"
 msgstr ""
 "Desativar auto seleção de dispositivos e escolher um dispositivo específico"
 
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:77 rc.cpp:77
 msgid "Set network device"
 msgstr "Escolher dispositivo de rede"
 
-#: po/rc.cpp:74 rc.cpp:74
+#: po/rc.cpp:80 rc.cpp:80
 msgid "AC online tag"
 msgstr "Rótulo com carregador conectado"
 
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:83 rc.cpp:83
 msgid "Line, which returns when AC is online"
 msgstr "Linha, que aparece quando o carregador está conectado"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:86 rc.cpp:86
 msgid "AC offline tag"
 msgstr "Rótulo com carregador desconectado"
 
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:89 rc.cpp:89
 msgid "Line, which returns when AC is offline"
 msgstr "Linha, que aparece quando o carregador está offline"
 
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:92 rc.cpp:92
 msgid "Time interval"
 msgstr "Intervalo de tempo"
 
-#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
+#: po/rc.cpp:95 po/rc.cpp:196 rc.cpp:95 rc.cpp:196
 msgid "Font"
 msgstr "Tamanho da fonte"
 
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:98 rc.cpp:98
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:101 rc.cpp:101
 msgid "Font color"
 msgstr "Cor da fonte"
 
-#: po/rc.cpp:98 rc.cpp:98
+#: po/rc.cpp:104 rc.cpp:104
 msgid "Font style"
 msgstr "Estilo da fonte"
 
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:107 rc.cpp:107
 msgid "Font weight"
 msgstr "Peso da fonte"
 
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:110 rc.cpp:110
 msgid "HDD"
 msgstr "HDD"
 
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:113 rc.cpp:113
 msgid "MPD port"
 msgstr "Porta do MPD"
 
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:116 rc.cpp:116
 msgid "GPU device"
 msgstr "Dispositivo GPU"
 
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:119 rc.cpp:119
 msgid "hddtemp cmd"
 msgstr "comando hddtemp "
 
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:122 rc.cpp:122
 msgid "Music player"
 msgstr "Reprodutor de áudio"
 
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:125 rc.cpp:125
 msgid "MPD address"
 msgstr "Endereço do MPD"
 
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:128 rc.cpp:128
 msgid "Desktop check cmd"
 msgstr ""
 
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:131 rc.cpp:131
 msgid "<b>NOTE:</b> Player DBus interface should be an active"
 msgstr ""
 
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:134 rc.cpp:134
 msgid "MPRIS player name"
 msgstr ""
 
-#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
+#: po/rc.cpp:137 po/rc.cpp:147 rc.cpp:137 rc.cpp:147
 msgid ""
 "Editable\n"
 "del - remove item"
@@ -253,20 +258,13 @@ msgstr ""
 "Editável\n"
 "del - remover item"
 
-#: po/rc.cpp:148 rc.cpp:148
-msgid "Battery device"
-msgstr "Dispositivo do carregador"
-
-#: po/rc.cpp:151 rc.cpp:151
-msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
-msgstr "\"/sys/class/power_supply/BAT0/capacity\" por padrão"
-
 #: po/rc.cpp:154 rc.cpp:154
-msgid "AC device"
-msgstr "Dispositivo do carregador"
+msgid "ACPI path"
+msgstr ""
 
 #: po/rc.cpp:157 rc.cpp:157
-msgid "\"/sys/class/power_supply/AC/online\" by default"
+#, fuzzy
+msgid "\"/sys/class/power_supply/\" by default"
 msgstr "\"/sys/class/power_supply/AC/online\" por padrão"
 
 #: po/rc.cpp:160 rc.cpp:160
@@ -352,6 +350,12 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "dreanazous@gmail.com"
 
+#~ msgid "Battery device"
+#~ msgstr "Dispositivo do carregador"
+
+#~ msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
+#~ msgstr "\"/sys/class/power_supply/BAT0/capacity\" por padrão"
+
 #~ msgid "Vertical layout"
 #~ msgstr "Layout vertical"
 
diff --git a/sources/awesome-widget/po/ru.po b/sources/awesome-widget/po/ru.po
index 54a0ca7..016eb21 100644
--- a/sources/awesome-widget/po/ru.po
+++ b/sources/awesome-widget/po/ru.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-08 01:52+0400\n"
-"PO-Revision-Date: 2014-09-05 11:16+0400\n"
+"POT-Creation-Date: 2014-09-21 20:18+0400\n"
+"PO-Revision-Date: 2014-09-21 20:19+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -18,55 +18,55 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: awesome-widget.cpp:77
+#: awesome-widget.cpp:78
 msgid "Run ksysguard"
 msgstr "Запустить ksysguard"
 
-#: awesome-widget.cpp:80
+#: awesome-widget.cpp:81
 msgid "Show README"
 msgstr "Показать README"
 
-#: awesome-widget.cpp:83
+#: awesome-widget.cpp:84
 msgid "Update text"
 msgstr "Обновить текст"
 
-#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
+#: configuration.cpp:362 po/rc.cpp:151 rc.cpp:151
 msgid "Custom command"
 msgstr "Своя команда"
 
-#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
+#: configuration.cpp:392 po/rc.cpp:141 rc.cpp:141
 msgid "Package manager"
 msgstr "Пакетный менеджер"
 
-#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
+#: configuration.cpp:393 po/rc.cpp:144 rc.cpp:144
 msgid "Null lines"
 msgstr "Число пустых линий"
 
-#: configuration.cpp:362
+#: configuration.cpp:405
 msgid "Widget"
 msgstr "Виджет"
 
-#: configuration.cpp:363
+#: configuration.cpp:406
 msgid "Advanced"
 msgstr "Расширенные"
 
-#: configuration.cpp:364
+#: configuration.cpp:407
 msgid "Tooltip"
 msgstr "Тултип"
 
-#: configuration.cpp:365
+#: configuration.cpp:408
 msgid "Appearance"
 msgstr "Внешний вид"
 
-#: configuration.cpp:366
+#: configuration.cpp:409
 msgid "DataEngine"
 msgstr "DataEngine"
 
-#: configuration.cpp:645 configuration.cpp:659
+#: configuration.cpp:697 configuration.cpp:711
 msgid "Remove"
 msgstr "Удалить"
 
-#: configuration.cpp:706
+#: configuration.cpp:766
 msgid "Select font"
 msgstr "Выберете шрифт"
 
@@ -146,108 +146,112 @@ msgstr "Температурные единицы"
 msgid "Temperature devices"
 msgstr "Температурные устройства"
 
-#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
-#: rc.cpp:59 rc.cpp:65
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 po/rc.cpp:71 rc.cpp:47
+#: rc.cpp:53 rc.cpp:59 rc.cpp:65 rc.cpp:71
 msgid "Editable"
 msgstr "Редактируемо"
 
 #: po/rc.cpp:50 rc.cpp:50
+msgid "Fan devices"
+msgstr "Кулеры"
+
+#: po/rc.cpp:56 rc.cpp:56
 msgid "Mount points"
 msgstr "Точки монтирования"
 
-#: po/rc.cpp:56 rc.cpp:56
+#: po/rc.cpp:62 rc.cpp:62
 msgid "HDD devices (speed)"
 msgstr "HDD (скорость)"
 
-#: po/rc.cpp:62 rc.cpp:62
+#: po/rc.cpp:68 rc.cpp:68
 msgid "HDD devices (temp)"
 msgstr "HDD (температура)"
 
-#: po/rc.cpp:68 rc.cpp:68
+#: po/rc.cpp:74 rc.cpp:74
 msgid "Disable auto select device and set specified device"
 msgstr "Отключить автовыбор устройства и использовать указанное"
 
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:77 rc.cpp:77
 msgid "Set network device"
 msgstr "Выберете сетевое устройство"
 
-#: po/rc.cpp:74 rc.cpp:74
+#: po/rc.cpp:80 rc.cpp:80
 msgid "AC online tag"
 msgstr "AC подключен"
 
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:83 rc.cpp:83
 msgid "Line, which returns when AC is online"
 msgstr "Строка, возвращаемая при подключенном адаптере питания"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:86 rc.cpp:86
 msgid "AC offline tag"
 msgstr "AC отключен"
 
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:89 rc.cpp:89
 msgid "Line, which returns when AC is offline"
 msgstr "Строка, возвращаемая при отключенном адаптере питания"
 
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:92 rc.cpp:92
 msgid "Time interval"
 msgstr "Интервал обновления"
 
-#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
+#: po/rc.cpp:95 po/rc.cpp:196 rc.cpp:95 rc.cpp:196
 msgid "Font"
 msgstr "Шрифт"
 
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:98 rc.cpp:98
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:101 rc.cpp:101
 msgid "Font color"
 msgstr "Цвет шрифта"
 
-#: po/rc.cpp:98 rc.cpp:98
+#: po/rc.cpp:104 rc.cpp:104
 msgid "Font style"
 msgstr "Стиль шрифта"
 
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:107 rc.cpp:107
 msgid "Font weight"
 msgstr "Ширина шрифта"
 
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:110 rc.cpp:110
 msgid "HDD"
 msgstr "HDD"
 
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:113 rc.cpp:113
 msgid "MPD port"
 msgstr "Порт сервера MPD"
 
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:116 rc.cpp:116
 msgid "GPU device"
 msgstr "Устройство GPU"
 
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:119 rc.cpp:119
 msgid "hddtemp cmd"
 msgstr "Команда hddtemp"
 
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:122 rc.cpp:122
 msgid "Music player"
 msgstr "Музыкальный плеер"
 
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:125 rc.cpp:125
 msgid "MPD address"
 msgstr "Адрес сервера MPD"
 
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:128 rc.cpp:128
 msgid "Desktop check cmd"
 msgstr "Команда для проверки рабочего стола"
 
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:131 rc.cpp:131
 msgid "<b>NOTE:</b> Player DBus interface should be an active"
 msgstr "<b>ВНИМАНИЕ:</b> DBus интерфейс плеера должен быть активен"
 
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:134 rc.cpp:134
 msgid "MPRIS player name"
 msgstr "Имя плеера в MPRIS"
 
-#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
+#: po/rc.cpp:137 po/rc.cpp:147 rc.cpp:137 rc.cpp:147
 msgid ""
 "Editable\n"
 "del - remove item"
@@ -255,21 +259,13 @@ msgstr ""
 "Редактируемо\n"
 "del - удалить строку"
 
-#: po/rc.cpp:148 rc.cpp:148
-msgid "Battery device"
-msgstr "Устройство батареи"
-
-#: po/rc.cpp:151 rc.cpp:151
-msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
-msgstr "\"/sys/class/power_supply/BAT0/capacity\" по умолчанию"
-
 #: po/rc.cpp:154 rc.cpp:154
-msgid "AC device"
-msgstr "Устройство AC"
+msgid "ACPI path"
+msgstr "Пусть к ACPI"
 
 #: po/rc.cpp:157 rc.cpp:157
-msgid "\"/sys/class/power_supply/AC/online\" by default"
-msgstr "\"/sys/class/power_supply/AC/online\" по умолчанию"
+msgid "\"/sys/class/power_supply/\" by default"
+msgstr "\"/sys/class/power_supply/\" по умолчанию"
 
 #: po/rc.cpp:160 rc.cpp:160
 msgid ""
@@ -354,6 +350,12 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "Battery device"
+#~ msgstr "Устройство батареи"
+
+#~ msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
+#~ msgstr "\"/sys/class/power_supply/BAT0/capacity\" по умолчанию"
+
 #~ msgid "Vertical layout"
 #~ msgstr "Вертикальная разметка"
 
diff --git a/sources/awesome-widget/po/uk.po b/sources/awesome-widget/po/uk.po
index 2cc3291..f0fb36e 100644
--- a/sources/awesome-widget/po/uk.po
+++ b/sources/awesome-widget/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-08 01:52+0400\n"
+"POT-Creation-Date: 2014-09-21 20:18+0400\n"
 "PO-Revision-Date: 2014-09-05 11:22+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Ukrainian <kde-russian@lists.kde.ru>\n"
@@ -18,55 +18,55 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: awesome-widget.cpp:77
+#: awesome-widget.cpp:78
 msgid "Run ksysguard"
 msgstr "Запустити ksysguard"
 
-#: awesome-widget.cpp:80
+#: awesome-widget.cpp:81
 msgid "Show README"
 msgstr "Показати README"
 
-#: awesome-widget.cpp:83
+#: awesome-widget.cpp:84
 msgid "Update text"
 msgstr "Оновити текст"
 
-#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
+#: configuration.cpp:362 po/rc.cpp:151 rc.cpp:151
 msgid "Custom command"
 msgstr "Своя команда"
 
-#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
+#: configuration.cpp:392 po/rc.cpp:141 rc.cpp:141
 msgid "Package manager"
 msgstr "Пакетний менеджер"
 
-#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
+#: configuration.cpp:393 po/rc.cpp:144 rc.cpp:144
 msgid "Null lines"
 msgstr "Кількість пустих рядків"
 
-#: configuration.cpp:362
+#: configuration.cpp:405
 msgid "Widget"
 msgstr "Віджет"
 
-#: configuration.cpp:363
+#: configuration.cpp:406
 msgid "Advanced"
 msgstr "Розширені"
 
-#: configuration.cpp:364
+#: configuration.cpp:407
 msgid "Tooltip"
 msgstr "Тултіп"
 
-#: configuration.cpp:365
+#: configuration.cpp:408
 msgid "Appearance"
 msgstr "Зовнішній вигляд"
 
-#: configuration.cpp:366
+#: configuration.cpp:409
 msgid "DataEngine"
 msgstr "DataEngine"
 
-#: configuration.cpp:645 configuration.cpp:659
+#: configuration.cpp:697 configuration.cpp:711
 msgid "Remove"
 msgstr "Видалити"
 
-#: configuration.cpp:706
+#: configuration.cpp:766
 msgid "Select font"
 msgstr ""
 
@@ -146,108 +146,113 @@ msgstr "Одиниці виміру температури"
 msgid "Temperature devices"
 msgstr "Температурні пристрої"
 
-#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
-#: rc.cpp:59 rc.cpp:65
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 po/rc.cpp:71 rc.cpp:47
+#: rc.cpp:53 rc.cpp:59 rc.cpp:65 rc.cpp:71
 msgid "Editable"
 msgstr "Можна редагувати"
 
 #: po/rc.cpp:50 rc.cpp:50
+#, fuzzy
+msgid "Fan devices"
+msgstr "AC пристрій"
+
+#: po/rc.cpp:56 rc.cpp:56
 msgid "Mount points"
 msgstr "Точки монтування"
 
-#: po/rc.cpp:56 rc.cpp:56
+#: po/rc.cpp:62 rc.cpp:62
 msgid "HDD devices (speed)"
 msgstr "HDD (швидкість)"
 
-#: po/rc.cpp:62 rc.cpp:62
+#: po/rc.cpp:68 rc.cpp:68
 msgid "HDD devices (temp)"
 msgstr "HDD (температура)"
 
-#: po/rc.cpp:68 rc.cpp:68
+#: po/rc.cpp:74 rc.cpp:74
 msgid "Disable auto select device and set specified device"
 msgstr "Відключити автоматичний вибір пристрою та використовувати вказаний"
 
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:77 rc.cpp:77
 msgid "Set network device"
 msgstr "Оберіть мережевий пристрій"
 
-#: po/rc.cpp:74 rc.cpp:74
+#: po/rc.cpp:80 rc.cpp:80
 msgid "AC online tag"
 msgstr "AC підключений"
 
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:83 rc.cpp:83
 msgid "Line, which returns when AC is online"
 msgstr "Рядок, що повертається при підключеному адаптері живлення"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:86 rc.cpp:86
 msgid "AC offline tag"
 msgstr "AC відключений"
 
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:89 rc.cpp:89
 msgid "Line, which returns when AC is offline"
 msgstr "Рядок, що повертається при відключеному адаптері живлення"
 
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:92 rc.cpp:92
 msgid "Time interval"
 msgstr "Інтервал оновлення"
 
-#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
+#: po/rc.cpp:95 po/rc.cpp:196 rc.cpp:95 rc.cpp:196
 msgid "Font"
 msgstr "Шрифт"
 
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:98 rc.cpp:98
 msgid "Font size"
 msgstr "Розмір шрифту"
 
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:101 rc.cpp:101
 msgid "Font color"
 msgstr "Колір шрифту"
 
-#: po/rc.cpp:98 rc.cpp:98
+#: po/rc.cpp:104 rc.cpp:104
 msgid "Font style"
 msgstr "Стиль шрифту"
 
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:107 rc.cpp:107
 msgid "Font weight"
 msgstr "Ширина шрифту"
 
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:110 rc.cpp:110
 msgid "HDD"
 msgstr "HDD"
 
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:113 rc.cpp:113
 msgid "MPD port"
 msgstr "Порт сервера MPD"
 
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:116 rc.cpp:116
 msgid "GPU device"
 msgstr "Пристій GPU"
 
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:119 rc.cpp:119
 msgid "hddtemp cmd"
 msgstr "Команда hddtemp"
 
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:122 rc.cpp:122
 msgid "Music player"
 msgstr "Музичний плеєр"
 
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:125 rc.cpp:125
 msgid "MPD address"
 msgstr "Адреса сервера MPD"
 
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:128 rc.cpp:128
 msgid "Desktop check cmd"
 msgstr ""
 
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:131 rc.cpp:131
 msgid "<b>NOTE:</b> Player DBus interface should be an active"
 msgstr ""
 
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:134 rc.cpp:134
 msgid "MPRIS player name"
 msgstr ""
 
-#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
+#: po/rc.cpp:137 po/rc.cpp:147 rc.cpp:137 rc.cpp:147
 msgid ""
 "Editable\n"
 "del - remove item"
@@ -255,20 +260,13 @@ msgstr ""
 "Можна редагувати\n"
 "del - видалити рядок"
 
-#: po/rc.cpp:148 rc.cpp:148
-msgid "Battery device"
-msgstr "Пристрій батареї"
-
-#: po/rc.cpp:151 rc.cpp:151
-msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
-msgstr "\"/sys/class/power_supply/BAT0/capacity\" за замовчуванням"
-
 #: po/rc.cpp:154 rc.cpp:154
-msgid "AC device"
-msgstr "AC пристрій"
+msgid "ACPI path"
+msgstr ""
 
 #: po/rc.cpp:157 rc.cpp:157
-msgid "\"/sys/class/power_supply/AC/online\" by default"
+#, fuzzy
+msgid "\"/sys/class/power_supply/\" by default"
 msgstr "\"/sys/class/power_supply/AC/online\" за замовчуванням"
 
 #: po/rc.cpp:160 rc.cpp:160
@@ -355,6 +353,12 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "sarumyan@i.ua"
 
+#~ msgid "Battery device"
+#~ msgstr "Пристрій батареї"
+
+#~ msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
+#~ msgstr "\"/sys/class/power_supply/BAT0/capacity\" за замовчуванням"
+
 #~ msgid "Vertical layout"
 #~ msgstr "Вертикальна розмітка"
 
diff --git a/sources/awesome-widget/po/zh.po b/sources/awesome-widget/po/zh.po
index 80b71a9..9b67806 100644
--- a/sources/awesome-widget/po/zh.po
+++ b/sources/awesome-widget/po/zh.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-08 01:52+0400\n"
+"POT-Creation-Date: 2014-09-21 20:18+0400\n"
 "PO-Revision-Date: 2014-09-10 22:50+0800\n"
 "Last-Translator: Steve Lemuel <wlemuel@hotmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -17,55 +17,55 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: awesome-widget.cpp:77
+#: awesome-widget.cpp:78
 msgid "Run ksysguard"
 msgstr "运行任务管理器"
 
-#: awesome-widget.cpp:80
+#: awesome-widget.cpp:81
 msgid "Show README"
 msgstr "显示帮助文档"
 
-#: awesome-widget.cpp:83
+#: awesome-widget.cpp:84
 msgid "Update text"
 msgstr "刷新文本"
 
-#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
+#: configuration.cpp:362 po/rc.cpp:151 rc.cpp:151
 msgid "Custom command"
 msgstr "自定义命令"
 
-#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
+#: configuration.cpp:392 po/rc.cpp:141 rc.cpp:141
 msgid "Package manager"
 msgstr "包管理器"
 
-#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
+#: configuration.cpp:393 po/rc.cpp:144 rc.cpp:144
 msgid "Null lines"
 msgstr "空行"
 
-#: configuration.cpp:362
+#: configuration.cpp:405
 msgid "Widget"
 msgstr "窗口小部件"
 
-#: configuration.cpp:363
+#: configuration.cpp:406
 msgid "Advanced"
 msgstr "高级设置"
 
-#: configuration.cpp:364
+#: configuration.cpp:407
 msgid "Tooltip"
 msgstr "提示"
 
-#: configuration.cpp:365
+#: configuration.cpp:408
 msgid "Appearance"
 msgstr "外观"
 
-#: configuration.cpp:366
+#: configuration.cpp:409
 msgid "DataEngine"
 msgstr "数据引擎"
 
-#: configuration.cpp:645 configuration.cpp:659
+#: configuration.cpp:697 configuration.cpp:711
 msgid "Remove"
 msgstr "移除"
 
-#: configuration.cpp:706
+#: configuration.cpp:766
 msgid "Select font"
 msgstr "选择字体"
 
@@ -145,108 +145,113 @@ msgstr "温度单位"
 msgid "Temperature devices"
 msgstr "温度传感器"
 
-#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
-#: rc.cpp:59 rc.cpp:65
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 po/rc.cpp:71 rc.cpp:47
+#: rc.cpp:53 rc.cpp:59 rc.cpp:65 rc.cpp:71
 msgid "Editable"
 msgstr "可编辑的"
 
 #: po/rc.cpp:50 rc.cpp:50
+#, fuzzy
+msgid "Fan devices"
+msgstr "外界电源设备"
+
+#: po/rc.cpp:56 rc.cpp:56
 msgid "Mount points"
 msgstr "挂载点"
 
-#: po/rc.cpp:56 rc.cpp:56
+#: po/rc.cpp:62 rc.cpp:62
 msgid "HDD devices (speed)"
 msgstr "硬盘（高速）"
 
-#: po/rc.cpp:62 rc.cpp:62
+#: po/rc.cpp:68 rc.cpp:68
 msgid "HDD devices (temp)"
 msgstr "硬盘（临时）"
 
-#: po/rc.cpp:68 rc.cpp:68
+#: po/rc.cpp:74 rc.cpp:74
 msgid "Disable auto select device and set specified device"
 msgstr "禁用自动选择设备和设置特殊设备"
 
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:77 rc.cpp:77
 msgid "Set network device"
 msgstr "设置网络设备"
 
-#: po/rc.cpp:74 rc.cpp:74
+#: po/rc.cpp:80 rc.cpp:80
 msgid "AC online tag"
 msgstr "外接电源使用中标签"
 
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:83 rc.cpp:83
 msgid "Line, which returns when AC is online"
 msgstr "外接电源使用时显示线条"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:86 rc.cpp:86
 msgid "AC offline tag"
 msgstr "外接电源未使用标签"
 
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:89 rc.cpp:89
 msgid "Line, which returns when AC is offline"
 msgstr "外接电源未使用时显示线条"
 
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:92 rc.cpp:92
 msgid "Time interval"
 msgstr "时间周期"
 
-#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
+#: po/rc.cpp:95 po/rc.cpp:196 rc.cpp:95 rc.cpp:196
 msgid "Font"
 msgstr "字体"
 
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:98 rc.cpp:98
 msgid "Font size"
 msgstr "字体大小"
 
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:101 rc.cpp:101
 msgid "Font color"
 msgstr "字体颜色"
 
-#: po/rc.cpp:98 rc.cpp:98
+#: po/rc.cpp:104 rc.cpp:104
 msgid "Font style"
 msgstr "字体样式"
 
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:107 rc.cpp:107
 msgid "Font weight"
 msgstr "字体宽度"
 
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:110 rc.cpp:110
 msgid "HDD"
 msgstr "硬盘"
 
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:113 rc.cpp:113
 msgid "MPD port"
 msgstr "MPD 端口"
 
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:116 rc.cpp:116
 msgid "GPU device"
 msgstr "GPU 设备"
 
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:119 rc.cpp:119
 msgid "hddtemp cmd"
 msgstr "硬盘温度显示命令"
 
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:122 rc.cpp:122
 msgid "Music player"
 msgstr "音乐播放器"
 
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:125 rc.cpp:125
 msgid "MPD address"
 msgstr "MPD 地址"
 
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:128 rc.cpp:128
 msgid "Desktop check cmd"
 msgstr "检测桌面命令"
 
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:131 rc.cpp:131
 msgid "<b>NOTE:</b> Player DBus interface should be an active"
 msgstr "<b>提示:</b> 播放器 DBus 应当处于激活状态"
 
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:134 rc.cpp:134
 msgid "MPRIS player name"
 msgstr "MPRIS 播放器名"
 
-#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
+#: po/rc.cpp:137 po/rc.cpp:147 rc.cpp:137 rc.cpp:147
 msgid ""
 "Editable\n"
 "del - remove item"
@@ -254,20 +259,13 @@ msgstr ""
 "可编辑的\n"
 "del - 移除项目"
 
-#: po/rc.cpp:148 rc.cpp:148
-msgid "Battery device"
-msgstr "电池设备"
-
-#: po/rc.cpp:151 rc.cpp:151
-msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
-msgstr "默认为 \"/sys/class/power_supply/BAT0/capacity\""
-
 #: po/rc.cpp:154 rc.cpp:154
-msgid "AC device"
-msgstr "外界电源设备"
+msgid "ACPI path"
+msgstr ""
 
 #: po/rc.cpp:157 rc.cpp:157
-msgid "\"/sys/class/power_supply/AC/online\" by default"
+#, fuzzy
+msgid "\"/sys/class/power_supply/\" by default"
 msgstr "默认为 \"/sys/class/power_supply/AC/online\""
 
 #: po/rc.cpp:160 rc.cpp:160
@@ -275,8 +273,8 @@ msgid ""
 "CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
 "To enable them just make needed checkbox fully checked."
 msgstr ""
-"CPU， CPU 时钟，内存，虚拟内存和网络连接标签均支持图形化提示显示。 "
-"请在相应复选框中勾选以启用该功能。 "
+"CPU， CPU 时钟，内存，虚拟内存和网络连接标签均支持图形化提示显示。 请在相应复"
+"选框中勾选以启用该功能。 "
 
 #: po/rc.cpp:163 rc.cpp:163
 msgid "Number of values for tooltips"
@@ -323,8 +321,8 @@ msgid ""
 "Detailed information may be found on <a href=\"http://arcanis.name/projects/"
 "awesome-widgets/\">project homepage</a>"
 msgstr ""
-"详情请参照 <a href=\"http://arcanis.name/projects/ "
-"awesome-widgets/\">项目主页</a>"
+"详情请参照 <a href=\"http://arcanis.name/projects/ awesome-widgets/\">项目主"
+"页</a>"
 
 #: po/rc.cpp:199 rc.cpp:199
 msgid "Ctrl+B"
@@ -352,4 +350,8 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "用户邮箱"
 
+#~ msgid "Battery device"
+#~ msgstr "电池设备"
 
+#~ msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
+#~ msgstr "默认为 \"/sys/class/power_supply/BAT0/capacity\""
diff --git a/sources/awesome-widget/reinit.cpp b/sources/awesome-widget/reinit.cpp
index 0a044a0..1077c66 100644
--- a/sources/awesome-widget/reinit.cpp
+++ b/sources/awesome-widget/reinit.cpp
@@ -39,7 +39,6 @@ void AwesomeWidget::reinit()
         textLabel->setPopupEnabled(true);
     updateText(true);
     textLabel->adjustSize();
-    mainLayout->itemAt(0, 0)->adjustSize();
 
     keys = getKeys();
     foundKeys = findKeys();
diff --git a/sources/ext-sysmon/extsysmon.conf b/sources/ext-sysmon/extsysmon.conf
index 9f107ad..a66fa17 100644
--- a/sources/ext-sysmon/extsysmon.conf
+++ b/sources/ext-sysmon/extsysmon.conf
@@ -2,8 +2,7 @@
 # $kdehome/share/config/extsysmon.conf
 
 # ACPI devices
-#AC=/sys/class/power_supply/AC/online
-#BATTERY=/sys/class/power_supply/BAT0/capacity
+#ACPIPATH=/sys/class/power_supply/
 
 # Custom command, separator is '@@'
 #CUSTOM=curl ip4.telize.com
diff --git a/sources/ext-sysmon/extsysmon.cpp b/sources/ext-sysmon/extsysmon.cpp
index 6bf076c..aaa67ce 100644
--- a/sources/ext-sysmon/extsysmon.cpp
+++ b/sources/ext-sysmon/extsysmon.cpp
@@ -22,6 +22,7 @@
 #include <KDE/KGlobal>
 #include <KDE/KStandardDirs>
 #include <QDebug>
+#include <QDir>
 #include <QFile>
 #include <QProcessEnvironment>
 #include <QRegExp>
@@ -171,8 +172,7 @@ void ExtendedSysMon::readConfiguration()
 
     // pre-setup
     QMap<QString, QString> rawConfig;
-    rawConfig[QString("AC")] = QString("/sys/class/power_supply/AC/online");
-    rawConfig[QString("BATTERY")] = QString("/sys/class/power_supply/BAT0/capacity");
+    rawConfig[QString("ACPIPATH")] = QString("/sys/class/power_supply/");
     rawConfig[QString("CUSTOM")] = QString("curl ip4.telize.com");
     rawConfig[QString("DESKTOP")] = QString("");
     rawConfig[QString("DESKTOPCMD")] = QString("qdbus org.kde.kwin /KWin currentDesktop");
@@ -278,25 +278,42 @@ QMap<QString, QString> ExtendedSysMon::updateConfiguration(const QMap<QString, Q
 }
 
 
-QMap<QString, QVariant> ExtendedSysMon::getBattery(const QString acPath, const QString batPath)
+QMap<QString, QVariant> ExtendedSysMon::getBattery(const QString acpiPath)
 {
     if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "AC path" << acPath;
-    if (debug) qDebug() << PDEBUG << ":" << "Battery path" << batPath;
+    if (debug) qDebug() << PDEBUG << ":" << "ACPI path" << acpiPath;
 
     QMap<QString, QVariant> battery;
     battery[QString("ac")] = false;
-    battery[QString("battery")] = 0;
-    QFile acFile(acPath);
+    battery[QString("bat0")] = 0;
+    QFile acFile(acpiPath + QString("/AC/online"));
     if (acFile.open(QIODevice::ReadOnly)) {
         if (QString(acFile.readLine()).trimmed().toInt() == 1)
             battery[QString("ac")] = true;
     }
     acFile.close();
-    QFile batFile(batPath);
-    if (batFile.open(QIODevice::ReadOnly))
-        battery[QString("battery")] = QString(batFile.readLine()).trimmed().toInt();
-    batFile.close();
+    // batterites
+    QStringList allDevices = QDir(acpiPath).entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+    QStringList batDevices;
+    QRegExp batRegexp = QRegExp(QString("BAT.*"));
+    for (int i=0; i<allDevices.count(); i++)
+        if (allDevices[i].indexOf(batRegexp) > -1)
+            batDevices.append(allDevices[i]);
+    for (int i=0; i<batDevices.count(); i++) {
+        QFile batFile(acpiPath + QString("/") + batDevices[i] + QString("/capacity"));
+        if (batFile.open(QIODevice::ReadOnly))
+            battery[QString("bat") + QString::number(i+1)] = QString(batFile.readLine()).trimmed().toInt();
+        batFile.close();
+    }
+    float number = 0.0;
+    float average = 0.0;
+    for (int i=0; i<battery.keys().count(); i++) {
+        if (battery.keys()[i] == QString("ac")) continue;
+        if (battery.keys()[i] == QString("bat0")) continue;
+        average += battery[battery.keys()[i]].toInt();
+        number++;
+    }
+    battery[QString("bat0")] = int(average / number);
 
     return battery;
 }
@@ -571,10 +588,12 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
     if (debug) qDebug() << PDEBUG << ":" << "Source" << source;
 
     if (source == QString("battery")) {
-        QMap<QString, QVariant> battery = getBattery(configuration[QString("AC")],
-                configuration[QString("BATTERY")]);
+        QMap<QString, QVariant> battery = getBattery(configuration[QString("ACPIPATH")]);
         setData(source, QString("ac"), battery[QString("ac")].toBool());
-        setData(source, QString("bat"), battery[QString("battery")].toInt());
+        for (int i=0; i<battery.keys().count(); i++) {
+            if (battery.keys()[i] == QString("ac")) continue;
+            setData(source, battery.keys()[i], battery[battery.keys()[i]].toInt());
+        }
     } else if (source == QString("custom")) {
         for (int i=0; i<configuration[QString("CUSTOM")].split(QString("@@"), QString::SkipEmptyParts).count(); i++) {
             setData(source, QString("custom") + QString::number(i),
diff --git a/sources/ext-sysmon/extsysmon.h b/sources/ext-sysmon/extsysmon.h
index b3ba27a..9a867a9 100644
--- a/sources/ext-sysmon/extsysmon.h
+++ b/sources/ext-sysmon/extsysmon.h
@@ -28,7 +28,7 @@ class ExtendedSysMon : public Plasma::DataEngine
 public:
     ExtendedSysMon(QObject *parent, const QVariantList &args);
     // update functions
-    QMap<QString, QVariant> getBattery(const QString acPath, const QString batPath);
+    QMap<QString, QVariant> getBattery(const QString acpiPath);
     QMap<QString, QVariant> getCurrentDesktop(const QString cmd);
     QString getCustomCmd(const QString cmd);
     float getGpu(const QString device);