release 1.9.0

update fr translation

.gitignore

@@ -1,3 +1,4 @@
 sources/build
 sources/usr
-*-src.tar.xz
+*src.tar.xz
+*src.tar.gz

AUTHORS

@@ -2,4 +2,5 @@ Current developers:
 Evgeniy Alekseev aka arcanis <esalexeev (at) gmail (dot) com>
 
 Translators:
-@Mermouy (french translations)
+@Mermouy (French translations)
+Ernesto Avilés Vzqz (Spanish translations)

CHANGELOG

@@ -1,3 +1,28 @@
+Ver.1.9.0:
++ added support of several custom commands ($customN)
++ added hdd speed label ($hddrN, $hddwN)
++ added actions to context menu (open readme and run ksysguard)
+* fix parsing pkg label
+- removed doubleclick event
+
+Ver.1.8.3:
++ added Spanish translation (thanks to Ernesto Avilés Vzqz)
++ added readme to the package
+
+Ver.1.8.2:
++ added different temperature units (Farenheit and Kelvin)
+
+Ver.1.8.1:
+* change pkg update time to hour
+
+Ver.1.8.0:
++ added scrollbar to configuration interface
++ added AC lines configuration
++ added $hddmbN, %hddgbN tags
++ added support of ps ($ps, $pscount, $pstotal tags)
++ added support of package managers ($pkgcountN tags)
+* refactoring of DataEngine
+
 Ver.1.7.4:
 + added support more than 10 tags in cpu, cpuclock, hdd, hddtemp, temp labels
 - format bug fixes

CHANGELOG-RU

@@ -1,3 +1,28 @@
+Вер.1.9.0:
++ добавлена поддержка нескольких кастомных команд ($customN)
++ добавлено поле скорости hdd ($hddrN, $hddwN)
++ добавлены действия в контекстное меню (открыть readme и запустить ksysguard)
+* исправлен парсинг поля pkg
+- убрано событие по двойному клику
+
+Вер.1.8.3:
++ добавлен испанский перевод (Ernesto Avilés Vzqz)
++ добавлены файлы readme
+
+Вер.1.8.2:
++ добавлены различные температурные единицы (Farenheit и Kelvin)
+
+Вер.1.8.1:
+* поле pkg теперь обновляется раз в час
+
+Вер.1.8.0:
++ добавлены скроллбары в конфигурационный интерфейс
++ добавлена настройка значений AC
++ добавлены теги $hddmbN, $hddgbN
++ добавлена поддержка ps (теги $ps, $pscount, $pstotal)
++ добавлена поддержка пакетных менеджеров (теги $pkgcountN)
+* рефакторинг DataEngine
+
 Вер.1.7.4:
 + добавлена поддержка более чем 10 тэгов в полях cpu, cpuclock, hdd, hddtemp, temp
 - фиксы в форматах

PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=kdeplasma-applets-pytextmonitor
 _pkgname=pytextmonitor
-pkgver=1.7.4
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="Minimalistic Plasmoid script written on Python2. It looks like widgets in Awesome WM"
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ optdepends=("amarok: for music player monitor"
 makedepends=('automoc4' 'cmake')
 source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
 install=${pkgname}.install
-md5sums=('a820a3f9d676e1b05c13839d36df4a9d')
+md5sums=('0af86da1971ebc625d9b8d72c4e6a126')
 backup=('usr/share/config/extsysmon.conf')
 
 prepare() {

README.md

@@ -5,7 +5,7 @@ Information
 -----------
 PyTextMonitor is a minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm.
 
-**NOTE** LOOKING FOR TRANSLATORS!
+**NOTE** [LOOKING FOR TRANSLATORS!](https://github.com/arcan1s/pytextmonitor/issues/14)
 
 Configuration
 -------------
@@ -31,6 +31,10 @@ For edited output you must open Settings window and setup output format in lines
 * tag `$swapmb` - swap, *MB*
 * tag `$swapgb` - swap, *GB*
 * tag `$hddN` - usage for mount point N, *%*. For example, `$hdd0`
+* tag `$hddmbN` - usage for mount point N, *MB*. For example, `$hddmb0`
+* tag `$hddgbN` - usage for mount point N, *GB*. For example, `$hddgb0`
+* tag `$hddrN` - read speed of disk N, *KB/s*. For example, `$hddr0`
+* tag `$hddwN` - write speed of disk N, *KB/s*. For example, `$hddw0`
 * tag `$hddtempN` - temperature for HDD N. For example, `$hddtemp0`
 * tag `$down` - download speed, *KB/s*
 * tag `$up` - upload speed, *KB/s*
@@ -42,7 +46,11 @@ For edited output you must open Settings window and setup output format in lines
 * tag `$progress` - current song progress. One of supported music players must be installed
 * tag `$time` - current song duration. One of supported music players must be installed
 * tag `$title` - current song title. One of supported music players must be installed
-* tag `$custom` - returns output for custom command
+* tag `$pscount` - number of running processes
+* tag `$pstotal` - total number of processes
+* tag `$ps` - list of running processes
+* tag `$pkgcountN` - number of packages, which available to upgrade for command N. For example, `$pkgcount0`
+* tag `$customN` - returns output for custom command N. For example, `$custom0`
 
 Label order will changed if you change slider position. HTML tags in label work normally.
 
@@ -78,6 +86,10 @@ Advanced settings
 * tag `$mm` - uptime minutes
 * tag `$m` - uptime minutes without zero
 
+**Temperature units**
+
+Select units for temperature. Available units are Celsius, Farenheit and Kelvin.
+
 **Temperature devices**
 
 List of devices, which will be observed in temp label (combo box items come from `sensors`). List widget is editable, delete key will remove current item.
@@ -86,9 +98,13 @@ List of devices, which will be observed in temp label (combo box items come from
 
 List of mount points, which will be observed in hdd label (combo box items come from `mount`). List widget is editable, delete key will remove current item.
 
-**HDD**
+**HDD (speed)**
 
-List of hard disk devices, which will be observed in hddtem label (combo box items come from `find`). List widget is editable, delete key will remove current item.
+List of hard disk devices, which will be observed in hddspeed label (combo box items come from DataEngine). List widget is editable, delete key will remove current item.
+
+**HDD (temperature)**
+
+List of hard disk devices, which will be observed in hddtemp label (combo box items come from `find`). List widget is editable, delete key will remove current item.
 
 **Network directory**
 
@@ -102,6 +118,14 @@ Use specified device as active. Combo box items come from **network directory**.
 
 File with battery information. File (`/sys/class/power_supply/BAT0/capacity` by default) should contain only battery charge in percent.
 
+**AC online tag**
+
+Line which will be shown when AC is online.
+
+**AC offline tag**
+
+Line which will be shown when AC is offline.
+
 **AC device**
 
 File with AC information. File (`/sys/class/power_supply/AC/online` by default) must contain `1` if AC is online.
@@ -116,6 +140,12 @@ Since version 1.7.0 CPU, CPU clock, memory, swap and network labels support grap
 
 DataEngine settings
 -------------------
+**Custom command**
+
+*NOTE* This can cause the computer freeze.
+
+Commands, which will be run for custom label.
+
 **GPU device**
 
 Select one of supported GPU devices. `auto` will enable auto selection. Default is `auto`.
@@ -132,11 +162,16 @@ Address of MPD server. Default is `localhost`.
 
 Port of MPD server. Default is `6600`.
 
-**Custom command**
+**Package manager**
 
-*NOTE* This can cause the computer freeze.
+List of commands, which will be run. Number of null lines is a number of unneeded lines. Defaults:
+* *Arch*: `PKGCMD=pacman -Qu`, `PKGNULL=0`
+* *Debian*: `PKGCMD=apt-show-versions -u -b`, `PKGNULL=0`
+* *Ubuntu*: `PKGCMD=aptitude search '~U'`, `PKGNULL=0`
+* *Fedora*: `PKGCMD=yum list updates`, `PKGNULL=3`
+* *FreeBSD*: `PKGCMD=pkg_version -I -l '<'`, `PKGNULL=0`
+* *Mandriva*: `PKGCMD=urpmq --auto-select`, `PKGNULL=0`
 
-A command, which will be run for custom label.
 
 DataEngine configuration
 ------------------------
@@ -182,6 +217,9 @@ Installation
 Additional information
 ======================
 
+TODO (wish list)
+----------------
+
 Links
 -----
 * [Homepage](http://arcanis.name/projects/pytextmonitor/)

create_archive.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # update english readme
-cp readme/en.md README.md
+cp README.md sources/readme/en.md
 
 SRCDIR="sources"
 VERSION=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
@@ -19,7 +19,7 @@ rm -rf "${ARCHIVE}"
 
 # build widget
 ARCHIVE="pytextmonitor"
-FILES="AUTHORS CHANGELOG CHANGELOG-RU COPYING readme"
+FILES="AUTHORS CHANGELOG CHANGELOG-RU COPYING"
 IGNORELIST="build usr"
 # create archive
 [[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f "${ARCHIVE}-${VERSION}-src.tar.xz"

sources/CMakeLists.txt

@@ -7,8 +7,8 @@ cmake_policy (SET CMP0015 NEW)
 
 project (pytextmonitor)
 set (PROJECT_VERSION_MAJOR 1)
-set (PROJECT_VERSION_MINOR 7)
+set (PROJECT_VERSION_MINOR 9)
-set (PROJECT_VERSION_PATCH 4)
+set (PROJECT_VERSION_PATCH 0)
 set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 
 message (STATUS "Version: ${PROJECT_VERSION}")
@@ -25,3 +25,4 @@ endif ()
 
 add_subdirectory (ext-sysmon)
 add_subdirectory (ptm)
+add_subdirectory (readme)

sources/ext-sysmon/extsysmon.conf

@@ -1,6 +1,9 @@
 # Configuration file for Extended Systemmonitor DataEngine
 # Uncomment needed lines
 
+# Custom command
+#CUSTOM=wget -qO- http://ifconfig.me/ip
+
 # Set GPU device
 # May be 'nvidia' (for nvidia), 'ati' (for ATI RADEON), 'ignore' or 'auto'
 #GPUDEV=auto
@@ -12,5 +15,15 @@
 #MPDADDRESS=localhost
 #MPDPORT=6600
 
-# Custom command
+# Package upgrade info
-#CUSTOM=wget -qO- http://ifconfig.me/ip
+## from vicious
+## Arch:        PKGCMD=pacman -Qu                       PKGNULL=0
+## Debian:      PKGCMD=apt-show-versions -u -b          PKGNULL=0
+## Ubuntu:      PKGCMD=aptitude search '~U'             PKGNULL=0
+## Fedora:      PKGCMD=yum list updates                 PKGNULL=3
+## FreeBSD:     PKGCMD=pkg_version -I -l '<'            PKGNULL=0
+## Mandriva:    PKGCMD=urpmq --auto-select              PKGNULL=0
+# Commands to run, comma separated
+#PKGCMD=pacman -Qu
+# Number of null lines for commands, comma separated
+#PKGNULL=0

sources/ext-sysmon/extsysmon.cpp

@@ -19,354 +19,470 @@
 #include "extsysmon.h"
 
 #include <Plasma/DataContainer>
+#include <KDE/KGlobal>
+#include <KDE/KStandardDirs>
 #include <QFile>
 #include <QProcess>
 #include <QTextCodec>
 
-#include <stdio.h>
-#include <stdlib.h>
-
 
 ExtendedSysMon::ExtendedSysMon(QObject* parent, const QVariantList& args)
-  : Plasma::DataEngine(parent, args)
+    : Plasma::DataEngine(parent, args)
 {
-  Q_UNUSED(args)
+    Q_UNUSED(args)
 
-  setMinimumPollingInterval(333);
+    setMinimumPollingInterval(333);
-  readConfiguration();
+    readConfiguration();
 }
 
+
+QString ExtendedSysMon::getAllHdd()
+{
+    QProcess command;
+    QStringList devices;
+    QString qoutput = QString("");
+    QString dev;
+    command.start("find /dev -name [hs]d[a-z]");
+    command.waitForFinished(-1);
+    qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput());
+    for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++) {
+        dev = qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i];
+        devices.append(dev);
+    }
+    return devices.join(QChar(','));
+}
+
+
+QString ExtendedSysMon::getAutoGpu()
+{
+    QProcess command;
+    QString gpu = QString("");
+    QString qoutput = QString("");
+    command.start("lspci");
+    command.waitForFinished(-1);
+    qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput());
+    if (qoutput.toLower().contains("nvidia"))
+        gpu = QString("nvidia");
+    else if (qoutput.toLower().contains("radeon"))
+        gpu = QString("ati");
+    return gpu;
+}
+
+
 QStringList ExtendedSysMon::sources() const
 {
-  QStringList source;
+    QStringList source;
-  source.append(QString("gpu"));
+    source.append(QString("custom"));
-  source.append(QString("gputemp"));
+    source.append(QString("gpu"));
-  source.append(QString("hddtemp"));
+    source.append(QString("gputemp"));
-  source.append(QString("player"));
+    source.append(QString("hddtemp"));
-  source.append(QString("custom"));
+    source.append(QString("pkg"));
-  return source;
+    source.append(QString("player"));
+    source.append(QString("ps"));
+    return source;
 }
 
-bool ExtendedSysMon::readConfiguration()
+
+void ExtendedSysMon::readConfiguration()
 {
-  // pre-setup
+    // pre-setup
-  FILE *f_out;
+    QMap<QString, QString> rawConfig;
-  f_out = popen("lspci 2> /dev/null", "r");
+    rawConfig[QString("CUSTOM")] = QString("wget -qO- http://ifconfig.me/ip");
-  char device[256];
+    rawConfig[QString("GPUDEV")] = QString("auto");
-  QString dev;
+    rawConfig[QString("HDDDEV")] = QString("all");
-  while (fgets(device, 256, f_out) != NULL) {
+    rawConfig[QString("MPDADDRESS")] = QString("localhost");
-    dev = QString(device);
+    rawConfig[QString("MPDPORT")] = QString("6600");
-    if (dev.toLower().contains("nvidia"))
+    rawConfig[QString("PKGCMD")] = QString("pacman -Qu");
-      gpuDev = QString("nvidia");
+    rawConfig[QString("PKGNULL")] = QString("0");
-    else if (dev.toLower().contains("radeon"))
+
-      gpuDev = QString("ati");
+    QString fileName = KGlobal::dirs()->findResource("config", "extsysmon.conf");
-  }
+    QFile confFile(fileName);
-  pclose(f_out);
+    bool ok = confFile.open(QIODevice::ReadOnly);
-  
+    if (!ok) {
-  f_out = popen("ls -1 /dev/sd[a-z] 2> /dev/null ; ls -1 /dev/hd[a-z] 2> /dev/null", "r");
+        configuration = updateConfiguration(rawConfig);
-  while (fgets(device, 256, f_out) != NULL) {
+        return;
-    dev = QString(device).split("\n")[0];
-    if (dev[0] == '/')
-      hddDev.append(dev);
-  }
-  pclose(f_out);
-  
-  mpdAddress = QString("localhost");
-  mpdPort = QString("6600");
-  
-  customCommand = QString("wget -qO- http://ifconfig.me/ip");
-  
-  QString fileStr;
-  // FIXME: define configuration file
-  QString confFileName = QString(getenv("HOME")) + QString("/.kde4/share/config/extsysmon.conf");
-  QFile confFile(confFileName);
-  bool exists = confFile.open(QIODevice::ReadOnly);
-  if (!exists) {
-    confFileName = QString("/usr/share/config/extsysmon.conf");
-    confFile.setFileName(confFileName);
-    exists = confFile.open(QIODevice::ReadOnly);
-    if (!exists)
-      return false;
-  }
-  
-  while (true) {
-    fileStr = QString(confFile.readLine());
-    if (fileStr[0] != '#') {
-      if (fileStr.split(QString("="), QString::SkipEmptyParts).count() == 2) {
-        if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("GPUDEV")) {
-          if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed() == QString("ati"))
-            gpuDev = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed();
-          else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed() == QString("nvidia"))
-            gpuDev = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed();
-          else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed() != QString("auto"))
-            gpuDev = QString("ignore");
-        }
-        else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("HDDDEV")) {
-          if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed() != QString("all")) {
-            hddDev.clear();
-            for (int i=0; i<fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), \
-                            QString::SkipEmptyParts)[0].split(QString(","), QString::SkipEmptyParts).count(); i++)
-              hddDev.append(fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), \
-                            QString::SkipEmptyParts)[0].split(QString(","), QString::SkipEmptyParts)[i]);
-          }
-        }
-        else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("MPDADDRESS"))
-          mpdAddress = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed();
-        else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("MPDPORT"))
-          mpdPort = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed();
-       else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("CUSTOM"))
-          customCommand = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed();
-      }
     }
-    if (confFile.atEnd())
+    QString fileStr;
-      break;
+    QStringList value;
-  }
+    while (true) {
-  
+        fileStr = QString(confFile.readLine()).trimmed();
-  confFile.close();
+        if (fileStr[0] == QChar('#')) continue;
-  return true;
+        if (fileStr[0] == QChar(';')) continue;
+        if (fileStr.contains(QChar('='))) {
+            value.clear();
+            for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
+                value.append(fileStr.split(QChar('='))[i]);
+            rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
+        }
+        if (confFile.atEnd())
+            break;
+    }
+    confFile.close();
+    configuration = updateConfiguration(rawConfig);
+    return;
 }
 
+
+QMap<QString, QString> ExtendedSysMon::updateConfiguration(const QMap<QString, QString> rawConfig)
+{
+    QMap<QString, QString> config;
+    QString key, value;
+    // remove spaces and copy source map
+    for (int i=0; i<rawConfig.keys().count(); i++) {
+        key = rawConfig.keys()[i];
+        value = rawConfig[key];
+        key.remove(QChar(' '));
+        if ((key != QString("CUSTOM")) && (key != QString("PKGCMD")))
+            value.remove(QChar(' '));
+        config[key] = value;
+    }
+    // update values
+    if (config[QString("GPUDEV")] == QString("auto"))
+        config[QString("GPUDEV")] = getAutoGpu();
+    if (config[QString("HDDDEV")] == QString("all"))
+        config[QString("HDDDEV")] = getAllHdd();
+    for (int i=config[QString("PKGNULL")].split(QString(","), QString::SkipEmptyParts).count();
+         i<config[QString("PKGCMD")].split(QString(","), QString::SkipEmptyParts).count()+1;
+         i++)
+        config[QString("PKGNULL")] += QString(",0");
+    return config;
+}
+
+
+QString ExtendedSysMon::getCustomCmd(const QString cmd)
+{
+    QProcess command;
+    QString qoutput = QString("");
+    command.start(QString("bash -c \"") + cmd + QString("\""));
+    command.waitForFinished(-1);
+    qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput()).trimmed();
+    return qoutput;
+}
+
+
+float ExtendedSysMon::getGpu(const QString device)
+{
+    float gpu = 0.0;
+    if ((device != QString("nvidia")) && (device != QString("ati")))
+        return gpu;
+    QProcess command;
+    QString qoutput;
+
+    if (device == QString("nvidia")) {
+        command.start(QString("nvidia-smi -q -d UTILIZATION"));
+        command.waitForFinished(-1);
+        qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput());
+        for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++) {
+            if (qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i].contains(QString("Gpu"))) {
+                QString load = qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i]
+                        .split(QChar(' '), QString::SkipEmptyParts)[2]
+                        .remove(QChar('%'));
+                gpu = load.toFloat();
+            }
+        }
+    }
+    else if (device == QString("ati")) {
+        command.start(QString("aticonfig --od-getclocks"));
+        command.waitForFinished(-1);
+        qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput());
+        for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++) {
+            if (qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i].contains(QString("load"))) {
+                QString load = qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i]
+                        .split(QChar(' '), QString::SkipEmptyParts)[3]
+                        .remove(QChar('%'));
+                gpu = load.toFloat();
+            }
+        }
+    }
+    return gpu;
+}
+
+
+float ExtendedSysMon::getGpuTemp(const QString device)
+{
+    float gpuTemp = 0.0;
+    if ((device != QString("nvidia")) && (device != QString("ati")))
+        return gpuTemp;
+    QProcess command;
+    QString qoutput;
+    if (device == QString("nvidia")) {
+        command.start(QString("nvidia-smi -q -d TEMPERATURE"));
+        command.waitForFinished(-1);
+        qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput());
+        for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++) {
+            if (qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i].contains(QString("Gpu"))) {
+                QString temp = qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i]
+                        .split(QChar(' '), QString::SkipEmptyParts)[2];
+                gpuTemp = temp.toFloat();
+            }
+        }
+    }
+    else if (device == QString("ati")) {
+        command.start(QString("aticonfig --od-gettemperature"));
+        command.waitForFinished(-1);
+        qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput());
+        for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++) {
+            if (qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i].contains(QString("Temperature"))) {
+                QString temp = qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i]
+                        .split(QChar(' '), QString::SkipEmptyParts)[4];
+                gpuTemp = temp.toFloat();
+            }
+        }
+    }
+    return gpuTemp;
+}
+
+
+float ExtendedSysMon::getHddTemp(const QString device)
+{
+    float hddTemp = 0.0;
+    QProcess command;
+    QString qoutput = QString("");
+    command.start(QString("sudo hddtemp ") + device);
+    command.waitForFinished(-1);
+    qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput()).trimmed();
+    if (qoutput.split(QChar(':'), QString::SkipEmptyParts).count() >= 3) {
+        QString temp = qoutput.split(QChar(':'), QString::SkipEmptyParts)[2];
+        temp.remove(QChar(0260)).remove(QChar('C'));
+        hddTemp = temp.toFloat();
+    }
+    return hddTemp;
+}
+
+
+QStringList ExtendedSysMon::getPlayerInfo(const QString playerName,
+                                          const QString mpdAddress,
+                                          const QString mpdPort)
+{
+    QStringList info;
+    // album
+    info.append(QString("unknown"));
+    // artist
+    info.append(QString("unknown"));
+    // progress
+    info.append(QString("0"));
+    // duration
+    info.append(QString("0"));
+    // title
+    info.append(QString("unknown"));
+    if ((playerName != QString("amarok")) &&
+            (playerName != QString("mpd")) &&
+            (playerName != QString("qmmp")))
+        return info;
+    QProcess command;
+    QString qoutput = QString("");
+    QString qstr;
+    if (playerName == QString("amarok")) {
+        // amarok
+        command.start("qdbus org.kde.amarok /Player GetMetadata");
+        command.waitForFinished(-1);
+        qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput());
+        for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++) {
+            qstr = qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i];
+            if (qstr.split(QString(": "), QString::SkipEmptyParts).count() > 1) {
+                if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("album"))
+                    info[0] = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
+                else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("artist"))
+                    info[1] = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
+                else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("time"))
+                    info[3] = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
+                else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("title"))
+                    info[4] = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
+            }
+        }
+        command.start("qdbus org.kde.amarok /Player PositionGet");
+        command.waitForFinished(-1);
+        qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput());
+        for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++) {
+            qstr = qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i];
+            int time = qstr.toInt() / 1000;
+            info[2] = QString::number(time);
+        }
+    }
+    else if (playerName == QString("mpd")) {
+        // mpd
+        command.start(QString("bash -c \"echo 'currentsong\nstatus\nclose' | curl --connect-timeout 1 -fsm 3 telnet://") +
+                      mpdAddress + QString(":") + mpdPort + QString("\""));
+        command.waitForFinished(-1);
+        qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput());
+        for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++) {
+            qstr = qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i];
+            if (qstr.split(QString(": "), QString::SkipEmptyParts).count() > 1) {
+                if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Album"))
+                    info[0] = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
+                else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Artist"))
+                    info[1] = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
+                else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("time")) {
+                    info[3] = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed().split(QString(":"))[0];
+                    info[2] = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed().split(QString(":"))[1];
+                }
+                else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Title"))
+                    info[4] = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
+            }
+        }
+    }
+    else if (playerName == QString("qmmp")) {
+        // qmmp
+        command.start("qmmp --status");
+        command.waitForFinished(-1);
+        qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput());
+        for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++) {
+            qstr = qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i];
+            if ((qstr.split(QString(" = "), QString::SkipEmptyParts).count() > 1) || (qstr.at(0) == QChar('['))) {
+                if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ALBUM"))
+                    info[0] = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
+                else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ARTIST"))
+                    info[1] = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
+                else if ((qstr.at(0) == QChar('[')) && (!qstr.contains("[stopped]"))) {
+                    QString time = qstr.split(QString(" "), QString::SkipEmptyParts)[2].trimmed();
+                    info[2] = QString::number(time.split(QString("/"), QString::SkipEmptyParts)[0].split(QString(":"), QString::SkipEmptyParts)[0].toInt() * 60 +
+                            time.split(QString("/"), QString::SkipEmptyParts)[0].split(QString(":"), QString::SkipEmptyParts)[1].toInt());
+                    info[3] = QString::number(time.split(QString("/"), QString::SkipEmptyParts)[1].split(QString(":"), QString::SkipEmptyParts)[0].toInt() * 60 +
+                            time.split(QString("/"), QString::SkipEmptyParts)[1].split(QString(":"), QString::SkipEmptyParts)[1].toInt());
+                }
+                else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("TITLE"))
+                    info[4] = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
+            }
+        }
+    }
+    return info;
+}
+
+
+QStringList ExtendedSysMon::getPsStats()
+{
+    int psCount = 0;
+    QStringList psList;
+    QProcess command;
+    QString qoutput = QString("");
+    command.start(QString("ps --no-headers -o command"));
+    command.waitForFinished(-1);
+    qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput()).trimmed();
+    for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++)
+        if (qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i] != QString("ps --no-headers -o command")) {
+            psCount++;
+            psList.append(qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i]);
+        }
+    QStringList psStats;
+    psStats.append(QString::number(psCount));
+    psStats.append(psList.join(QString(",")));
+    command.start(QString("ps -e --no-headers -o command"));
+    command.waitForFinished(-1);
+    qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput()).trimmed();
+    int psTotal = qoutput.split(QChar('\n'), QString::SkipEmptyParts).count();
+    psStats.append(QString::number(psTotal));
+    return psStats;
+}
+
+
+int ExtendedSysMon::getUpgradeInfo(const QString pkgCommand, const int pkgNull)
+{
+    int count = 0;
+    QProcess command;
+    QString qoutput = QString("");
+    command.start(QString("bash -c \"") + pkgCommand + QString("\""));
+    command.waitForFinished(-1);
+    qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput()).trimmed();
+    count = qoutput.split(QChar('\n'), QString::SkipEmptyParts).count();
+    return (count - pkgNull);
+}
+
+
 bool ExtendedSysMon::sourceRequestEvent(const QString &name)
 {
-  return updateSourceEvent(name);
+    return updateSourceEvent(name);
 }
 
+
 bool ExtendedSysMon::updateSourceEvent(const QString &source)
 {
-  FILE *f_out;
+    QString key;
-  QString key, out, tmp_out, value;
+    if (source == QString("custom")) {
-  bool ok = false;
+        for (int i=0; i<configuration[QString("CUSTOM")].split(QString("@@"), QString::SkipEmptyParts).count(); i++) {
-  char output[256], val[5];
+            key = QString("custom") + QString::number(i);
-  if (source == QString("gpu")) {
+            QString value = getCustomCmd(configuration[QString("CUSTOM")].split(QString("@@"), QString::SkipEmptyParts)[i]);
-    key = QString("GPU");
+            setData(source, key, value);
-    if (gpuDev == QString("nvidia")) {
-      f_out = popen("nvidia-smi -q -d UTILIZATION 2> /dev/null | grep Gpu | tail -n1", "r");
-      fgets (output, 256, f_out);
-      if ((output[0] == '\0') ||
-          (QString(output).split(QString(" "), QString::SkipEmptyParts).count() < 2))
-        value = QString("  N\\A");
-      else {
-        out = QString(output).split(QString(" "), QString::SkipEmptyParts)[2];
-        sprintf (val, "%5.1f", out.left(out.count()-2).toFloat(&ok));
-        value = QString(val);
-      }
-      pclose(f_out);
-    }
-    else if (gpuDev == QString("ati")) {
-      f_out = popen("aticonfig --od-getclocks 2> /dev/null | grep load | tail -n1", "r");
-      fgets (output, 256, f_out);
-      if ((output[0] == '\0') ||
-          (QString(output).split(QString(" "), QString::SkipEmptyParts).count() < 3))
-        value = QString("  N\\A");
-      else {
-        out = QString(output).split(QString(" "), QString::SkipEmptyParts)[3];
-        sprintf (val, "%5.1f", out.left(out.count()-2).toFloat(&ok));
-        value = QString(val);
-      }
-      pclose(f_out);
-    }
-    else {
-      value = QString("  N\\A");
-    }
-    if (ok == false)
-      value = QString("  N\\A");
-    value = value.split(QString(","), QString::SkipEmptyParts).join(QString("."));
-    setData(source, key, value);
-  }
-  else if (source == QString("gputemp")) {
-    key = QString("GPUTemp");
-    if (gpuDev == QString("nvidia")) {
-      f_out = popen("nvidia-smi -q -d TEMPERATURE 2> /dev/null | grep Gpu | tail -n1", "r");
-      fgets (output, 256, f_out);
-      if ((output[0] == '\0') ||
-          (QString(output).split(QString(" "), QString::SkipEmptyParts).count() < 2))
-        value = QString(" N\\A");
-      else {
-        out = QString(output).split(QString(" "), QString::SkipEmptyParts)[2];
-        sprintf (val, "%4.1f", out.toFloat(&ok));
-        value = QString(val);
-      }
-      pclose(f_out);
-    }
-    else if (gpuDev == QString("ati")) {
-      f_out = popen("aticonfig --od-gettemperature 2> /dev/null | grep Temperature | tail -n1", "r");
-      fgets (output, 256, f_out);
-      if ((output[0] == '\0') ||
-          (QString(output).split(QString(" "), QString::SkipEmptyParts).count() < 4))
-        value = QString(" N\\A");
-      else {
-        out = QString(output).split(QString(" "), QString::SkipEmptyParts)[4];
-        sprintf (val, "%4.1f", out.toFloat(&ok));
-        value = QString(val);
-      }
-      pclose(f_out);
-    }
-    else {
-      value = QString(" N\\A");
-    }
-    if (ok == false)
-      value = QString(" N\\A");
-    value = value.split(QString(","), QString::SkipEmptyParts).join(QString("."));
-    setData(source, key, value);
-  }
-  else if (source == QString("hddtemp")) {
-    char command[256], *dev;
-    QByteArray qb;
-    for (int i=0; i<hddDev.count(); i++) {
-      qb = hddDev[i].toUtf8();
-      dev = qb.data();
-      sprintf(command, "sudo hddtemp %s 2> /dev/null", dev);
-      f_out = popen(command, "r");
-      fgets(output, 256, f_out);
-      if ((output[0] == '\0') ||
-          (QString(output).split(QString(":"), QString::SkipEmptyParts).count() < 3))
-        value = QString(" N\\A");
-      else {
-        out = QString(output).split(QString(":"), QString::SkipEmptyParts)[2];
-        sprintf (val, "%4.1f", out.left(out.count()-4).toFloat(&ok));
-        value = QString(val);
-      }
-      pclose(f_out);
-      if (ok == false)
-        value = QString(" N\\A");
-      value = value.split(QString(","), QString::SkipEmptyParts).join(QString("."));
-      setData(source, hddDev[i], value);
-    }
-  }
-  else if (source == QString("player")) {
-    QProcess player;
-    QString qoutput;
-    QString value_album, value_artist, value_progress, value_duration, qstr;
-    // qmmp
-    qoutput = QString("");
-    value = QString("N\\A");
-    value_album = QString("N\\A");
-    value_artist = QString("N\\A");
-    value_progress = QString("0");
-    value_duration = QString("0");
-    player.start("qmmp --status");
-    player.waitForFinished(-1);
-    qoutput = QTextCodec::codecForMib(106)->toUnicode(player.readAllStandardOutput());
-    for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) {
-      qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i];
-      if ((qstr.split(QString(" = "), QString::SkipEmptyParts).count() > 1) || (qstr.at(0) == QChar('['))) {
-        if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ALBUM"))
-          value_album = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
-        else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ARTIST"))
-          value_artist = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
-        else if ((qstr.at(0) == QChar('[')) && (!qstr.contains("[stopped]"))) {
-          QString time = qstr.split(QString(" "), QString::SkipEmptyParts)[2].trimmed();
-          value_progress = QString::number(time.split(QString("/"), QString::SkipEmptyParts)[0].split(QString(":"), QString::SkipEmptyParts)[0].toInt() * 60 +
-                                          time.split(QString("/"), QString::SkipEmptyParts)[0].split(QString(":"), QString::SkipEmptyParts)[1].toInt());
-          value_duration = QString::number(time.split(QString("/"), QString::SkipEmptyParts)[1].split(QString(":"), QString::SkipEmptyParts)[0].toInt() * 60 +
-                                          time.split(QString("/"), QString::SkipEmptyParts)[1].split(QString(":"), QString::SkipEmptyParts)[1].toInt());
         }
-        else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("TITLE"))
-          value = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
-      }
     }
-    key = QString("qmmp_album");
+    else if (source == QString("gpu")) {
-    setData(source, key, value_album);
+        key = QString("GPU");
-    key = QString("qmmp_artist");
+        float value = getGpu(configuration[QString("GPUDEV")]);
-    setData(source, key, value_artist);
+        setData(source, key, value);
-    key = QString("qmmp_progress");
-    setData(source, key, value_progress);
-    key = QString("qmmp_duration");
-    setData(source, key, value_duration);
-    key = QString("qmmp_title");
-    setData(source, key, value);
-    // amarok
-    qoutput = QString("");
-    value = QString("N\\A");
-    value_album = QString("N\\A");
-    value_artist = QString("N\\A");
-    value_progress = QString("0");
-    value_duration = QString("0");
-    player.start("qdbus org.kde.amarok /Player GetMetadata");
-    player.waitForFinished(-1);
-    qoutput = QTextCodec::codecForMib(106)->toUnicode(player.readAllStandardOutput());
-    for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) {
-      qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i];
-      if (qstr.split(QString(": "), QString::SkipEmptyParts).count() > 1) {
-        if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("album"))
-          value_album = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
-        else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("artist"))
-          value_artist = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
-        else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("time"))
-          value_duration = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
-        else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("title"))
-          value = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
-      }
     }
-    player.start("qdbus org.kde.amarok /Player PositionGet");
+    else if (source == QString("gputemp")) {
-    player.waitForFinished(-1);
+        key = QString("GPUTemp");
-    qoutput = player.readAllStandardOutput();
+        float value = getGpuTemp(configuration[QString("GPUDEV")]);
-    for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) {
+        setData(source, key, value);
-      qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i];
-      int time = qstr.toInt() / 1000;
-      value_progress = QString::number(time);
     }
-    key = QString("amarok_album");
+    else if (source == QString("hddtemp")) {
-    setData(source, key, value_album);
+        QStringList deviceList = configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts);
-    key = QString("amarok_artist");
+        for (int i=0; i<deviceList.count(); i++) {
-    setData(source, key, value_artist);
+            float value = getHddTemp(deviceList[i]);
-    key = QString("amarok_progress");
+            setData(source, deviceList[i], value);
-    setData(source, key, value_progress);
-    key = QString("amarok_duration");
-    setData(source, key, value_duration);
-    key = QString("amarok_title");
-    setData(source, key, value);
-    // mpd
-    value = QString("N\\A");
-    value_album = QString("N\\A");
-    value_artist = QString("N\\A");
-    value_progress = QString("0");
-    value_duration = QString("0");
-    char commandStr[512];
-    sprintf(commandStr, "bash -c \"echo 'currentsong\nstatus\nclose' | curl --connect-timeout 1 -fsm 3 telnet://%s:%s 2> /dev/null\"", \
-            mpdAddress.toUtf8().data(), mpdPort.toUtf8().data());
-    qoutput = QString("");
-    player.start(QString(commandStr));
-    player.waitForFinished(-1);
-    qoutput = QTextCodec::codecForMib(106)->toUnicode(player.readAllStandardOutput());
-    for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) {
-      qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i];
-      if (qstr.split(QString(": "), QString::SkipEmptyParts).count() > 1) {
-        if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Album"))
-          value_album = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
-        else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Artist"))
-          value_artist = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
-        else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("time")) {
-          value_duration = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed().split(QString(":"))[0];
-          value_progress = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed().split(QString(":"))[1];
         }
-        else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Title"))
-          value = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
-      }
     }
-    key = QString("mpd_album");
+    else if (source == QString("pkg")) {
-    setData(source, key, value_album);
+        for (int i=0; i<configuration[QString("PKGCMD")].split(QString(","), QString::SkipEmptyParts).count(); i++) {
-    key = QString("mpd_artist");
+            key = QString("pkgCount") + QString::number(i);
-    setData(source, key, value_artist);
+            int value = getUpgradeInfo(configuration[QString("PKGCMD")].split(QString(","), QString::SkipEmptyParts)[i],
-    key = QString("mpd_progress");
+                    configuration[QString("PKGNULL")].split(QString(","), QString::SkipEmptyParts)[i].toInt());
-    setData(source, key, value_progress);
+            setData(source, key, value);
-    key = QString("mpd_duration");
+        }
-    setData(source, key, value_duration);
+    }
-    key = QString("mpd_title");
+    else if (source == QString("player")) {
-    setData(source, key, value);
+        QStringList value;
-  }
+        // amarok
-  else if (source == QString("custom")) {
+        value = getPlayerInfo(QString("amarok"));
-    QProcess custom;
+        key = QString("amarok_album");
-    custom.start(QString("bash -c \"") + QString(customCommand) + QString("\""));
+        setData(source, key, value[0]);
-    custom.waitForFinished(-1);
+        key = QString("amarok_artist");
-    value = QTextCodec::codecForMib(106)->toUnicode(custom.readAllStandardOutput()).trimmed();
+        setData(source, key, value[1]);
-    key = QString("custom");
+        key = QString("amarok_progress");
-    setData(source, key, value);
+        setData(source, key, value[2]);
-  }
+        key = QString("amarok_duration");
-
+        setData(source, key, value[3]);
-  return true;
+        key = QString("amarok_title");
+        setData(source, key, value[4]);
+        // mpd
+        value = getPlayerInfo(QString("mpd"),
+                              configuration[QString("MPDADDRESS")],
+                              configuration[QString("MPDPORT")]);
+        key = QString("mpd_album");
+        setData(source, key, value[0]);
+        key = QString("mpd_artist");
+        setData(source, key, value[1]);
+        key = QString("mpd_progress");
+        setData(source, key, value[2]);
+        key = QString("mpd_duration");
+        setData(source, key, value[3]);
+        key = QString("mpd_title");
+        setData(source, key, value[4]);
+        // qmmp
+        value = getPlayerInfo(QString("qmmp"));
+        key = QString("qmmp_album");
+        setData(source, key, value[0]);
+        key = QString("qmmp_artist");
+        setData(source, key, value[1]);
+        key = QString("qmmp_progress");
+        setData(source, key, value[2]);
+        key = QString("qmmp_duration");
+        setData(source, key, value[3]);
+        key = QString("qmmp_title");
+        setData(source, key, value[4]);
+    }
+    else if (source == QString("ps")) {
+        QStringList value = getPsStats();
+        key = QString("psCount");
+        setData(source, key, value[0].toInt());
+        key = QString("ps");
+        setData(source, key, value[1]);
+        key = QString("psTotal");
+        setData(source, key, value[2].toInt());
+    }
+    return true;
 }
 
+
 K_EXPORT_PLASMA_DATAENGINE(extsysmon, ExtendedSysMon)
 
 #include "extsysmon.moc"

sources/ext-sysmon/extsysmon.h

@@ -22,22 +22,35 @@
 
 class ExtendedSysMon : public Plasma::DataEngine
 {
-  Q_OBJECT
+    Q_OBJECT
 
 public:
-  ExtendedSysMon(QObject *parent, const QVariantList &args);
+    ExtendedSysMon(QObject *parent, const QVariantList &args);
+    // update functions
+    QString getCustomCmd(const QString cmd);
+    float getGpu(const QString device);
+    float getGpuTemp(const QString device);
+    float getHddTemp(const QString device);
+    QStringList getPlayerInfo(const QString playerName,
+                              const QString mpdAddress = 0,
+                              const QString mpdPort = 0);
+    QStringList getPsStats();
+    int getUpgradeInfo(const QString pkgCommand,
+                       const int pkgNull = 0);
 
 protected:
-  bool sourceRequestEvent(const QString &name);
+    bool sourceRequestEvent(const QString &name);
-  bool updateSourceEvent(const QString &source);
+    bool updateSourceEvent(const QString &source);
-  bool readConfiguration();
+    QStringList sources() const;
-  QStringList sources() const;
+
-// main configuration
+private:
-  QStringList hddDev;
+    // configuration
-  QString gpuDev;
+    QMap<QString, QString> configuration;
-  QString mpdAddress;
+    // reread configuration
-  QString mpdPort;
+    QString getAllHdd();
-  QString customCommand;
+    QString getAutoGpu();
+    void readConfiguration();
+    QMap<QString, QString> updateConfiguration(const QMap<QString, QString> rawConfig);
 };
 
 #endif /* EXTSYSMON_H */

sources/ptm/CMakeLists.txt

@@ -6,10 +6,7 @@ message (STATUS "Subproject ${SUBPROJECT}")
 
 # find required libaries
 find_package (KDE4 REQUIRED)
-include (KDE4Defaults)
+add_definitions (${KDE4_DEFINITIONS})
-
-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)
 

sources/ptm/contents/code/configdef.py

@@ -48,6 +48,7 @@ class ConfigDefinition:
 
         settings.set('custom_time', str(self.configpage.ui.lineEdit_timeFormat.text()))
         settings.set('custom_uptime', str(self.configpage.ui.lineEdit_uptimeFormat.text()))
+        settings.set('temp_units', str(self.configpage.ui.comboBox_tempUnits.currentText()))
         item = QStringList()
         for i in range(self.configpage.ui.listWidget_tempDevice.count()):
             item.append(self.configpage.ui.listWidget_tempDevice.item(i).text())
@@ -60,11 +61,17 @@ class ConfigDefinition:
         for i in range(self.configpage.ui.listWidget_hddDevice.count()):
             item.append(self.configpage.ui.listWidget_hddDevice.item(i).text())
         settings.set('hdd', str(item.join(QString('@@'))))
+        item = QStringList()
+        for i in range(self.configpage.ui.listWidget_hddSpeedDevice.count()):
+            item.append(self.configpage.ui.listWidget_hddSpeedDevice.item(i).text())
+        settings.set('disk', str(item.join(QString('@@'))))
         settings.set('netdir', str(self.configpage.ui.lineEdit_netdir.text()))
         settings.set('netdevBool', self.configpage.ui.checkBox_netdev.checkState())
         settings.set('custom_netdev', str(self.configpage.ui.comboBox_netdev.currentText()))
         settings.set('battery_device', str(self.configpage.ui.lineEdit_batdev.text()))
         settings.set('ac_device', str(self.configpage.ui.lineEdit_acdev.text()))
+        settings.set('ac_online', str(self.configpage.ui.lineEdit_acOnline.text()))
+        settings.set('ac_offline', str(self.configpage.ui.lineEdit_acOffline.text()))
         settings.set('player_name', str(self.configpage.ui.comboBox_playerSelect.currentText()))
 
         settings.set('tooltip_num', self.configpage.ui.spinBox_tooltipNum.value())
@@ -74,11 +81,28 @@ class ConfigDefinition:
         dataengineConfig = unicode(KGlobal.dirs().localkdedir()) + "/share/config/extsysmon.conf"
         try:
             with open(dataengineConfig, 'w') as deConfigFile:
+                item = QStringList()
+                for i in range(self.configpage.ui.listWidget_customCommand.count()):
+                    item.append(self.configpage.ui.listWidget_customCommand.item(i).text())
+                deConfigFile.write("CUSTOM=" + str(item.join(QString('@@'))) + "\n")
                 deConfigFile.write("GPUDEV=" + str(self.configpage.ui.comboBox_gpudev.currentText()) + "\n")
                 deConfigFile.write("HDDDEV=" + str(self.configpage.ui.comboBox_hdddev.currentText()) + "\n")
                 deConfigFile.write("MPDADDRESS=" + str(self.configpage.ui.lineEdit_mpdaddress.text()) + "\n")
                 deConfigFile.write("MPDPORT=" + str(self.configpage.ui.spinBox_mpdport.value()) + "\n")
-                deConfigFile.write("CUSTOM=" + str(self.configpage.ui.lineEdit_customCommand.text()) + "\n")
+                item = QStringList()
+                for i in range(self.configpage.ui.listWidget_pkgCommand.count()):
+                    item.append(self.configpage.ui.listWidget_pkgCommand.item(i).text())
+                pkgCmd = []
+                pkgNull = []
+                for command in item:
+                    try:
+                        pkgCmd.append(str(command.split(QString(":"))[0]))
+                        pkgNull.append(str(command.split(QString(":"))[1]))
+                    except:
+                        pkgCmd.append(str(command))
+                        pkgNull.append("0")
+                deConfigFile.write("PKGCMD=" + ','.join(pkgCmd) + "\n")
+                deConfigFile.write("PKGNULL=" + ','.join(pkgNull) + "\n")
         except:
             pass
 
@@ -117,6 +141,8 @@ class ConfigDefinition:
 
         self.configpage.ui.lineEdit_timeFormat.setText(str(settings.get('custom_time', '$hh:$mm')))
         self.configpage.ui.lineEdit_uptimeFormat.setText(str(settings.get('custom_uptime', '$ds,$hs,$ms')))
+        index = self.configpage.ui.comboBox_tempUnits.findText(str(settings.get('temp_units', "Celsius")))
+        self.configpage.ui.comboBox_tempUnits.setCurrentIndex(index)
         commandOut = commands.getoutput("sensors")
         for item in commandOut.split("\n\n"):
             for device in item.split("\n"):
@@ -149,6 +175,12 @@ class ConfigDefinition:
         self.configpage.ui.listWidget_hddDevice.clear()
         for item in str(settings.get('hdd', '/dev/sda')).split('@@'):
             self.configpage.ui.listWidget_hddDevice.addItem(item)
+        self.configpage.ui.comboBox_hddSpeedDevice.clear()
+        for item in self.defaults['disk']:
+            self.configpage.ui.comboBox_hddSpeedDevice.addItem(item)
+        self.configpage.ui.listWidget_hddSpeedDevice.clear()
+        for item in str(settings.get('disk', 'disk/sda_(8:0)')).split('@@'):
+            self.configpage.ui.listWidget_hddSpeedDevice.addItem(item)
         self.configpage.ui.lineEdit_netdir.setText(str(settings.get('netdir', '/sys/class/net')))
         self.configpage.ui.checkBox_netdev.setCheckState(settings.get('netdevBool', 0).toInt()[0])
         for item in QDir.entryList(QDir(str(settings.get('netdir', '/sys/class/net'))), QDir.Dirs | QDir.NoDotAndDotDot):
@@ -157,6 +189,8 @@ class ConfigDefinition:
         self.configpage.ui.comboBox_netdev.setCurrentIndex(index)
         self.configpage.ui.lineEdit_batdev.setText(str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity')))
         self.configpage.ui.lineEdit_acdev.setText(str(settings.get('ac_device', '/sys/class/power_supply/AC/online')))
+        self.configpage.ui.lineEdit_acOnline.setText(str(settings.get('ac_online', '(*)')))
+        self.configpage.ui.lineEdit_acOffline.setText(str(settings.get('ac_offline', '( )')))
         index = self.configpage.ui.comboBox_playerSelect.findText(str(settings.get('player_name', "amarok")))
         self.configpage.ui.comboBox_playerSelect.setCurrentIndex(index)
 
@@ -168,8 +202,8 @@ class ConfigDefinition:
         self.configpage.ui.kcolorcombo_down.setColor(QColor(str(settings.get('down_color', '#00ffff'))))
         self.configpage.ui.kcolorcombo_up.setColor(QColor(str(settings.get('up_color', '#ff00ff'))))
 
-        deSettings = {'GPUDEV':'auto', 'HDDDEV':'all', 'MPDADDRESS':'localhost',
+        deSettings = {'CUSTOM':'wget -qO- http://ifconfig.me/ip', 'GPUDEV':'auto', 'HDDDEV':'all',
-            'MPDPORT':'6600', 'CUSTOM':'wget -qO- http://ifconfig.me/ip'}
+            'MPDADDRESS':'localhost', 'MPDPORT':'6600', 'PKGCMD':'pacman -Qu', 'PKGNULL':'0'}
         dataengineConfig = unicode(KGlobal.dirs().localkdedir()) + "/share/config/extsysmon.conf"
         try:
             with open(dataengineConfig, 'r') as deConfigFile:
@@ -178,6 +212,8 @@ class ConfigDefinition:
                         deSettings[line.split('=')[0]] = line.split('=')[1][:-1]
         except:
             pass
+        for item in deSettings['CUSTOM'].split('@@'):
+            self.configpage.ui.listWidget_customCommand.addItem(item)
         index = self.configpage.ui.comboBox_gpudev.findText(deSettings['GPUDEV'])
         self.configpage.ui.comboBox_gpudev.setCurrentIndex(index)
         self.configpage.ui.comboBox_hdddev.addItem("all")
@@ -192,7 +228,13 @@ class ConfigDefinition:
         self.configpage.ui.lineEdit_mpdaddress.setText(deSettings['MPDADDRESS'])
         self.configpage.ui.spinBox_mpdport.setValue(int(deSettings['MPDPORT']))
         self.configpage.ui.spinBox_mpdport.setValue(int(deSettings['MPDPORT']))
-        self.configpage.ui.lineEdit_customCommand.setText(deSettings['CUSTOM'])
+        self.configpage.ui.listWidget_pkgCommand.clear()
+        for i in range(len(deSettings['PKGCMD'].split(','))):
+            try:
+                num = deSettings['PKGNULL'].split(',')[i]
+            except:
+                num = "0"
+            self.configpage.ui.listWidget_pkgCommand.addItem(deSettings['PKGCMD'].split(',')[i] + ':' + num)
 
         labelOrder = str(settings.get('label_order', '1345'))
         for label in self.defaults['order'].keys():

sources/ptm/contents/code/configwindow.py

@@ -36,36 +36,45 @@ class ConfigWindow(QWidget):
             'up':self.ui.kcolorcombo_up}
         self.checkboxes = {'bat':self.ui.checkBox_bat, 'cpu':self.ui.checkBox_cpu,
             'cpuclock':self.ui.checkBox_cpuclock, 'custom':self.ui.checkBox_custom,
-            'gpu':self.ui.checkBox_gpu, 'gputemp':self.ui.checkBox_gpuTemp,
+            'disk':self.ui.checkBox_hddSpeed, 'gpu':self.ui.checkBox_gpu,
-            'hdd':self.ui.checkBox_hdd, 'hddtemp':self.ui.checkBox_hddTemp,
+            'gputemp':self.ui.checkBox_gpuTemp, 'hdd':self.ui.checkBox_hdd,
-            'mem':self.ui.checkBox_mem, 'net':self.ui.checkBox_net,
+            'hddtemp':self.ui.checkBox_hddTemp, 'mem':self.ui.checkBox_mem,
-            'swap':self.ui.checkBox_swap, 'temp':self.ui.checkBox_temp,
+            'net':self.ui.checkBox_net, 'swap':self.ui.checkBox_swap,
-            'uptime':self.ui.checkBox_uptime, 'player':self.ui.checkBox_player,
+            'temp':self.ui.checkBox_temp, 'uptime':self.ui.checkBox_uptime,
-            'time':self.ui.checkBox_time}
+            'pkg':self.ui.checkBox_pkg, 'player':self.ui.checkBox_player,
+            'ps':self.ui.checkBox_ps, 'time':self.ui.checkBox_time}
         self.lineedits = {'bat':self.ui.lineEdit_bat, 'cpu':self.ui.lineEdit_cpu,
             'cpuclock':self.ui.lineEdit_cpuclock, 'custom':self.ui.lineEdit_custom,
-            'gpu':self.ui.lineEdit_gpu, 'gputemp':self.ui.lineEdit_gpuTemp,
+            'disk':self.ui.lineEdit_hddSpeed, 'gpu':self.ui.lineEdit_gpu,
-            'hdd':self.ui.lineEdit_hdd, 'hddtemp':self.ui.lineEdit_hddTemp,
+            'gputemp':self.ui.lineEdit_gpuTemp, 'hdd':self.ui.lineEdit_hdd,
-            'mem':self.ui.lineEdit_mem, 'net':self.ui.lineEdit_net,
+            'hddtemp':self.ui.lineEdit_hddTemp, 'mem':self.ui.lineEdit_mem,
-            'swap':self.ui.lineEdit_swap, 'temp':self.ui.lineEdit_temp,
+            'net':self.ui.lineEdit_net, 'swap':self.ui.lineEdit_swap,
-            'uptime':self.ui.lineEdit_uptime, 'player':self.ui.lineEdit_player,
+            'temp':self.ui.lineEdit_temp, 'uptime':self.ui.lineEdit_uptime,
-            'time':self.ui.lineEdit_time}
+            'pkg':self.ui.lineEdit_pkg, 'player':self.ui.lineEdit_player,
+            'ps':self.ui.lineEdit_ps, 'time':self.ui.lineEdit_time}
         self.sliders = {'bat':self.ui.slider_bat, 'cpu':self.ui.slider_cpu,
             'cpuclock':self.ui.slider_cpuclock, 'custom':self.ui.slider_custom,
-            'gpu':self.ui.slider_gpu, 'gputemp':self.ui.slider_gpuTemp,
+            'disk':self.ui.slider_hddSpeed, 'gpu':self.ui.slider_gpu,
-            'hdd':self.ui.slider_hdd, 'hddtemp':self.ui.slider_hddTemp,
+            'gputemp':self.ui.slider_gpuTemp, 'hdd':self.ui.slider_hdd,
-            'mem':self.ui.slider_mem, 'net':self.ui.slider_net,
+            'hddtemp':self.ui.slider_hddTemp, 'mem':self.ui.slider_mem,
-            'swap':self.ui.slider_swap, 'temp':self.ui.slider_temp,
+            'net':self.ui.slider_net, 'swap':self.ui.slider_swap,
-            'uptime':self.ui.slider_uptime, 'player':self.ui.slider_player,
+            'temp':self.ui.slider_temp, 'uptime':self.ui.slider_uptime,
-            'time':self.ui.slider_time}
+            'pkg':self.ui.slider_pkg, 'player':self.ui.slider_player,
+            'ps':self.ui.slider_ps, 'time':self.ui.slider_time}
 
         QObject.connect(self.ui.checkBox_netdev, SIGNAL("stateChanged(int)"), self.setNetdevEnabled)
         QObject.connect(self.ui.pushButton_hddDevice, SIGNAL("clicked()"), self.addHddDevice)
+        QObject.connect(self.ui.pushButton_hddSpeedDevice, SIGNAL("clicked()"), self.addHddSpeedDevice)
         QObject.connect(self.ui.pushButton_mount, SIGNAL("clicked()"), self.addMount)
         QObject.connect(self.ui.pushButton_tempDevice, SIGNAL("clicked()"), self.addTempDevice)
+        QObject.connect(self.ui.pushButton_customCommand, SIGNAL("clicked()"), self.addCustomCommand)
+        QObject.connect(self.ui.pushButton_pkgCommand, SIGNAL("clicked()"), self.addPkgCommand)
         QObject.connect(self.ui.listWidget_hddDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_hddDevice.openPersistentEditor)
         QObject.connect(self.ui.listWidget_mount, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_mount.openPersistentEditor)
         QObject.connect(self.ui.listWidget_tempDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_tempDevice.openPersistentEditor)
+        QObject.connect(self.ui.listWidget_pkgCommand, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_pkgCommand.openPersistentEditor)
+        QObject.connect(self.ui.comboBox_pkgCommand, SIGNAL("currentIndexChanged(int)"), self.updatePkgNullValue)
+        QObject.connect(self.ui.comboBox_pkgCommand, SIGNAL("editTextChanged(QString)"), self.updatePkgNullValue)
         for item in self.sliders.values():
             QObject.connect(item, SIGNAL("valueChanged(int)"), self.setSlider)
         for item in self.checkboxes.values():
@@ -78,12 +87,21 @@ class ConfigWindow(QWidget):
             if (self.ui.listWidget_hddDevice.hasFocus() and
                 (self.ui.listWidget_hddDevice.currentRow() > -1)):
                 self.ui.listWidget_hddDevice.takeItem(self.ui.listWidget_hddDevice.currentRow())
+            elif (self.ui.listWidget_hddSpeedDevice.hasFocus() and
+                (self.ui.listWidget_hddSpeedDevice.currentRow() > -1)):
+                self.ui.listWidget_hddSpeedDevice.takeItem(self.ui.listWidget_hddSpeedDevice.currentRow())
             elif (self.ui.listWidget_mount.hasFocus() and
                 (self.ui.listWidget_mount.currentRow() > -1)):
                 self.ui.listWidget_mount.takeItem(self.ui.listWidget_mount.currentRow())
             elif (self.ui.listWidget_tempDevice.hasFocus() and
                 (self.ui.listWidget_tempDevice.currentRow() > -1)):
                 self.ui.listWidget_tempDevice.takeItem(self.ui.listWidget_tempDevice.currentRow())
+            elif (self.ui.listWidget_customCommand.hasFocus() and
+                (self.ui.listWidget_customCommand.currentRow() > -1)):
+                self.ui.listWidget_customCommand.takeItem(self.ui.listWidget_customCommand.currentRow())
+            elif (self.ui.listWidget_pkgCommand.hasFocus() and
+                (self.ui.listWidget_pkgCommand.currentRow() > -1)):
+                self.ui.listWidget_pkgCommand.takeItem(self.ui.listWidget_pkgCommand.currentRow())
 
 
     def addHddDevice(self):
@@ -92,6 +110,12 @@ class ConfigWindow(QWidget):
         self.ui.listWidget_hddDevice.addItem(self.ui.comboBox_hddDevice.currentText())
 
 
+    def addHddSpeedDevice(self):
+        """function to add disk device"""
+        self.ui.listWidget_hddSpeedDevice.clearSelection()
+        self.ui.listWidget_hddSpeedDevice.addItem(self.ui.comboBox_hddSpeedDevice.currentText())
+
+
     def addMount(self):
         """function to add mount points"""
         self.ui.listWidget_mount.clearSelection()
@@ -104,6 +128,35 @@ class ConfigWindow(QWidget):
         self.ui.listWidget_tempDevice.addItem(self.ui.comboBox_tempDevice.currentText())
 
 
+    def addCustomCommand(self):
+        """function to add custom command"""
+        self.ui.listWidget_customCommand.clearSelection()
+        self.ui.listWidget_customCommand.addItem(self.ui.lineEdit_customCommand.text())
+
+
+    def addPkgCommand(self):
+        """function to add package manager command"""
+        self.ui.listWidget_pkgCommand.clearSelection()
+        self.ui.listWidget_pkgCommand.addItem(self.ui.comboBox_pkgCommand.currentText() +\
+            QString(":") + QString.number(self.ui.spinBox_pkgCommandNum.value()))
+
+
+    def updatePkgNullValue(self):
+        """function to set default values to PKGNULL spinbox"""
+        if (self.ui.comboBox_pkgCommand.currentText().contains(QString("pacman -Qu"))):
+            self.ui.spinBox_pkgCommandNum.setValue(0)
+        elif (self.ui.comboBox_pkgCommand.currentText().contains(QString("apt-show-versions -u -b"))):
+            self.ui.spinBox_pkgCommandNum.setValue(0)
+        elif (self.ui.comboBox_pkgCommand.currentText().contains(QString("aptitude search '~U'"))):
+            self.ui.spinBox_pkgCommandNum.setValue(0)
+        elif (self.ui.comboBox_pkgCommand.currentText().contains(QString("yum list updates"))):
+            self.ui.spinBox_pkgCommandNum.setValue(3)
+        elif (self.ui.comboBox_pkgCommand.currentText().contains(QString("pkg_version -I -l '<'"))):
+            self.ui.spinBox_pkgCommandNum.setValue(0)
+        elif (self.ui.comboBox_pkgCommand.currentText().contains(QString("urpmq --auto-select"))):
+            self.ui.spinBox_pkgCommandNum.setValue(0)
+
+
     def setNetdevEnabled(self):
         """function to set enabled netdev"""
         if (self.ui.checkBox_netdev.checkState() == 0):

sources/ptm/contents/code/dataengine.py

@@ -19,6 +19,7 @@
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
+from PyKDE4.plasma import Plasma
 
 import datetime
 
@@ -46,6 +47,10 @@ class DataEngine:
                 dataEngines['system'].connectSource("cpu/cpu" + str(core) + "/clock", self.parent, interval)
         if (bools['custom'] > 0):
             dataEngines['ext'].connectSource("custom", self.parent, interval)
+        if (bools['disk'] > 0):
+            for item in names['disk']:
+                dataEngines['system'].connectSource(item + "/Rate/rblk", self.parent, interval)
+                dataEngines['system'].connectSource(item + "/Rate/wblk", self.parent, interval)
         if (bools['gpu'] > 0):
             dataEngines['ext'].connectSource("gpu", self.parent, interval)
         if (bools['gputemp'] > 0):
@@ -53,6 +58,7 @@ class DataEngine:
         if (bools['hdd'] > 0):
             for item in names['hdd']:
                 dataEngines['system'].connectSource("partitions" + item + "/filllevel", self.parent, interval)
+                dataEngines['system'].connectSource("partitions" + item + "/usedspace", self.parent, interval)
         if (bools['hddtemp'] > 0):
             dataEngines['ext'].connectSource("hddtemp", self.parent, interval)
         if (bools['mem'] > 0):
@@ -63,8 +69,12 @@ class DataEngine:
             self.updateNetdev = 0
             dataEngines['system'].connectSource("network/interfaces/" + names['net'] + "/transmitter/data", self.parent, interval)
             dataEngines['system'].connectSource("network/interfaces/" + names['net'] + "/receiver/data", self.parent, interval)
+        if (bools['pkg'] > 0):
+            dataEngines['ext'].connectSource("pkg", self.parent, 60*60*1000, Plasma.AlignToHour)
         if (bools['player'] > 0):
             dataEngines['ext'].connectSource("player", self.parent, interval)
+        if (bools['ps'] > 0):
+            dataEngines['ext'].connectSource("ps", self.parent, interval)
         if (bools['swap'] > 0):
             dataEngines['system'].connectSource("mem/swap/free", self.parent, interval)
             dataEngines['system'].connectSource("mem/swap/used", self.parent, interval)
@@ -108,26 +118,42 @@ class DataEngine:
                 updatedData['value'] = value
             elif (sourceName == "custom"):
                 updatedData['name'] = "custom"
-                value = str(data[QString(u'custom')].toUtf8()).decode("utf-8")
+                updatedData['value'] = {}
+                for singleData in data.keys():
+                    updatedData['value'][str(singleData.toLower())] = str(data[singleData].toUtf8()).decode("utf-8")
+            elif ((sourceName[:4] == "disk") and (sourceName[-4:] == "rblk")):
+                updatedData['name'] = "disk-r"
+                updatedData['type'] = '/'.join(str(sourceName).split('/')[0:2])
+                value = round(data[QString(u'value')].toFloat()[0], 0)
+                updatedData['value'] = value
+            elif ((sourceName[:4] == "disk") and (sourceName[-4:] == "wblk")):
+                updatedData['name'] = "disk-w"
+                updatedData['type'] = '/'.join(str(sourceName).split('/')[0:2])
+                value = round(data[QString(u'value')].toFloat()[0], 0)
                 updatedData['value'] = value
             elif (sourceName == "gpu"):
                 updatedData['name'] = "gpu"
-                value = round(data[QString(u'GPU')].toFloat()[0], 1)
+                value = round(data[QString(u'GPU')], 1)
                 updatedData['value'] = "%4.1f" % (value)
             elif (sourceName == "gputemp"):
                 updatedData['name'] = "gputemp"
-                value = round(data[QString(u'GPUTemp')].toFloat()[0], 1)
+                value = round(data[QString(u'GPUTemp')], 1)
                 updatedData['value'] = "%4.1f" % (value)
-            elif (sourceName.split('/')[0] == "partitions"):
+            elif (sourceName.split('/')[0] == "partitions") and (sourceName.split('/')[-1] == "filllevel"):
                 updatedData['name'] = "hdd"
                 updatedData['type'] = '/' + '/'.join(sourceName.split('/')[1:-1])
                 value = round(data[QString(u'value')].toFloat()[0], 1)
-                updatedData['value'] = "%5.1f" % (value)
+                updatedData['value'] = value
+            elif (sourceName.split('/')[0] == "partitions") and (sourceName.split('/')[-1] == "usedspace"):
+                updatedData['name'] = "hddmb"
+                updatedData['type'] = '/' + '/'.join(sourceName.split('/')[1:-1])
+                value = data[QString(u'value')].toFloat()[0]
+                updatedData['value'] = value
             elif (sourceName == "hddtemp"):
                 updatedData['name'] = "hddtemp"
                 updatedData['value'] = {}
                 for item in names['hddtemp']:
-                    value = round(data[QString(item)].toFloat()[0], 1)
+                    value = round(data[QString(item)], 1)
                     updatedData['value'][item] = "%4.1f" % (value)
             elif (sourceName == "mem/physical/application"):
                 updatedData['name'] = "mem"
@@ -164,6 +190,11 @@ class DataEngine:
                 updatedData['type'] = "up"
                 value = round(data[QString(u'value')].toFloat()[0], 0)
                 updatedData['value'] = value
+            elif (sourceName == "pkg"):
+                updatedData['name'] = "pkg"
+                updatedData['value'] = {}
+                for singleData in data.keys():
+                    updatedData['value'][str(singleData.toLower())] = "%i" % (data[singleData])
             elif (sourceName == "player"):
                 updatedData['name'] = "player"
                 updatedData['value'] = {}
@@ -185,6 +216,12 @@ class DataEngine:
                     updatedData['value']['progress'] = str(data[QString(u'qmmp_progress')].toUtf8()).decode("utf-8")
                     updatedData['value']['time'] = str(data[QString(u'qmmp_duration')].toUtf8()).decode("utf-8")
                     updatedData['value']['title'] = str(data[QString(u'qmmp_title')].toUtf8()).decode("utf-8")
+            elif (sourceName == "ps"):
+                updatedData['name'] = "ps"
+                updatedData['value'] = {}
+                updatedData['value']['num'] = "%i" % (data[QString(u'psCount')])
+                updatedData['value']['total'] = "%i" % (data[QString(u'psTotal')])
+                updatedData['value']['list'] = data[QString(u'ps')]
             elif (sourceName == "mem/swap/free"):
                 updatedData['name'] = "swap"
                 updatedData['type'] = "free"
@@ -260,6 +297,10 @@ class DataEngine:
                     dataEngines['system'].disconnectSource("cpu/cpu" + str(item) + "/clock", self.parent)
         elif (name == "custom"):
             dataEngines['ext'].disconnectSource("custom", self.parent)
+        elif (name == "disk"):
+            for item in keys['disk']:
+                dataEngines['system'].disconnectSource(item + "/Rate/rblk", self.parent)
+                dataEngines['system'].disconnectSource(item + "/Rate/rblk", self.parent)
         elif (name == "gpu"):
             dataEngines['ext'].disconnectSource("gpu", self.parent)
         elif (name == "gputemp"):
@@ -267,6 +308,7 @@ class DataEngine:
         elif (name == "hdd"):
             for item in keys['hdd']:
                 dataEngines['system'].disconnectSource("partitions" + item + "/filllevel", self.parent)
+                dataEngines['system'].disconnectSource("partitions" + item + "/usedspace", self.parent)
         elif (name == "hddtemp"):
             dataEngines['ext'].disconnectSource("hddtemp", self.parent)
         elif (name == "mem"):
@@ -276,8 +318,12 @@ class DataEngine:
         elif (name == "net"):
             dataEngines['system'].disconnectSource("network/interfaces/" + keys['net'] + "/transmitter/data", self.parent)
             dataEngines['system'].disconnectSource("network/interfaces/" + keys['net'] + "/receiver/data", self.parent)
+        elif (name == "pkg"):
+            dataEngines['ext'].disconnectSource("pkg", self.parent)
         elif (name == "player"):
             dataEngines['ext'].disconnectSource("player", self.parent)
+        elif (name == "ps"):
+            dataEngines['ext'].disconnectSource("ps", self.parent)
         elif (name == "swap"):
             dataEngines['system'].disconnectSource("mem/swap/used", self.parent)
             dataEngines['system'].disconnectSource("mem/swap/free", self.parent)

sources/ptm/contents/code/main.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python2
 # -*- coding: utf-8 -*-
 
 ############################################################################
@@ -35,6 +36,17 @@ import tooltip
 from util import *
 
 
+def getTemp(temp, unit):
+    """function to return temperature"""
+    if (unit == "Celsius"):
+        pass
+    elif (unit == "Fahrenheit"):
+        temp = str(round(((float(temp) * 9.0 / 5.0) + 32.0), 1))
+    elif (unit == "Kelvin"):
+        temp = str(round((float(temp) + 273.15), 1))
+    return temp
+
+
 
 class CustomPlasmaLabel(Plasma.Label):
     """new Label with defined clicked() event"""
@@ -63,6 +75,9 @@ class pyTextWidget(plasmascript.Applet):
         """function to initializate widget"""
         self._name = str(self.package().metadata().pluginName())
         self.setupVar()
+        # actions
+        self.createActions()
+
 
         self.dataengine = dataengine.DataEngine(self)
         self.reinit = reinit.Reinit(self, self.ptm['defaults'])
@@ -79,14 +94,62 @@ class pyTextWidget(plasmascript.Applet):
         self.setBackgroundHints(Plasma.Applet.DefaultBackground)
 
         self.setHasConfigurationInterface(True)
-        # Create notifyrc file if required
+        # create notifyrc file if required
         kdehome = unicode(KGlobal.dirs().localkdedir())
         if ((not os.path.exists(kdehome + "/share/apps/plasma_applet_pytextmonitor/plasma_applet_pytextmonitor.notifyrc")) and
             (not os.path.exists("/usr" + "/share/apps/plasma_applet_pytextmonitor/plasma_applet_pytextmonitor.notifyrc"))):
             self.createNotifyrc(kdehome)
 
 
+    # context menu
+    def createActions(self):
+        """function to create actions"""
+        self.ptmActions = {}
+        self.ptmActions['ksysguard'] = QAction(i18n("Run ksysguard"), self)
+        QObject.connect(self.ptmActions['ksysguard'], SIGNAL("triggered(bool)"), self.runKsysguard)
+        self.ptmActions['readme'] = QAction(i18n("Show README"), self)
+        QObject.connect(self.ptmActions['readme'], SIGNAL("triggered(bool)"), self.showReadme)
+
+
+    def contextualActions(self):
+        """function to create context menu"""
+        contextMenu = []
+        contextMenu.append(self.ptmActions['ksysguard'])
+        contextMenu.append(self.ptmActions['readme'])
+        return contextMenu
+
+
+    def runKsysguard(self, event):
+        """function to run ksysguard"""
+        os.system("ksysguard &")
+
+
+    def showReadme(self):
+        """function to show readme file"""
+        kdehome = unicode(KGlobal.dirs().localkdedir())
+        if (os.path.exists("/usr/share/pytextmonitor/")):
+            dirPath = "/usr/share/pytextmonitor/"
+        elif (os.path.exists(kdehome + "/share/pytextmonitor/")):
+            dirPath = kdehome + "/share/pytextmonitor/"
+        else:
+            return
+        locale = QLocale.system().name().split('_')[0]
+        if (os.path.exists(dirPath + locale + ".md")):
+            filePath = dirPath + locale + ".md"
+        elif (os.path.exists(dirPath + "en.md")):
+            filePath = dirPath + "en.md"
+        else:
+            return
+        os.system("kioclient exec " + str(filePath) + " &")
+
+
     # internal functions
+    def addDiskDevice(self, sourceName):
+        diskRegexp = QRegExp("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)")
+        if (diskRegexp.indexIn(sourceName) > -1):
+            self.ptm['defaults']['disk'].append('/'.join(str(sourceName).split('/')[0:2]))
+
+
     def createConfigurationInterface(self, parent):
         """function to setup configuration window"""
         self.configpage = configwindow.ConfigWindow(self)
@@ -117,11 +180,6 @@ class pyTextWidget(plasmascript.Applet):
         Plasma.ToolTipManager.self().setContent(self.applet, self.tooltip)
 
 
-    def mouseDoubleClickEvent(self, event):
-        """function to doubleclick event"""
-        os.system("ksysguard &")
-
-
     def setupVar(self):
         """function to setup variables"""
         self.ptm = {}
@@ -130,37 +188,41 @@ class pyTextWidget(plasmascript.Applet):
         # defaults
         self.ptm['defaults'] = {}
         self.ptm['defaults']['confBool'] = {'bat':'batBool', 'cpu':'cpuBool',
-            'cpuclock':'cpuclockBool', 'custom':'customBool', 'gpu':'gpuBool',
+            'cpuclock':'cpuclockBool', 'custom':'customBool', 'disk':'diskBool',
-            'gputemp':'gputempBool', 'hdd':'hddBool', 'hddtemp':'hddtempBool',
+            'gpu':'gpuBool', 'gputemp':'gputempBool', 'hdd':'hddBool',
-            'mem':'memBool', 'net':'netBool', 'swap':'swapBool', 'temp':'tempBool',
+            'hddtemp':'hddtempBool', 'mem':'memBool', 'net':'netBool', 'pkg':'pkgBool',
-            'uptime':'uptimeBool', 'player':'playerBool', 'time':'timeBool'}
+            'player':'playerBool', 'ps':'psBool', 'swap':'swapBool', 'temp':'tempBool',
+            'uptime':'uptimeBool', 'time':'timeBool'}
         self.ptm['defaults']['confColor'] = {'cpu':'cpu_color', 'cpuclock':'cpuclock_color',
             'down':'down_color', 'mem':'mem_color', 'swap':'swap_color', 'up':'up_color'}
         self.ptm['defaults']['confFormat'] = {'bat':'batFormat', 'cpu':'cpuFormat',
-            'cpuclock':'cpuclockFormat', 'custom':'customFormat', 'gpu':'gpuFormat',
+            'cpuclock':'cpuclockFormat', 'custom':'customFormat', 'disk':'diskFormat',
-            'gputemp':'gputempFormat', 'hdd':'hddFormat', 'hddtemp':'hddtempFormat',
+            'gpu':'gpuFormat', 'gputemp':'gputempFormat', 'hdd':'hddFormat',
-            'mem':'memFormat', 'net':'netFormat', 'player':'playerFormat',
+            'hddtemp':'hddtempFormat', 'mem':'memFormat', 'net':'netFormat',
-            'swap':'swapFormat', 'temp':'tempFormat', 'time':'timeFormat',
+            'pkg':'pkgFormat', 'player':'playerFormat', 'ps':'psFormat', 'swap':'swapFormat',
-            'uptime':'uptimeFormat'}
+            'temp':'tempFormat', 'time':'timeFormat', 'uptime':'uptimeFormat'}
         self.ptm['defaults']['bool'] = {'bat':0, 'cpu':2, 'cpuclock':0, 'custom':0,
-            'gpu':0, 'gputemp':0, 'hdd':0, 'hddtemp':0, 'mem':2, 'net':2, 'player':0,
+            'disk':0, 'gpu':0, 'gputemp':0, 'hdd':0, 'hddtemp':0, 'mem':2, 'net':2,
-            'swap':2, 'temp':0, 'time':0, 'uptime':0}
+            'pkg':0, 'player':0, 'ps':0, 'swap':2, 'temp':0, 'time':0, 'uptime':0}
         self.ptm['defaults']['format'] = {'bat':'[bat: $bat%$ac]', 'cpu':'[cpu: $cpu%]',
-            'cpuclock':'[mhz: $cpucl]', 'custom':'[$custom]', 'gpu':'[gpu: $gpu%]',
+            'cpuclock':'[mhz: $cpucl]', 'custom':'[$custom]', 'disk':'[disk: $hddr0/$hddw0 KB/s]',
-            'gputemp':'[gpu temp: $gputemp°C]', 'hdd':'[hdd: $hdd0%]',
+            'gpu':'[gpu: $gpu%]', 'gputemp':'[gpu temp: $gputemp°C]', 'hdd':'[hdd: $hdd0%]',
             'hddtemp':'[hdd temp: $hddtemp0°C]', 'mem':'[mem: $mem%]',
-            'net':'[$netdev: $down/$upKB/s]', 'player':'[$artist - $title]',
+            'net':'[$netdev: $down/$upKB/s]', 'pkg':'[upgrade: $pkgcount0]',
-            'swap':'[swap: $swap%]', 'temp':'[temp: $temp0°C]',
+            'player':'[$artist - $title]', 'ps':'[proc: $pscount]', 'swap':'[swap: $swap%]',
-            'time':'[$time]', 'uptime':'[uptime: $uptime]'}
+            'temp':'[temp: $temp0°C]', 'time':'[$time]', 'uptime':'[uptime: $uptime]'}
-        self.ptm['defaults']['order'] = {'6':'bat', '1':'cpu', '7':'cpuclock', 'f':'custom', '9':'gpu',
+        self.ptm['defaults']['order'] = {'1':'cpu', '2':'temp', '3':'mem', '4':'swap', '5':'net',
-            'a':'gputemp', 'b':'hdd', 'c':'hddtemp', '3':'mem', '5':'net', '4':'swap', '2':'temp',
+            '6':'bat', '7':'cpuclock', '8':'uptime', '9':'gpu', 'a':'gputemp', 'b':'hdd',
-            '8':'uptime', 'd':'player', 'e':'time'}
+            'c':'hddtemp', 'd':'player', 'e':'time', 'f':'custom', 'g':'ps', 'h':'pkg', 'i':'disk'}
+        # disk devices for r/w speed
+        self.ptm['defaults']['disk'] = []
         # labels
         self.ptm['labels'] = {}
         self.ptm['layout'] = QGraphicsLinearLayout(Qt.Horizontal, self.applet)
         self.ptm['layout'].setContentsMargins(1, 1, 1, 1)
         # names
         self.ptm['names'] = {}
+        self.ptm['names']['disk'] = []
         self.ptm['names']['hdd'] = []
         self.ptm['names']['hddtemp'] = []
         self.ptm['names']['net'] = ""
@@ -179,11 +241,13 @@ class pyTextWidget(plasmascript.Applet):
         for i in range(numCores):
             self.ptm['values']['cpu'][i] = 0.0
             self.ptm['values']['cpuclock'][i] = 0.0
+        self.ptm['values']['disk-r'] = {}
+        self.ptm['values']['disk-w'] = {}
         self.ptm['values']['hdd'] = {}
+        self.ptm['values']['hddmb'] = {}
         self.ptm['values']['hddtemp'] = {}
         self.ptm['values']['mem'] = {'app':0.0, 'used':0.0, 'free':1.0}
         self.ptm['values']['net'] = {"up":0.0, "down":0.0}
-        self.ptm['values']['player'] = {}
         self.ptm['values']['swap'] = {'used':0.0, 'free':1.0}
         self.ptm['values']['temp'] = {}
         # variables
@@ -218,6 +282,8 @@ class pyTextWidget(plasmascript.Applet):
             self.cpuText()
         if (self.ptm['vars']['bools']['cpuclock'] > 0):
             self.cpuclockText()
+        if (self.ptm['vars']['bools']['disk'] > 0):
+            self.diskText()
         if (self.ptm['vars']['bools']['hdd'] > 0):
             self.hddText()
         if (self.ptm['vars']['bools']['hddtemp'] > 0):
@@ -249,15 +315,14 @@ class pyTextWidget(plasmascript.Applet):
         updatedData = self.dataengine.dataUpdated(str(sourceName), data, self.ptm)
         if (updatedData['value'] == None):
             return
-        # update falues where is needed
+        # update values where is needed
         if (updatedData['type'] != None):
             self.ptm['values'][updatedData['name']][updatedData['type']] = updatedData['value']
-        else:
+        elif (updatedData['name'] in ['custom', 'gpu', 'gputemp', 'pkg', 'player', 'ps', 'time', 'uptime']):
-            self.ptm['values'][updatedData['name']] = updatedData['value']
-        # update labels where is needed
-        if (updatedData['name'] in ['custom', 'gpu', 'gputemp', 'player', 'time', 'uptime']):
             text = self.textPrepare(updatedData['name'], updatedData['value'])
             self.setText(updatedData['name'], text)
+        else:
+            self.ptm['values'][updatedData['name']] = updatedData['value']
         # update tooltips
         if ((updatedData['name'] in ['cpu', 'cpuclock', 'mem', 'swap', 'net']) and (self.ptm['vars']['bools'][updatedData['name']] == 2)):
             if (updatedData['name'] == "net"):
@@ -296,12 +361,12 @@ class pyTextWidget(plasmascript.Applet):
             try:
                 with open (self.ptm['vars']['adv']['acDev'], 'r') as batFile:
                     bat = batFile.readline()[:-1]
-                if (bat == '1'):
+                if (bat == "1"):
-                    bat = "(*)"
+                    bat = self.ptm['vars']['adv']['acOnline']
                 else:
-                    bat = "( )"
+                    bat = self.ptm['vars']['adv']['acOffline']
             except:
-                bat = "(?)"
+                bat = "N\\A"
             line = line.split('$ac')[0] + bat + line.split('$ac')[1]
         text = self.ptm['vars']['app']['format'][0] + line + self.ptm['vars']['app']['format'][1]
         self.setText("bat", text)
@@ -341,6 +406,25 @@ class pyTextWidget(plasmascript.Applet):
         self.setText("cpuclock", text)
 
 
+    def diskText(self):
+        line = self.ptm['vars']['formats']['disk']
+        devices = range(len(self.ptm['names']['disk']))
+        devices.reverse()
+        for i in devices:
+            if (line.split('$hddr' + str(i))[0] != line):
+                hdd = "%4i" % (self.ptm['values']['disk-r'][self.ptm['names']['disk'][i]])
+                line = line.split('$hddr' + str(i))[0] +\
+                    hdd +\
+                    line.split('$hddr' + str(i))[1]
+            if (line.split('$hddw' + str(i))[0] != line):
+                hdd = "%4i" % (self.ptm['values']['disk-w'][self.ptm['names']['disk'][i]])
+                line = line.split('$hddw' + str(i))[0] +\
+                    hdd +\
+                    line.split('$hddw' + str(i))[1]
+        text = self.ptm['vars']['app']['format'][0] + line + self.ptm['vars']['app']['format'][1]
+        self.setText("disk", text)
+
+
     def hddText(self):
         """function to set hdd text"""
         line = self.ptm['vars']['formats']['hdd']
@@ -348,7 +432,20 @@ class pyTextWidget(plasmascript.Applet):
         devices.reverse()
         for i in devices:
             if (line.split('$hdd' + str(i))[0] != line):
-                line = line.split('$hdd' + str(i))[0] + str(self.ptm['values']['hdd'][devices[i]]) + line.split('$hdd' + str(i))[1]
+                hdd = "%4.1f" % (self.ptm['values']['hdd'][self.ptm['names']['hdd'][i]])
+                line = line.split('$hdd' + str(i))[0] +\
+                    hdd +\
+                    line.split('$hdd' + str(i))[1]
+            if (line.split('$hddmb' + str(i))[0] != line):
+                hdd = "%i" % (self.ptm['values']['hddmb'][self.ptm['names']['hdd'][i]] / 1024.0)
+                line = line.split('$hddmb' + str(i))[0] +\
+                    str(int(self.ptm['values']['hddmb'][self.ptm['names']['hdd'][i]] / 1024.0)) +\
+                    line.split('$hddmb' + str(i))[1]
+            if (line.split('$hddgb' + str(i))[0] != line):
+                hdd = "%4.1f" % (self.ptm['values']['hddmb'][self.ptm['names']['hdd'][i]] / (1024.0 * 1024.0))
+                line = line.split('$hddgb' + str(i))[0] +\
+                    hdd +\
+                    line.split('$hddgb' + str(i))[1]
         text = self.ptm['vars']['app']['format'][0] + line + self.ptm['vars']['app']['format'][1]
         self.setText("hdd", text)
 
@@ -360,7 +457,9 @@ class pyTextWidget(plasmascript.Applet):
         devices.reverse()
         for i in devices:
             if (line.split('$hddtemp' + str(i))[0] != line):
-                line = line.split('$hddtemp' + str(i))[0] + self.ptm['values']['hddtemp'][devices[i]] + line.split('$hddtemp' + str(i))[1]
+                line = line.split('$hddtemp' + str(i))[0] +\
+                    getTemp(str(self.ptm['values']['hddtemp'][self.ptm['names']['hddtemp'][i]]), self.ptm['vars']['adv']['tempUnit']) +\
+                    line.split('$hddtemp' + str(i))[1]
         text = self.ptm['vars']['app']['format'][0] + line + self.ptm['vars']['app']['format'][1]
         self.setText("hddtemp", text)
 
@@ -427,7 +526,9 @@ class pyTextWidget(plasmascript.Applet):
         devices.reverse()
         for i in devices:
             if (line.split('$temp' + str(i))[0] != line):
-                line = line.split('$temp' + str(i))[0] + self.ptm['values']['temp'][devices[i]] + line.split('$temp' + str(i))[1]
+                line = line.split('$temp' + str(i))[0] +\
+                    getTemp(str(self.ptm['values']['temp'][self.ptm['names']['temp'][i]]), self.ptm['vars']['adv']['tempUnits']) +\
+                    line.split('$temp' + str(i))[1]
         text = self.ptm['vars']['app']['format'][0] + line + self.ptm['vars']['app']['format'][1]
         self.setText("temp", text)
 
@@ -448,9 +549,16 @@ class pyTextWidget(plasmascript.Applet):
         """function to read settings"""
         self.ptm[name] = ptm
         if (name == "names"):
-            for item in ['hdd', 'hddtemp', 'temp']:
+            for item in ['hddtemp', 'temp']:
                 for value in self.ptm['names'][item]:
                     self.ptm['values'][item][value] = 0.0
+            for value in self.ptm['names']['hdd']:
+                self.ptm['values']['hdd'][value] = 0.0
+                self.ptm['values']['hddmb'][value] = 0.0
+            for value in self.ptm['names']['disk']:
+                self.ptm['values']['disk-r'][value] = 0.0
+                self.ptm['values']['disk-w'][value] = 0.0
+
 
 
     def connectToEngine(self):
@@ -458,6 +566,7 @@ class pyTextWidget(plasmascript.Applet):
         self.ptm['dataengine']['ext'] = self.dataEngine("ext-sysmon")
         self.ptm['dataengine']['system'] = self.dataEngine("systemmonitor")
         self.ptm['dataengine']['time'] = self.dataEngine("time")
+        QObject.connect(self.ptm['dataengine']['system'], SIGNAL("sourceAdded(QString)"), self.addDiskDevice)
         self.dataengine.connectToEngine(self.ptm['vars']['bools'], self.ptm['dataengine'],
             self.ptm['vars']['app']['interval'], self.ptm['names'])
 
@@ -468,8 +577,8 @@ class pyTextWidget(plasmascript.Applet):
             if (self.ptm['vars']['bools'][label] > 0):
                 self.addLabel(label, None, False)
                 keys = {'cpu':self.ptm['values']['cpu'].keys(), 'cpuclock':self.ptm['values']['cpuclock'].keys(),
-                    'hdd':self.ptm['values']['hdd'].keys(), 'net':self.ptm['names']['net'],
+                    'disk':self.ptm['values']['disk-r'].keys(), 'hdd':self.ptm['values']['hdd'].keys(),
-                    'temp':self.ptm['values']['temp'].keys()}
+                    'net':self.ptm['names']['net'], 'temp':self.ptm['values']['temp'].keys()}
                 self.dataengine.disconnectFromSource(self.ptm['dataengine'], keys, label)
 
 
@@ -514,25 +623,45 @@ class pyTextWidget(plasmascript.Applet):
         """function to prepare text"""
         line = self.ptm['vars']['formats'][name]
         if (name == "custom"):
-            if (line.split('$custom')[0] != line):
+            cmds = range(len(text.keys()))
-                line = line.split('$custom')[0] + text + line.split('$custom')[1]
+            cmds.reverse()
+            for i in cmds:
+                if (line.split('$custom' + str(i))[0] != line):
+                    line = line.split('$custom' + str(i))[0] + \
+                        text['custom'+str(i)] + \
+                        line.split('$custom' + str(i))[1]
         elif (name == "gpu"):
             if (line.split('$gpu')[0] != line):
                 line = line.split('$gpu')[0] + text + line.split('$gpu')[1]
         elif (name == "gputemp"):
             if (line.split('$gputemp')[0] != line):
-                line = line.split('$gputemp')[0] + text + line.split('$gputemp')[1]
+                line = line.split('$gputemp')[0] + getTemp(text, self.ptm['vars']['adv']['tempUnits']) + line.split('$gputemp')[1]
+        elif (name == "pkg"):
+            pkgs = range(len(text.keys()))
+            pkgs.reverse()
+            for i in pkgs:
+                if (line.split('$pkgcount' + str(i))[0] != line):
+                    line = line.split('$pkgcount' + str(i))[0] + \
+                        text['pkgcount'+str(i)] + \
+                        line.split('$pkgcount' + str(i))[1]
         elif (name == "player"):
             if (line.split('$album')[0] != line):
-                line = line.split('$album')[0] + self.ptm['values']['player']['album'] + line.split('$album')[1]
+                line = line.split('$album')[0] + text['album'] + line.split('$album')[1]
             if (line.split('$artist')[0] != line):
-                line = line.split('$artist')[0] + self.ptm['values']['player']['artist'] + line.split('$artist')[1]
+                line = line.split('$artist')[0] + text['artist'] + line.split('$artist')[1]
             if (line.split('$progress')[0] != line):
-                line = line.split('$progress')[0] + self.ptm['values']['player']['progress'] + line.split('$progress')[1]
+                line = line.split('$progress')[0] + text['progress'] + line.split('$progress')[1]
             if (line.split('$time')[0] != line):
-                line = line.split('$time')[0] + self.ptm['values']['player']['time'] + line.split('$time')[1]
+                line = line.split('$time')[0] + text['time'] + line.split('$time')[1]
             if (line.split('$title')[0] != line):
-                line = line.split('$title')[0] + self.ptm['values']['player']['title'] + line.split('$title')[1]
+                line = line.split('$title')[0] + text['title'] + line.split('$title')[1]
+        elif (name == "ps"):
+            if (line.split('$pscount')[0] != line):
+                line = line.split('$pscount')[0] + text['num'] + line.split('$pscount')[1]
+            if (line.split('$pstotal')[0] != line):
+                line = line.split('$pstotal')[0] + text['total'] + line.split('$pstotal')[1]
+            if (line.split('$ps')[0] != line):
+                line = line.split('$ps')[0] + text['list'] + line.split('$ps')[1]
         elif (name == "time"):
             if (line.split('$time')[0] != line):
                 line = line.split('$time')[0] + text + line.split('$time')[1]

sources/ptm/contents/code/ptmnotify.py

@@ -194,6 +194,8 @@ class PTMNotify:
             return self.createText("processor")
         elif (name == "custom"):
             return self.createText("system")
+        elif (name == "disk"):
+            return self.createText("disk")
         elif (name == "gpu"):
             return self.createText("graphical")
         elif (name == "gputemp"):
@@ -206,8 +208,12 @@ class PTMNotify:
             return self.createText("memory")
         elif (name == "net"):
             return self.createText("network")
+        elif (name == "pkg"):
+            return self.createText("system")
         elif (name == "player"):
             return self.createText("player")
+        elif (name == "ps"):
+            return self.createText("system")
         elif (name == "swap"):
             return self.createText("memory")
         elif (name == "temp"):

sources/ptm/contents/code/reinit.py

@@ -38,6 +38,9 @@ class Reinit():
 
         ptmVars['adv'] = {}
         ptmVars['adv']['acDev'] = str(settings.get('ac_device', '/sys/class/power_supply/AC/online'))
+        ptmVars['adv']['acOnline'] = str(settings.get('ac_online', '(*)'))
+        ptmVars['adv']['acOffline'] = str(settings.get('ac_offline', '( )'))
+        ptmVars['adv']['tempUnits'] = str(settings.get('temp_units', 'Celsius'))
         ptmVars['adv']['batDev'] = str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity'))
         ptmVars['adv']['customTime'] = str(settings.get('custom_time', '$hh:$mm'))
         ptmVars['adv']['customUptime'] = str(settings.get('custom_uptime', '$dd,$hh,$mm'))
@@ -68,6 +71,7 @@ class Reinit():
             ptmVars['bools'][label] = settings.get(self.defaults['confBool'][label], self.defaults['bool'][label]).toInt()[0]
 
         ptmNames = {}
+        ptmNames['disk'] = str(settings.get('disk', 'disk/sda_(8:0)')).split('@@')
         ptmNames['hdd'] = str(settings.get('mount', '/')).split('@@')
         ptmNames['hddtemp'] = str(settings.get('hdd', '/dev/sda')).split('@@')
         if (ptmVars['adv']['netdevBool'] > 0):

sources/ptm/po/en.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n"
-"POT-Creation-Date: 2014-04-05 22:36+0400\n"
+"POT-Creation-Date: 2014-05-19 11:55+0400\n"
-"PO-Revision-Date: 2014-04-05 22:36+0400\n"
+"PO-Revision-Date: 2014-05-19 11:56+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -18,20 +18,22 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#. i18n: file: ui/configwindow.ui:32
+#: code/main.py:108
-#. i18n: ectx: property (windowTitle), widget (QWidget, ConfigWindow)
+msgid "Run ksysguard"
+msgstr "Run ksysguard"
+
+#: code/main.py:110
+msgid "Show README"
+msgstr "Show README"
+
 #: rc.cpp:3
 msgid "Form"
 msgstr "Form"
 
-#. i18n: file: ui/configwindow.ui:42
-#. i18n: ectx: attribute (title), widget (QWidget, settings)
 #: rc.cpp:6
 msgid "Widget settings"
 msgstr "Widget settings"
 
-#. i18n: file: ui/configwindow.ui:48
-#. i18n: ectx: property (text), widget (QLabel, label)
 #: rc.cpp:9
 msgid ""
 "Detailed information may be found on <a href=\"http://arcanis.name/projects/"
@@ -40,14 +42,10 @@ msgstr ""
 "Detailed information may be found on <a href=\"http://arcanis.name/projects/"
 "pytextmonitor/\">project homepage</a>"
 
-#. i18n: file: ui/configwindow.ui:69
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_time)
 #: rc.cpp:12
 msgid "Time"
 msgstr "Time"
 
-#. i18n: file: ui/configwindow.ui:83
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_time)
 #: rc.cpp:15
 msgid ""
 "$time - time in default format\n"
@@ -62,14 +60,10 @@ msgstr ""
 "$longtime - time in log format\n"
 "$custom - custom time format"
 
-#. i18n: file: ui/configwindow.ui:128
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_uptime)
 #: rc.cpp:22
 msgid "Uptime"
 msgstr "Uptime"
 
-#. i18n: file: ui/configwindow.ui:139
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptime)
 #: rc.cpp:25
 msgid ""
 "$uptime - system uptime\n"
@@ -78,16 +72,11 @@ msgstr ""
 "$uptime - system uptime\n"
 "$custom - custom format"
 
-#. i18n: file: ui/configwindow.ui:187
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpu)
 #: rc.cpp:29
 msgid "CPU"
 msgstr "CPU"
 
-#. i18n: file: ui/configwindow.ui:205
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpu)
 #: rc.cpp:33
-#, no-c-format
 msgid ""
 "$cpu - total load CPU, %\n"
 "$cpu0 - load CPU for core 0, %\n"
@@ -103,14 +92,10 @@ msgstr ""
 "...\n"
 "$cpuN - load CPU for core N, %"
 
-#. i18n: file: ui/configwindow.ui:253
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpuclock)
 #: rc.cpp:41
 msgid "CPU Clock"
 msgstr "CPU Clock"
 
-#. i18n: file: ui/configwindow.ui:271
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpuclock)
 #: rc.cpp:44
 msgid ""
 "$cpucl - average CPU clock, MHz\n"
@@ -127,53 +112,35 @@ msgstr ""
 "...\n"
 "$cpuclN - CPU clock for core N, MHz"
 
-#. i18n: file: ui/configwindow.ui:319
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_temp)
 #: rc.cpp:52
 msgid "Temperature"
 msgstr "Temperature"
 
-#. i18n: file: ui/configwindow.ui:329
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_temp)
 #: rc.cpp:55
 msgid "$tempN - physical temperature on device N (from 0). Example: $temp0"
 msgstr "$tempN - physical temperature on device N (from 0). Example: $temp0"
 
-#. i18n: file: ui/configwindow.ui:377
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpu)
 #: rc.cpp:58
 msgid "GPU"
 msgstr "GPU"
 
-#. i18n: file: ui/configwindow.ui:387
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpu)
 #: rc.cpp:62
-#, no-c-format
 msgid "$gpu - gpu usage, %"
 msgstr "$gpu - gpu usage, %"
 
-#. i18n: file: ui/configwindow.ui:435
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpuTemp)
 #: rc.cpp:65
 msgid "GPU Temp"
 msgstr "GPU Temp"
 
-#. i18n: file: ui/configwindow.ui:445
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpuTemp)
 #: rc.cpp:68
 msgid "$gputemp - physical temperature on GPU"
 msgstr "$gputemp - physical temperature on GPU"
 
-#. i18n: file: ui/configwindow.ui:493
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_mem)
 #: rc.cpp:71
 msgid "Memory"
 msgstr "Memory"
 
-#. i18n: file: ui/configwindow.ui:508
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_mem)
 #: rc.cpp:75
-#, no-c-format
 msgid ""
 "$mem - RAM usage, %\n"
 "$memmb - RAM usage, MB\n"
@@ -183,16 +150,11 @@ msgstr ""
 "$memmb - RAM usage, MB\n"
 "$memgb - RAM usage, GB"
 
-#. i18n: file: ui/configwindow.ui:556
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_swap)
 #: rc.cpp:80
 msgid "Swap"
 msgstr "Swap"
 
-#. i18n: file: ui/configwindow.ui:571
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_swap)
 #: rc.cpp:84
-#, no-c-format
 msgid ""
 "$swap - swap usage, %\n"
 "$swapmb - swap usage, MB\n"
@@ -202,44 +164,47 @@ msgstr ""
 "$swapmb - swap usage, MB\n"
 "$swapgb - swap usage, GB"
 
-#. i18n: file: ui/configwindow.ui:619
+#: rc.cpp:89 rc.cpp:341
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#. i18n: file: ui/configwindow.ui:2106
-#. i18n: ectx: property (text), widget (QLabel, label_hdddev)
-#: rc.cpp:89 rc.cpp:298
 msgid "HDD"
 msgstr "HDD"
 
-#. i18n: file: ui/configwindow.ui:629
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hdd)
 #: rc.cpp:93
-#, no-c-format
+msgid ""
-msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
+"$hddN - usage for mount point N (from 0), %. Example: $hdd0\n"
-msgstr "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
+"$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n"
+"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0"
+msgstr ""
+"$hddN - usage for mount point N (from 0), %. Example: $hdd0\n"
+"$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n"
+"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0"
 
-#. i18n: file: ui/configwindow.ui:677
+#: rc.cpp:98
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_hddTemp)
+msgid "HDD speed"
-#: rc.cpp:96
+msgstr "HDD speed"
-msgid "HDD Temp"
-msgstr "HDD Temp"
 
-#. i18n: file: ui/configwindow.ui:687
+#: rc.cpp:101
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hddTemp)
+msgid ""
-#: rc.cpp:99
+"$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n"
+"$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0"
+msgstr ""
+"$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n"
+"$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0"
+
+#: rc.cpp:105
+msgid "HDD temp"
+msgstr "HDD temp"
+
+#: rc.cpp:108
 msgid ""
 "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0"
 msgstr ""
 "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0"
 
-#. i18n: file: ui/configwindow.ui:735
+#: rc.cpp:111
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_net)
-#: rc.cpp:102
 msgid "Network"
 msgstr "Network"
 
-#. i18n: file: ui/configwindow.ui:750
+#: rc.cpp:114
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_net)
-#: rc.cpp:105
 msgid ""
 "$down - download speed, KB/s\n"
 "$up - upload speed, KB/s\n"
@@ -249,16 +214,11 @@ msgstr ""
 "$up - upload speed, KB/s\n"
 "$netdev - current network device"
 
-#. i18n: file: ui/configwindow.ui:798
+#: rc.cpp:119
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_bat)
-#: rc.cpp:110
 msgid "Battery"
 msgstr "Battery"
 
-#. i18n: file: ui/configwindow.ui:809
+#: rc.cpp:123
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_bat)
-#: rc.cpp:114
-#, no-c-format
 msgid ""
 "$bat - battery charge, %\n"
 "$ac - AC status"
@@ -266,17 +226,11 @@ msgstr ""
 "$bat - battery charge, %\n"
 "$ac - AC status"
 
-#. i18n: file: ui/configwindow.ui:857
+#: rc.cpp:127 rc.cpp:271
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_player)
-#. i18n: file: ui/configwindow.ui:1347
-#. i18n: ectx: property (text), widget (QLabel, label_playerSelect)
-#: rc.cpp:118 rc.cpp:223
 msgid "Music player"
 msgstr "Music player"
 
-#. i18n: file: ui/configwindow.ui:871
+#: rc.cpp:130
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_player)
-#: rc.cpp:121
 msgid ""
 "$album - song album\n"
 "$artist - song artist\n"
@@ -290,33 +244,51 @@ msgstr ""
 "$time - song duration\n"
 "$title - song title"
 
-#. i18n: file: ui/configwindow.ui:919
+#: rc.cpp:137
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_custom)
+msgid "Processes"
-#: rc.cpp:128
+msgstr "Processes"
+
+#: rc.cpp:140
+msgid ""
+"$pscount - number of running processes\n"
+"$pstotal - total number of running processes\n"
+"$ps - list of running processes comma separated"
+msgstr ""
+"$pscount - number of running processes\n"
+"$pstotal - total number of running processes\n"
+"$ps - list of running processes comma separated"
+
+#: rc.cpp:145 rc.cpp:350
+msgid "Package manager"
+msgstr "Package manager"
+
+#: rc.cpp:148
+msgid ""
+"$pkgcountN - number of packages which are available for updates, command N. "
+"For example $pkgcount0"
+msgstr ""
+"$pkgcountN - number of packages which are available for updates, command N. "
+"For example $pkgcount0"
+
+#: rc.cpp:151
 msgid "Custom"
 msgstr "Custom"
 
-#. i18n: file: ui/configwindow.ui:929
+#: rc.cpp:154
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_custom)
+msgid ""
-#: rc.cpp:131
+"$customN - get output from custom command N (from N). Example `$custom0`"
-msgid "$custom - get output from custom command"
+msgstr ""
-msgstr "$custom - get output from custom command"
+"$customN - get output from custom command N (from N). Example `$custom0`"
 
-#. i18n: file: ui/configwindow.ui:983
+#: rc.cpp:157
-#. i18n: ectx: attribute (title), widget (QWidget, advanced)
-#: rc.cpp:134
 msgid "Advanced"
 msgstr "Advanced"
 
-#. i18n: file: ui/configwindow.ui:997
+#: rc.cpp:160
-#. i18n: ectx: property (text), widget (QLabel, label_timeFormat)
-#: rc.cpp:137
 msgid "Custom time format"
 msgstr "Custom time format"
 
-#. i18n: file: ui/configwindow.ui:1019
+#: rc.cpp:163
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_timeFormat)
-#: rc.cpp:140
 msgid ""
 "$dddd - long weekday\n"
 "$ddd - short weekday\n"
@@ -352,15 +324,11 @@ msgstr ""
 "$ss - seconds\n"
 "$s - seconds w\\o zero"
 
-#. i18n: file: ui/configwindow.ui:1039
+#: rc.cpp:181
-#. i18n: ectx: property (text), widget (QLabel, label_uptimeFormat)
-#: rc.cpp:158
 msgid "Custom uptime format"
 msgstr "Custom uptime format"
 
-#. i18n: file: ui/configwindow.ui:1051
+#: rc.cpp:184
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptimeFormat)
-#: rc.cpp:161
 msgid ""
 "$dd - uptime days\n"
 "$d - uptime days without zero\n"
@@ -376,29 +344,19 @@ msgstr ""
 "$mm - uptime minutes\n"
 "$m - uptime minutes without zero"
 
-#. i18n: file: ui/configwindow.ui:1073
+#: rc.cpp:192
-#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+msgid "Temperature units"
-#: rc.cpp:169
+msgstr "Temperature units"
+
+#: rc.cpp:195
 msgid "Temperature devices"
 msgstr "Temperature devices"
 
-#. i18n: file: ui/configwindow.ui:1099
+#: rc.cpp:198 rc.cpp:208 rc.cpp:218 rc.cpp:228 rc.cpp:331 rc.cpp:374
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
-#. i18n: file: ui/configwindow.ui:1154
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
-#. i18n: file: ui/configwindow.ui:1209
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_hddDevice)
-#: rc.cpp:172 rc.cpp:182 rc.cpp:192
 msgid "Add"
 msgstr "Add"
 
-#. i18n: file: ui/configwindow.ui:1109
+#: rc.cpp:201 rc.cpp:211 rc.cpp:221 rc.cpp:231 rc.cpp:334 rc.cpp:377
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
-#. i18n: file: ui/configwindow.ui:1164
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
-#. i18n: file: ui/configwindow.ui:1219
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_hddDevice)
-#: rc.cpp:175 rc.cpp:185 rc.cpp:195
 msgid ""
 "Editable\n"
 "del - remove item"
@@ -406,93 +364,71 @@ msgstr ""
 "Editable\n"
 "del - remove item"
 
-#. i18n: file: ui/configwindow.ui:1128
+#: rc.cpp:205
-#. i18n: ectx: property (text), widget (QLabel, label_mount)
-#: rc.cpp:179
 msgid "Mount points"
 msgstr "Mount points"
 
-#. i18n: file: ui/configwindow.ui:1183
+#: rc.cpp:215
-#. i18n: ectx: property (text), widget (QLabel, label_hddDevice)
+msgid "HDD devices (speed)"
-#: rc.cpp:189
+msgstr "HDD (speed)"
-msgid "HDD devices"
-msgstr "HDD devices"
 
-#. i18n: file: ui/configwindow.ui:1236
+#: rc.cpp:225
-#. i18n: ectx: property (text), widget (QLabel, label_netdir)
+msgid "HDD devices (temp)"
-#: rc.cpp:199
+msgstr "HDD (temp)"
+
+#: rc.cpp:235
 msgid "Network directory"
 msgstr "Network directory"
 
-#. i18n: file: ui/configwindow.ui:1243
+#: rc.cpp:238
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_netdir)
-#: rc.cpp:202
 msgid "\"/sys/class/net\" by default"
 msgstr "\"/sys/class/net\" by default"
 
-#. i18n: file: ui/configwindow.ui:1263
+#: rc.cpp:241
-#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:205
 msgid "Disable auto select device and set specified device"
 msgstr "Disable auto select device and set specified device"
 
-#. i18n: file: ui/configwindow.ui:1266
+#: rc.cpp:244
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:208
 msgid "Set network device"
 msgstr "Set network device"
 
-#. i18n: file: ui/configwindow.ui:1299
+#: rc.cpp:247
-#. i18n: ectx: property (text), widget (QLabel, label_batdev)
-#: rc.cpp:211
 msgid "Battery device"
 msgstr "Battery device"
 
-#. i18n: file: ui/configwindow.ui:1306
+#: rc.cpp:250
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
-#: rc.cpp:214
 msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
 msgstr "\"/sys/class/power_supply/BAT0/capacity\" by default"
 
-#. i18n: file: ui/configwindow.ui:1323
+#: rc.cpp:253
-#. i18n: ectx: property (text), widget (QLabel, label_acdev)
+msgid "AC online tag"
-#: rc.cpp:217
+msgstr "AC online tag"
+
+#: rc.cpp:256
+msgid "Line, which returns when AC is online"
+msgstr "Line, which returns when AC is online"
+
+#: rc.cpp:259
+msgid "AC offline tag"
+msgstr "AC offline tag"
+
+#: rc.cpp:262
+msgid "Line, which returns when AC is offline"
+msgstr "Line, which returns when AC is offline"
+
+#: rc.cpp:265
 msgid "AC device"
 msgstr "AC device"
 
-#. i18n: file: ui/configwindow.ui:1330
+#: rc.cpp:268
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
-#: rc.cpp:220
 msgid "\"/sys/class/power_supply/AC/online\" by default"
 msgstr "\"/sys/class/power_supply/AC/online\" by default"
 
-#. i18n: file: ui/configwindow.ui:1367
+#: rc.cpp:274
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:226
-msgid "amarok"
-msgstr "amarok"
-
-#. i18n: file: ui/configwindow.ui:1372
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:229
-msgid "mpd"
-msgstr "mpd"
-
-#. i18n: file: ui/configwindow.ui:1377
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:232
-msgid "qmmp"
-msgstr "qmmp"
-
-#. i18n: file: ui/configwindow.ui:1401
-#. i18n: ectx: attribute (title), widget (QWidget, tooltip)
-#: rc.cpp:235
 msgid "Tooltip"
 msgstr "Tooltip"
 
-#. i18n: file: ui/configwindow.ui:1407
+#: rc.cpp:277
-#. i18n: ectx: property (text), widget (QLabel, label_tooltip)
-#: rc.cpp:238
 msgid ""
 "CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
 "To enable them just make needed checkbox fully checked."
@@ -500,154 +436,145 @@ msgstr ""
 "CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
 "To enable them just make needed checkbox fully checked."
 
-#. i18n: file: ui/configwindow.ui:1428
+#: rc.cpp:280
-#. i18n: ectx: property (text), widget (QLabel, label_tooltipNum)
-#: rc.cpp:241
 msgid "Number of values for tooltips"
 msgstr "Number of values for tooltips"
 
-#. i18n: file: ui/configwindow.ui:1483
+#: rc.cpp:283
-#. i18n: ectx: property (text), widget (QLabel, label_cpuColor)
-#: rc.cpp:244
-msgid "CPU color"
-msgstr "CPU color"
-
-#. i18n: file: ui/configwindow.ui:1523
-#. i18n: ectx: property (text), widget (QLabel, label_cpuclockColor)
-#: rc.cpp:247
 msgid "CPU clock color"
 msgstr "CPU clock color"
 
-#. i18n: file: ui/configwindow.ui:1563
+#: rc.cpp:286
-#. i18n: ectx: property (text), widget (QLabel, label_memColor)
-#: rc.cpp:250
-msgid "Memory color"
-msgstr "Memory color"
-
-#. i18n: file: ui/configwindow.ui:1603
-#. i18n: ectx: property (text), widget (QLabel, label_swapColor)
-#: rc.cpp:253
 msgid "Swap color"
 msgstr "Swap color"
 
-#. i18n: file: ui/configwindow.ui:1643
+#: rc.cpp:289
-#. i18n: ectx: property (text), widget (QLabel, label_downColor)
+msgid "CPU color"
-#: rc.cpp:256
+msgstr "CPU color"
+
+#: rc.cpp:292
 msgid "Download speed color"
 msgstr "Download speed color"
 
-#. i18n: file: ui/configwindow.ui:1683
+#: rc.cpp:295
-#. i18n: ectx: property (text), widget (QLabel, label_upColor)
+msgid "Memory color"
-#: rc.cpp:259
+msgstr "Memory color"
+
+#: rc.cpp:298
 msgid "Upload speed color"
 msgstr "Upload speed color"
 
-#. i18n: file: ui/configwindow.ui:1729
+#: rc.cpp:301
-#. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:262
 msgid "Appearance"
 msgstr "Appearance"
 
-#. i18n: file: ui/configwindow.ui:1743
+#: rc.cpp:304
-#. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:265
 msgid "Time interval"
 msgstr "Time interval"
 
-#. i18n: file: ui/configwindow.ui:1798
+#: rc.cpp:307
-#. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:268
 msgid "Font"
 msgstr "Font"
 
-#. i18n: file: ui/configwindow.ui:1838
+#: rc.cpp:310
-#. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:271
 msgid "Font size"
 msgstr "Font size"
 
-#. i18n: file: ui/configwindow.ui:1893
+#: rc.cpp:313
-#. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:274
 msgid "Font color"
 msgstr "Font color"
 
-#. i18n: file: ui/configwindow.ui:1933
+#: rc.cpp:316
-#. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:277
 msgid "Font style"
 msgstr "Font style"
 
-#. i18n: file: ui/configwindow.ui:1983
+#: rc.cpp:319
-#. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:280
 msgid "Font weight"
 msgstr "Font weight"
 
-#. i18n: file: ui/configwindow.ui:2044
+#: rc.cpp:322
-#. i18n: ectx: attribute (title), widget (QWidget, dataengine)
-#: rc.cpp:283
 msgid "DataEngine"
 msgstr "DataEngine"
 
-#. i18n: file: ui/configwindow.ui:2058
+#: rc.cpp:325
-#. i18n: ectx: property (text), widget (QLabel, label_gpudev)
-#: rc.cpp:286
-msgid "GPU device"
-msgstr "GPU device"
-
-#. i18n: file: ui/configwindow.ui:2078
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:289
-msgid "auto"
-msgstr "auto"
-
-#. i18n: file: ui/configwindow.ui:2083
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:292
-msgid "nvidia"
-msgstr "nvidia"
-
-#. i18n: file: ui/configwindow.ui:2088
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:295
-msgid "ati"
-msgstr "ati"
-
-#. i18n: file: ui/configwindow.ui:2139
-#. i18n: ectx: property (text), widget (QLabel, label_mpdaddress)
-#: rc.cpp:301
-msgid "MPD address"
-msgstr "MPD address"
-
-#. i18n: file: ui/configwindow.ui:2163
-#. i18n: ectx: property (text), widget (QLabel, label_mpdport)
-#: rc.cpp:304
-msgid "MPD port"
-msgstr "MPD port"
-
-#. i18n: file: ui/configwindow.ui:2218
-#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
-#: rc.cpp:307
 msgid "Custom command"
 msgstr "Custom command"
 
-#. i18n: file: ui/configwindow.ui:2225
+#: rc.cpp:328
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
-#: rc.cpp:310
 msgid "Custom command to run"
 msgstr "Custom command to run"
 
-#: rc.cpp:311
+#: rc.cpp:338
+msgid "GPU device"
+msgstr "GPU device"
+
+#: rc.cpp:344
+msgid "MPD address"
+msgstr "MPD address"
+
+#: rc.cpp:347
+msgid "MPD port"
+msgstr "MPD port"
+
+#: rc.cpp:353
+msgid "pacman -Qu"
+msgstr "pacman -Qu"
+
+#: rc.cpp:356
+msgid "apt-show-versions -u -b"
+msgstr "apt-show-versions -u -b"
+
+#: rc.cpp:359
+msgid "aptitude search '~U'"
+msgstr "aptitude search '~U'"
+
+#: rc.cpp:362
+msgid "yum list updates"
+msgstr "yum list updates"
+
+#: rc.cpp:365
+msgid "pkg_version -I -l '<'"
+msgstr "pkg_version -I -l '<'"
+
+#: rc.cpp:368
+msgid "urpmq --auto-select"
+msgstr "urpmq --auto-select"
+
+#: rc.cpp:371
+msgid "Number of null lines"
+msgstr "Number of null lines"
+
+#: rc.cpp:379
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Evgeniy Alekseev"
 
-#: rc.cpp:312
+#: rc.cpp:380
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "amarok"
+#~ msgstr "amarok"
+
+#~ msgid "mpd"
+#~ msgstr "mpd"
+
+#~ msgid "qmmp"
+#~ msgstr "qmmp"
+
+#~ msgid "auto"
+#~ msgstr "auto"
+
+#~ msgid "nvidia"
+#~ msgstr "nvidia"
+
+#~ msgid "ati"
+#~ msgstr "ati"
+
+#~ msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
+#~ msgstr "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
+
 #~ msgid ""
 #~ "$ds - uptime days\n"
 #~ "$hs - uptime hours\n"

sources/ptm/po/es.po

@@ -0,0 +1,565 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Ernesto Avilés Vzqz <whippiii@gmail.com>, 2014.
+# Evgeniy Alekseev <esalexeev@gmail.com>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n"
+"POT-Creation-Date: 2014-05-19 11:55+0400\n"
+"PO-Revision-Date: 2014-05-19 23:02+0400\n"
+"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
+"Language-Team: Spanish <kde-russian@lists.kde.ru>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: code/main.py:108
+msgid "Run ksysguard"
+msgstr "Ejecutar ksysguard"
+
+#: code/main.py:110
+msgid "Show README"
+msgstr "Mostrar el README"
+
+#: rc.cpp:3
+msgid "Form"
+msgstr "Formulario"
+
+#: rc.cpp:6
+msgid "Widget settings"
+msgstr "Configuración del componente"
+
+#: rc.cpp:9
+msgid ""
+"Detailed information may be found on <a href=\"http://arcanis.name/projects/"
+"pytextmonitor/\">project homepage</a>"
+msgstr ""
+"Puede encontrar información detallada en el <a href=\"http://arcanis.name/"
+"projects/pytextmonitor/\">sitio del proyecto</a>"
+
+#: rc.cpp:12
+msgid "Time"
+msgstr "Hora"
+
+#: rc.cpp:15
+msgid ""
+"$time - time in default format\n"
+"$isotime - time in ISO format\n"
+"$shorttime - time in short format\n"
+"$longtime - time in log format\n"
+"$custom - custom time format"
+msgstr ""
+"$time - hora en el  formato por defecto\n"
+"$isotime - hora en formato ISO\n"
+"$shorttime - hora en formato corto\n"
+"$longtime - hora en formato largo\n"
+"$custom - hora en formato personalizado"
+
+#: rc.cpp:22
+msgid "Uptime"
+msgstr "Tiempo de actividad"
+
+#: rc.cpp:25
+msgid ""
+"$uptime - system uptime\n"
+"$custom - custom format"
+msgstr ""
+"$uptime - tiempo de actividad del sistema\n"
+"$custom - formato personalizado"
+
+#: rc.cpp:29
+msgid "CPU"
+msgstr "CPU"
+
+#: rc.cpp:33
+msgid ""
+"$cpu - total load CPU, %\n"
+"$cpu0 - load CPU for core 0, %\n"
+"...\n"
+"$cpu9 - load CPU for core 9, %\n"
+"...\n"
+"$cpuN - load CPU for core N, %"
+msgstr ""
+"$cpu - carga total de la CPU, %\n"
+"$cpu0 - carga de la CPU para el núcleo 0, %\n"
+"...\n"
+"$cpu9 - carga de la CPU para el núcleo 9, %\n"
+"...\n"
+"$cpuN - carga de la CPU para el núcleo N, %"
+
+#: rc.cpp:41
+msgid "CPU Clock"
+msgstr "Frecuencia de la CPU"
+
+#: rc.cpp:44
+msgid ""
+"$cpucl - average CPU clock, MHz\n"
+"$cpucl0 - CPU clock for core 0, MHz\n"
+"...\n"
+"$cpucl9 - CPU clock for core 9, MHz\n"
+"...\n"
+"$cpuclN - CPU clock for core N, MHz"
+msgstr ""
+"$cpucl - frecuencia de la CPU promedio, MHz\n"
+"$cpucl0 - frecuencia de la CPU para el núcleo 0, MHz\n"
+"...\n"
+"$cpucl9 - frecuencia de la CPU para el núcleo 9, MHz\n"
+"...\n"
+"$cpuclN - frecuencia de la CPU para el núcleo N, MHz"
+
+#: rc.cpp:52
+msgid "Temperature"
+msgstr "Temperatura"
+
+#: rc.cpp:55
+msgid "$tempN - physical temperature on device N (from 0). Example: $temp0"
+msgstr ""
+"$tempN - temperatura física en el dispositivo N (a partir de 0). Ejemplo: "
+"$temp0"
+
+#: rc.cpp:58
+msgid "GPU"
+msgstr "GPU"
+
+#: rc.cpp:62
+msgid "$gpu - gpu usage, %"
+msgstr "$gpu - uso de la GPU, %"
+
+#: rc.cpp:65
+msgid "GPU Temp"
+msgstr "Temperatura de la GPU"
+
+#: rc.cpp:68
+msgid "$gputemp - physical temperature on GPU"
+msgstr "$gputemp - temperatura física de la GPU"
+
+#: rc.cpp:71
+msgid "Memory"
+msgstr "Memoria"
+
+#: rc.cpp:75
+msgid ""
+"$mem - RAM usage, %\n"
+"$memmb - RAM usage, MB\n"
+"$memgb - RAM usage, GB"
+msgstr ""
+"$mem - uso de la RAM, %\n"
+"$memmb - uso de la RAM, MB\n"
+"$memgb - uso de la RAM, GB"
+
+#: rc.cpp:80
+msgid "Swap"
+msgstr "Swap"
+
+#: rc.cpp:84
+msgid ""
+"$swap - swap usage, %\n"
+"$swapmb - swap usage, MB\n"
+"$swapgb - swap usage, GB"
+msgstr ""
+"$swap - uso de la swap, %\n"
+"$swapmb - uso de la swap, MB\n"
+"$swapgb - uso de la swap, GB"
+
+#: rc.cpp:89 rc.cpp:341
+msgid "HDD"
+msgstr "Disco duro"
+
+#: rc.cpp:93
+msgid ""
+"$hddN - usage for mount point N (from 0), %. Example: $hdd0\n"
+"$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n"
+"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0"
+msgstr ""
+"$hddN - uso para el punto de montaje N (a partir de 0), %. Ejemplo: $hdd0\n"
+"$hddmbN - uso para el punto de montaje N (a partir de 0), MB. Ejemplo: "
+"$hddmb0\n"
+"$hddgbN - uso para el punto de montaje N (a partir de 0), GB. Ejemplo: $hddgb0"
+
+#: rc.cpp:98
+msgid "HDD speed"
+msgstr "Velocidad del disco duro"
+
+#: rc.cpp:101
+msgid ""
+"$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n"
+"$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0"
+msgstr ""
+"$hddrN - leer la velocidad del disco N (a partir de 0), KB/s. Por ejemplo: "
+"$hddr0\n"
+"$hddwN - velocidad de escritura del disco N (a partir de 0), KB/s. Por "
+"ejemplo: $hddw0"
+
+#: rc.cpp:105
+msgid "HDD temp"
+msgstr "Temperatura del disco duro"
+
+#: rc.cpp:108
+msgid ""
+"$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0"
+msgstr ""
+"$hddtempN - temperatura física en el dispositivo N (a partir de 0). Ejemplo: "
+"$hddtemp0"
+
+#: rc.cpp:111
+msgid "Network"
+msgstr "Red"
+
+#: rc.cpp:114
+msgid ""
+"$down - download speed, KB/s\n"
+"$up - upload speed, KB/s\n"
+"$netdev - current network device"
+msgstr ""
+"$down - velocidad de recepción, KB/s\n"
+"$up - velocidad de envío, KB/s\n"
+"$netdev - dispositivo de red actual"
+
+#: rc.cpp:119
+msgid "Battery"
+msgstr "Batería"
+
+#: rc.cpp:123
+msgid ""
+"$bat - battery charge, %\n"
+"$ac - AC status"
+msgstr ""
+"$bat - carga de la batería, %\n"
+"$ac - estado de la alimentación"
+
+#: rc.cpp:127 rc.cpp:271
+msgid "Music player"
+msgstr "Reproductor de música"
+
+#: rc.cpp:130
+msgid ""
+"$album - song album\n"
+"$artist - song artist\n"
+"$progress - song progress\n"
+"$time - song duration\n"
+"$title - song title"
+msgstr ""
+"$album - álbum de la canción\n"
+"$artist - artista de la canción\n"
+"$progress - progreso de la canción\n"
+"$time - duración de la canción\n"
+"$title - título de la canción"
+
+#: rc.cpp:137
+msgid "Processes"
+msgstr "Procesos"
+
+#: rc.cpp:140
+msgid ""
+"$pscount - number of running processes\n"
+"$pstotal - total number of running processes\n"
+"$ps - list of running processes comma separated"
+msgstr ""
+"$pscount - número de procesos en ejecución\n"
+"$pstotal - total de procesos en ejecución\n"
+"$ps - listado de procesos en ejecución separados por coma"
+
+#: rc.cpp:145 rc.cpp:350
+msgid "Package manager"
+msgstr "Gestor de paquetes"
+
+#: rc.cpp:148
+msgid ""
+"$pkgcountN - number of packages which are available for updates, command N. "
+"For example $pkgcount0"
+msgstr ""
+"$pkgcountN - número de paquetes con actualizaciones disponibles, comando N. "
+"Por ejemplo $pkgcount0"
+
+#: rc.cpp:151
+msgid "Custom"
+msgstr "Personalizado"
+
+#: rc.cpp:154
+msgid ""
+"$customN - get output from custom command N (from N). Example `$custom0`"
+msgstr ""
+"$customN - obtener la salida de ejecución del comando personalizado N "
+"(apartir de 0). Por ejemplo: $custom0"
+
+#: rc.cpp:157
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: rc.cpp:160
+msgid "Custom time format"
+msgstr "Formato personalizado para la hora"
+
+#: rc.cpp:163
+msgid ""
+"$dddd - long weekday\n"
+"$ddd - short weekday\n"
+"$dd - day\n"
+"$d - day w\\o zero\n"
+"$MMMM - long month\n"
+"$MMM - short month\n"
+"$MM - month\n"
+"$M - month w\\o zero\n"
+"$yyyy - year\n"
+"$yy - short year\n"
+"$hh - hours (24 only)\n"
+"$h - hours w\\o zero (24 only)\n"
+"$mm - minutes\n"
+"$m - minutes w\\o zero\n"
+"$ss - seconds\n"
+"$s - seconds w\\o zero"
+msgstr ""
+"$dddd - día de la semana largo\n"
+"$ddd - día de la semana corto\n"
+"$dd - día\n"
+"$d - día (sin ceros)\n"
+"$MMMM - mes largo\n"
+"$MMM - mes corto\n"
+"$MM - mes\n"
+"$M - mes (sin ceros)\n"
+"$yyyy - año\n"
+"$yy - año largo\n"
+"$hh - horas (solo formato de 24 horas)\n"
+"$h - horas (sin ceros, solo formato de 24 horas)\n"
+"$mm - minutos\n"
+"$m - minutos (sin ceros)\n"
+"$ss - segundos\n"
+"$s - segundos (sin ceros)"
+
+#: rc.cpp:181
+msgid "Custom uptime format"
+msgstr "Formato personalizado para el tiempo de actividad del sistema"
+
+#: rc.cpp:184
+msgid ""
+"$dd - uptime days\n"
+"$d - uptime days without zero\n"
+"$hh - uptime hours\n"
+"$h - uptime hours without zero\n"
+"$mm - uptime minutes\n"
+"$m - uptime minutes without zero"
+msgstr ""
+"$dd - días\n"
+"$d - días (sin ceros)\n"
+"$hh - horas\n"
+"$h - horas (sin ceros)\n"
+"$mm - minutos\n"
+"$m - minutos (sin ceros)"
+
+#: rc.cpp:192
+msgid "Temperature units"
+msgstr "Unidades de temperatura"
+
+#: rc.cpp:195
+msgid "Temperature devices"
+msgstr "Dispositivos de temperatura"
+
+#: rc.cpp:198 rc.cpp:208 rc.cpp:218 rc.cpp:228 rc.cpp:331 rc.cpp:374
+msgid "Add"
+msgstr "Añadir"
+
+#: rc.cpp:201 rc.cpp:211 rc.cpp:221 rc.cpp:231 rc.cpp:334 rc.cpp:377
+msgid ""
+"Editable\n"
+"del - remove item"
+msgstr ""
+"Editable\n"
+"del - eliminar elemento"
+
+#: rc.cpp:205
+msgid "Mount points"
+msgstr "Puntos de montaje"
+
+#: rc.cpp:215
+msgid "HDD devices (speed)"
+msgstr "Disco duro (velocidad)"
+
+#: rc.cpp:225
+msgid "HDD devices (temp)"
+msgstr "Disco duro (temperatura)"
+
+#: rc.cpp:235
+msgid "Network directory"
+msgstr "Directorio de la red"
+
+#: rc.cpp:238
+msgid "\"/sys/class/net\" by default"
+msgstr "\"/sys/class/net\" por defecto"
+
+#: rc.cpp:241
+msgid "Disable auto select device and set specified device"
+msgstr "Inhabilitar selección automática del dispositivo y especificar uno"
+
+#: rc.cpp:244
+msgid "Set network device"
+msgstr "Establecer dispositivo de red"
+
+#: rc.cpp:247
+msgid "Battery device"
+msgstr "Dispositivo de batería"
+
+#: rc.cpp:250
+msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
+msgstr "\"/sys/class/power_supply/BAT0/capacity\" por defecto"
+
+#: rc.cpp:253
+msgid "AC online tag"
+msgstr "Etiqueta para alimentación conectada"
+
+#: rc.cpp:256
+msgid "Line, which returns when AC is online"
+msgstr "Línea que devuelve si la alimentación está conectada"
+
+#: rc.cpp:259
+msgid "AC offline tag"
+msgstr "Etiqueta para la alimentación desconectada"
+
+#: rc.cpp:262
+msgid "Line, which returns when AC is offline"
+msgstr "Línea que devuelve si la alimentación está desconectada"
+
+#: rc.cpp:265
+msgid "AC device"
+msgstr "Dispositivo de alimentación"
+
+#: rc.cpp:268
+msgid "\"/sys/class/power_supply/AC/online\" by default"
+msgstr "\"/sys/class/power_supply/AC/online\" por defecto"
+
+#: rc.cpp:274
+msgid "Tooltip"
+msgstr "Ventana emergente"
+
+#: rc.cpp:277
+msgid ""
+"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
+"To enable them just make needed checkbox fully checked."
+msgstr ""
+"Las etiquetas para CPU, frecuencia de la CPU, memoria, swap  y red soportan "
+"ventanas emergentes. "
+"Para habilitarlas habilite la caja de seleccione la casilla de verificación "
+"pertinente."
+
+#: rc.cpp:280
+msgid "Number of values for tooltips"
+msgstr "Número de valores para las ventanas emergentes"
+
+#: rc.cpp:283
+msgid "CPU clock color"
+msgstr "Color de la frecuencia de la CPU"
+
+#: rc.cpp:286
+msgid "Swap color"
+msgstr "Color de la swap"
+
+#: rc.cpp:289
+msgid "CPU color"
+msgstr "Color de la CPU"
+
+#: rc.cpp:292
+msgid "Download speed color"
+msgstr "Color de la velocidad de recepción"
+
+#: rc.cpp:295
+msgid "Memory color"
+msgstr "Color de la memoria"
+
+#: rc.cpp:298
+msgid "Upload speed color"
+msgstr "Color de la velocidad de envío"
+
+#: rc.cpp:301
+msgid "Appearance"
+msgstr "Apariencia"
+
+#: rc.cpp:304
+msgid "Time interval"
+msgstr "Intervalo de tiempo"
+
+#: rc.cpp:307
+msgid "Font"
+msgstr "Fuente"
+
+#: rc.cpp:310
+msgid "Font size"
+msgstr "Tamaño de fuente"
+
+#: rc.cpp:313
+msgid "Font color"
+msgstr "Color de fuente"
+
+#: rc.cpp:316
+msgid "Font style"
+msgstr "Estilo de fuente"
+
+#: rc.cpp:319
+msgid "Font weight"
+msgstr "Grosor de la fuente"
+
+#: rc.cpp:322
+msgid "DataEngine"
+msgstr "DataEngine"
+
+#: rc.cpp:325
+msgid "Custom command"
+msgstr "Comando personalizado"
+
+#: rc.cpp:328
+msgid "Custom command to run"
+msgstr "Comando personalizado para ejecutar"
+
+#: rc.cpp:338
+msgid "GPU device"
+msgstr "Dispositivo de GPU"
+
+#: rc.cpp:344
+msgid "MPD address"
+msgstr "Dirección de MPD"
+
+#: rc.cpp:347
+msgid "MPD port"
+msgstr "Puerto de MPD"
+
+#: rc.cpp:353
+msgid "pacman -Qu"
+msgstr "pacman -Qu"
+
+#: rc.cpp:356
+msgid "apt-show-versions -u -b"
+msgstr "apt-show-versions -u -b"
+
+#: rc.cpp:359
+msgid "aptitude search '~U'"
+msgstr "aptitude search '~U'"
+
+#: rc.cpp:362
+msgid "yum list updates"
+msgstr "yum list updates"
+
+#: rc.cpp:365
+msgid "pkg_version -I -l '<'"
+msgstr "pkg_version -I -l '<'"
+
+#: rc.cpp:368
+msgid "urpmq --auto-select"
+msgstr "urpmq --auto-select"
+
+#: rc.cpp:371
+msgid "Number of null lines"
+msgstr "Número de líneas nulas"
+
+#: rc.cpp:379
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Tu nombre"
+
+#: rc.cpp:380
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "Tus correos"
+

sources/ptm/po/extract_messages.sh

@@ -31,7 +31,7 @@ add_list()
 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
+find . -name '*.rc' -o -name '*.ui' -o -name '*.kcfg' -o -name '*.py' | sort > ${WDIR}/rcfiles.list
 xargs --arg-file=${WDIR}/rcfiles.list extractrc > ${WDIR}/rc.cpp
 
 # additional string for KAboutData
@@ -52,12 +52,12 @@ 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
+find . -name '*.cpp' -o -name '*.h' -o -name '*.c' -o -name '*.py' | 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}" \
+--msgid-bugs-address="${BUGADDR}" --language=Python \
 --files-from=infiles.list -D ${BASEDIR} -D ${WDIR} -o ${PROJECT}.pot || { echo "error while calling xgettext. aborting."; exit 1; }
 echo "Done extracting messages"
 

sources/ptm/po/fr.po

@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n"
-"POT-Creation-Date: 2014-04-05 22:36+0400\n"
+"POT-Creation-Date: 2014-05-19 11:55+0400\n"
-"PO-Revision-Date: 2014-04-05 22:36+0400\n"
+"PO-Revision-Date: 2014-05-21 16:45+0200\n"
-"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
+"Last-Translator: Mermouy <mermouy@gmail.com>\n"
-"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"Language-Team: French <kde-i18n-doc@kde.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,20 +19,22 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#. i18n: file: ui/configwindow.ui:32
+#: code/main.py:108
-#. i18n: ectx: property (windowTitle), widget (QWidget, ConfigWindow)
+msgid "Run ksysguard"
+msgstr "Lancer ksysguard"
+
+#: code/main.py:110
+msgid "Show README"
+msgstr "Voir le README"
+
 #: rc.cpp:3
 msgid "Form"
 msgstr "Entrées"
 
-#. i18n: file: ui/configwindow.ui:42
-#. i18n: ectx: attribute (title), widget (QWidget, settings)
 #: rc.cpp:6
 msgid "Widget settings"
 msgstr "Paramètres de l'applet"
 
-#. i18n: file: ui/configwindow.ui:48
-#. i18n: ectx: property (text), widget (QLabel, label)
 #: rc.cpp:9
 msgid ""
 "Detailed information may be found on <a href=\"http://arcanis.name/projects/"
@@ -41,14 +43,10 @@ msgstr ""
 "D'avantage d'informations se trouvent sur <a href=\"http://arcanis.name/"
 "projects/pytextmonitor/\">la page du projet</a>"
 
-#. i18n: file: ui/configwindow.ui:69
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_time)
 #: rc.cpp:12
 msgid "Time"
 msgstr "Durée"
 
-#. i18n: file: ui/configwindow.ui:83
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_time)
 #: rc.cpp:15
 msgid ""
 "$time - time in default format\n"
@@ -63,14 +61,10 @@ msgstr ""
 "$longtime - l'heure au format log\n"
 "$custom - l'heure, format personnalisé"
 
-#. i18n: file: ui/configwindow.ui:128
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_uptime)
 #: rc.cpp:22
 msgid "Uptime"
 msgstr "temps de fonctionnement"
 
-#. i18n: file: ui/configwindow.ui:139
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptime)
 #: rc.cpp:25
 msgid ""
 "$uptime - system uptime\n"
@@ -79,16 +73,12 @@ msgstr ""
 "$uptime - temps de fonctionnement\n"
 "$custom - format personnalisé"
 
-#. i18n: file: ui/configwindow.ui:187
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpu)
 #: rc.cpp:29
 msgid "CPU"
 msgstr "CPU"
 
-#. i18n: file: ui/configwindow.ui:205
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpu)
 #: rc.cpp:33
-#, no-c-format
+#, fuzzy
 msgid ""
 "$cpu - total load CPU, %\n"
 "$cpu0 - load CPU for core 0, %\n"
@@ -100,19 +90,14 @@ msgstr ""
 "$cpu - charge totale du processeur, %\n"
 "$cpu0 - charge du processeur pour le coeur 0, %\n"
 "...\n"
-"$cpu9 - charge processeur pour le coeur 9, %\n"
+"$cpu7 - charge processeur pour le coeur 7, %"
-"...\n"
-"$cpuN - charge processeur pour le coeur N, %"
 
-#. i18n: file: ui/configwindow.ui:253
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpuclock)
 #: rc.cpp:41
 msgid "CPU Clock"
 msgstr "Horloge processeur"
 
-#. i18n: file: ui/configwindow.ui:271
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpuclock)
 #: rc.cpp:44
+#, fuzzy
 msgid ""
 "$cpucl - average CPU clock, MHz\n"
 "$cpucl0 - CPU clock for core 0, MHz\n"
@@ -124,128 +109,108 @@ msgstr ""
 "$cpucl - Moyenne de l'horloge du processeur, MHz\n"
 "$cpucl0 - Horloge du coeur 0, MHz\n"
 "...\n"
-"$cpucl9 - Horloge du coeur 9, MHz\n"
+"$cpucl7 - Horloge du coeur 7, MHz"
-"...\n"
-"$cpuclN - Horloge du coeur N, MHz"
 
-#. i18n: file: ui/configwindow.ui:319
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_temp)
 #: rc.cpp:52
 msgid "Temperature"
 msgstr "Température"
 
-#. i18n: file: ui/configwindow.ui:329
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_temp)
 #: rc.cpp:55
 msgid "$tempN - physical temperature on device N (from 0). Example: $temp0"
 msgstr ""
 "$tempN - Température physique du périphérique N (à partir de 0). Exemple: "
 "$temp0"
 
-#. i18n: file: ui/configwindow.ui:377
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpu)
 #: rc.cpp:58
 msgid "GPU"
 msgstr "Processeur graphique"
 
-#. i18n: file: ui/configwindow.ui:387
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpu)
 #: rc.cpp:62
-#, no-c-format
 msgid "$gpu - gpu usage, %"
 msgstr "$gpu - utilisation du processeur graphique, %"
 
-#. i18n: file: ui/configwindow.ui:435
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpuTemp)
 #: rc.cpp:65
 msgid "GPU Temp"
 msgstr "Temp du processeur graphique"
 
-#. i18n: file: ui/configwindow.ui:445
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpuTemp)
 #: rc.cpp:68
 msgid "$gputemp - physical temperature on GPU"
 msgstr "$gputemp - Température physique du processeur graphique"
 
-#. i18n: file: ui/configwindow.ui:493
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_mem)
 #: rc.cpp:71
 msgid "Memory"
 msgstr "Mémoire"
 
-#. i18n: file: ui/configwindow.ui:508
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_mem)
 #: rc.cpp:75
-#, no-c-format
+#, fuzzy
 msgid ""
 "$mem - RAM usage, %\n"
 "$memmb - RAM usage, MB\n"
 "$memgb - RAM usage, GB"
 msgstr ""
 "$mem - utilisation de la RAM, %\n"
-"$memmb - utilisation de la RAM, MB\n"
+"$memmb - utilisation de la RAM, MB"
-"$memgb - utilisation de la RAM, GB"
 
-#. i18n: file: ui/configwindow.ui:556
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_swap)
 #: rc.cpp:80
 msgid "Swap"
 msgstr "mémoire d'échange (swap)"
 
-#. i18n: file: ui/configwindow.ui:571
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_swap)
 #: rc.cpp:84
-#, no-c-format
+#, fuzzy
 msgid ""
 "$swap - swap usage, %\n"
 "$swapmb - swap usage, MB\n"
 "$swapgb - swap usage, GB"
 msgstr ""
 "$swap - utilisation swap, %\n"
-"$swapmb - utilisation swap, MB\n"
+"$swapmb - utilisation swap, MB"
-"$swapgb - utilisation swap, GB"
 
-#. i18n: file: ui/configwindow.ui:619
+#: rc.cpp:89 rc.cpp:341
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#. i18n: file: ui/configwindow.ui:2106
-#. i18n: ectx: property (text), widget (QLabel, label_hdddev)
-#: rc.cpp:89 rc.cpp:298
 msgid "HDD"
 msgstr "Disque dur"
 
-#. i18n: file: ui/configwindow.ui:629
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hdd)
 #: rc.cpp:93
-#, no-c-format
+msgid ""
-msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
+"$hddN - usage for mount point N (from 0), %. Example: $hdd0\n"
+"$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n"
+"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0"
 msgstr ""
-"$hddN - espace occupé sur le point de montage N (à partir de 0), %. Exemple: "
+"$hddN - utilisation du point de montage N (à partir de 0), %. Exemple: $hdd0\n"
-"$hdd0"
+"$hddmbN - utilisation du point de montage N (à partir de 0), MB. Exemple: "
+"$hddmb0\n"
+"$hddgbN - utilisation du point de montage N (à partir de 0), GB. Exemple: "
+"$hddgb0"
 
-#. i18n: file: ui/configwindow.ui:677
+#: rc.cpp:98
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_hddTemp)
+#, fuzzy
-#: rc.cpp:96
+msgid "HDD speed"
-msgid "HDD Temp"
+msgstr "Périphériques HDD"
+
+#: rc.cpp:101
+msgid ""
+"$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n"
+"$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0"
+msgstr ""
+"$hddrN - vitesse de lecture HDD N (à partir de 0), KB/s. Exemple: $hddr0\n"
+"$hddwN - vitesse d'écriture HDD N (à partir de 0), KB/s. Exemple: $hddw0"
+
+#: rc.cpp:105
+#, fuzzy
+msgid "HDD temp"
 msgstr "Température disque dur"
 
-#. i18n: file: ui/configwindow.ui:687
+#: rc.cpp:108
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hddTemp)
-#: rc.cpp:99
 msgid ""
 "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0"
 msgstr ""
 "$hddtempN - température physique du périphérique N (à partir de 0). Exemple: "
 "$hddtemp0"
 
-#. i18n: file: ui/configwindow.ui:735
+#: rc.cpp:111
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_net)
-#: rc.cpp:102
 msgid "Network"
 msgstr "Réseau"
 
-#. i18n: file: ui/configwindow.ui:750
+#: rc.cpp:114
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_net)
-#: rc.cpp:105
 msgid ""
 "$down - download speed, KB/s\n"
 "$up - upload speed, KB/s\n"
@@ -255,16 +220,11 @@ msgstr ""
 "$up - vitesse ascendante, KB/s\n"
 "$netdev - périphérique réseau actuel"
 
-#. i18n: file: ui/configwindow.ui:798
+#: rc.cpp:119
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_bat)
-#: rc.cpp:110
 msgid "Battery"
 msgstr "Batterie"
 
-#. i18n: file: ui/configwindow.ui:809
+#: rc.cpp:123
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_bat)
-#: rc.cpp:114
-#, no-c-format
 msgid ""
 "$bat - battery charge, %\n"
 "$ac - AC status"
@@ -272,17 +232,11 @@ msgstr ""
 "$bat - charge de la batterie, %\n"
 "$ac - état de l'alimentation"
 
-#. i18n: file: ui/configwindow.ui:857
+#: rc.cpp:127 rc.cpp:271
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_player)
-#. i18n: file: ui/configwindow.ui:1347
-#. i18n: ectx: property (text), widget (QLabel, label_playerSelect)
-#: rc.cpp:118 rc.cpp:223
 msgid "Music player"
 msgstr "Lecteur audio"
 
-#. i18n: file: ui/configwindow.ui:871
+#: rc.cpp:130
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_player)
-#: rc.cpp:121
 msgid ""
 "$album - song album\n"
 "$artist - song artist\n"
@@ -296,33 +250,51 @@ msgstr ""
 "$time - durée du morceau\n"
 "$title - titre du morceau"
 
-#. i18n: file: ui/configwindow.ui:919
+#: rc.cpp:137
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_custom)
+msgid "Processes"
-#: rc.cpp:128
+msgstr "Processus"
+
+#: rc.cpp:140
+msgid ""
+"$pscount - number of running processes\n"
+"$pstotal - total number of running processes\n"
+"$ps - list of running processes comma separated"
+msgstr ""
+"$pscount - nombre de processus actifs\n"
+"$pstotal - nombre total de processus actifs\n"
+"$ps - liste des processus actifs séparés par une virgule"
+
+#: rc.cpp:145 rc.cpp:350
+msgid "Package manager"
+msgstr "Gestionnaire de paquets"
+
+#: rc.cpp:148
+msgid ""
+"$pkgcountN - number of packages which are available for updates, command N. "
+"For example $pkgcount0"
+msgstr ""
+"$pkgcountN - nombre de paquets à mettre à jour, commande N. "
+"Par exemple $pkgcount0"
+
+#: rc.cpp:151
 msgid "Custom"
 msgstr "Personnalisé"
 
-#. i18n: file: ui/configwindow.ui:929
+#: rc.cpp:154
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_custom)
+#, fuzzy
-#: rc.cpp:131
+msgid ""
-msgid "$custom - get output from custom command"
+"$customN - get output from custom command N (from N). Example `$custom0`"
 msgstr "$custom - sortie d'une commande personnelle"
 
-#. i18n: file: ui/configwindow.ui:983
+#: rc.cpp:157
-#. i18n: ectx: attribute (title), widget (QWidget, advanced)
-#: rc.cpp:134
 msgid "Advanced"
 msgstr "Avancé"
 
-#. i18n: file: ui/configwindow.ui:997
+#: rc.cpp:160
-#. i18n: ectx: property (text), widget (QLabel, label_timeFormat)
-#: rc.cpp:137
 msgid "Custom time format"
 msgstr "Format de l'heure personnalisé"
 
-#. i18n: file: ui/configwindow.ui:1019
+#: rc.cpp:163
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_timeFormat)
-#: rc.cpp:140
 msgid ""
 "$dddd - long weekday\n"
 "$ddd - short weekday\n"
@@ -358,15 +330,11 @@ msgstr ""
 "$ss - secondes\n"
 "$s - secondes sans zéro"
 
-#. i18n: file: ui/configwindow.ui:1039
+#: rc.cpp:181
-#. i18n: ectx: property (text), widget (QLabel, label_uptimeFormat)
-#: rc.cpp:158
 msgid "Custom uptime format"
 msgstr "Temps de fonctionnement personalisé"
 
-#. i18n: file: ui/configwindow.ui:1051
+#: rc.cpp:184
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptimeFormat)
-#: rc.cpp:161
 msgid ""
 "$dd - uptime days\n"
 "$d - uptime days without zero\n"
@@ -382,29 +350,20 @@ msgstr ""
 "$mm - temps de fonctionnement en minutes\n"
 "$m - temps de fonctionnement en minutes sans zéro"
 
-#. i18n: file: ui/configwindow.ui:1073
+#: rc.cpp:192
-#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+#, fuzzy
-#: rc.cpp:169
+msgid "Temperature units"
+msgstr "Température"
+
+#: rc.cpp:195
 msgid "Temperature devices"
 msgstr "Temperature des périphériques"
 
-#. i18n: file: ui/configwindow.ui:1099
+#: rc.cpp:198 rc.cpp:208 rc.cpp:218 rc.cpp:228 rc.cpp:331 rc.cpp:374
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
-#. i18n: file: ui/configwindow.ui:1154
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
-#. i18n: file: ui/configwindow.ui:1209
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_hddDevice)
-#: rc.cpp:172 rc.cpp:182 rc.cpp:192
 msgid "Add"
 msgstr "Ajouter"
 
-#. i18n: file: ui/configwindow.ui:1109
+#: rc.cpp:201 rc.cpp:211 rc.cpp:221 rc.cpp:231 rc.cpp:334 rc.cpp:377
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
-#. i18n: file: ui/configwindow.ui:1164
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
-#. i18n: file: ui/configwindow.ui:1219
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_hddDevice)
-#: rc.cpp:175 rc.cpp:185 rc.cpp:195
 msgid ""
 "Editable\n"
 "del - remove item"
@@ -412,95 +371,75 @@ msgstr ""
 "Modifiable\n"
 "del - supprimer un élément"
 
-#. i18n: file: ui/configwindow.ui:1128
+#: rc.cpp:205
-#. i18n: ectx: property (text), widget (QLabel, label_mount)
-#: rc.cpp:179
 msgid "Mount points"
 msgstr "Points de montage"
 
-#. i18n: file: ui/configwindow.ui:1183
+#: rc.cpp:215
-#. i18n: ectx: property (text), widget (QLabel, label_hddDevice)
+#, fuzzy
-#: rc.cpp:189
+msgid "HDD devices (speed)"
-msgid "HDD devices"
 msgstr "Périphériques HDD"
 
-#. i18n: file: ui/configwindow.ui:1236
+#: rc.cpp:225
-#. i18n: ectx: property (text), widget (QLabel, label_netdir)
+#, fuzzy
-#: rc.cpp:199
+msgid "HDD devices (temp)"
+msgstr "Périphériques HDD"
+
+#: rc.cpp:235
 msgid "Network directory"
 msgstr "Voisinage réseau"
 
-#. i18n: file: ui/configwindow.ui:1243
+#: rc.cpp:238
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_netdir)
-#: rc.cpp:202
 msgid "\"/sys/class/net\" by default"
 msgstr "\"/sys/class/net\" par défaut"
 
-#. i18n: file: ui/configwindow.ui:1263
+#: rc.cpp:241
-#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:205
 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"
 
-#. i18n: file: ui/configwindow.ui:1266
+#: rc.cpp:244
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:208
 msgid "Set network device"
 msgstr "Sélectionner le périphérique réseau"
 
-#. i18n: file: ui/configwindow.ui:1299
+#: rc.cpp:247
-#. i18n: ectx: property (text), widget (QLabel, label_batdev)
-#: rc.cpp:211
 msgid "Battery device"
 msgstr "Batterie"
 
-#. i18n: file: ui/configwindow.ui:1306
+#: rc.cpp:250
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
-#: rc.cpp:214
 msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
 msgstr "\"/sys/class/power_supply/BAT0/capacity\" par défaut"
 
-#. i18n: file: ui/configwindow.ui:1323
+#: rc.cpp:253
-#. i18n: ectx: property (text), widget (QLabel, label_acdev)
+msgid "AC online tag"
-#: rc.cpp:217
+msgstr "Tag alimentation branchée"
+
+#: rc.cpp:256
+msgid "Line, which returns when AC is online"
+msgstr "Ligne qui est renvoyée lorsque l'alimentation est branchée"
+
+#: rc.cpp:259
+msgid "AC offline tag"
+msgstr "Tag alimentation débranchée"
+
+#: rc.cpp:262
+msgid "Line, which returns when AC is offline"
+msgstr "Ligne, qui est renvoyée lorsque l'alimentation est débranchée"
+
+#: rc.cpp:265
 msgid "AC device"
 msgstr "Périphérique d'alimentation"
 
-#. i18n: file: ui/configwindow.ui:1330
+#: rc.cpp:268
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
-#: rc.cpp:220
 msgid "\"/sys/class/power_supply/AC/online\" by default"
 msgstr "\"/sys/class/power_supply/AC/online\" par défaut"
 
-#. i18n: file: ui/configwindow.ui:1367
+#: rc.cpp:274
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:226
-msgid "amarok"
-msgstr "amarok"
-
-#. i18n: file: ui/configwindow.ui:1372
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:229
-msgid "mpd"
-msgstr "mpd"
-
-#. i18n: file: ui/configwindow.ui:1377
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:232
-msgid "qmmp"
-msgstr "qmmp"
-
-#. i18n: file: ui/configwindow.ui:1401
-#. i18n: ectx: attribute (title), widget (QWidget, tooltip)
-#: rc.cpp:235
 msgid "Tooltip"
 msgstr "Conseil"
 
-#. i18n: file: ui/configwindow.ui:1407
+#: rc.cpp:277
-#. i18n: ectx: property (text), widget (QLabel, label_tooltip)
-#: rc.cpp:238
 msgid ""
 "CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
 "To enable them just make needed checkbox fully checked."
@@ -509,154 +448,148 @@ msgstr ""
 "les conseils visuels. Pour les activer cochez simplement les cases "
 "correspondantes."
 
-#. i18n: file: ui/configwindow.ui:1428
+#: rc.cpp:280
-#. i18n: ectx: property (text), widget (QLabel, label_tooltipNum)
-#: rc.cpp:241
 msgid "Number of values for tooltips"
 msgstr "Nombre d'éléments pour les conseils"
 
-#. i18n: file: ui/configwindow.ui:1483
+#: rc.cpp:283
-#. i18n: ectx: property (text), widget (QLabel, label_cpuColor)
-#: rc.cpp:244
-msgid "CPU color"
-msgstr "Couleur processeur"
-
-#. i18n: file: ui/configwindow.ui:1523
-#. i18n: ectx: property (text), widget (QLabel, label_cpuclockColor)
-#: rc.cpp:247
 msgid "CPU clock color"
 msgstr "Couleur de l'horloge processeur"
 
-#. i18n: file: ui/configwindow.ui:1563
+#: rc.cpp:286
-#. i18n: ectx: property (text), widget (QLabel, label_memColor)
-#: rc.cpp:250
-msgid "Memory color"
-msgstr "Couleur de la mémoire"
-
-#. i18n: file: ui/configwindow.ui:1603
-#. i18n: ectx: property (text), widget (QLabel, label_swapColor)
-#: rc.cpp:253
 msgid "Swap color"
 msgstr "Couleur de la mémoire d'échange"
 
-#. i18n: file: ui/configwindow.ui:1643
+#: rc.cpp:289
-#. i18n: ectx: property (text), widget (QLabel, label_downColor)
+msgid "CPU color"
-#: rc.cpp:256
+msgstr "Couleur processeur"
+
+#: rc.cpp:292
 msgid "Download speed color"
 msgstr "Couleur de la vitesse de téléchargement"
 
-#. i18n: file: ui/configwindow.ui:1683
+#: rc.cpp:295
-#. i18n: ectx: property (text), widget (QLabel, label_upColor)
+msgid "Memory color"
-#: rc.cpp:259
+msgstr "Couleur de la mémoire"
+
+#: rc.cpp:298
 msgid "Upload speed color"
 msgstr "Couleur du téléversement"
 
-#. i18n: file: ui/configwindow.ui:1729
+#: rc.cpp:301
-#. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:262
 msgid "Appearance"
 msgstr "Apparence"
 
-#. i18n: file: ui/configwindow.ui:1743
+#: rc.cpp:304
-#. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:265
 msgid "Time interval"
 msgstr "Intervalle"
 
-#. i18n: file: ui/configwindow.ui:1798
+#: rc.cpp:307
-#. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:268
 msgid "Font"
 msgstr "Police"
 
-#. i18n: file: ui/configwindow.ui:1838
+#: rc.cpp:310
-#. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:271
 msgid "Font size"
 msgstr "Taille de la police"
 
-#. i18n: file: ui/configwindow.ui:1893
+#: rc.cpp:313
-#. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:274
 msgid "Font color"
 msgstr "Couleur de la police"
 
-#. i18n: file: ui/configwindow.ui:1933
+#: rc.cpp:316
-#. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:277
 msgid "Font style"
 msgstr "Style de la police"
 
-#. i18n: file: ui/configwindow.ui:1983
+#: rc.cpp:319
-#. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:280
 msgid "Font weight"
 msgstr "Épaisseur de la police"
 
-#. i18n: file: ui/configwindow.ui:2044
+#: rc.cpp:322
-#. i18n: ectx: attribute (title), widget (QWidget, dataengine)
-#: rc.cpp:283
 msgid "DataEngine"
 msgstr "Moteur de données"
 
-#. i18n: file: ui/configwindow.ui:2058
+#: rc.cpp:325
-#. i18n: ectx: property (text), widget (QLabel, label_gpudev)
-#: rc.cpp:286
-msgid "GPU device"
-msgstr "Périphérique graphique"
-
-#. i18n: file: ui/configwindow.ui:2078
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:289
-msgid "auto"
-msgstr "auto"
-
-#. i18n: file: ui/configwindow.ui:2083
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:292
-msgid "nvidia"
-msgstr "nvidia"
-
-#. i18n: file: ui/configwindow.ui:2088
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:295
-msgid "ati"
-msgstr "ati"
-
-#. i18n: file: ui/configwindow.ui:2139
-#. i18n: ectx: property (text), widget (QLabel, label_mpdaddress)
-#: rc.cpp:301
-msgid "MPD address"
-msgstr "Adresse MPD"
-
-#. i18n: file: ui/configwindow.ui:2163
-#. i18n: ectx: property (text), widget (QLabel, label_mpdport)
-#: rc.cpp:304
-msgid "MPD port"
-msgstr "Port MPD"
-
-#. i18n: file: ui/configwindow.ui:2218
-#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
-#: rc.cpp:307
 msgid "Custom command"
 msgstr "Commande personnalisée"
 
-#. i18n: file: ui/configwindow.ui:2225
+#: rc.cpp:328
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
-#: rc.cpp:310
 msgid "Custom command to run"
 msgstr "Commande personnalisée à exécuter"
 
-#: rc.cpp:311
+#: rc.cpp:338
+msgid "GPU device"
+msgstr "Périphérique graphique"
+
+#: rc.cpp:344
+msgid "MPD address"
+msgstr "Adresse MPD"
+
+#: rc.cpp:347
+msgid "MPD port"
+msgstr "Port MPD"
+
+#: rc.cpp:353
+msgid "pacman -Qu"
+msgstr "pacman -Qu"
+
+#: rc.cpp:356
+msgid "apt-show-versions -u -b"
+msgstr "apt-show-versions -u -b"
+
+#: rc.cpp:359
+msgid "aptitude search '~U'"
+msgstr "aptitude search '~U'"
+
+#: rc.cpp:362
+msgid "yum list updates"
+msgstr "yum list updates"
+
+#: rc.cpp:365
+msgid "pkg_version -I -l '<'"
+msgstr "pkg_version -I -l '<'"
+
+#: rc.cpp:368
+msgid "urpmq --auto-select"
+msgstr "urpmq --auto-select"
+
+#: rc.cpp:371
+#, fuzzy
+msgid "Number of null lines"
+msgstr "Nombre d'éléments pour les conseils"
+
+#: rc.cpp:379
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Evgeniy Alekseev"
 
-#: rc.cpp:312
+#: rc.cpp:380
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
+#~ msgstr ""
+#~ "$hddN - espace occupé sur le point de montage N (à partir de 0), %. "
+#~ "Exemple: $hdd0"
+
+#~ msgid "amarok"
+#~ msgstr "amarok"
+
+#~ msgid "mpd"
+#~ msgstr "mpd"
+
+#~ msgid "qmmp"
+#~ msgstr "qmmp"
+
+#~ msgid "auto"
+#~ msgstr "auto"
+
+#~ msgid "nvidia"
+#~ msgstr "nvidia"
+
+#~ msgid "ati"
+#~ msgstr "ati"
+
 #~ msgid ""
 #~ "$ds - uptime days\n"
 #~ "$hs - uptime hours\n"

sources/ptm/po/pytextmonitor.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n"
-"POT-Creation-Date: 2014-04-05 22:36+0400\n"
+"POT-Creation-Date: 2014-05-19 11:55+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,34 +17,32 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. i18n: file: ui/configwindow.ui:32
+#: code/main.py:108
-#. i18n: ectx: property (windowTitle), widget (QWidget, ConfigWindow)
+msgid "Run ksysguard"
+msgstr ""
+
+#: code/main.py:110
+msgid "Show README"
+msgstr ""
+
 #: rc.cpp:3
 msgid "Form"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:42
-#. i18n: ectx: attribute (title), widget (QWidget, settings)
 #: rc.cpp:6
 msgid "Widget settings"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:48
-#. i18n: ectx: property (text), widget (QLabel, label)
 #: rc.cpp:9
 msgid ""
 "Detailed information may be found on <a href=\"http://arcanis.name/projects/"
 "pytextmonitor/\">project homepage</a>"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:69
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_time)
 #: rc.cpp:12
 msgid "Time"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:83
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_time)
 #: rc.cpp:15
 msgid ""
 "$time - time in default format\n"
@@ -54,30 +52,21 @@ msgid ""
 "$custom - custom time format"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:128
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_uptime)
 #: rc.cpp:22
 msgid "Uptime"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:139
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptime)
 #: rc.cpp:25
 msgid ""
 "$uptime - system uptime\n"
 "$custom - custom format"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:187
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpu)
 #: rc.cpp:29
 msgid "CPU"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:205
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpu)
 #: rc.cpp:33
-#, no-c-format
 msgid ""
 "$cpu - total load CPU, %\n"
 "$cpu0 - load CPU for core 0, %\n"
@@ -87,14 +76,10 @@ msgid ""
 "$cpuN - load CPU for core N, %"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:253
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpuclock)
 #: rc.cpp:41
 msgid "CPU Clock"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:271
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpuclock)
 #: rc.cpp:44
 msgid ""
 "$cpucl - average CPU clock, MHz\n"
@@ -105,144 +90,108 @@ msgid ""
 "$cpuclN - CPU clock for core N, MHz"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:319
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_temp)
 #: rc.cpp:52
 msgid "Temperature"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:329
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_temp)
 #: rc.cpp:55
 msgid "$tempN - physical temperature on device N (from 0). Example: $temp0"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:377
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpu)
 #: rc.cpp:58
 msgid "GPU"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:387
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpu)
 #: rc.cpp:62
-#, no-c-format
 msgid "$gpu - gpu usage, %"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:435
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpuTemp)
 #: rc.cpp:65
 msgid "GPU Temp"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:445
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpuTemp)
 #: rc.cpp:68
 msgid "$gputemp - physical temperature on GPU"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:493
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_mem)
 #: rc.cpp:71
 msgid "Memory"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:508
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_mem)
 #: rc.cpp:75
-#, no-c-format
 msgid ""
 "$mem - RAM usage, %\n"
 "$memmb - RAM usage, MB\n"
 "$memgb - RAM usage, GB"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:556
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_swap)
 #: rc.cpp:80
 msgid "Swap"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:571
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_swap)
 #: rc.cpp:84
-#, no-c-format
 msgid ""
 "$swap - swap usage, %\n"
 "$swapmb - swap usage, MB\n"
 "$swapgb - swap usage, GB"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:619
+#: rc.cpp:89 rc.cpp:341
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#. i18n: file: ui/configwindow.ui:2106
-#. i18n: ectx: property (text), widget (QLabel, label_hdddev)
-#: rc.cpp:89 rc.cpp:298
 msgid "HDD"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:629
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hdd)
 #: rc.cpp:93
-#, no-c-format
+msgid ""
-msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
+"$hddN - usage for mount point N (from 0), %. Example: $hdd0\n"
+"$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n"
+"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:677
+#: rc.cpp:98
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_hddTemp)
+msgid "HDD speed"
-#: rc.cpp:96
-msgid "HDD Temp"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:687
+#: rc.cpp:101
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hddTemp)
+msgid ""
-#: rc.cpp:99
+"$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n"
+"$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0"
+msgstr ""
+
+#: rc.cpp:105
+msgid "HDD temp"
+msgstr ""
+
+#: rc.cpp:108
 msgid ""
 "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:735
+#: rc.cpp:111
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_net)
-#: rc.cpp:102
 msgid "Network"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:750
+#: rc.cpp:114
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_net)
-#: rc.cpp:105
 msgid ""
 "$down - download speed, KB/s\n"
 "$up - upload speed, KB/s\n"
 "$netdev - current network device"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:798
+#: rc.cpp:119
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_bat)
-#: rc.cpp:110
 msgid "Battery"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:809
+#: rc.cpp:123
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_bat)
-#: rc.cpp:114
-#, no-c-format
 msgid ""
 "$bat - battery charge, %\n"
 "$ac - AC status"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:857
+#: rc.cpp:127 rc.cpp:271
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_player)
-#. i18n: file: ui/configwindow.ui:1347
-#. i18n: ectx: property (text), widget (QLabel, label_playerSelect)
-#: rc.cpp:118 rc.cpp:223
 msgid "Music player"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:871
+#: rc.cpp:130
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_player)
-#: rc.cpp:121
 msgid ""
 "$album - song album\n"
 "$artist - song artist\n"
@@ -251,33 +200,45 @@ msgid ""
 "$title - song title"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:919
+#: rc.cpp:137
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_custom)
+msgid "Processes"
-#: rc.cpp:128
+msgstr ""
+
+#: rc.cpp:140
+msgid ""
+"$pscount - number of running processes\n"
+"$pstotal - total number of running processes\n"
+"$ps - list of running processes comma separated"
+msgstr ""
+
+#: rc.cpp:145 rc.cpp:350
+msgid "Package manager"
+msgstr ""
+
+#: rc.cpp:148
+msgid ""
+"$pkgcountN - number of packages which are available for updates, command N. "
+"For example $pkgcount0"
+msgstr ""
+
+#: rc.cpp:151
 msgid "Custom"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:929
+#: rc.cpp:154
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_custom)
+msgid ""
-#: rc.cpp:131
+"$customN - get output from custom command N (from N). Example `$custom0`"
-msgid "$custom - get output from custom command"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:983
+#: rc.cpp:157
-#. i18n: ectx: attribute (title), widget (QWidget, advanced)
-#: rc.cpp:134
 msgid "Advanced"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:997
+#: rc.cpp:160
-#. i18n: ectx: property (text), widget (QLabel, label_timeFormat)
-#: rc.cpp:137
 msgid "Custom time format"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1019
+#: rc.cpp:163
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_timeFormat)
-#: rc.cpp:140
 msgid ""
 "$dddd - long weekday\n"
 "$ddd - short weekday\n"
@@ -297,15 +258,11 @@ msgid ""
 "$s - seconds w\\o zero"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1039
+#: rc.cpp:181
-#. i18n: ectx: property (text), widget (QLabel, label_uptimeFormat)
-#: rc.cpp:158
 msgid "Custom uptime format"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1051
+#: rc.cpp:184
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptimeFormat)
-#: rc.cpp:161
 msgid ""
 "$dd - uptime days\n"
 "$d - uptime days without zero\n"
@@ -315,270 +272,208 @@ msgid ""
 "$m - uptime minutes without zero"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1073
+#: rc.cpp:192
-#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+msgid "Temperature units"
-#: rc.cpp:169
+msgstr ""
+
+#: rc.cpp:195
 msgid "Temperature devices"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1099
+#: rc.cpp:198 rc.cpp:208 rc.cpp:218 rc.cpp:228 rc.cpp:331 rc.cpp:374
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
-#. i18n: file: ui/configwindow.ui:1154
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
-#. i18n: file: ui/configwindow.ui:1209
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_hddDevice)
-#: rc.cpp:172 rc.cpp:182 rc.cpp:192
 msgid "Add"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1109
+#: rc.cpp:201 rc.cpp:211 rc.cpp:221 rc.cpp:231 rc.cpp:334 rc.cpp:377
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
-#. i18n: file: ui/configwindow.ui:1164
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
-#. i18n: file: ui/configwindow.ui:1219
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_hddDevice)
-#: rc.cpp:175 rc.cpp:185 rc.cpp:195
 msgid ""
 "Editable\n"
 "del - remove item"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1128
+#: rc.cpp:205
-#. i18n: ectx: property (text), widget (QLabel, label_mount)
-#: rc.cpp:179
 msgid "Mount points"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1183
+#: rc.cpp:215
-#. i18n: ectx: property (text), widget (QLabel, label_hddDevice)
+msgid "HDD devices (speed)"
-#: rc.cpp:189
-msgid "HDD devices"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1236
+#: rc.cpp:225
-#. i18n: ectx: property (text), widget (QLabel, label_netdir)
+msgid "HDD devices (temp)"
-#: rc.cpp:199
+msgstr ""
+
+#: rc.cpp:235
 msgid "Network directory"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1243
+#: rc.cpp:238
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_netdir)
-#: rc.cpp:202
 msgid "\"/sys/class/net\" by default"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1263
+#: rc.cpp:241
-#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:205
 msgid "Disable auto select device and set specified device"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1266
+#: rc.cpp:244
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:208
 msgid "Set network device"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1299
+#: rc.cpp:247
-#. i18n: ectx: property (text), widget (QLabel, label_batdev)
-#: rc.cpp:211
 msgid "Battery device"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1306
+#: rc.cpp:250
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
-#: rc.cpp:214
 msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1323
+#: rc.cpp:253
-#. i18n: ectx: property (text), widget (QLabel, label_acdev)
+msgid "AC online tag"
-#: rc.cpp:217
+msgstr ""
+
+#: rc.cpp:256
+msgid "Line, which returns when AC is online"
+msgstr ""
+
+#: rc.cpp:259
+msgid "AC offline tag"
+msgstr ""
+
+#: rc.cpp:262
+msgid "Line, which returns when AC is offline"
+msgstr ""
+
+#: rc.cpp:265
 msgid "AC device"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1330
+#: rc.cpp:268
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
-#: rc.cpp:220
 msgid "\"/sys/class/power_supply/AC/online\" by default"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1367
+#: rc.cpp:274
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:226
-msgid "amarok"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:1372
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:229
-msgid "mpd"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:1377
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:232
-msgid "qmmp"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:1401
-#. i18n: ectx: attribute (title), widget (QWidget, tooltip)
-#: rc.cpp:235
 msgid "Tooltip"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1407
+#: rc.cpp:277
-#. i18n: ectx: property (text), widget (QLabel, label_tooltip)
-#: rc.cpp:238
 msgid ""
 "CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
 "To enable them just make needed checkbox fully checked."
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1428
+#: rc.cpp:280
-#. i18n: ectx: property (text), widget (QLabel, label_tooltipNum)
-#: rc.cpp:241
 msgid "Number of values for tooltips"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1483
+#: rc.cpp:283
-#. i18n: ectx: property (text), widget (QLabel, label_cpuColor)
-#: rc.cpp:244
-msgid "CPU color"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:1523
-#. i18n: ectx: property (text), widget (QLabel, label_cpuclockColor)
-#: rc.cpp:247
 msgid "CPU clock color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1563
+#: rc.cpp:286
-#. i18n: ectx: property (text), widget (QLabel, label_memColor)
-#: rc.cpp:250
-msgid "Memory color"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:1603
-#. i18n: ectx: property (text), widget (QLabel, label_swapColor)
-#: rc.cpp:253
 msgid "Swap color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1643
+#: rc.cpp:289
-#. i18n: ectx: property (text), widget (QLabel, label_downColor)
+msgid "CPU color"
-#: rc.cpp:256
+msgstr ""
+
+#: rc.cpp:292
 msgid "Download speed color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1683
+#: rc.cpp:295
-#. i18n: ectx: property (text), widget (QLabel, label_upColor)
+msgid "Memory color"
-#: rc.cpp:259
+msgstr ""
+
+#: rc.cpp:298
 msgid "Upload speed color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1729
+#: rc.cpp:301
-#. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:262
 msgid "Appearance"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1743
+#: rc.cpp:304
-#. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:265
 msgid "Time interval"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1798
+#: rc.cpp:307
-#. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:268
 msgid "Font"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1838
+#: rc.cpp:310
-#. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:271
 msgid "Font size"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1893
+#: rc.cpp:313
-#. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:274
 msgid "Font color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1933
+#: rc.cpp:316
-#. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:277
 msgid "Font style"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1983
+#: rc.cpp:319
-#. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:280
 msgid "Font weight"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:2044
+#: rc.cpp:322
-#. i18n: ectx: attribute (title), widget (QWidget, dataengine)
-#: rc.cpp:283
 msgid "DataEngine"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:2058
+#: rc.cpp:325
-#. i18n: ectx: property (text), widget (QLabel, label_gpudev)
-#: rc.cpp:286
-msgid "GPU device"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:2078
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:289
-msgid "auto"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:2083
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:292
-msgid "nvidia"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:2088
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:295
-msgid "ati"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:2139
-#. i18n: ectx: property (text), widget (QLabel, label_mpdaddress)
-#: rc.cpp:301
-msgid "MPD address"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:2163
-#. i18n: ectx: property (text), widget (QLabel, label_mpdport)
-#: rc.cpp:304
-msgid "MPD port"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:2218
-#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
-#: rc.cpp:307
 msgid "Custom command"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:2225
+#: rc.cpp:328
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
-#: rc.cpp:310
 msgid "Custom command to run"
 msgstr ""
 
-#: rc.cpp:311
+#: rc.cpp:338
+msgid "GPU device"
+msgstr ""
+
+#: rc.cpp:344
+msgid "MPD address"
+msgstr ""
+
+#: rc.cpp:347
+msgid "MPD port"
+msgstr ""
+
+#: rc.cpp:353
+msgid "pacman -Qu"
+msgstr ""
+
+#: rc.cpp:356
+msgid "apt-show-versions -u -b"
+msgstr ""
+
+#: rc.cpp:359
+msgid "aptitude search '~U'"
+msgstr ""
+
+#: rc.cpp:362
+msgid "yum list updates"
+msgstr ""
+
+#: rc.cpp:365
+msgid "pkg_version -I -l '<'"
+msgstr ""
+
+#: rc.cpp:368
+msgid "urpmq --auto-select"
+msgstr ""
+
+#: rc.cpp:371
+msgid "Number of null lines"
+msgstr ""
+
+#: rc.cpp:379
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 
-#: rc.cpp:312
+#: rc.cpp:380
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ""

sources/ptm/po/ru.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n"
-"POT-Creation-Date: 2014-04-05 22:36+0400\n"
+"POT-Creation-Date: 2014-05-19 11:55+0400\n"
-"PO-Revision-Date: 2014-04-05 22:37+0400\n"
+"PO-Revision-Date: 2014-05-19 02:58+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -18,20 +18,22 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#. i18n: file: ui/configwindow.ui:32
+#: code/main.py:108
-#. i18n: ectx: property (windowTitle), widget (QWidget, ConfigWindow)
+msgid "Run ksysguard"
+msgstr "Запутить ksysguard"
+
+#: code/main.py:110
+msgid "Show README"
+msgstr "Показать README"
+
 #: rc.cpp:3
 msgid "Form"
 msgstr "Form"
 
-#. i18n: file: ui/configwindow.ui:42
-#. i18n: ectx: attribute (title), widget (QWidget, settings)
 #: rc.cpp:6
 msgid "Widget settings"
 msgstr "Настройки виджета"
 
-#. i18n: file: ui/configwindow.ui:48
-#. i18n: ectx: property (text), widget (QLabel, label)
 #: rc.cpp:9
 msgid ""
 "Detailed information may be found on <a href=\"http://arcanis.name/projects/"
@@ -40,14 +42,10 @@ msgstr ""
 "Подробная информация может быть найдена на <a href=\"http://arcanis.name/ru/"
 "projects/pytextmonitor/\">домашней странице проекта</a>"
 
-#. i18n: file: ui/configwindow.ui:69
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_time)
 #: rc.cpp:12
 msgid "Time"
 msgstr "Время"
 
-#. i18n: file: ui/configwindow.ui:83
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_time)
 #: rc.cpp:15
 msgid ""
 "$time - time in default format\n"
@@ -62,14 +60,10 @@ msgstr ""
 "$longtime - время в длинном формате\n"
 "$custom - свой формат времени"
 
-#. i18n: file: ui/configwindow.ui:128
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_uptime)
 #: rc.cpp:22
 msgid "Uptime"
 msgstr "Время работы"
 
-#. i18n: file: ui/configwindow.ui:139
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptime)
 #: rc.cpp:25
 msgid ""
 "$uptime - system uptime\n"
@@ -78,16 +72,11 @@ msgstr ""
 "$uptime - время работы\n"
 "$custom - свой формат"
 
-#. i18n: file: ui/configwindow.ui:187
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpu)
 #: rc.cpp:29
 msgid "CPU"
 msgstr "CPU"
 
-#. i18n: file: ui/configwindow.ui:205
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpu)
 #: rc.cpp:33
-#, no-c-format
 msgid ""
 "$cpu - total load CPU, %\n"
 "$cpu0 - load CPU for core 0, %\n"
@@ -103,14 +92,10 @@ msgstr ""
 "...\n"
 "$cpuN - загрузка CPU для ядра N, %"
 
-#. i18n: file: ui/configwindow.ui:253
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpuclock)
 #: rc.cpp:41
 msgid "CPU Clock"
 msgstr "Частота CPU"
 
-#. i18n: file: ui/configwindow.ui:271
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpuclock)
 #: rc.cpp:44
 msgid ""
 "$cpucl - average CPU clock, MHz\n"
@@ -127,53 +112,35 @@ msgstr ""
 "...\n"
 "$cpuclN - частота CPU для ядра N, MHz"
 
-#. i18n: file: ui/configwindow.ui:319
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_temp)
 #: rc.cpp:52
 msgid "Temperature"
 msgstr "Температура"
 
-#. i18n: file: ui/configwindow.ui:329
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_temp)
 #: rc.cpp:55
 msgid "$tempN - physical temperature on device N (from 0). Example: $temp0"
 msgstr "$tempN - физическая температура на устройстве N (от 0). Пример: $temp0"
 
-#. i18n: file: ui/configwindow.ui:377
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpu)
 #: rc.cpp:58
 msgid "GPU"
 msgstr "GPU"
 
-#. i18n: file: ui/configwindow.ui:387
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpu)
 #: rc.cpp:62
-#, no-c-format
 msgid "$gpu - gpu usage, %"
 msgstr "$gpu - использование GPU, %"
 
-#. i18n: file: ui/configwindow.ui:435
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpuTemp)
 #: rc.cpp:65
 msgid "GPU Temp"
 msgstr "Температура GPU"
 
-#. i18n: file: ui/configwindow.ui:445
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpuTemp)
 #: rc.cpp:68
 msgid "$gputemp - physical temperature on GPU"
 msgstr "$gputemp - физическая температура на GPU"
 
-#. i18n: file: ui/configwindow.ui:493
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_mem)
 #: rc.cpp:71
 msgid "Memory"
 msgstr "Память"
 
-#. i18n: file: ui/configwindow.ui:508
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_mem)
 #: rc.cpp:75
-#, no-c-format
 msgid ""
 "$mem - RAM usage, %\n"
 "$memmb - RAM usage, MB\n"
@@ -183,16 +150,11 @@ msgstr ""
 "$memmb - использование RAM, MB\n"
 "$memgb - использование RAM, GB"
 
-#. i18n: file: ui/configwindow.ui:556
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_swap)
 #: rc.cpp:80
 msgid "Swap"
 msgstr "Swap"
 
-#. i18n: file: ui/configwindow.ui:571
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_swap)
 #: rc.cpp:84
-#, no-c-format
 msgid ""
 "$swap - swap usage, %\n"
 "$swapmb - swap usage, MB\n"
@@ -202,45 +164,48 @@ msgstr ""
 "$swapmb - использование swap, MB\n"
 "$swapgb - использование swap, GB"
 
-#. i18n: file: ui/configwindow.ui:619
+#: rc.cpp:89 rc.cpp:341
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#. i18n: file: ui/configwindow.ui:2106
-#. i18n: ectx: property (text), widget (QLabel, label_hdddev)
-#: rc.cpp:89 rc.cpp:298
 msgid "HDD"
 msgstr "HDD"
 
-#. i18n: file: ui/configwindow.ui:629
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hdd)
 #: rc.cpp:93
-#, no-c-format
+msgid ""
-msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
+"$hddN - usage for mount point N (from 0), %. Example: $hdd0\n"
-msgstr "$hddN - использование точки монтирования N (от 0), %. Пример: $hdd0"
+"$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n"
+"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0"
+msgstr ""
+"$hddN - usage for mount point N (from 0), %. Example: $hdd0\n"
+"$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n"
+"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0"
 
-#. i18n: file: ui/configwindow.ui:677
+#: rc.cpp:98
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_hddTemp)
+msgid "HDD speed"
-#: rc.cpp:96
+msgstr "Скорость HDD"
-msgid "HDD Temp"
+
+#: rc.cpp:101
+msgid ""
+"$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n"
+"$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0"
+msgstr ""
+"$hddrN - скорость записи на HDD N (от 0), KB/s. Например: $hddr0\n"
+"$hddwN - скорость чтения с HDD N (от 0), KB/s. Например: $hddw0"
+
+#: rc.cpp:105
+msgid "HDD temp"
 msgstr "Температура HDD"
 
-#. i18n: file: ui/configwindow.ui:687
+#: rc.cpp:108
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hddTemp)
-#: rc.cpp:99
 msgid ""
 "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0"
 msgstr ""
 "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0 "
 "$hddtempN - температура на устройстве N (от 0). Пример: $hddtemp0"
 
-#. i18n: file: ui/configwindow.ui:735
+#: rc.cpp:111
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_net)
-#: rc.cpp:102
 msgid "Network"
 msgstr "Сеть"
 
-#. i18n: file: ui/configwindow.ui:750
+#: rc.cpp:114
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_net)
-#: rc.cpp:105
 msgid ""
 "$down - download speed, KB/s\n"
 "$up - upload speed, KB/s\n"
@@ -250,16 +215,11 @@ msgstr ""
 "$up - скорость загрузки, KB/s\n"
 "$netdev - текущее устройство"
 
-#. i18n: file: ui/configwindow.ui:798
+#: rc.cpp:119
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_bat)
-#: rc.cpp:110
 msgid "Battery"
 msgstr "Батарея"
 
-#. i18n: file: ui/configwindow.ui:809
+#: rc.cpp:123
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_bat)
-#: rc.cpp:114
-#, no-c-format
 msgid ""
 "$bat - battery charge, %\n"
 "$ac - AC status"
@@ -267,17 +227,11 @@ msgstr ""
 "$bat - заряд батареи, %\n"
 "$ac - статус адаптора питания"
 
-#. i18n: file: ui/configwindow.ui:857
+#: rc.cpp:127 rc.cpp:271
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_player)
-#. i18n: file: ui/configwindow.ui:1347
-#. i18n: ectx: property (text), widget (QLabel, label_playerSelect)
-#: rc.cpp:118 rc.cpp:223
 msgid "Music player"
 msgstr "Музыкальный плеер"
 
-#. i18n: file: ui/configwindow.ui:871
+#: rc.cpp:130
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_player)
-#: rc.cpp:121
 msgid ""
 "$album - song album\n"
 "$artist - song artist\n"
@@ -291,33 +245,50 @@ msgstr ""
 "$time - продолжительность\n"
 "$title - название"
 
-#. i18n: file: ui/configwindow.ui:919
+#: rc.cpp:137
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_custom)
+msgid "Processes"
-#: rc.cpp:128
+msgstr "Процессы"
+
+#: rc.cpp:140
+msgid ""
+"$pscount - number of running processes\n"
+"$pstotal - total number of running processes\n"
+"$ps - list of running processes comma separated"
+msgstr ""
+"$pscount - число запущенных процессов\n"
+"$pstotal - общее число процессов\n"
+"$ps - список запущенных процессов, разделенных запятыми"
+
+#: rc.cpp:145 rc.cpp:350
+msgid "Package manager"
+msgstr "Пакетный менеджер"
+
+#: rc.cpp:148
+msgid ""
+"$pkgcountN - number of packages which are available for updates, command N. "
+"For example $pkgcount0"
+msgstr ""
+"$pkgcountN - число пакетов, которые доступны для обновления, для команды N. "
+"Например, $pkgcount0"
+
+#: rc.cpp:151
 msgid "Custom"
 msgstr "Своя команда"
 
-#. i18n: file: ui/configwindow.ui:929
+#: rc.cpp:154
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_custom)
+msgid ""
-#: rc.cpp:131
+"$customN - get output from custom command N (from N). Example `$custom0`"
-msgid "$custom - get output from custom command"
+msgstr "$customN - получить информацию из своей команды N. Например $custom0"
-msgstr "$custom - получить информацию из своей команды"
 
-#. i18n: file: ui/configwindow.ui:983
+#: rc.cpp:157
-#. i18n: ectx: attribute (title), widget (QWidget, advanced)
-#: rc.cpp:134
 msgid "Advanced"
 msgstr "Расширенные"
 
-#. i18n: file: ui/configwindow.ui:997
+#: rc.cpp:160
-#. i18n: ectx: property (text), widget (QLabel, label_timeFormat)
-#: rc.cpp:137
 msgid "Custom time format"
 msgstr "Свой формат времени"
 
-#. i18n: file: ui/configwindow.ui:1019
+#: rc.cpp:163
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_timeFormat)
-#: rc.cpp:140
 msgid ""
 "$dddd - long weekday\n"
 "$ddd - short weekday\n"
@@ -353,15 +324,11 @@ msgstr ""
 "$ss - секунды\n"
 "$s - секунды без 0"
 
-#. i18n: file: ui/configwindow.ui:1039
+#: rc.cpp:181
-#. i18n: ectx: property (text), widget (QLabel, label_uptimeFormat)
-#: rc.cpp:158
 msgid "Custom uptime format"
 msgstr "Свой формат аптайма"
 
-#. i18n: file: ui/configwindow.ui:1051
+#: rc.cpp:184
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptimeFormat)
-#: rc.cpp:161
 msgid ""
 "$dd - uptime days\n"
 "$d - uptime days without zero\n"
@@ -377,29 +344,19 @@ msgstr ""
 "$mm - минуты аптайма\n"
 "$m - минуты аптайма без нулей"
 
-#. i18n: file: ui/configwindow.ui:1073
+#: rc.cpp:192
-#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+msgid "Temperature units"
-#: rc.cpp:169
+msgstr "Температурные единицы"
+
+#: rc.cpp:195
 msgid "Temperature devices"
 msgstr "Температурные устройства"
 
-#. i18n: file: ui/configwindow.ui:1099
+#: rc.cpp:198 rc.cpp:208 rc.cpp:218 rc.cpp:228 rc.cpp:331 rc.cpp:374
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
-#. i18n: file: ui/configwindow.ui:1154
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
-#. i18n: file: ui/configwindow.ui:1209
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_hddDevice)
-#: rc.cpp:172 rc.cpp:182 rc.cpp:192
 msgid "Add"
 msgstr "Добавить"
 
-#. i18n: file: ui/configwindow.ui:1109
+#: rc.cpp:201 rc.cpp:211 rc.cpp:221 rc.cpp:231 rc.cpp:334 rc.cpp:377
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
-#. i18n: file: ui/configwindow.ui:1164
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
-#. i18n: file: ui/configwindow.ui:1219
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_hddDevice)
-#: rc.cpp:175 rc.cpp:185 rc.cpp:195
 msgid ""
 "Editable\n"
 "del - remove item"
@@ -407,93 +364,71 @@ msgstr ""
 "Редактируемо\n"
 "del - удалить строку"
 
-#. i18n: file: ui/configwindow.ui:1128
+#: rc.cpp:205
-#. i18n: ectx: property (text), widget (QLabel, label_mount)
-#: rc.cpp:179
 msgid "Mount points"
 msgstr "Точки монтирования"
 
-#. i18n: file: ui/configwindow.ui:1183
+#: rc.cpp:215
-#. i18n: ectx: property (text), widget (QLabel, label_hddDevice)
+msgid "HDD devices (speed)"
-#: rc.cpp:189
+msgstr "HDD (скорость)"
-msgid "HDD devices"
-msgstr "HDD"
 
-#. i18n: file: ui/configwindow.ui:1236
+#: rc.cpp:225
-#. i18n: ectx: property (text), widget (QLabel, label_netdir)
+msgid "HDD devices (temp)"
-#: rc.cpp:199
+msgstr "HDD (температура)"
+
+#: rc.cpp:235
 msgid "Network directory"
 msgstr "Путь к интерфейсам"
 
-#. i18n: file: ui/configwindow.ui:1243
+#: rc.cpp:238
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_netdir)
-#: rc.cpp:202
 msgid "\"/sys/class/net\" by default"
 msgstr "\"/sys/class/net\" по умолчанию"
 
-#. i18n: file: ui/configwindow.ui:1263
+#: rc.cpp:241
-#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:205
 msgid "Disable auto select device and set specified device"
 msgstr "Отключить авто выбор устройства и использовать указанное"
 
-#. i18n: file: ui/configwindow.ui:1266
+#: rc.cpp:244
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:208
 msgid "Set network device"
 msgstr "Выберете сетевое устройство"
 
-#. i18n: file: ui/configwindow.ui:1299
+#: rc.cpp:247
-#. i18n: ectx: property (text), widget (QLabel, label_batdev)
-#: rc.cpp:211
 msgid "Battery device"
 msgstr "Устройство батареи"
 
-#. i18n: file: ui/configwindow.ui:1306
+#: rc.cpp:250
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
-#: rc.cpp:214
 msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
 msgstr "\"/sys/class/power_supply/BAT0/capacity\" по умолчанию"
 
-#. i18n: file: ui/configwindow.ui:1323
+#: rc.cpp:253
-#. i18n: ectx: property (text), widget (QLabel, label_acdev)
+msgid "AC online tag"
-#: rc.cpp:217
+msgstr "AC подключен"
+
+#: rc.cpp:256
+msgid "Line, which returns when AC is online"
+msgstr "Строка, возвращаемая при подключенном адапторе питания"
+
+#: rc.cpp:259
+msgid "AC offline tag"
+msgstr "AC отключен"
+
+#: rc.cpp:262
+msgid "Line, which returns when AC is offline"
+msgstr "Строка, возвращаемая при отключенном адапторе питания"
+
+#: rc.cpp:265
 msgid "AC device"
 msgstr "Устройство AC"
 
-#. i18n: file: ui/configwindow.ui:1330
+#: rc.cpp:268
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
-#: rc.cpp:220
 msgid "\"/sys/class/power_supply/AC/online\" by default"
 msgstr "\"/sys/class/power_supply/AC/online\" по умолчанию"
 
-#. i18n: file: ui/configwindow.ui:1367
+#: rc.cpp:274
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:226
-msgid "amarok"
-msgstr "amarok"
-
-#. i18n: file: ui/configwindow.ui:1372
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:229
-msgid "mpd"
-msgstr "mpd"
-
-#. i18n: file: ui/configwindow.ui:1377
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:232
-msgid "qmmp"
-msgstr "qmmp"
-
-#. i18n: file: ui/configwindow.ui:1401
-#. i18n: ectx: attribute (title), widget (QWidget, tooltip)
-#: rc.cpp:235
 msgid "Tooltip"
 msgstr "Тултип"
 
-#. i18n: file: ui/configwindow.ui:1407
+#: rc.cpp:277
-#. i18n: ectx: property (text), widget (QLabel, label_tooltip)
-#: rc.cpp:238
 msgid ""
 "CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
 "To enable them just make needed checkbox fully checked."
@@ -501,154 +436,145 @@ msgstr ""
 "Поля CPU, частота CPU, память, swap, сеть поддерживают графический тултип. "
 "Чтобы включить его, просто сделайте требуемые чекбоксы полностью чекнутыми."
 
-#. i18n: file: ui/configwindow.ui:1428
+#: rc.cpp:280
-#. i18n: ectx: property (text), widget (QLabel, label_tooltipNum)
-#: rc.cpp:241
 msgid "Number of values for tooltips"
 msgstr "Число хранящихся значений"
 
-#. i18n: file: ui/configwindow.ui:1483
+#: rc.cpp:283
-#. i18n: ectx: property (text), widget (QLabel, label_cpuColor)
-#: rc.cpp:244
-msgid "CPU color"
-msgstr "Цвет CPU"
-
-#. i18n: file: ui/configwindow.ui:1523
-#. i18n: ectx: property (text), widget (QLabel, label_cpuclockColor)
-#: rc.cpp:247
 msgid "CPU clock color"
 msgstr "Цвет частоты CPU"
 
-#. i18n: file: ui/configwindow.ui:1563
+#: rc.cpp:286
-#. i18n: ectx: property (text), widget (QLabel, label_memColor)
-#: rc.cpp:250
-msgid "Memory color"
-msgstr "Цвет памяти"
-
-#. i18n: file: ui/configwindow.ui:1603
-#. i18n: ectx: property (text), widget (QLabel, label_swapColor)
-#: rc.cpp:253
 msgid "Swap color"
 msgstr "Цвет swap"
 
-#. i18n: file: ui/configwindow.ui:1643
+#: rc.cpp:289
-#. i18n: ectx: property (text), widget (QLabel, label_downColor)
+msgid "CPU color"
-#: rc.cpp:256
+msgstr "Цвет CPU"
+
+#: rc.cpp:292
 msgid "Download speed color"
 msgstr "Цвет скорости загрузки"
 
-#. i18n: file: ui/configwindow.ui:1683
+#: rc.cpp:295
-#. i18n: ectx: property (text), widget (QLabel, label_upColor)
+msgid "Memory color"
-#: rc.cpp:259
+msgstr "Цвет памяти"
+
+#: rc.cpp:298
 msgid "Upload speed color"
 msgstr "Цвет скорости отдачи"
 
-#. i18n: file: ui/configwindow.ui:1729
+#: rc.cpp:301
-#. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:262
 msgid "Appearance"
 msgstr "Внешний вид"
 
-#. i18n: file: ui/configwindow.ui:1743
+#: rc.cpp:304
-#. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:265
 msgid "Time interval"
 msgstr "Интервал обновления"
 
-#. i18n: file: ui/configwindow.ui:1798
+#: rc.cpp:307
-#. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:268
 msgid "Font"
 msgstr "Шрифт"
 
-#. i18n: file: ui/configwindow.ui:1838
+#: rc.cpp:310
-#. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:271
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#. i18n: file: ui/configwindow.ui:1893
+#: rc.cpp:313
-#. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:274
 msgid "Font color"
 msgstr "Цвет шрифта"
 
-#. i18n: file: ui/configwindow.ui:1933
+#: rc.cpp:316
-#. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:277
 msgid "Font style"
 msgstr "Стиль шрифта"
 
-#. i18n: file: ui/configwindow.ui:1983
+#: rc.cpp:319
-#. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:280
 msgid "Font weight"
 msgstr "Ширина шрифта"
 
-#. i18n: file: ui/configwindow.ui:2044
+#: rc.cpp:322
-#. i18n: ectx: attribute (title), widget (QWidget, dataengine)
-#: rc.cpp:283
 msgid "DataEngine"
 msgstr "DataEngine"
 
-#. i18n: file: ui/configwindow.ui:2058
+#: rc.cpp:325
-#. i18n: ectx: property (text), widget (QLabel, label_gpudev)
-#: rc.cpp:286
-msgid "GPU device"
-msgstr "Устройство GPU"
-
-#. i18n: file: ui/configwindow.ui:2078
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:289
-msgid "auto"
-msgstr "auto"
-
-#. i18n: file: ui/configwindow.ui:2083
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:292
-msgid "nvidia"
-msgstr "nvidia"
-
-#. i18n: file: ui/configwindow.ui:2088
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:295
-msgid "ati"
-msgstr "ati"
-
-#. i18n: file: ui/configwindow.ui:2139
-#. i18n: ectx: property (text), widget (QLabel, label_mpdaddress)
-#: rc.cpp:301
-msgid "MPD address"
-msgstr "Адрес сервера MPD"
-
-#. i18n: file: ui/configwindow.ui:2163
-#. i18n: ectx: property (text), widget (QLabel, label_mpdport)
-#: rc.cpp:304
-msgid "MPD port"
-msgstr "Порт сервера MPD"
-
-#. i18n: file: ui/configwindow.ui:2218
-#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
-#: rc.cpp:307
 msgid "Custom command"
 msgstr "Своя команда"
 
-#. i18n: file: ui/configwindow.ui:2225
+#: rc.cpp:328
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
-#: rc.cpp:310
 msgid "Custom command to run"
 msgstr "Своя команда для запуска"
 
-#: rc.cpp:311
+#: rc.cpp:338
+msgid "GPU device"
+msgstr "Устройство GPU"
+
+#: rc.cpp:344
+msgid "MPD address"
+msgstr "Адрес сервера MPD"
+
+#: rc.cpp:347
+msgid "MPD port"
+msgstr "Порт сервера MPD"
+
+#: rc.cpp:353
+msgid "pacman -Qu"
+msgstr "pacman -Qu"
+
+#: rc.cpp:356
+msgid "apt-show-versions -u -b"
+msgstr "apt-show-versions -u -b"
+
+#: rc.cpp:359
+msgid "aptitude search '~U'"
+msgstr "aptitude search '~U'"
+
+#: rc.cpp:362
+msgid "yum list updates"
+msgstr "yum list updates"
+
+#: rc.cpp:365
+msgid "pkg_version -I -l '<'"
+msgstr "pkg_version -I -l '<'"
+
+#: rc.cpp:368
+msgid "urpmq --auto-select"
+msgstr "urpmq --auto-select"
+
+#: rc.cpp:371
+msgid "Number of null lines"
+msgstr "Число пустых линий"
+
+#: rc.cpp:379
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Evgeniy Alekseev"
 
-#: rc.cpp:312
+#: rc.cpp:380
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "amarok"
+#~ msgstr "amarok"
+
+#~ msgid "mpd"
+#~ msgstr "mpd"
+
+#~ msgid "qmmp"
+#~ msgstr "qmmp"
+
+#~ msgid "auto"
+#~ msgstr "auto"
+
+#~ msgid "nvidia"
+#~ msgstr "nvidia"
+
+#~ msgid "ati"
+#~ msgstr "ati"
+
+#~ msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
+#~ msgstr "$hddN - использование точки монтирования N (от 0), %. Пример: $hdd0"
+
 #~ msgid ""
 #~ "$ds - uptime days\n"
 #~ "$hs - uptime hours\n"

sources/readme/CMakeLists.txt

@@ -0,0 +1,5 @@
+# set project name
+set (SUBPROJECT pytextmonitor)
+
+file (GLOB SUBPROJECT_MD *.md)
+install (FILES ${SUBPROJECT_MD} DESTINATION share/${SUBPROJECT}/)

sources/readme/en.md

@@ -5,7 +5,7 @@ Information
 -----------
 PyTextMonitor is a minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm.
 
-**NOTE** LOOKING FOR TRANSLATORS!
+**NOTE** [LOOKING FOR TRANSLATORS!](https://github.com/arcan1s/pytextmonitor/issues/14)
 
 Configuration
 -------------
@@ -31,6 +31,10 @@ For edited output you must open Settings window and setup output format in lines
 * tag `$swapmb` - swap, *MB*
 * tag `$swapgb` - swap, *GB*
 * tag `$hddN` - usage for mount point N, *%*. For example, `$hdd0`
+* tag `$hddmbN` - usage for mount point N, *MB*. For example, `$hddmb0`
+* tag `$hddgbN` - usage for mount point N, *GB*. For example, `$hddgb0`
+* tag `$hddrN` - read speed of disk N, *KB/s*. For example, `$hddr0`
+* tag `$hddwN` - write speed of disk N, *KB/s*. For example, `$hddw0`
 * tag `$hddtempN` - temperature for HDD N. For example, `$hddtemp0`
 * tag `$down` - download speed, *KB/s*
 * tag `$up` - upload speed, *KB/s*
@@ -42,7 +46,11 @@ For edited output you must open Settings window and setup output format in lines
 * tag `$progress` - current song progress. One of supported music players must be installed
 * tag `$time` - current song duration. One of supported music players must be installed
 * tag `$title` - current song title. One of supported music players must be installed
-* tag `$custom` - returns output for custom command
+* tag `$pscount` - number of running processes
+* tag `$pstotal` - total number of processes
+* tag `$ps` - list of running processes
+* tag `$pkgcountN` - number of packages, which available to upgrade for command N. For example, `$pkgcount0`
+* tag `$customN` - returns output for custom command N. For example, `$custom0`
 
 Label order will changed if you change slider position. HTML tags in label work normally.
 
@@ -78,6 +86,10 @@ Advanced settings
 * tag `$mm` - uptime minutes
 * tag `$m` - uptime minutes without zero
 
+**Temperature units**
+
+Select units for temperature. Available units are Celsius, Farenheit and Kelvin.
+
 **Temperature devices**
 
 List of devices, which will be observed in temp label (combo box items come from `sensors`). List widget is editable, delete key will remove current item.
@@ -86,9 +98,13 @@ List of devices, which will be observed in temp label (combo box items come from
 
 List of mount points, which will be observed in hdd label (combo box items come from `mount`). List widget is editable, delete key will remove current item.
 
-**HDD**
+**HDD (speed)**
 
-List of hard disk devices, which will be observed in hddtem label (combo box items come from `find`). List widget is editable, delete key will remove current item.
+List of hard disk devices, which will be observed in hddspeed label (combo box items come from DataEngine). List widget is editable, delete key will remove current item.
+
+**HDD (temperature)**
+
+List of hard disk devices, which will be observed in hddtemp label (combo box items come from `find`). List widget is editable, delete key will remove current item.
 
 **Network directory**
 
@@ -102,6 +118,14 @@ Use specified device as active. Combo box items come from **network directory**.
 
 File with battery information. File (`/sys/class/power_supply/BAT0/capacity` by default) should contain only battery charge in percent.
 
+**AC online tag**
+
+Line which will be shown when AC is online.
+
+**AC offline tag**
+
+Line which will be shown when AC is offline.
+
 **AC device**
 
 File with AC information. File (`/sys/class/power_supply/AC/online` by default) must contain `1` if AC is online.
@@ -116,6 +140,12 @@ Since version 1.7.0 CPU, CPU clock, memory, swap and network labels support grap
 
 DataEngine settings
 -------------------
+**Custom command**
+
+*NOTE* This can cause the computer freeze.
+
+Commands, which will be run for custom label.
+
 **GPU device**
 
 Select one of supported GPU devices. `auto` will enable auto selection. Default is `auto`.
@@ -132,11 +162,16 @@ Address of MPD server. Default is `localhost`.
 
 Port of MPD server. Default is `6600`.
 
-**Custom command**
+**Package manager**
 
-*NOTE* This can cause the computer freeze.
+List of commands, which will be run. Number of null lines is a number of unneeded lines. Defaults:
+* *Arch*: `PKGCMD=pacman -Qu`, `PKGNULL=0`
+* *Debian*: `PKGCMD=apt-show-versions -u -b`, `PKGNULL=0`
+* *Ubuntu*: `PKGCMD=aptitude search '~U'`, `PKGNULL=0`
+* *Fedora*: `PKGCMD=yum list updates`, `PKGNULL=3`
+* *FreeBSD*: `PKGCMD=pkg_version -I -l '<'`, `PKGNULL=0`
+* *Mandriva*: `PKGCMD=urpmq --auto-select`, `PKGNULL=0`
 
-A command, which will be run for custom label.
 
 DataEngine configuration
 ------------------------
@@ -182,6 +217,9 @@ Installation
 Additional information
 ======================
 
+TODO (wish list)
+----------------
+
 Links
 -----
 * [Homepage](http://arcanis.name/projects/pytextmonitor/)

sources/readme/es.md

@@ -0,0 +1,228 @@
+pytextmonitor
+=============
+
+Información
+-----------
+PyTextMonitor es un plasmoide minimalista escrito en Python2. Luce como los componentes visuales de awesome-wm.
+
+**NOTA** [¡Se buscan traductores!](https://github.com/arcan1s/pytextmonitor/issues/14)
+
+Configuración
+-------------
+Para editar la visualización debes abrir la ventana de Ajustes y establecer el formato de visualización en líneas:
+* etiqueta `$time` - hora en formato por defecto. Por ejemplo, *vie 06 Nov 04:48:01 2013*
+* etiqueta `$isotime` - hora en formato ISO
+* etiqueta `$shorttime` - hora en formato local corto
+* etiqueta `$longtime` - hora en formato local largo
+* etiqueta `$custom` - formato de hora personalizado
+* etiqueta `$uptime` - tiempo de actividad del sistema, *---d--h--m*
+* etiqueta `$custom` - formato personalizado del tiempo de actividad del sistema
+* etiqueta `$cpu` - carga total de la CPU, *%*
+* etiqueta `$cpuN` - carga de la CPU para el núcleo N, *%*
+* etiqueta `$cpucl` - frecuencia promedio de la CPU, *MHz*
+* etiqueta `$cpuclN` - frecuencia de la CPU para el núcleo N, *MHz*
+* etiqueta `$tempN` - temperatura para el dispositivo N. Por ejemplo, `$temp0`
+* etiqueta `$gpu` - uso de la GPU, *%*. Debe estar instalado `aticonfig` o `nvidia-smi`
+* etiqueta `$gputemp` - temperatura de la GPU. Debe estar instalado `aticonfig` o `nvidia-smi`
+* etiqueta `$mem` - uso de la memori, *%*
+* etiqueta `$memmb` - uso de la memoria, *MB*
+* etiqueta `$memgb` - uso de la memoria, *GB*
+* etiqueta `$swap` - swap, *%*
+* etiqueta `$swapmb` - swap, *MB*
+* etiqueta `$swapgb` - swap, *GB*
+* etiqueta `$hddN` - uso para el punto de montaje N, *%*. Por ejemplo, `$hdd0`
+* etiqueta `$hddmbN` - uso para el punto de montaje N, *MB*. Por ejemplo, `$hddmb0`
+* etiqueta `$hddgbN` - uso para el punto de montaje N, *GB*. Por ejemplo, `$hddgb0`
+* etiqueta `$hddrN` - leer la velocidad del disco N, *KB/s*. Por ejemplo, `$hddr0`
+* etiqueta `$hddwN` - velocidad de escritura del disco N, *KB/s*. Por ejemplo: `$hddw0`
+* etiqueta `$hddtempN` - temperatura para el disco duro N. Por ejemplo, `$hddtemp0`
+* etiqueta `$down` - velocidad de recepción, *KB/s*
+* etiqueta `$up` - velocidad de envío, *KB/s*
+* etiqueta `$netdev` - dispositivo de red actual
+* etiqueta `$bat` - carga de la batería, *%*
+* etiqueta `$ac` - estado del dispositivo de alimentación. Devuelve (\*) si la alimentación está conectada o *( )* si no lo está
+* etiqueta `$album` - álbum de la canción actual. Debe estar instalado uno de los reproductores soportados
+* etiqueta `$artist` - artista de la canción actual. Debe estar instalado uno de los reproductores soportados
+* etiqueta `$progress` - progreso de la canción actual. Debe estar instalado uno de los reproductores soportados
+* etiqueta `$time` - duración de la canción actual. Debe estar instalado uno de los reproductores soportados
+* etiqueta `$title` - título de la canción actual. Debe estar instalado uno de los reproductores soportados
+* etiqueta `$pscount` - cantidad de procesos en ejecución
+* etiqueta `$pstotal` - total de procesos en ejecución
+* etiqueta `$ps` - listado de procesos en ejecución
+* etiqueta `$pkgcountN` - cantidad de paquetes con actualizaciones disponibles para el comando N. Por ejemplo, `$pkgcount0`
+* etiqueta `$customN` - obtener la salida de ejecución del comando personalizado N (a partir de 0). Por ejemplo, `$custom0`
+
+El orden de las etiquetas será cambiado si cambias la posición del deslizador. Es posible usar código HTML para las etiquetas.
+
+**NOTA** no puedes establecer la etiqueta `$cpu` para que se muestre en la información de la swap, por citar un ejemplo. **`$cpu` solo funcionará en la etiqueta de la CPU**.
+
+Ajustes avanzados
+-----------------
+**Hora personalizada**
+
+* etiqueta `$dddd` - día de la semana en foramto largo
+* etiqueta `$ddd` - día de la semana en formato corto
+* etiqueta `$dd` - día
+* etiqueta `$d` - día sin ceros
+* etiqueta `$MMMM` - mes en formato largo
+* etiqueta `$MMM` - mes en formato corto
+* etiqueta `$MM` - mes
+* etiqueta `$M` - mes sin ceros
+* etiqueta `$yyyy` - año
+* etiqueta `$yy` - año en formato corto
+* etiqueta `$hh` - horas
+* etiqueta `$h` - horas sin ceros
+* etiqueta `$mm` - minutos
+* etiqueta `$m` - minutos sin ceros
+* etiqueta `$ss` - segundos
+* etiqueta `$s` - segundos sin ceros
+
+**Tiempo de ejecución del sistema personalizado**
+
+* etiqueta `$dd` - días
+* etiqueta `$d` - días sin ceros
+* etiqueta `$hh` - horas
+* etiqueta `$h` - horas sin ceros
+* etiqueta `$mm` - minutos
+* etiqueta `$m` - minutos sin ceros
+
+**Unidades de temperatura**
+
+Elija las unidades de temperatura. Las unidades disponibles son: Celsius, Farenheit y Kelvin.
+
+**Dispositivos de temperatura**
+
+El listado de dispositivos, será observado en la etiqueta de temperatura (los elementos de la lista desplegable provienen de `sensors`). El listado es editable, la tecla Suprimir borrará el elemento activo.
+
+**Puntos de montaje**
+
+El listado de puntos de montaje, será observado en la etiqueta de disco duro (los elementos de la lista desplegable provienen de `mount`). El listado es editable, la tecla Suprimir borrará el elemento activo.
+
+**Disco duro (velocidad)**
+
+Listado de dispositivos de disco duro, será observado en la etiqueta hddspeed (los elementos de la lista desplegable provienen de DataEngine).
+
+**Disco duro (temperatura)**
+
+El listado de dispositivos de disco duro, será observado desde la etiqueta disco duro (los elementos de la lista desplegable provienen de `find`). El listado es editable, la tecla Suprimir borrará el elemento activo.
+
+**Directorio de red**
+
+Ruta hacia el directorio que contiene información de los dispositivos de red. Por defecto es `/sys/class/net`. Se requiere para la selección automática del dispositivo de red.
+
+**Dispositivo de red**
+
+Usar el dispositivo especificado como activo. Los elementos de la lista desplegable provienen del **directorio de red**. Esto inhabilitará la selección automática del dispositivo de red.
+
+**Dispositivo de batería**
+
+El archivo que contiene información de la batería. El archivo (`/sys/class/power_supply/BAT0/capacity` por defecto) solo debería contener la carga de la batería en por ciento.
+
+**Etiqueta alimentación conectada**
+
+Línea que será mostrada cuando la alimentación esté conectada.
+
+**Etiqueta alimentación conectada**
+
+Línea que será mostrada cuando la alimentación esté desconectada.
+
+**Dispositivo de alimentación**
+
+El archivo con información de la alimentación. El archivo (`/sys/class/power_supply/AC/online` por defecto) debe contener `1` si la alimentación está conectada.
+
+**Reproductor de música**
+
+Seleccionar uno de los reproductores de música soportados para la etiqueta del reproductor.
+
+Ajustes de las ventanas emergentes
+----------------------------------
+Desde la versión 1.7.0 las etiquetas CPU, frecuencia de la CPU, memoria, swap y red soportan ventanas emergentes. Para habilitarlas es necesario tener marcadas las casillas de verificación pertinentes. El número de valores almacenados puede ser establecido en la pestaña. También es posible configurar los colores de los gráficos.
+
+Ajustes de DataEngine
+---------------------
+**Comando personalizado**
+
+*NOTA* Esto puede causar congelamiento de la computadora.
+
+Listado de los comandos que serán ejecutados para etiquetas personalizadas.
+
+**Dispositivo GPU**
+
+Elegir uno de los dispositivos GPU soportados. `auto` habilitará la selección automática. El valor por defecto es `auto`.
+
+**Disco duro**
+
+Elegir uno de los discos duros para el monitor de temperatura del disco. `all` habilitará el monitor para todos los dispositivos. El valor por defecto es `all`.
+
+**Dirección MPD**
+
+Dirección del servidor MPD. El valor por defecto es `localhost`.
+
+**Puerto MPD**
+
+Puerto del servidor MPD. El valor por defecto es `6600`.
+
+**Gestor de paquetes**
+
+Listado de comandos que serán ejecutados. La cantidad de líneas nulas es el número de líneas innecesarias. Predeterminados:
+* *Arch*: `PKGCMD=pacman -Qu`, `PKGNULL=0`
+* *Debian*: `PKGCMD=apt-show-versions -u -b`, `PKGNULL=0`
+* *Ubuntu*: `PKGCMD=aptitude search '~U'`, `PKGNULL=0`
+* *Fedora*: `PKGCMD=yum list updates`, `PKGNULL=3`
+* *FreeBSD*: `PKGCMD=pkg_version -I -l '<'`, `PKGNULL=0`
+* *Mandriva*: `PKGCMD=urpmq --auto-select`, `PKGNULL=0`
+
+
+Configuración de DataEngine
+---------------------------
+Se puede editar la configuración de DataEngine. Se encuentra en `/usr/share/config/extsysmon.conf` o `$HOME/share/config/extsysmon.conf` en dependencia del tipo de instalación. Quitar el comentario de la línea requerida y editarlo.
+
+Instrucción
+===========
+
+Dependencias
+------------
+* kdebase-workspace
+* kdebindings-python2
+* lm_sensors (*para definir el dispositivo de temperatura*)
+* sysstat (*para las notificaciones*)
+
+Dependencias opcionales
+-----------------------
+* controlador propietario de video
+* hddtemp (asegúrate de que puede ser ejecutado con `sudo` y sin contraseña. Solo hay que agregar la siguiente línea al archivo `/etc/sudoers`: `$USERNAME ALL=NOPASSWD: /usr/bin/hddtemp`)
+* reproductor de música (amarok, mpd or qmmp)
+
+Dependencias de construcción
+----------------------------
+* automoc4
+* cmake
+* kdebase-runtime
+
+Instalación
+-----------
+* descargar fuentes
+* instalar
+
+        mkdir build && cd build
+        cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --localprefix` ../
+        make && make install
+
+  También es posible instalarlo en `/`:
+
+        mkdir build && cd build
+        cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` ../
+        make && sudo make install
+
+Información adicional
+=====================
+
+TODO (funcionalidades solicitadas)
+----------------------------------
+
+Enlaces
+-----
+* [Sitio oficial](http://arcanis.name/projects/pytextmonitor/)
+* Plasmoide en [kde-look](http://kde-look.org/content/show.php/Py+Text+Monitor?content=157124)
+* DataEngine en [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
+* Archlinux [AUR](https://aur.archlinux.org/packages/kdeplasma-applets-pytextmonitor/) package

sources/readme/ru.md

@@ -5,76 +5,90 @@ pytextmonitor
 ----------
 PyTextMonitor - минималистичный плазмоид, написанный на Python2. Он выглядит, как виджеты в Awesome WM.
 
+**ВНИМАНИЕ** [НУЖНЫ ПЕРЕВОДЧИКИ!](https://github.com/arcan1s/pytextmonitor/issues/14)
+
 Настройка
 ---------
 Для редактирования внешнего виде, откройте окно настроек и установите требуемый формат в поля:
-* тэг `$time` - время в стандартном формате. Например, *fri Nov 6 04:48:01 2013*
+* тег `$time` - время в стандартном формате. Например, *fri Nov 6 04:48:01 2013*
-* тэг `$isotime` - время в ISO формате
+* тег `$isotime` - время в ISO формате
-* тэг `$shorttime` - время в коротком формате
+* тег `$shorttime` - время в коротком формате
-* тэг `$longtime` - время в длинном формате
+* тег `$longtime` - время в длинном формате
-* тэг `$custom` - свой формат времени
+* тег `$custom` - свой формат времени
-* тэг `$uptime` - время работы, *---d--h--m*
+* тег `$uptime` - время работы, *---d--h--m*
-* тэг `$custom` - свой формат аптайма
+* тег `$custom` - свой формат аптайма
-* тэг `$cpu` - общая загрузка CPU, *%*
+* тег `$cpu` - общая загрузка CPU, *%*
-* тэг `$cpuN` - загрузка CPU для ядра N, *%*
+* тег `$cpuN` - загрузка CPU для ядра N, *%*
-* тэг `$cpucl` - средняя частота CPU, *MHz*
+* тег `$cpucl` - средняя частота CPU, *MHz*
-* тэг `$cpuclN` - частота CPU для ядра N, *MHz
+* тег `$cpuclN` - частота CPU для ядра N, *MHz
-* тэг `$tempN` - температура для устройства N. Например, `$temp0`
+* тег `$tempN` - температура для устройства N. Например, `$temp0`
-* тэг `$gpu` - использование GPU, *%*. `aticonfig` или `nvidia-smi` должны быть установлены
+* тег `$gpu` - использование GPU, *%*. `aticonfig` или `nvidia-smi` должны быть установлены
-* тэг `$gputemp` - температура GPU. `aticonfig` или `nvidia-smi` должны быть установлены
+* тег `$gputemp` - температура GPU. `aticonfig` или `nvidia-smi` должны быть установлены
-* тэг `$mem` - использование RAM, *%*
+* тег `$mem` - использование RAM, *%*
-* тэг `$memmb` - использование RAM, *MB*
+* тег `$memmb` - использование RAM, *MB*
-* тэг `$memgb` - использование RAM, *GB*
+* тег `$memgb` - использование RAM, *GB*
-* тэг `$swap` - swap, *%*
+* тег `$swap` - swap, *%*
-* тэг `$swapmb` - swap, *MB*
+* тег `$swapmb` - swap, *MB*
-* тэг `$swapgb` - swap, *GB*
+* тег `$swapgb` - swap, *GB*
-* тэг `$hddN` - использование точки монтирования N, *%*. Например, `$hdd0`
+* тег `$hddN` - использование точки монтирования N, *%*. Например, `$hdd0`
-* тэг `$hddtempN` - температура HDD N. Например, `$hddtemp0`
+* тег `$hddmbN` - использование точки монтирования N, *KB/s*. Например, `$hddmb0`
-* тэг `$down` - скорость загрузки, *KB/s*
+* тег `$hddgbN` - использование точки монтирования N, *KB/s*. Например, `$hddgb0`
-* тэг `$up` - скорость отдачи, *KB/s*
+* тег `$hddrN` - скорость записи на диск N, *KB/s*. Например, `$hddr0`
-* тэг `$netdev` - текущий сетевой интерфейс
+* тег `$hddwN` - скорость чтения с диска N, *KB/s*. Например, `$hddw0`
-* тэг `$bat` - заряд батареи, *%*
+* тег `$hddtempN` - температура HDD N. Например, `$hddtemp0`
-* тэг `$ac` - статус адаптора питания. Возвращает (\*), если AC подключен или *( )*, если нет
+* тег `$down` - скорость загрузки, *KB/s*
-* тэг `$album` - альбом. Один из поддерживаемых плееров должен быть установлен
+* тег `$up` - скорость отдачи, *KB/s*
-* тэг `$artist` - исполнитель. Один из поддерживаемых плееров должен быть установлен
+* тег `$netdev` - текущий сетевой интерфейс
-* тэг `$progress` - прогресс. Один из поддерживаемых плееров должен быть установлен
+* тег `$bat` - заряд батареи, *%*
-* тэг `$time` - длительность. Один из поддерживаемых плееров должен быть установлен
+* тег `$ac` - статус адаптора питания. Возвращает (\*), если AC подключен или *( )*, если нет
-* тэг `$title` - название. Один из поддерживаемых плееров должен быть установлен
+* тег `$album` - альбом. Один из поддерживаемых плееров должен быть установлен
-* тэг `$custom` - возвращает результат своей команды
+* тег `$artist` - исполнитель. Один из поддерживаемых плееров должен быть установлен
+* тег `$progress` - прогресс. Один из поддерживаемых плееров должен быть установлен
+* тег `$time` - длительность. Один из поддерживаемых плееров должен быть установлен
+* тег `$title` - название. Один из поддерживаемых плееров должен быть установлен
+* тег `$pscount` - число запущенных процессов
+* тег `$pstotal` - общее число процессов
+* тег `$ps` - список процессов
+* тег `$pkgcountN` - число пакетов, которые могут быть обновлены, для команды N. Например, `$pkgcount0`
+* тег `$customN` - возвращает результат своей команды N. Например, `$custom0`
 
-Порядок полей изменится, если вы измените позицию слайдеров. HTML тэги в полях работают корректно.
+Порядок полей изменится, если вы измените позицию слайдеров. HTML теги в полях работают корректно.
 
-**ЗАМЕЧАНИЕ** вы не можете установить тэг `$cpu`, например, в поле swap. **`$cpu` будет работать только в поле CPU**.
+**ЗАМЕЧАНИЕ** вы не можете установить тег `$cpu`, например, в поле swap. **`$cpu` будет работать только в поле CPU**.
 
 Расширенные настройки
 ---------------------
 **Свой формат времени**
 
-* тэг `$dddd` - день недели в длинном формате
+* тег `$dddd` - день недели в длинном формате
-* тэг `$ddd` - день недели в коротком формате
+* тег `$ddd` - день недели в коротком формате
-* тэг `$dd` - день
+* тег `$dd` - день
-* тэг `$d` - день без нуля
+* тег `$d` - день без нуля
-* тэг `$MMMM` - месяц в длинном формате
+* тег `$MMMM` - месяц в длинном формате
-* тэг `$MMM` - месяц в коротком формате
+* тег `$MMM` - месяц в коротком формате
-* тэг `$MM` - месяц
+* тег `$MM` - месяц
-* тэг `$M` - месяц без нуля
+* тег `$M` - месяц без нуля
-* тэг `$yyyy` - год
+* тег `$yyyy` - год
-* тэг `$yy` - год в коротком формате
+* тег `$yy` - год в коротком формате
-* тэг `$hh` - часы
+* тег `$hh` - часы
-* тэг `$h` - часы без нуля
+* тег `$h` - часы без нуля
-* тэг `$mm` - минуты
+* тег `$mm` - минуты
-* тэг `$m` - минуты без нуля
+* тег `$m` - минуты без нуля
-* тэг `$ss` - секунды
+* тег `$ss` - секунды
-* тэг `$s` - секунды без нуля
+* тег `$s` - секунды без нуля
 
 **Свой формат аптайма**
 
-* тэг `$dd` - дни аптайма
+* тег `$dd` - дни аптайма
-* тэг `$d` - дни аптайма без нуля
+* тег `$d` - дни аптайма без нуля
-* тэг `$hh` - часы аптайма
+* тег `$hh` - часы аптайма
-* тэг `$h` - часы аптайма без нуля
+* тег `$h` - часы аптайма без нуля
-* тэг `$mm` - минуты аптайма
+* тег `$mm` - минуты аптайма
-* тэг `$m` - минуты аптайма без нуля
+* тег `$m` - минуты аптайма без нуля
+
+**Температурные единицы**
+
+Выберете единицы температуры. Доступные единицы следующие: Цельсий, Фаренгейт и Кельвин.
 
 **Датчики температуры**
 
@@ -84,7 +98,11 @@ PyTextMonitor - минималистичный плазмоид, написан
 
 Список точек монтирования, которые будут наблюдаться в поле hdd (содержимое комбо бокса берется из `mount`). Виджет редактируем, клавиша delete удалит текущую строку.
 
-**HDD**
+**HDD (скорость)**
+
+Список HDD, которые будут наблюдаться в поле hddspeed (содержимое комбо бокса берется из DataEngine). Виджет редактируем, клавиша delete удалит текущую строку.
+
+**HDD (температура)**
 
 Список HDD, которые будут наблюдаться в поле hddtemp (содержимое комбо бокса берется из `find`). Виджет редактируем, клавиша delete удалит текущую строку.
 
@@ -100,6 +118,14 @@ PyTextMonitor - минималистичный плазмоид, написан
 
 Файл с информацией о батарее. Данный файл (`/sys/class/power_supply/BAT0/capacity` по умолчанию) должен содержать только заряд батареи в процентах.
 
+**AC online тег**
+
+Строка, которая будет показана, когда AC онлайн.
+
+**AC offline тег**
+
+Строка, которая будет показана, когда AC оффлайн.
+
 **Устройство AC**
 
 Файл с информацией об адапторе питания. Данный файл (`/sys/class/power_supply/AC/online` по умолчанию) должен содержать `1`, если адаптор подключен.
@@ -114,6 +140,12 @@ PyTextMonitor - минималистичный плазмоид, написан
 
 Настройки DataEngine
 --------------------
+**Своя команда**
+
+*ЗАМЕЧАНИЕ* Может вызвать зависание компьютера.
+
+Команды, которые будет запущена для соответствующего поля.
+
 **Устройство GPU**
 
 Выберете одно из поддерживаемых устройств GPU. `auto` включит автоматическое определение. По умолчанию `auto`.
@@ -130,11 +162,15 @@ PyTextMonitor - минималистичный плазмоид, написан
 
 Порт MPD сервера. По умолчанию `6600`.
 
-**Своя команда**
+**Package manager**
 
-*ЗАМЕЧАНИЕ* Может вызвать зависание компьютера.
+Список команд, которые будут запущены. Число пустых строк - число ненужных для подсчета строк. Стандартные настройки:
-
+* *Arch*: `PKGCMD=pacman -Qu`, `PKGNULL=0`
-Команда, которая будет запущена для соответствующего поля.
+* *Debian*: `PKGCMD=apt-show-versions -u -b`, `PKGNULL=0`
+* *Ubuntu*: `PKGCMD=aptitude search '~U'`, `PKGNULL=0`
+* *Fedora*: `PKGCMD=yum list updates`, `PKGNULL=3`
+* *FreeBSD*: `PKGCMD=pkg_version -I -l '<'`, `PKGNULL=0`
+* *Mandriva*: `PKGCMD=urpmq --auto-select`, `PKGNULL=0`
 
 Настройка DataEngine
 --------------------
@@ -180,6 +216,9 @@ PyTextMonitor - минималистичный плазмоид, написан
 Дополнительная информация
 =========================
 
+TODO (wish list)
+----------------
+
 Ссылки
 ------
 * [Домашняя страница](http://arcanis.name/projects/pytextmonitor/)