release 2.3.1

* merge fan tags to temp ones for better handling

CHANGELOG

@@ -1,16 +1,33 @@
+Ver.2.3.1:
+- fix bug with no updates from configuration UI
+- fix invalid vertical tab parsing
+* translation update
+* merge fan tags to temp ones, improve lmsensors tags handling
+
+Ver.2.3.0:
++ implement fitlers support to ExtScripts (ApiVer = 3) (#53)
++ implement ability to wrap `\n` as new lines (#53)
++ implement key sorting in comboboxes
++ implement (perc)(bid|ask|price)chg tag support (ApiVer = 2)
++ implement timeouts to quotes (#54)
+- fix bug with invalid html parsing
+* move from XML to JSON in ExtQuotes (ApiVer = 2)
+* more pretty configuration UI
+* some part of refactoring
+
 Ver.2.2.2:
 + add quotes support (#46)
 + add support of properties height and width (#47)
 + add transtaltion support to the plugins (#50)
 + add support of key caching
-+ add support of X-AW-Number to ExtScript and ExtUpgrade (ApiVer=2)
++ add support of X-AW-Number to ExtScript and ExtUpgrade (ApiVer = 2)
 + add reconnection to DataEngine (in some cases some values are not updated)
 + add widgets width and height update
 - fix bug with Ext* items update (#49)
 - fix bug with GPUDEV, HDDDEV settings saving from UI
 - fix Desktop Panel settings
 - fix bug with adding paragraph settings
-* drop support of KDE4 support, created a separate branch
+* drop support of KDE4 support, created a separated branch
 * increase intervals limits (#48)
 * hddtemp was replaced to smartctl by default
 * plugins were moved from private

CHANGELOG-RU

@@ -1,3 +1,20 @@
+Вер.2.3.1:
+- пофикшен баг с отсутствием обновлений значений из настроек
+- убрана поддержка фильтра `\t`
+* обновлены переводы
+* теги fan были объединены с temp, улучшена поддержка тегов lmsensors
+
+Вер.2.3.0:
++ добавлена поддержка фильтров в ExtScript (ApiVer = 3) (#53)
++ добавлена возможность отображать `\n`, как перенос строки (#53)
++ добавлена сортировка ключей в комбобоксах
++ добавлена поддержка тегов (perc)(bid|ask|price)chg (ApiVer = 2)
++ добавлены таймауты запросов котировок (#54)
+- исправлен баг с неправильным парсингом html
+* ExtQuotes теперь использует JSON вместо XML (ApiVer = 2)
+* более красивый UI настроек
+* некоторый рефакторинг
+
 Вер.2.2.2:
 + добавлена поддержка котировок (#46)
 + добавлена поддержка свойств height и width (#47)

README.md

@@ -27,8 +27,7 @@ Instruction
 Dependencies
 ------------
 
-* kdebase-workspace (*if KDE4 is used*) **or** plasma-framework (*if KF5 is used*)
+* plasma-framework
-* lm_sensors (*for definition temperature device*)
 
 Optional dependencies
 ---------------------
@@ -42,7 +41,7 @@ Make dependencies
 -----------------
 
 * cmake
-* automoc4 (*if KDE4 is used*) or extra-cmake-modules (*if KF5 is used*)
+* extra-cmake-modules
 
 Installation
 ------------
@@ -72,4 +71,5 @@ Links
 * [Scripts and bars](http://arcanis.name/en/2014/12/19/aw-v21-bells-and-whistles/)
 * Plasmoid on [kde-look](http://kde-look.org/content/show.php/Awesome+Widgets?content=157124)
 * DataEngine on [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
-* Archlinux [AUR](https://aur.archlinux.org/packages/kdeplasma-applets-awesome-widgets/) package
+* Archlinux [AUR](https://aur.archlinux.org/packages/plasma5-applet-awesome-widgets/) package
+* [OpenSuse](http://software.opensuse.org/package/awesome-widgets) package

arch/PKGBUILD

@@ -2,25 +2,22 @@
 
 pkgname=plasma5-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=2.2.2
+pkgver=2.3.1
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
 arch=('i686' 'x86_64')
 url="http://arcanis.name/projects/awesome-widgets"
 license=('GPL3')
 depends=('plasma-framework')
-optdepends=("amarok: for music player monitor"
+optdepends=("catalyst: for GPU monitor"
-            "clementine: for music player monitor"
-            "catalyst: for GPU monitor"
             "hddtemp: for HDD temperature monitor"
             "smartmontools: for HDD temperature monitor"
             "mpd: for music player monitor"
-            "nvidia-utils: for GPU monitor"
+            "nvidia-utils: for GPU monitor")
-            "qmmp: for music player monitor")
 makedepends=('cmake' 'extra-cmake-modules')
 source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
 install=${pkgname}.install
-md5sums=('73e176a124f8bfe43a0a112307624bfe')
+md5sums=('90e640b6679b4cf0f6f99cf6da2848f3')
 backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
 
 prepare() {

sources/CMakeLists.txt

@@ -10,8 +10,8 @@ set (PROJECT_AUTHOR "Evgeniy Alekseev")
 set (PROJECT_CONTACT "esalexeev@gmail.com")
 set (PROJECT_LICENSE "GPLv3")
 set (PROJECT_VERSION_MAJOR 2)
-set (PROJECT_VERSION_MINOR 2)
+set (PROJECT_VERSION_MINOR 3)
-set (PROJECT_VERSION_PATCH 2)
+set (PROJECT_VERSION_PATCH 1)
 set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 
 string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)

sources/awesome-widget/CMakeLists.txt

@@ -8,7 +8,7 @@ configure_file (metadata.desktop ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.de
 find_package (ECM 0.0.12 REQUIRED NO_MODULE)
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
-find_package (Qt5 REQUIRED COMPONENTS Core Network Qml Xml)
+find_package (Qt5 REQUIRED COMPONENTS Core Network Qml)
 find_package (KF5 REQUIRED COMPONENTS I18n Notifications Plasma)
 
 include (KDEInstallDirs)

sources/awesome-widget/package/contents/config/main.xml

@@ -23,6 +23,9 @@
     <entry name="notify" type="bool">
       <default>true</default>
     </entry>
+    <entry name="wrapNewLines" type="bool">
+      <default>false</default>
+    </entry>
     <entry name="background" type="bool">
       <default>true</default>
     </entry>

sources/awesome-widget/package/contents/ui/about.qml

@@ -48,6 +48,12 @@ Item {
                         text: AWActions.getAboutText("header")
                     }
 
+                    QtControls.Label {
+                        QtLayouts.Layout.fillWidth: true
+                        horizontalAlignment: Text.AlignHCenter
+                        text: AWActions.getAboutText("version")
+                    }
+
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignJustify
@@ -62,9 +68,11 @@ Item {
                     }
 
                     QtControls.Label {
+                        QtLayouts.Layout.fillHeight: true
                         QtLayouts.Layout.fillWidth: true
                         font.capitalization: Font.SmallCaps
                         horizontalAlignment: Text.AlignHCenter
+                        verticalAlignment: Text.AlignBottom
                         textFormat: Text.RichText
                         text: AWActions.getAboutText("copy")
                     }
@@ -83,8 +91,10 @@ Item {
                     }
 
                     QtControls.Label {
+                        QtLayouts.Layout.fillHeight: true
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignJustify
+                        verticalAlignment: Text.AlignTop
                         textFormat: Text.RichText
                         text: AWActions.getAboutText("3rdparty")
                     }

sources/awesome-widget/package/contents/ui/advanced.qml

@@ -33,6 +33,7 @@ Item {
     property alias cfg_height: widgetHeight.value
     property alias cfg_width: widgetWidth.value
     property alias cfg_notify: notify.checked
+    property alias cfg_wrapNewLines: wrapNewLines.checked
     property alias cfg_background: background.checked
     property alias cfg_customTime: customTime.text
     property alias cfg_customUptime: customUptime.text
@@ -98,6 +99,20 @@ Item {
             }
         }
 
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.heigth
+                width: parent.width * 2 / 5
+            }
+            QtControls.CheckBox {
+                id: wrapNewLines
+                width: parent.width * 3 / 5
+                text: i18n("Wrap new lines")
+            }
+        }
+
         Row {
             height: implicitHeight
             width: parent.width

sources/awesome-widget/package/contents/ui/dataengine.qml

@@ -273,7 +273,7 @@ Item {
         if (debug) console.log("[dataengine::onCompleted]")
 
         // init submodule
-        AWKeys.initKeys(plasmoid.configuration.text, tooltipSettings)
+        AWKeys.initKeys(plasmoid.configuration.text)
     }
 
     Component.onDestruction: {

sources/awesome-widget/package/contents/ui/main.qml

@@ -199,7 +199,10 @@ Item {
         if (debug) console.log("[main::onUserConfiguringChanged]")
 
         // init submodule
-        AWKeys.initKeys(plasmoid.configuration.text, tooltipSettings, plasmoid.configuration.notify)
+        AWKeys.initKeys(plasmoid.configuration.text)
+        AWKeys.initTooltip(tooltipSettings)
+        AWKeys.setPopupEnabled(plasmoid.configuration.notify)
+        AWKeys.setWrapNewLines(plasmoid.configuration.wrapNewLines)
 
         needUpdate()
     }

sources/awesome-widget/package/contents/ui/widget.qml

@@ -76,6 +76,7 @@ Item {
             height: implicitHeight
             width: parent.width
             QtControls.Button {
+                width: parent.width * 3 / 12
                 text: i18n("Font")
                 iconName: "font"
 
@@ -98,6 +99,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-indent-more"
 
                 onClicked: {
@@ -111,6 +113,7 @@ Item {
             }
 
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-text-bold"
 
                 onClicked: {
@@ -123,6 +126,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-text-italic"
 
                 onClicked: {
@@ -135,6 +139,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-text-underline"
 
                 onClicked: {
@@ -147,6 +152,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-text-strikethrough"
 
                 onClicked: {
@@ -160,6 +166,7 @@ Item {
             }
 
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-justify-left"
 
                 onClicked: {
@@ -172,6 +179,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-justify-center"
 
                 onClicked: {
@@ -184,6 +192,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-justify-right"
 
                 onClicked: {
@@ -196,6 +205,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-justify-fill"
 
                 onClicked: {
@@ -310,7 +320,7 @@ Item {
         if (debug) console.log("[widget::onCompleted]")
 
         // init submodule
-        AWKeys.initKeys(plasmoid.configuration.text, tooltipSettings)
+        AWKeys.initKeys(plasmoid.configuration.text)
-        tags.model = AWKeys.dictKeys()
+        tags.model = AWKeys.dictKeys(true)
     }
 }

sources/awesome-widget/package/metadata.desktop

@@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
-X-KDE-PluginInfo-Version=2.2.2
+X-KDE-PluginInfo-Version=2.3.0
 X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=

sources/awesome-widget/plugin/CMakeLists.txt

@@ -1,15 +1,9 @@
 set (PLUGIN_NAME awplugin)
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\")
 
-add_definitions (${Qt5Core_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5Xml_DEFINITIONS})
+add_definitions (${Qt5Core_DEFINITIONS} ${Qt5Network_DEFINITIONS})
-set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS}
+set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Qml_INCLUDE_DIRS})
-                ${Qt5Network_INCLUDE_DIRS}
+set (Qt_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Qml_LIBRARIES})
-                ${Qt5Qml_INCLUDE_DIRS}
-                ${Qt5Xml_INCLUDE_DIRS})
-set (Qt_LIBRARIES ${Qt5Core_LIBRARIES}
-                  ${Qt5Network_LIBRARIES}
-                  ${Qt5Qml_LIBRARIES}
-                  ${Qt5Xml_LIBRARIES})
 set (Kf5_INCLUDE ${I18n_INCLUDE_DIR}
                  ${Notifications_INCLUDE_DIR})
 set (Kf5_LIBRARIES KF5::I18n

sources/awesome-widget/plugin/awactions.cpp

@@ -101,6 +101,8 @@ QString AWActions::getAboutText(const QString type)
     QString text;
     if (type == QString("header"))
         text = QString(NAME);
+    else if (type == QString("version"))
+        text = i18n("Version %1 (build date %2)", QString(VERSION), QString(BUILD_DATE));
     else if (type == QString("description"))
         text = i18n("A set of minimalistic plasmoid widgets");
     else if (type == QString("links"))
@@ -130,11 +132,11 @@ QString AWActions::getAboutText(const QString type)
 }
 
 
-QMap<QString, QVariant> AWActions::getFont(const QMap<QString, QVariant> defaultFont)
+QVariantMap AWActions::getFont(const QVariantMap defaultFont)
 {
     if (debug) qDebug() << PDEBUG;
 
-    QMap<QString, QVariant> fontMap;
+    QVariantMap fontMap;
     CFont defaultCFont = CFont(defaultFont[QString("family")].toString(),
                                defaultFont[QString("size")].toInt(),
                                400, false, defaultFont[QString("color")].toString());
@@ -148,14 +150,14 @@ QMap<QString, QVariant> AWActions::getFont(const QMap<QString, QVariant> default
 }
 
 
-QMap<QString, QVariant> AWActions::readDataEngineConfiguration()
+QVariantMap AWActions::readDataEngineConfiguration()
 {
     if (debug) qDebug() << PDEBUG;
 
     QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, QString("plasma-dataengine-extsysmon.conf"));
     if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << fileName;
     QSettings settings(fileName, QSettings::IniFormat);
-    QMap<QString, QVariant> configuration;
+    QVariantMap configuration;
 
     settings.beginGroup(QString("Configuration"));
     configuration[QString("ACPIPATH")] = settings.value(QString("ACPIPATH"), QString("/sys/class/power_supply/"));
@@ -172,7 +174,7 @@ QMap<QString, QVariant> AWActions::readDataEngineConfiguration()
 }
 
 
-void AWActions::writeDataEngineConfiguration(const QMap<QString, QVariant> configuration)
+void AWActions::writeDataEngineConfiguration(const QVariantMap configuration)
 {
     if (debug) qDebug() << PDEBUG;
 

sources/awesome-widget/plugin/awactions.h

@@ -40,10 +40,10 @@ public:
     Q_INVOKABLE void showReadme();
     // configuration slots
     Q_INVOKABLE QString getAboutText(const QString type = QString("header"));
-    Q_INVOKABLE QMap<QString, QVariant> getFont(const QMap<QString, QVariant> defaultFont);
+    Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont);
     // dataengine
-    Q_INVOKABLE QMap<QString, QVariant> readDataEngineConfiguration();
+    Q_INVOKABLE QVariantMap readDataEngineConfiguration();
-    Q_INVOKABLE void writeDataEngineConfiguration(const QMap<QString, QVariant> configuration);
+    Q_INVOKABLE void writeDataEngineConfiguration(const QVariantMap configuration);
 
 public slots:
     Q_INVOKABLE static void sendNotification(const QString eventId, const QString message,

sources/awesome-widget/plugin/awkeys.cpp

@@ -86,9 +86,7 @@ AWKeys::~AWKeys()
 }
 
 
-void AWKeys::initKeys(const QString currentPattern,
+void AWKeys::initKeys(const QString currentPattern)
-                      const QMap<QString, QVariant> tooltipParams,
-                      const bool popup)
 {
     if (debug) qDebug() << PDEBUG;
 
@@ -100,7 +98,6 @@ void AWKeys::initKeys(const QString currentPattern,
     keys.clear();
     foundBars.clear();
     foundKeys.clear();
-    if (toolTip != nullptr) delete toolTip;
 
     // init
     pattern = currentPattern;
@@ -113,12 +110,34 @@ void AWKeys::initKeys(const QString currentPattern,
     addKeyToCache(QString("Network"));
     loadKeysFromCache();
     reinitKeys();
+}
+
+
+void AWKeys::initTooltip(const QVariantMap tooltipParams)
+{
+    if (debug) qDebug() << PDEBUG;
+
+    if (toolTip != nullptr) delete toolTip;
     toolTip = new AWToolTip(this, tooltipParams);
+}
+
+
+void AWKeys::setPopupEnabled(const bool popup)
+{
+    if (debug) qDebug() << PDEBUG;
 
     enablePopup = popup;
 }
 
 
+void AWKeys::setWrapNewLines(const bool wrap)
+{
+    if (debug) qDebug() << PDEBUG;
+
+    wrapNewLines = wrap;
+}
+
+
 bool AWKeys::isDebugEnabled()
 {
     if (debug) qDebug() << PDEBUG;
@@ -135,11 +154,12 @@ QString AWKeys::parsePattern()
     QString parsed = pattern;
     parsed.replace(QString("$$"), QString("$\\$\\"));
     for (int i=0; i<foundKeys.count(); i++)
-        parsed.replace(QString("$%1").arg(foundKeys[i]), valueByKey(foundKeys[i]));
+        parsed.replace(QString("$%1").arg(foundKeys[i]), htmlValue(foundKeys[i]));
-    parsed.replace(QString(" "), QString("&nbsp;"));
     for (int i=0; i<foundBars.count(); i++)
         parsed.replace(QString("$%1").arg(foundBars[i]), getItemByTag(foundBars[i])->image(valueByKey(foundBars[i]).toFloat()));
     parsed.replace(QString("$\\$\\"), QString("$$"));
+    // wrap new lines if required
+    if (wrapNewLines) parsed.replace(QString("\n"), QString("<br>"));
 
     return parsed;
 }
@@ -148,6 +168,7 @@ QString AWKeys::parsePattern()
 QString AWKeys::toolTipImage()
 {
     if(debug) qDebug() << PDEBUG;
+    if (toolTip == nullptr) return QString("");
 
     if (keys.isEmpty()) return QString();
 
@@ -163,6 +184,7 @@ QString AWKeys::toolTipImage()
 QSize AWKeys::toolTipSize()
 {
     if (debug) qDebug() << PDEBUG;
+    if (toolTip == nullptr) return QSize();
 
     return toolTip->getSize();
 }
@@ -174,16 +196,13 @@ void AWKeys::addDevice(const QString source)
     if (debug) qDebug() << PDEBUG << ":" << "Source" << source;
 
     QRegExp diskRegexp = QRegExp(QString("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)"));
-    QRegExp fanRegexp = QRegExp(QString("lmsensors/.*/fan.*"));
     QRegExp mountRegexp = QRegExp(QString("partitions/.*/filllevel"));
-    QRegExp tempRegexp = QRegExp(QString("lmsensors/.*temp.*/.*"));
+    QRegExp tempRegexp = QRegExp(QString("lmsensors/.*"));
 
     if (diskRegexp.indexIn(source) > -1) {
         QString device = source;
         device.remove(QString("/Rate/rblk"));
         addKeyToCache(QString("Disk"), device);
-    } else if (fanRegexp.indexIn(source) > -1) {
-        addKeyToCache(QString("Fan"), source);
     } else if (mountRegexp.indexIn(source) > -1) {
         QString device = source;
         device.remove(QString("partitions")).remove(QString("/filllevel"));
@@ -194,7 +213,7 @@ void AWKeys::addDevice(const QString source)
 }
 
 
-QStringList AWKeys::dictKeys()
+QStringList AWKeys::dictKeys(const bool sorted)
 {
     if (debug) qDebug() << PDEBUG;
 
@@ -219,8 +238,6 @@ QStringList AWKeys::dictKeys()
     // temperature
     for (int i=tempDevices.count()-1; i>=0; i--)
         allKeys.append(QString("temp%1").arg(i));
-    for (int i=fanDevices.count()-1; i>=0; i--)
-        allKeys.append(QString("fan%1").arg(i));
     // gputemp
     allKeys.append(QString("gputemp"));
     // gpu
@@ -293,8 +310,14 @@ QStringList AWKeys::dictKeys()
     // quotes
     for (int i=extQuotes.count()-1; i>=0; i--) {
         allKeys.append(extQuotes[i]->tag(QString("ask")));
+        allKeys.append(extQuotes[i]->tag(QString("askchg")));
+        allKeys.append(extQuotes[i]->tag(QString("percaskchg")));
         allKeys.append(extQuotes[i]->tag(QString("bid")));
+        allKeys.append(extQuotes[i]->tag(QString("bidchg")));
+        allKeys.append(extQuotes[i]->tag(QString("percbidchg")));
         allKeys.append(extQuotes[i]->tag(QString("price")));
+        allKeys.append(extQuotes[i]->tag(QString("pricechg")));
+        allKeys.append(extQuotes[i]->tag(QString("percpricechg")));
     }
     // custom
     for (int i=extScripts.count()-1; i>=0; i--)
@@ -312,6 +335,9 @@ QStringList AWKeys::dictKeys()
     for (int i=graphicalItemsKeys.count()-1; i>=0; i--)
         allKeys.append(graphicalItemsKeys[i]);
 
+    // sort if required
+    if (sorted) allKeys.sort();
+
     return allKeys;
 }
 
@@ -329,9 +355,8 @@ QStringList AWKeys::getHddDevices()
 }
 
 
-bool AWKeys::setDataBySource(const QString sourceName,
+bool AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
-                             const QMap<QString, QVariant> data,
+                             const QVariantMap params)
-                             const QMap<QString, QVariant> params)
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Source" << sourceName;
@@ -373,7 +398,8 @@ bool AWKeys::setDataBySource(const QString sourceName,
                     values[QString("ac")] = params[QString("acOffline")].toString();
             } else {
                 values[data.keys()[i]] = QString("%1").arg(data[data.keys()[i]].toFloat(), 3, 'f', 0);
-                toolTip->setData(QString("batTooltip"), data[data.keys()[i]].toFloat(), data[QString("ac")].toBool());
+                if (toolTip != nullptr) toolTip->setData(QString("batTooltip"), data[data.keys()[i]].toFloat(),
+                                                         data[QString("ac")].toBool());
             }
         }
     } else if (sourceName == QString("cpu/system/TotalLoad")) {
@@ -383,7 +409,7 @@ bool AWKeys::setDataBySource(const QString sourceName,
             AWActions::sendNotification(QString("event"), i18n("High CPU load"), enablePopup);
         // value
         values[QString("cpu")] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 1);
-        toolTip->setData(QString("cpuTooltip"), data[QString("value")].toFloat());
+        if (toolTip != nullptr) toolTip->setData(QString("cpuTooltip"), data[QString("value")].toFloat());
     } else if (sourceName.contains(cpuRegExp)) {
         // cpus
         QString number = sourceName;
@@ -392,7 +418,7 @@ bool AWKeys::setDataBySource(const QString sourceName,
     } else if (sourceName == QString("cpu/system/AverageClock")) {
         // cpucl
         values[QString("cpucl")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
-        toolTip->setData(QString("cpuclTooltip"), data[QString("value")].toFloat());
+        if (toolTip != nullptr) toolTip->setData(QString("cpuclTooltip"), data[QString("value")].toFloat());
     } else if (sourceName.contains(cpuclRegExp)) {
         // cpucls
         QString number = sourceName;
@@ -511,7 +537,7 @@ bool AWKeys::setDataBySource(const QString sourceName,
             AWActions::sendNotification(QString("event"), i18n("High memory usage"), enablePopup);
         // value
         values[QString("mem")] = QString("%1").arg(value, 5, 'f', 1);
-        toolTip->setData(QString("memTooltip"), values[QString("mem")].toFloat());
+        if (toolTip != nullptr) toolTip->setData(QString("memTooltip"), values[QString("mem")].toFloat());
     } else if (sourceName == QString("netdev")) {
         // network device
         // notification
@@ -531,9 +557,9 @@ bool AWKeys::setDataBySource(const QString sourceName,
                 values[QString("down%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
                 break;
         }
-        if (device == networkDevice()) {
+        if (device == values[QString("netdev")]) {
             values[QString("down")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
-            toolTip->setData(QString("downTooltip"), data[QString("value")].toFloat());
+            if (toolTip != nullptr) toolTip->setData(QString("downTooltip"), data[QString("value")].toFloat());
         }
     } else if (sourceName.contains(netTransRegExp)) {
         // upload speed
@@ -545,9 +571,9 @@ bool AWKeys::setDataBySource(const QString sourceName,
                 values[QString("up%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
                 break;
         }
-        if (device == networkDevice()) {
+        if (device == values[QString("netdev")]) {
             values[QString("up")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
-            toolTip->setData(QString("upTooltip"), data[QString("value")].toFloat());
+            if (toolTip != nullptr) toolTip->setData(QString("upTooltip"), data[QString("value")].toFloat());
         }
     } else if (sourceName == QString("pkg")) {
         // package manager
@@ -589,23 +615,17 @@ bool AWKeys::setDataBySource(const QString sourceName,
             AWActions::sendNotification(QString("event"), i18n("Swap is used"), enablePopup);
         // value
         values[QString("swap")] = QString("%1").arg(value, 5, 'f', 1);
-        toolTip->setData(QString("swapTooltip"), values[QString("swap")].toFloat());
+        if (toolTip != nullptr) toolTip->setData(QString("swapTooltip"), values[QString("swap")].toFloat());
     } else if (sourceName.contains(tempRegExp)) {
         // temperature devices
-        if (data[QString("units")].toString() == QString("rpm")) {
+        for (int i=0; i<tempDevices.count(); i++)
-            for (int i=0; i<fanDevices.count(); i++)
+            if (sourceName == tempDevices[i]) {
-                if (sourceName == fanDevices[i]) {
+                float temp = data[QString("units")].toString() == QString("°C") ?
-                    values[QString("fan%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 1);
+                    temperature(data[QString("value")].toFloat(), params[QString("tempUnits")].toString())
-                    break;
+                    : data[QString("value")].toFloat();
-                }
+                values[QString("temp%1").arg(i)] = QString("%1").arg(temp, 4, 'f', 1);
-        } else {
+                break;
-            for (int i=0; i<tempDevices.count(); i++)
+            }
-                if (sourceName == tempDevices[i]) {
-                    values[QString("temp%1").arg(i)] = QString("%1").arg(
-                        temperature(data[QString("value")].toFloat(), params[QString("tempUnits")].toString()), 4, 'f', 1);
-                    break;
-                }
-        }
     } else if (sourceName == QString("Local")) {
         // time
         values[QString("time")] = data[QString("DateTime")].toDateTime().toString(Qt::TextDate);
@@ -646,8 +666,8 @@ void AWKeys::graphicalValueByKey()
     if (debug) qDebug() << PDEBUG;
 
     bool ok;
-    QString tag = QInputDialog::getItem(0, i18n("Select tag"),
+    QString tag = QInputDialog::getItem(0, i18n("Select tag"), i18n("Tag"),
-                                        i18n("Tag"), keys, 0, false, &ok);
+                                        dictKeys(true), 0, false, &ok);
 
     if ((!ok) || (tag.isEmpty())) return;
     QString message = i18n("Tag: %1", tag);
@@ -671,8 +691,6 @@ QString AWKeys::infoByKey(QString key)
         }
     else if (key.contains(QRegExp(QString("^hdd[rw]"))))
         return QString("%1").arg(diskDevices[key.remove(QRegExp(QString("hdd[rw]"))).toInt()]);
-    else if (key.startsWith(QString("fan")))
-        return QString("%1").arg(fanDevices[key.remove(QString("fan")).toInt()]);
     else if (key.contains(QRegExp(QString("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))))
         return QString("%1").arg(mountDevices[key.remove(QRegExp(QString("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))).toInt()]);
     else if (key.startsWith(QString("hddtemp")))
@@ -684,11 +702,9 @@ QString AWKeys::infoByKey(QString key)
             if (extUpgrade[i]->tag() != key) continue;
             return extUpgrade[i]->executable();
         }
-    else if ((key.startsWith(QString("ask"))) ||
+    else if (key.contains(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)"))))
-             (key.startsWith(QString("bid"))) ||
-             (key.startsWith(QString("price"))))
         for (int i=0; i<extQuotes.count(); i++) {
-            if (extQuotes[i]->number() != key.remove(QRegExp(QString("^(ask|bid|price)"))).toInt()) continue;
+            if (extQuotes[i]->number() != key.remove(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)"))).toInt()) continue;
             return extQuotes[i]->ticker();
         }
     else if (key.startsWith(QString("temp")))
@@ -782,13 +798,6 @@ void AWKeys::loadKeysFromCache()
         diskDevices.append(cache.value(cachedKeys[i]).toString());
     cache.endGroup();
 
-    cache.beginGroup(QString("Fan"));
-    fanDevices.clear();
-    cachedKeys = cache.allKeys();
-    for (int i=0; i<cachedKeys.count(); i++)
-        fanDevices.append(cache.value(cachedKeys[i]).toString());
-    cache.endGroup();
-
     cache.beginGroup(QString("Hdd"));
     hddDevices.clear();
     cachedKeys = cache.allKeys();
@@ -1247,7 +1256,7 @@ void AWKeys::addKeyToCache(const QString type, const QString key)
 }
 
 
-bool AWKeys::checkKeys(const QMap<QString, QVariant> data)
+bool AWKeys::checkKeys(const QVariantMap data)
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Data" << data;
@@ -1256,22 +1265,15 @@ bool AWKeys::checkKeys(const QMap<QString, QVariant> data)
 }
 
 
-QString AWKeys::networkDevice()
+QString AWKeys::htmlValue(QString key)
 {
     if (debug) qDebug() << PDEBUG;
+    if (debug) qDebug() << PDEBUG << ":" << "Requested key" << key;
 
-    QString device = QString("lo");
+    QString value = values[key];
-    QList<QNetworkInterface> rawInterfaceList = QNetworkInterface::allInterfaces();
+    if (!key.startsWith(QString("custom")))
-    for (int i=0; i<rawInterfaceList.count(); i++)
+        value.replace(QString(" "), QString("&nbsp;"));
-        if ((rawInterfaceList[i].flags().testFlag(QNetworkInterface::IsUp)) &&
+    return value;
-            (!rawInterfaceList[i].flags().testFlag(QNetworkInterface::IsLoopBack)) &&
-            (!rawInterfaceList[i].flags().testFlag(QNetworkInterface::IsPointToPoint))) {
-            device = rawInterfaceList[i].name();
-            break;
-
-        }
-
-    return device;
 }
 
 

sources/awesome-widget/plugin/awkeys.h

@@ -51,20 +51,20 @@ public:
     AWKeys(QObject *parent = nullptr);
     ~AWKeys();
 
-    Q_INVOKABLE void initKeys(const QString currentPattern,
+    Q_INVOKABLE void initKeys(const QString currentPattern);
-                              const QMap<QString, QVariant> tooltipParams,
+    Q_INVOKABLE void initTooltip(const QVariantMap tooltipParams);
-                              const bool popup = false);
+    Q_INVOKABLE void setPopupEnabled(const bool popup = false);
+    Q_INVOKABLE void setWrapNewLines(const bool wrap = false);
     Q_INVOKABLE bool isDebugEnabled();
     Q_INVOKABLE QString parsePattern();
     Q_INVOKABLE QString toolTipImage();
     Q_INVOKABLE QSize toolTipSize();
     // keys
     Q_INVOKABLE void addDevice(const QString source);
-    Q_INVOKABLE QStringList dictKeys();
+    Q_INVOKABLE QStringList dictKeys(const bool sorted = false);
     Q_INVOKABLE QStringList getHddDevices();
-    Q_INVOKABLE bool setDataBySource(const QString sourceName,
+    Q_INVOKABLE bool setDataBySource(const QString sourceName, const QVariantMap data,
-                                     const QMap<QString, QVariant> data,
+                                     const QVariantMap params);
-                                     const QMap<QString, QVariant> params);
     // values
     Q_INVOKABLE void graphicalValueByKey();
     Q_INVOKABLE QString infoByKey(QString key);
@@ -85,8 +85,8 @@ private slots:
 private:
     // methods
     void addKeyToCache(const QString type, const QString key = QString(""));
-    bool checkKeys(const QMap<QString, QVariant> data);
+    bool checkKeys(const QVariantMap data);
-    QString networkDevice();
+    QString htmlValue(QString key);
     int numberCpus();
     float temperature(const float temp, const QString units);
     // find methods
@@ -111,6 +111,7 @@ private:
     // variables
     bool debug = false;
     bool enablePopup = false;
+    bool wrapNewLines = false;
     QList<GraphicalItem *> graphicalItems;
     QList<ExtQuotes *> extQuotes;
     QList<ExtScript *> extScripts;
@@ -118,7 +119,7 @@ private:
     QStringList foundBars, foundKeys, keys;
     QString pattern;
     QMap<QString, QString> values;
-    QStringList diskDevices, fanDevices, hddDevices, mountDevices, networkDevices, tempDevices;
+    QStringList diskDevices, hddDevices, mountDevices, networkDevices, tempDevices;
 };
 
 

sources/awesome-widget/plugin/awtooltip.cpp

@@ -24,8 +24,7 @@
 #include <pdebug/pdebug.h>
 
 
-AWToolTip::AWToolTip(QObject *parent,
+AWToolTip::AWToolTip(QObject *parent, QVariantMap settings)
-                     QMap<QString, QVariant> settings)
     : QObject(parent),
       configuration(settings)
 {

sources/awesome-widget/plugin/awtooltip.h

@@ -32,8 +32,7 @@ class AWToolTip : public QObject
     Q_OBJECT
 
 public:
-    AWToolTip(QObject *parent = nullptr,
+    AWToolTip(QObject *parent = nullptr, QVariantMap settings = QVariantMap());
-              QMap<QString, QVariant> settings = QMap<QString, QVariant>());
     ~AWToolTip();
 
     QSize getSize();
@@ -48,7 +47,7 @@ private:
     // variables
     bool debug = false;
     int counts = 0;
-    QMap<QString, QVariant> configuration;
+    QVariantMap configuration;
     QMap<QString, float> boundaries;
     QMap<QString, QList<float>> data;
     QStringList requiredKeys;

sources/desktop-panel/package/contents/ui/about.qml

@@ -48,6 +48,12 @@ Item {
                         text: DPAdds.getAboutText("header")
                     }
 
+                    QtControls.Label {
+                        QtLayouts.Layout.fillWidth: true
+                        horizontalAlignment: Text.AlignHCenter
+                        text: DPAdds.getAboutText("version")
+                    }
+
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignJustify
@@ -62,9 +68,11 @@ Item {
                     }
 
                     QtControls.Label {
+                        QtLayouts.Layout.fillHeight: true
                         QtLayouts.Layout.fillWidth: true
                         font.capitalization: Font.SmallCaps
                         horizontalAlignment: Text.AlignHCenter
+                        verticalAlignment: Text.AlignBottom
                         textFormat: Text.RichText
                         text: DPAdds.getAboutText("copy")
                     }
@@ -83,8 +91,10 @@ Item {
                     }
 
                     QtControls.Label {
+                        QtLayouts.Layout.fillHeight: true
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignJustify
+                        verticalAlignment: Text.AlignTop
                         textFormat: Text.RichText
                         text: DPAdds.getAboutText("3rdparty")
                     }

sources/desktop-panel/package/contents/ui/widget.qml

@@ -48,6 +48,7 @@ Item {
             height: implicitHeight
             width: parent.width
             QtControls.Button {
+                width: parent.width * 3 / 12
                 text: i18n("Font")
                 iconName: "font"
 
@@ -70,6 +71,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-indent-more"
 
                 onClicked: {
@@ -83,6 +85,7 @@ Item {
             }
 
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-text-bold"
 
                 onClicked: {
@@ -95,6 +98,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-text-italic"
 
                 onClicked: {
@@ -107,6 +111,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-text-underline"
 
                 onClicked: {
@@ -119,6 +124,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-text-strikethrough"
 
                 onClicked: {
@@ -132,6 +138,7 @@ Item {
             }
 
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-justify-left"
 
                 onClicked: {
@@ -144,6 +151,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-justify-center"
 
                 onClicked: {
@@ -156,6 +164,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-justify-right"
 
                 onClicked: {
@@ -168,6 +177,7 @@ Item {
                 }
             }
             QtControls.Button {
+                width: parent.width / 12
                 iconName: "format-justify-fill"
 
                 onClicked: {

sources/desktop-panel/package/metadata.desktop

@@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel
-X-KDE-PluginInfo-Version=2.2.2
+X-KDE-PluginInfo-Version=2.3.0
 X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=

sources/desktop-panel/plugin/dpadds.cpp

@@ -189,7 +189,6 @@ QString DPAdds::parsePattern(const QString pattern, const int desktop)
     parsed.replace(QString("$$"), QString("$\\$\\"));
     for (int i=0; i<keys.count(); i++)
         parsed.replace(QString("$%1").arg(keys[i]), valueByKey(keys[i], desktop));
-    parsed.replace(QString(" "), QString("&nbsp;"));
     parsed.replace(QString("$\\$\\"), QString("$$"));
 
     return parsed;
@@ -221,7 +220,7 @@ void DPAdds::setPanelsToControl(const QString newPanels)
 }
 
 
-void DPAdds::setToolTipData(const QMap<QString, QVariant> tooltipData)
+void DPAdds::setToolTipData(const QVariantMap tooltipData)
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Data" << tooltipData;
@@ -240,9 +239,10 @@ QString DPAdds::valueByKey(const QString key, int desktop)
 
     QString currentMark = currentDesktop() == desktop ? mark : QString("");
     if (key == QString("mark"))
-        return QString("%1").arg(currentMark, mark.count(), QLatin1Char(' '));
+        return QString("%1").arg(currentMark, mark.count(), QLatin1Char(' '))
+                            .replace(QString(" "), QString("&nbsp;"));
     else if (key == QString("name"))
-        return KWindowSystem::desktopName(desktop);
+        return KWindowSystem::desktopName(desktop).replace(QString(" "), QString("&nbsp;"));
     else if (key == QString("number"))
         return QString::number(desktop);
     else if (key == QString("total"))
@@ -310,6 +310,8 @@ QString DPAdds::getAboutText(const QString type)
     QString text;
     if (type == QString("header"))
         text = QString(NAME);
+    else if (type == QString("version"))
+        text = i18n("Version %1 (build date %2)", QString(VERSION), QString(BUILD_DATE));
     else if (type == QString("description"))
         text = i18n("A set of minimalistic plasmoid widgets");
     else if (type == QString("links"))
@@ -339,11 +341,11 @@ QString DPAdds::getAboutText(const QString type)
 }
 
 
-QMap<QString, QVariant> DPAdds::getFont(const QMap<QString, QVariant> defaultFont)
+QVariantMap DPAdds::getFont(const QVariantMap defaultFont)
 {
     if (debug) qDebug() << PDEBUG;
 
-    QMap<QString, QVariant> fontMap;
+    QVariantMap fontMap;
     CFont defaultCFont = CFont(defaultFont[QString("family")].toString(),
                                defaultFont[QString("size")].toInt(),
                                400, false, defaultFont[QString("color")].toString());

sources/desktop-panel/plugin/dpadds.h

@@ -55,12 +55,12 @@ public:
     // values
     Q_INVOKABLE void setMark(const QString newMark);
     Q_INVOKABLE void setPanelsToControl(const QString newPanels);
-    Q_INVOKABLE void setToolTipData(const QMap<QString, QVariant> tooltipData);
+    Q_INVOKABLE void setToolTipData(const QVariantMap tooltipData);
     Q_INVOKABLE QString valueByKey(const QString key, int desktop = -1);
     // configuration slots
     Q_INVOKABLE QString editPanelsToContol(const QString current);
     Q_INVOKABLE QString getAboutText(const QString type = "header");
-    Q_INVOKABLE QMap<QString, QVariant> getFont(const QMap<QString, QVariant> defaultFont);
+    Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont);
 
 signals:
     void desktopChanged();

sources/extsysmon/CMakeLists.txt

@@ -4,7 +4,7 @@ set (PLUGIN_NAME ${SUBPROJECT})
 message (STATUS "Subproject ${SUBPROJECT}")
 
 # find required libaries
-find_package (Qt5 REQUIRED COMPONENTS DBus Network Widgets Xml)
+find_package (Qt5 REQUIRED COMPONENTS DBus Network Widgets)
 find_package (ECM 0.0.11 REQUIRED NO_MODULE)
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 find_package (KF5 REQUIRED COMPONENTS Plasma Service WindowSystem)
@@ -14,9 +14,9 @@ include (KDECMakeSettings)
 include (KDECompilerSettings)
 
 add_definitions (${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS}
-                 ${Qt5Network_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Xml_DEFINITIONS})
+                 ${Qt5Network_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
 set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS}
-                ${Qt5Network_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Xml_INCLUDE_DIRS})
+                ${Qt5Network_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
 set (KDE_INCLUDE ${Plasma_INCLUDE_DIR})
 
 include_directories (${CMAKE_SOURCE_DIR}

sources/extsysmon/extquotes.cpp

@@ -20,11 +20,10 @@
 
 #include <QDebug>
 #include <QDir>
-#include <QDomDocument>
+#include <QJsonDocument>
-#include <QDomElement>
+#include <QJsonParseError>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
-#include <QNetworkReply>
 #include <QSettings>
 #include <QTime>
 
@@ -45,8 +44,14 @@ ExtQuotes::ExtQuotes(QWidget *parent, const QString quotesName, const QStringLis
     ui->setupUi(this);
 
     values[QString("ask")] = 0.0;
+    values[QString("askchg")] = 0.0;
+    values[QString("percaskchg")] = 0.0;
     values[QString("bid")] = 0.0;
+    values[QString("bidchg")] = 0.0;
+    values[QString("percbidchg")] = 0.0;
     values[QString("price")] = 0.0;
+    values[QString("pricechg")] = 0.0;
+    values[QString("percpricechg")] = 0.0;
 }
 
 
@@ -237,7 +242,8 @@ QMap<QString, float> ExtQuotes::run()
         QNetworkAccessManager *manager = new QNetworkAccessManager(this);
         connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(quotesReplyReceived(QNetworkReply *)));
 
-        manager->get(QNetworkRequest(QUrl(url())));
+        QNetworkReply *reply = manager->get(QNetworkRequest(QUrl(url())));
+        new QReplyTimeout(reply, 1000);
     }
 
     // update value
@@ -314,42 +320,37 @@ void ExtQuotes::quotesReplyReceived(QNetworkReply *reply)
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Return code" << reply->error();
-    if (debug) qDebug() << PDEBUG << ":" << "Error message" << reply->errorString();
+    if (debug) qDebug() << PDEBUG << ":" << "Reply error message" << reply->errorString();
 
-    if (reply->error() != QNetworkReply::NoError) {
+    QJsonParseError error;
-        reply->deleteLater();
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error);
+    reply->deleteLater();
+    if (debug) qDebug() << PDEBUG << ":" << "Json parse error" << error.errorString();
+    if ((reply->error() != QNetworkReply::NoError) ||
+        (error.error != QJsonParseError::NoError)) {
         return;
     }
-
+    QVariantMap jsonQuotes = jsonDoc.toVariant().toMap()[QString("query")].toMap();
-    QDomDocument doc;
+    jsonQuotes = jsonQuotes[QString("results")].toMap()[QString("quote")].toMap();
-    if (!doc.setContent(reply)) {
+    float value;
-        if (debug) qDebug() << PDEBUG << ":" << "Could not parse answer to XML";
-        return;
-    }
-    QDomNodeList fields;
 
     // ask
-    fields = doc.elementsByTagName(QString("Ask"));
+    value = jsonQuotes[QString("Ask")].toString().toFloat();
-    for (int i=0; i<fields.size(); i++) {
+    values[QString("askchg")] = values[QString("ask")] == 0 ? 0.0 : value - values[QString("ask")];
-        values[QString("ask")] = fields.item(i).toElement().text().toFloat();
+    values[QString("percaskchg")] = 100 * values[QString("askchg")] / values[QString("ask")];
-        if (debug) qDebug() << PDEBUG << "Found ask" << values[QString("ask")];
+    values[QString("ask")] = value;
-    }
 
     // bid
-    fields = doc.elementsByTagName(QString("Bid"));
+    value = jsonQuotes[QString("Bid")].toString().toFloat();
-    for (int i=0; i<fields.size(); i++) {
+    values[QString("bidchg")] = values[QString("bid")] == 0 ? 0.0 : value - values[QString("bid")];
-        values[QString("bid")] = fields.item(i).toElement().text().toFloat();
+    values[QString("percbidchg")] = 100 * values[QString("bidchg")] / values[QString("bid")];
-        if (debug) qDebug() << PDEBUG << "Found bid" << values[QString("bid")];
+    values[QString("bid")] = value;
-    }
 
     // last trade
-    fields = doc.elementsByTagName(QString("LastTradePriceOnly"));
+    value = jsonQuotes[QString("LastTradePriceOnly")].toString().toFloat();
-    for (int i=0; i<fields.size(); i++) {
+    values[QString("pricechg")] = values[QString("price")] == 0 ? 0.0 : value - values[QString("price")];
-        values[QString("price")] = fields.item(i).toElement().text().toFloat();
+    values[QString("percpricechg")] = 100 * values[QString("pricechg")] / values[QString("price")];
-        if (debug) qDebug() << PDEBUG << "Found last trade" << values[QString("price")];
+    values[QString("price")] = value;
-    }
-
-    reply->deleteLater();
 }
 
 

sources/extsysmon/extquotes.h

@@ -20,11 +20,29 @@
 
 #include <QDialog>
 #include <QMap>
+#include <QNetworkReply>
+#include <QTimer>
 
-#define YAHOO_URL "https://query.yahooapis.com/v1/public/yql?q=select * from yahoo.finance.quotes where symbol in (\"$TICKER\")&env=store://datatables.org/alltableswithkeys"
+#define YAHOO_URL "https://query.yahooapis.com/v1/public/yql?q=select * from yahoo.finance.quotes where symbol=\"$TICKER\"&env=store://datatables.org/alltableswithkeys&format=json"
 
 
-class QNetworkReply;
+class QReplyTimeout : public QObject
+{
+    Q_OBJECT
+
+public:
+    QReplyTimeout(QNetworkReply *reply, const int timeout) : QObject(reply)
+    {
+        QTimer::singleShot(timeout, this, SLOT(timeout()));
+    }
+
+public slots:
+    void timeout()
+    {
+        QNetworkReply *reply = static_cast<QNetworkReply *>(parent());
+        if (reply->isRunning()) reply->close();
+    }
+};
 
 namespace Ui {
     class ExtQuotes;

sources/extsysmon/extscript.cpp

@@ -20,7 +20,10 @@
 
 #include <QDebug>
 #include <QDir>
+#include <QJsonDocument>
+#include <QJsonParseError>
 #include <QSettings>
+#include <QStandardPaths>
 #include <QTextCodec>
 #include <QTime>
 
@@ -38,6 +41,7 @@ ExtScript::ExtScript(QWidget *parent, const QString scriptName, const QStringLis
 {
     m_name = m_fileName;
     readConfiguration();
+    readJsonFilters();
     // init process
     process = new QProcess(this);
     connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(updateValue()));
@@ -89,6 +93,22 @@ QString ExtScript::fileName()
 }
 
 
+QStringList ExtScript::filters()
+{
+    if (debug) qDebug() << PDEBUG;
+
+    return m_filters;
+}
+
+
+bool ExtScript::hasOutput()
+{
+    if (debug) qDebug() << PDEBUG;
+
+    return m_output;
+}
+
+
 int ExtScript::interval()
 {
     if (debug) qDebug() << PDEBUG;
@@ -97,6 +117,14 @@ int ExtScript::interval()
 }
 
 
+bool ExtScript::isActive()
+{
+    if (debug) qDebug() << PDEBUG;
+
+    return m_active;
+}
+
+
 QString ExtScript::name()
 {
     if (debug) qDebug() << PDEBUG;
@@ -141,6 +169,7 @@ QString ExtScript::strRedirect()
     case stderr2stdout:
         value = QString("stderr2stdout");
         break;
+    case nothing:
     default:
         value = QString("nothing");
         break;
@@ -158,22 +187,6 @@ QString ExtScript::tag()
 }
 
 
-bool ExtScript::hasOutput()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_output;
-}
-
-
-bool ExtScript::isActive()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_active;
-}
-
-
 void ExtScript::setApiVersion(const int _apiVersion)
 {
     if (debug) qDebug() << PDEBUG;
@@ -210,12 +223,22 @@ void ExtScript::setExecutable(const QString _executable)
 }
 
 
-void ExtScript::setHasOutput(const bool state)
+void ExtScript::setFilters(const QStringList _filters)
 {
     if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "State" << state;
+    if (debug) qDebug() << PDEBUG << ":" << "Filters" << _filters;
 
-    m_output = state;
+    for (int i=0; i<_filters.count(); i++)
+        updateFilter(_filters[i]);
+}
+
+
+void ExtScript::setHasOutput(const bool _state)
+{
+    if (debug) qDebug() << PDEBUG;
+    if (debug) qDebug() << PDEBUG << ":" << "State" << _state;
+
+    m_output = _state;
 }
 
 
@@ -285,6 +308,41 @@ void ExtScript::setStrRedirect(const QString _redirect)
 }
 
 
+QString ExtScript::applyFilters(QString _value)
+{
+    if (debug) qDebug() << PDEBUG;
+    if (debug) qDebug() << PDEBUG << ":" << "Value" << _value;
+
+    for (int i=0; i<m_filters.count(); i++) {
+        if (debug) qDebug() << PDEBUG << ":" << "Found filter" << m_filters[i];
+        QVariantMap filter = jsonFilters[m_filters[i]].toMap();
+        if (filter.isEmpty()) {
+            if (debug) qDebug() << PDEBUG << ":" << "Could not find filter in the json";
+            continue;
+        }
+        for (int j=0; j<filter.keys().count(); j++)
+            _value.replace(filter.keys()[j], filter[filter.keys()[j]].toString());
+    }
+
+    return _value;
+}
+
+
+void ExtScript::updateFilter(const QString _filter, const bool _add)
+{
+    if (debug) qDebug() << PDEBUG;
+    if (debug) qDebug() << PDEBUG << ":" << "Filter" << _filter;
+    if (debug) qDebug() << PDEBUG << ":" << "Should be added" << _add;
+
+    if (_add) {
+        if (m_filters.contains(_filter)) return;
+        m_filters.append(_filter);
+    } else {
+        m_filters.removeOne(_filter);
+    }
+}
+
+
 void ExtScript::readConfiguration()
 {
     if (debug) qDebug() << PDEBUG;
@@ -305,6 +363,9 @@ void ExtScript::readConfiguration()
         setInterval(settings.value(QString("X-AW-Interval"), m_interval).toInt());
         // api == 2
         setNumber(settings.value(QString("X-AW-Number"), m_number).toInt());
+        // api == 3
+        setFilters(settings.value(QString("X-AW-Filters"), m_filters).toString()
+                                                                     .split(QChar(','), QString::SkipEmptyParts));
         settings.endGroup();
     }
 
@@ -319,6 +380,30 @@ void ExtScript::readConfiguration()
 }
 
 
+void ExtScript::readJsonFilters()
+{
+    if (debug) qDebug() << PDEBUG;
+
+    QString fileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+                                              QString("awesomewidgets/scripts/awesomewidgets-extscripts-filters.json"));
+    if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << fileName;
+    QFile jsonFile(fileName);
+    if (!jsonFile.open(QIODevice::ReadOnly | QIODevice::Text))
+        return;
+    QString jsonText = jsonFile.readAll();
+    jsonFile.close();
+
+    QJsonParseError error;
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonText.toUtf8(), &error);
+    if (debug) qDebug() << PDEBUG << ":" << "Json parse error" << error.errorString();
+    if (error.error != QJsonParseError::NoError)
+        return;
+    jsonFilters = jsonDoc.toVariant().toMap();
+
+    if (debug) qDebug() << PDEBUG << ":" << "Filters" << jsonFilters;
+}
+
+
 QString ExtScript::run()
 {
     if (debug) qDebug() << PDEBUG;
@@ -351,6 +436,10 @@ int ExtScript::showConfiguration()
     ui->checkBox_output->setCheckState(m_output ? Qt::Checked : Qt::Unchecked);
     ui->comboBox_redirect->setCurrentIndex(static_cast<int>(m_redirect));
     ui->spinBox_interval->setValue(m_interval);
+    // filters
+    ui->checkBox_colorFilter->setCheckState(m_filters.contains(QString("color")) ? Qt::Checked : Qt::Unchecked);
+    ui->checkBox_linesFilter->setCheckState(m_filters.contains(QString("newline")) ? Qt::Checked : Qt::Unchecked);
+    ui->checkBox_spaceFilter->setCheckState(m_filters.contains(QString("space")) ? Qt::Checked : Qt::Unchecked);
 
     int ret = exec();
     if (ret != 1) return ret;
@@ -364,6 +453,10 @@ int ExtScript::showConfiguration()
     setHasOutput(ui->checkBox_output->checkState() == Qt::Checked);
     setStrRedirect(ui->comboBox_redirect->currentText());
     setInterval(ui->spinBox_interval->value());
+    // filters
+    updateFilter(QString("color"), ui->checkBox_colorFilter->checkState() == Qt::Checked);
+    updateFilter(QString("newline"), ui->checkBox_linesFilter->checkState() == Qt::Checked);
+    updateFilter(QString("space"), ui->checkBox_spaceFilter->checkState() == Qt::Checked);
 
     writeConfiguration();
     return ret;
@@ -404,6 +497,7 @@ void ExtScript::writeConfiguration()
     settings.setValue(QString("X-AW-Redirect"), strRedirect());
     settings.setValue(QString("X-AW-Interval"), m_interval);
     settings.setValue(QString("X-AW-Number"), m_number);
+    settings.setValue(QString("X-AW-Filters"), m_filters.join(QChar(',')));
     settings.endGroup();
 
     settings.sync();
@@ -433,4 +527,7 @@ void ExtScript::updateValue()
         value = qoutput;
         break;
     }
+
+    // filters
+    value = applyFilters(value);
 }

sources/extsysmon/extscript.h

@@ -19,6 +19,7 @@
 #define EXTSCRIPT_H
 
 #include <QDialog>
+#include <QMap>
 #include <QProcess>
 
 
@@ -29,15 +30,16 @@ namespace Ui {
 class ExtScript : public QDialog
 {
     Q_OBJECT
+    Q_PROPERTY(bool active READ isActive WRITE setActive)
     Q_PROPERTY(int apiVersion READ apiVersion WRITE setApiVersion)
-    Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(QString comment READ comment WRITE setComment)
     Q_PROPERTY(QString executable READ executable WRITE setExecutable)
-    Q_PROPERTY(int number READ number WRITE setNumber)
+    Q_PROPERTY(QStringList filters READ filters WRITE setFilters)
-    Q_PROPERTY(QString prefix READ prefix WRITE setPrefix)
-    Q_PROPERTY(bool active READ isActive WRITE setActive)
-    Q_PROPERTY(bool output READ hasOutput WRITE setHasOutput)
     Q_PROPERTY(int interval READ interval WRITE setInterval)
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(int number READ number WRITE setNumber)
+    Q_PROPERTY(bool output READ hasOutput WRITE setHasOutput)
+    Q_PROPERTY(QString prefix READ prefix WRITE setPrefix)
     Q_PROPERTY(Redirect redirect READ redirect WRITE setRedirect)
 
 public:
@@ -55,20 +57,23 @@ public:
     QString comment();
     QString executable();
     QString fileName();
+    QStringList filters();
+    bool hasOutput();
     int interval();
+    bool isActive();
     QString name();
     int number();
     QString prefix();
     Redirect redirect();
+    // derivatives
     QString strRedirect();
     QString tag();
-    bool hasOutput();
-    bool isActive();
     // set methods
     void setApiVersion(const int _apiVersion = 0);
     void setActive(const bool _state = true);
     void setComment(const QString _comment = QString("empty"));
     void setExecutable(const QString _executable = QString("/usr/bin/true"));
+    void setFilters(const QStringList _filters = QStringList());
     void setHasOutput(const bool _state = true);
     void setInterval(const int _interval = 1);
     void setName(const QString _name = QString("none"));
@@ -76,9 +81,13 @@ public:
     void setPrefix(const QString _prefix = QString(""));
     void setRedirect(const Redirect _redirect = nothing);
     void setStrRedirect(const QString _redirect = QString("nothing"));
+    // filters
+    QString applyFilters(QString _value);
+    void updateFilter(const QString _filter, const bool _add = true);
 
 public slots:
     void readConfiguration();
+    void readJsonFilters();
     QString run();
     int showConfiguration();
     bool tryDelete();
@@ -98,13 +107,16 @@ private:
     bool m_active = true;
     QString m_comment = QString("empty");
     QString m_executable = QString("/usr/bin/true");
+    QStringList m_filters = QStringList();
     int m_interval = 1;
     QString m_name = QString("none");
     int m_number = -1;
     bool m_output = true;
     QString m_prefix = QString("");
     Redirect m_redirect = nothing;
+    // internal properties
     Q_PID childProcess = 0;
+    QVariantMap jsonFilters = QVariantMap();
     int times = 0;
     QString value = QString();
 };

sources/extsysmon/extscript.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>420</width>
-    <height>304</height>
+    <height>424</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -244,6 +244,105 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_filters">
+     <property name="title">
+      <string>Additional filters</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <layout class="QHBoxLayout" name="layout_colorFilter">
+        <item>
+         <spacer name="spacer_colorFilter">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBox_colorFilter">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Wrap colors</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="layout_linesFilter">
+        <item>
+         <spacer name="spacer_linesFilter">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBox_linesFilter">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Wrap new lines</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="layout_spaceFilter">
+        <item>
+         <spacer name="spacer_spaceFilter">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBox_spaceFilter">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Wrap spaces</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">

sources/extsysmon/extsysmon.cpp

@@ -303,12 +303,12 @@ QMap<QString, QString> ExtendedSysMon::updateConfiguration(QMap<QString, QString
 }
 
 
-QMap<QString, QVariant> ExtendedSysMon::getBattery(const QString acpiPath)
+QVariantMap ExtendedSysMon::getBattery(const QString acpiPath)
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "ACPI path" << acpiPath;
 
-    QMap<QString, QVariant> battery;
+    QVariantMap battery;
     battery[QString("ac")] = false;
     battery[QString("bat")] = 0;
     QFile acFile(acpiPath + QString("/AC/online"));
@@ -344,13 +344,13 @@ QMap<QString, QVariant> ExtendedSysMon::getBattery(const QString acpiPath)
 }
 
 
-QMap<QString, QVariant> ExtendedSysMon::getCurrentDesktop()
+QVariantMap ExtendedSysMon::getCurrentDesktop()
 {
     if (debug) qDebug() << PDEBUG;
 
     int number = KWindowSystem::currentDesktop();
     int total = KWindowSystem::numberOfDesktops();
-    QMap<QString, QVariant> currentDesktop;
+    QVariantMap currentDesktop;
     currentDesktop[QString("currentName")] = KWindowSystem::desktopName(number);
     currentDesktop[QString("currentNumber")] = number;
     QStringList list;
@@ -499,17 +499,15 @@ QString ExtendedSysMon::getNetworkDevice()
 }
 
 
-QMap<QString, QVariant> ExtendedSysMon::getPlayerInfo(const QString playerName,
+QVariantMap ExtendedSysMon::getPlayerInfo(const QString playerName, const QString mpdAddress,
-                                                      const QString mpdAddress,
+                                          const QString mpdPort, QString mpris)
-                                                      const QString mpdPort,
-                                                      QString mpris)
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "player" << playerName;
-    if (debug) qDebug() << PDEBUG << ":" << "MPD" << mpdAddress + QString(":") + mpdPort;
+    if (debug) qDebug() << PDEBUG << ":" << "MPD" << QString("%1:%2").arg(mpdAddress).arg(mpdPort);
     if (debug) qDebug() << PDEBUG << ":" << "MPRIS" << mpris;
 
-    QMap<QString, QVariant> info;
+    QVariantMap info;
     info[QString("album")] = QString("unknown");
     info[QString("artist")] = QString("unknown");
     info[QString("duration")] = QString("0");
@@ -530,13 +528,12 @@ QMap<QString, QVariant> ExtendedSysMon::getPlayerInfo(const QString playerName,
 }
 
 
-QMap<QString, QVariant> ExtendedSysMon::getPlayerMpdInfo(const QString mpdAddress,
+QVariantMap ExtendedSysMon::getPlayerMpdInfo(const QString mpdAddress, const QString mpdPort)
-                                                         const QString mpdPort)
 {
     if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "MPD" << mpdAddress + QString(":") + mpdPort;
+    if (debug) qDebug() << PDEBUG << ":" << "MPD" << QString("%1:%2").arg(mpdAddress).arg(mpdPort);
 
-    QMap<QString, QVariant> info;
+    QVariantMap info;
     info[QString("album")] = QString("unknown");
     info[QString("artist")] = QString("unknown");
     info[QString("duration")] = QString("0");
@@ -572,12 +569,12 @@ QMap<QString, QVariant> ExtendedSysMon::getPlayerMpdInfo(const QString mpdAddres
 }
 
 
-QMap<QString, QVariant> ExtendedSysMon::getPlayerMprisInfo(const QString mpris)
+QVariantMap ExtendedSysMon::getPlayerMprisInfo(const QString mpris)
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << "MPRIS" << mpris;
 
-    QMap<QString, QVariant> info;
+    QVariantMap info;
     info[QString("album")] = QString("unknown");
     info[QString("artist")] = QString("unknown");
     info[QString("duration")] = 0;
@@ -622,7 +619,7 @@ QMap<QString, QVariant> ExtendedSysMon::getPlayerMprisInfo(const QString mpris)
 }
 
 
-QMap<QString, QVariant> ExtendedSysMon::getPsStats()
+QVariantMap ExtendedSysMon::getPsStats()
 {
     if (debug) qDebug() << PDEBUG;
 
@@ -641,7 +638,7 @@ QMap<QString, QVariant> ExtendedSysMon::getPsStats()
         if (output.contains(QString("running"))) running.append(cmdFile.readAll());
     }
 
-    QMap<QString, QVariant> psStats;
+    QVariantMap psStats;
     psStats[QString("pscount")] = running.count();
     psStats[QString("ps")] = running.join(QString(","));
     psStats[QString("pstotal")] = directories.count();
@@ -665,7 +662,7 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
     if (debug) qDebug() << PDEBUG << ":" << "Source" << source;
 
     if (source == QString("battery")) {
-        QMap<QString, QVariant> battery = getBattery(configuration[QString("ACPIPATH")]);
+        QVariantMap battery = getBattery(configuration[QString("ACPIPATH")]);
         setData(source, QString("ac"), battery[QString("ac")].toBool());
         for (int i=0; i<battery.keys().count(); i++) {
             if (battery.keys()[i] == QString("ac")) continue;
@@ -675,7 +672,7 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
         for (int i=0; i<externalScripts.count(); i++)
             setData(source, externalScripts[i]->tag(), externalScripts[i]->run());
     } else if (source == QString("desktop")) {
-        QMap<QString, QVariant> desktop = getCurrentDesktop();
+        QVariantMap desktop = getCurrentDesktop();
         for (int i=0; i<desktop.keys().count(); i++)
             setData(source, desktop.keys()[i], desktop[desktop.keys()[i]]);
     } else if (source == QString("gpu")) {
@@ -697,22 +694,28 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
         for (int i=0; i<externalUpgrade.count(); i++)
             setData(source, externalUpgrade[i]->tag(), externalUpgrade[i]->run());
     } else if (source == QString("player")) {
-        QMap<QString, QVariant> player = getPlayerInfo(configuration[QString("PLAYER")],
+        QVariantMap player = getPlayerInfo(configuration[QString("PLAYER")],
-                                                       configuration[QString("MPDADDRESS")],
+                                           configuration[QString("MPDADDRESS")],
-                                                       configuration[QString("MPDPORT")],
+                                           configuration[QString("MPDPORT")],
-                                                       configuration[QString("MPRIS")]);
+                                           configuration[QString("MPRIS")]);
         for (int i=0; i<player.keys().count(); i++)
             setData(source, player.keys()[i], player[player.keys()[i]]);
     } else if (source == QString("ps")) {
-        QMap<QString, QVariant> ps = getPsStats();
+        QVariantMap ps = getPsStats();
         for (int i=0; i<ps.keys().count(); i++)
             setData(source, ps.keys()[i], ps[ps.keys()[i]]);
     } else if (source == QString("quotes")) {
         for (int i=0; i<externalQuotes.count(); i++) {
             QMap<QString, float> data = externalQuotes[i]->run();
             setData(source, externalQuotes[i]->tag(QString("ask")), data[QString("ask")]);
+            setData(source, externalQuotes[i]->tag(QString("askchg")), data[QString("askchg")]);
+            setData(source, externalQuotes[i]->tag(QString("percaskchg")), data[QString("percaskchg")]);
             setData(source, externalQuotes[i]->tag(QString("bid")), data[QString("bid")]);
+            setData(source, externalQuotes[i]->tag(QString("bidchg")), data[QString("bidchg")]);
+            setData(source, externalQuotes[i]->tag(QString("percbidchg")), data[QString("percbidchg")]);
             setData(source, externalQuotes[i]->tag(QString("price")), data[QString("price")]);
+            setData(source, externalQuotes[i]->tag(QString("pricechg")), data[QString("pricechg")]);
+            setData(source, externalQuotes[i]->tag(QString("percpricechg")), data[QString("percpricechg")]);
         }
     } else if (source == QString("update")) {
         setData(source, QString("value"), true);

sources/extsysmon/extsysmon.h

@@ -33,20 +33,20 @@ public:
     explicit ExtendedSysMon(QObject *parent, const QVariantList &args);
     ~ExtendedSysMon();
     // update functions
-    QMap<QString, QVariant> getBattery(const QString acpiPath);
+    QVariantMap getBattery(const QString acpiPath);
-    QMap<QString, QVariant> getCurrentDesktop();
+    QVariantMap getCurrentDesktop();
     float getGpu(const QString device);
     float getGpuTemp(const QString device);
     float getHddTemp(const QString cmd, const QString device);
     QString getNetworkDevice();
-    QMap<QString, QVariant> getPlayerInfo(const QString playerName,
+    QVariantMap getPlayerInfo(const QString playerName,
-                                          const QString mpdAddress = QString(),
+                              const QString mpdAddress = QString(),
-                                          const QString mpdPort = QString(),
+                              const QString mpdPort = QString(),
-                                          const QString mpris = QString());
+                              const QString mpris = QString());
-    QMap<QString, QVariant> getPlayerMpdInfo(const QString mpdAddress = QString(),
+    QVariantMap getPlayerMpdInfo(const QString mpdAddress = QString(),
-                                             const QString mpdPort = QString());
+                                 const QString mpdPort = QString());
-    QMap<QString, QVariant> getPlayerMprisInfo(const QString mpris = QString());
+    QVariantMap getPlayerMprisInfo(const QString mpris = QString());
-    QMap<QString, QVariant> getPsStats();
+    QVariantMap getPsStats();
 
 protected:
     bool sourceRequestEvent(const QString &source);

sources/extsysmon/quotes/aapl.desktop

@@ -4,6 +4,6 @@ Name=AAPL.NASDAQ
 Comment=Apple Inc
 X-AW-Ticker="AAPL"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=0

sources/extsysmon/quotes/eurrub.desktop

@@ -4,6 +4,6 @@ Name=EUR/RUB
 Comment=EUR/RUB
 X-AW-Ticker="EURRUB=X"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=1

sources/extsysmon/quotes/eurusd.desktop

@@ -4,6 +4,6 @@ Name=EUR/USD
 Comment=EUR/USD
 X-AW-Ticker="EURUSD=X"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=2

sources/extsysmon/quotes/goog.desktop

@@ -4,6 +4,6 @@ Name=GOOG.NASDAQ
 Comment=Google Inc
 X-AW-Ticker="GOOG"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=3

sources/extsysmon/quotes/msft.desktop

@@ -4,6 +4,6 @@ Name=MSFT.NASDAQ
 Comment=Microsoft Corp
 X-AW-Ticker="MSFT"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=4

sources/extsysmon/quotes/rts.desktop

@@ -4,6 +4,6 @@ Name=RTS
 Comment=RTS Index
 X-AW-Ticker="RTS.RS"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=5

sources/extsysmon/quotes/snp.desktop

@@ -4,6 +4,6 @@ Name=S&P
 Comment=S&P 500 Index
 X-AW-Ticker="^GSPC"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=6

sources/extsysmon/quotes/usdrub.desktop

@@ -4,6 +4,6 @@ Name=USD/RUB
 Comment=USD/RUB
 X-AW-Ticker="USDRUB=X"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=8

sources/extsysmon/quotes/vix.desktop

@@ -4,6 +4,6 @@ Name=VIX
 Comment=Volatility S&P 500
 X-AW-Ticker="^VIX"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=7

sources/extsysmon/scripts/awesomewidgets-extscripts-filters.json

@@ -0,0 +1,29 @@
+{
+    "color": {
+        "\u001b[0;30m": "<span style=\"color:'#000000';\">",
+        "\u001b[1;30m": "<span style=\"color:'#808080';\">",
+        "\u001b[0;31m": "<span style=\"color:'#800000';\">",
+        "\u001b[1;31m": "<span style=\"color:'#ff0000';\">",
+        "\u001b[0;32m": "<span style=\"color:'#008000';\">",
+        "\u001b[1;32m": "<span style=\"color:'#00ff00';\">",
+        "\u001b[0;33m": "<span style=\"color:'#808000';\">",
+        "\u001b[1;33m": "<span style=\"color:'#ffff00';\">",
+        "\u001b[0;34m": "<span style=\"color:'#000080';\">",
+        "\u001b[1;34m": "<span style=\"color:'#0000ff';\">",
+        "\u001b[0;35m": "<span style=\"color:'#800080';\">",
+        "\u001b[1;35m": "<span style=\"color:'#ff00ff';\">",
+        "\u001b[0;36m": "<span style=\"color:'#008080';\">",
+        "\u001b[1;36m": "<span style=\"color:'#00ffff';\">",
+        "\u001b[0;37m": "<span style=\"color:'#c0c0c0';\">",
+        "\u001b[1;37m": "<span style=\"color:'#ffffff';\">",
+        "\u001b[0m": "</span>"
+    },
+    "newline": {
+        "\n": "<br>",
+        "\n\r": "<br>",
+        "\t": "&#09;"
+    },
+    "space": {
+        " ": "&nbsp;"
+    }
+}

sources/extsysmon/scripts/get-external-ip.desktop

@@ -8,5 +8,6 @@ X-AW-Active=true
 X-AW-Output=true
 X-AW-Redirect=nothing
 X-AW-Interval=1
-X-AW-ApiVersion=2
+X-AW-ApiVersion=3
 X-AW-Number=0
+X-AW-Filters=

sources/translations/awesome-widget/en.po

@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2015-05-22 00:07+0300\n"
+"POT-Creation-Date: 2015-06-01 01:48+0300\n"
-"PO-Revision-Date: 2015-05-22 00:07+0300\n"
+"PO-Revision-Date: 2015-06-01 01:48+0300\n"
-"Last-Translator: Evgeniy <darkarcanis@exante.eu>\n"
+"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: English <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -43,71 +43,75 @@ msgstr "DataEngine"
 msgid "About"
 msgstr "About"
 
-#: awesome-widget/package/contents/ui/about.qml:75
+#: awesome-widget/package/contents/ui/about.qml:83
 msgid "Acknowledgment"
 msgstr "Acknowledgment"
 
-#: awesome-widget/package/contents/ui/advanced.qml:55
+#: awesome-widget/package/contents/ui/advanced.qml:56
 msgid "Widget height, px"
 msgstr "Widget height, px"
 
-#: awesome-widget/package/contents/ui/advanced.qml:75
+#: awesome-widget/package/contents/ui/advanced.qml:76
 msgid "Widget width, px"
 msgstr "Widget width, px"
 
-#: awesome-widget/package/contents/ui/advanced.qml:97
+#: awesome-widget/package/contents/ui/advanced.qml:98
 msgid "Enable notifications"
 msgstr "Enable notifications"
 
-#: awesome-widget/package/contents/ui/advanced.qml:111
+#: awesome-widget/package/contents/ui/advanced.qml:112
+msgid "Wrap new lines"
+msgstr "Wrap new lines"
+
+#: awesome-widget/package/contents/ui/advanced.qml:126
 msgid "Enable background"
 msgstr "Enable background"
 
-#: awesome-widget/package/contents/ui/advanced.qml:123
+#: awesome-widget/package/contents/ui/advanced.qml:138
 msgid "Custom time format"
 msgstr "Custom time format"
 
-#: awesome-widget/package/contents/ui/advanced.qml:140
+#: awesome-widget/package/contents/ui/advanced.qml:155
 msgid "Custom uptime format"
 msgstr "Custom uptime format"
 
-#: awesome-widget/package/contents/ui/advanced.qml:157
+#: awesome-widget/package/contents/ui/advanced.qml:172
 msgid "Temperature units"
 msgstr "Temperature units"
 
-#: awesome-widget/package/contents/ui/advanced.qml:165
+#: awesome-widget/package/contents/ui/advanced.qml:180
 msgid "Celsius"
 msgstr "Celsius"
 
-#: awesome-widget/package/contents/ui/advanced.qml:169
+#: awesome-widget/package/contents/ui/advanced.qml:184
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: awesome-widget/package/contents/ui/advanced.qml:173
+#: awesome-widget/package/contents/ui/advanced.qml:188
 msgid "Kelvin"
 msgstr "Kelvin"
 
-#: awesome-widget/package/contents/ui/advanced.qml:177
+#: awesome-widget/package/contents/ui/advanced.qml:192
 msgid "Reaumur"
 msgstr "Reaumur"
 
-#: awesome-widget/package/contents/ui/advanced.qml:181
+#: awesome-widget/package/contents/ui/advanced.qml:196
 msgid "cm^-1"
 msgstr "cm^-1"
 
-#: awesome-widget/package/contents/ui/advanced.qml:185
+#: awesome-widget/package/contents/ui/advanced.qml:200
 msgid "kJ/mol"
 msgstr "kJ/mol"
 
-#: awesome-widget/package/contents/ui/advanced.qml:189
+#: awesome-widget/package/contents/ui/advanced.qml:204
 msgid "kcal/mol"
 msgstr "kcal/mol"
 
-#: awesome-widget/package/contents/ui/advanced.qml:212
+#: awesome-widget/package/contents/ui/advanced.qml:227
 msgid "AC online tag"
 msgstr "AC online tag"
 
-#: awesome-widget/package/contents/ui/advanced.qml:229
+#: awesome-widget/package/contents/ui/advanced.qml:244
 msgid "AC offline tag"
 msgstr "AC offline tag"
 
@@ -116,7 +120,7 @@ msgid "Time interval"
 msgstr "Time interval"
 
 #: awesome-widget/package/contents/ui/appearance.qml:81
-#: awesome-widget/package/contents/ui/widget.qml:79
+#: awesome-widget/package/contents/ui/widget.qml:80
 msgid "Font"
 msgstr "Font"
 
@@ -302,30 +306,30 @@ msgstr ""
 "Detailed information may be found on <a href=\"http://arcanis.name/projects/"
 "awesome-widgets/\">project homepage</a>"
 
-#: awesome-widget/package/contents/ui/widget.qml:221
+#: awesome-widget/package/contents/ui/widget.qml:231
 msgid "Add"
 msgstr "Add"
 
-#: awesome-widget/package/contents/ui/widget.qml:234
+#: awesome-widget/package/contents/ui/widget.qml:244
 msgid "Show value"
 msgstr "Show value"
 
-#: awesome-widget/package/contents/ui/widget.qml:239
+#: awesome-widget/package/contents/ui/widget.qml:249
-#: awesome-widget/plugin/awkeys.cpp:653 awesome-widget/plugin/awkeys.cpp:722
+#: awesome-widget/plugin/awkeys.cpp:685 awesome-widget/plugin/awkeys.cpp:752
-#: awesome-widget/plugin/awkeys.cpp:1022
+#: awesome-widget/plugin/awkeys.cpp:1052
 msgid "Tag: %1"
 msgstr "Tag: %1"
 
-#: awesome-widget/package/contents/ui/widget.qml:241
+#: awesome-widget/package/contents/ui/widget.qml:251
-#: awesome-widget/plugin/awkeys.cpp:655
+#: awesome-widget/plugin/awkeys.cpp:687
 msgid "Value: %1"
 msgstr "Value: %1"
 
-#: awesome-widget/package/contents/ui/widget.qml:243
+#: awesome-widget/package/contents/ui/widget.qml:253
 msgid "Info: %1"
 msgstr "Info: %1"
 
-#: awesome-widget/package/contents/ui/widget.qml:254
+#: awesome-widget/package/contents/ui/widget.qml:264
 msgid "Edit bars"
 msgstr "Edit bars"
 
@@ -334,66 +338,70 @@ msgid "Run %1"
 msgstr "Run %1"
 
 #: awesome-widget/plugin/awactions.cpp:105
+msgid "Version %1 (build date %2)"
+msgstr "Version %1 (build date %2)"
+
+#: awesome-widget/plugin/awactions.cpp:107
 msgid "A set of minimalistic plasmoid widgets"
 msgstr "A set of minimalistic plasmoid widgets"
 
-#: awesome-widget/plugin/awactions.cpp:107
+#: awesome-widget/plugin/awactions.cpp:109
 msgid "Links:"
 msgstr "Links:"
 
-#: awesome-widget/plugin/awactions.cpp:108
+#: awesome-widget/plugin/awactions.cpp:110
 msgid "Homepage"
 msgstr "Homepage"
 
-#: awesome-widget/plugin/awactions.cpp:109
+#: awesome-widget/plugin/awactions.cpp:111
 msgid "Repository"
 msgstr "Repository"
 
-#: awesome-widget/plugin/awactions.cpp:110
+#: awesome-widget/plugin/awactions.cpp:112
 msgid "Bugtracker"
 msgstr "Bugtracker"
 
-#: awesome-widget/plugin/awactions.cpp:111
+#: awesome-widget/plugin/awactions.cpp:113
 msgid "Translation issue"
 msgstr "Translation issue"
 
-#: awesome-widget/plugin/awactions.cpp:112
+#: awesome-widget/plugin/awactions.cpp:114
 msgid "AUR packages"
 msgstr "AUR packages"
 
-#: awesome-widget/plugin/awactions.cpp:113
+#: awesome-widget/plugin/awactions.cpp:115
 msgid "openSUSE packages"
 msgstr "openSUSE packages"
 
-#: awesome-widget/plugin/awactions.cpp:116
+#: awesome-widget/plugin/awactions.cpp:118
 msgid "This software is licensed under %1"
 msgstr "This software is licensed under %1"
 
-#: awesome-widget/plugin/awactions.cpp:118
+#: awesome-widget/plugin/awactions.cpp:120
 msgid "Translators: %1"
 msgstr "Translators: %1"
 
-#: awesome-widget/plugin/awactions.cpp:126
+#: awesome-widget/plugin/awactions.cpp:128
 msgid "This software uses: %1"
 msgstr "This software uses: %1"
 
-#: awesome-widget/plugin/awactions.cpp:141
+#: awesome-widget/plugin/awactions.cpp:143
 msgid "Select font"
 msgstr "Select font"
 
-#: awesome-widget/plugin/awactions.cpp:212
+#: awesome-widget/plugin/awactions.cpp:214
 msgid "Current version : %1"
 msgstr "Current version : %1"
 
-#: awesome-widget/plugin/awactions.cpp:213
+#: awesome-widget/plugin/awactions.cpp:215
 msgid "New version : %1"
 msgstr "New version : %1"
 
-#: awesome-widget/plugin/awactions.cpp:214
+#: awesome-widget/plugin/awactions.cpp:216
 msgid "Click \"Ok\" to download"
 msgstr "Click \"Ok\" to download"
 
-#: awesome-widget/plugin/awactions.cpp:216
+#: awesome-widget/plugin/awactions.cpp:218
 msgid "There are updates"
 msgstr "There are updates"
 
@@ -409,75 +417,75 @@ msgstr "Create"
 msgid "Remove"
 msgstr "Remove"
 
-#: awesome-widget/plugin/awkeys.cpp:364
+#: awesome-widget/plugin/awkeys.cpp:395
 msgid "AC online"
 msgstr "AC online"
 
-#: awesome-widget/plugin/awkeys.cpp:366
+#: awesome-widget/plugin/awkeys.cpp:397
 msgid "AC offline"
 msgstr "AC offline"
 
-#: awesome-widget/plugin/awkeys.cpp:383
+#: awesome-widget/plugin/awkeys.cpp:415
 msgid "High CPU load"
 msgstr "High CPU load"
 
-#: awesome-widget/plugin/awkeys.cpp:432
+#: awesome-widget/plugin/awkeys.cpp:464
 msgid "High GPU load"
 msgstr "High GPU load"
 
-#: awesome-widget/plugin/awkeys.cpp:446
+#: awesome-widget/plugin/awkeys.cpp:478
 msgid "Free space on %1 less than 10%"
 msgstr "Free space on %1 less than 10%"
 
-#: awesome-widget/plugin/awkeys.cpp:511
+#: awesome-widget/plugin/awkeys.cpp:543
 msgid "High memory usage"
 msgstr "High memory usage"
 
-#: awesome-widget/plugin/awkeys.cpp:519
+#: awesome-widget/plugin/awkeys.cpp:551
 msgid "Network device has been changed to %1"
 msgstr "Network device has been changed to %1"
 
-#: awesome-widget/plugin/awkeys.cpp:589
+#: awesome-widget/plugin/awkeys.cpp:621
 msgid "Swap is used"
 msgstr "Swap is used"
 
-#: awesome-widget/plugin/awkeys.cpp:649
+#: awesome-widget/plugin/awkeys.cpp:681
 msgid "Select tag"
 msgstr "Select tag"
 
-#: awesome-widget/plugin/awkeys.cpp:650
+#: awesome-widget/plugin/awkeys.cpp:681
 msgid "Tag"
 msgstr "Tag"
 
-#: awesome-widget/plugin/awkeys.cpp:723 awesome-widget/plugin/awkeys.cpp:733
+#: awesome-widget/plugin/awkeys.cpp:753 awesome-widget/plugin/awkeys.cpp:763
-#: awesome-widget/plugin/awkeys.cpp:744 awesome-widget/plugin/awkeys.cpp:755
+#: awesome-widget/plugin/awkeys.cpp:774 awesome-widget/plugin/awkeys.cpp:785
-#: awesome-widget/plugin/awkeys.cpp:1023 awesome-widget/plugin/awkeys.cpp:1078
+#: awesome-widget/plugin/awkeys.cpp:1053 awesome-widget/plugin/awkeys.cpp:1108
-#: awesome-widget/plugin/awkeys.cpp:1138 awesome-widget/plugin/awkeys.cpp:1195
+#: awesome-widget/plugin/awkeys.cpp:1168 awesome-widget/plugin/awkeys.cpp:1225
 msgid "Comment: %1"
 msgstr "Comment: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:732 awesome-widget/plugin/awkeys.cpp:743
+#: awesome-widget/plugin/awkeys.cpp:762 awesome-widget/plugin/awkeys.cpp:773
-#: awesome-widget/plugin/awkeys.cpp:754 awesome-widget/plugin/awkeys.cpp:1077
+#: awesome-widget/plugin/awkeys.cpp:784 awesome-widget/plugin/awkeys.cpp:1107
-#: awesome-widget/plugin/awkeys.cpp:1137 awesome-widget/plugin/awkeys.cpp:1194
+#: awesome-widget/plugin/awkeys.cpp:1167 awesome-widget/plugin/awkeys.cpp:1224
 msgid "Name: %1"
 msgstr "Name: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:734 awesome-widget/plugin/awkeys.cpp:1079
+#: awesome-widget/plugin/awkeys.cpp:764 awesome-widget/plugin/awkeys.cpp:1109
 msgid "Ticker: %1"
 msgstr "Ticker: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:745 awesome-widget/plugin/awkeys.cpp:756
+#: awesome-widget/plugin/awkeys.cpp:775 awesome-widget/plugin/awkeys.cpp:786
-#: awesome-widget/plugin/awkeys.cpp:1139 awesome-widget/plugin/awkeys.cpp:1196
+#: awesome-widget/plugin/awkeys.cpp:1169 awesome-widget/plugin/awkeys.cpp:1226
 msgid "Exec: %1"
 msgstr "Exec: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:982 awesome-widget/plugin/awkeys.cpp:1047
+#: awesome-widget/plugin/awkeys.cpp:1012 awesome-widget/plugin/awkeys.cpp:1077
-#: awesome-widget/plugin/awkeys.cpp:1104 awesome-widget/plugin/awkeys.cpp:1163
+#: awesome-widget/plugin/awkeys.cpp:1134 awesome-widget/plugin/awkeys.cpp:1193
 msgid "Enter file name"
 msgstr "Enter file name"
 
-#: awesome-widget/plugin/awkeys.cpp:983 awesome-widget/plugin/awkeys.cpp:1048
+#: awesome-widget/plugin/awkeys.cpp:1013 awesome-widget/plugin/awkeys.cpp:1078
-#: awesome-widget/plugin/awkeys.cpp:1105 awesome-widget/plugin/awkeys.cpp:1164
+#: awesome-widget/plugin/awkeys.cpp:1135 awesome-widget/plugin/awkeys.cpp:1194
 msgid "File name"
 msgstr "File name"
 
@@ -504,13 +512,6 @@ msgstr "esalexeev@gmail.com"
 #~ msgid "Check for updates"
 #~ msgstr "Check for updates"
 
-#~ msgid ""
-#~ "Version %1\n"
-#~ "(build date %2)"
-#~ msgstr ""
-#~ "Version %1\n"
-#~ "(build date %2)"
-
 #~ msgid "Edit"
 #~ msgstr "Edit"
 

sources/translations/awesome-widget/fr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2015-05-22 00:07+0300\n"
+"POT-Creation-Date: 2015-06-01 01:48+0300\n"
 "PO-Revision-Date: 2014-09-05 11:20+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: French <kde-russian@lists.kde.ru>\n"
@@ -44,72 +44,76 @@ msgstr "Moteur de données"
 msgid "About"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/about.qml:75
+#: awesome-widget/package/contents/ui/about.qml:83
 msgid "Acknowledgment"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:55
+#: awesome-widget/package/contents/ui/advanced.qml:56
 #, fuzzy
 msgid "Widget height, px"
 msgstr "Paramètres de l'applet"
 
-#: awesome-widget/package/contents/ui/advanced.qml:75
+#: awesome-widget/package/contents/ui/advanced.qml:76
 msgid "Widget width, px"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:97
+#: awesome-widget/package/contents/ui/advanced.qml:98
 msgid "Enable notifications"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:111
+#: awesome-widget/package/contents/ui/advanced.qml:112
+msgid "Wrap new lines"
+msgstr ""
+
+#: awesome-widget/package/contents/ui/advanced.qml:126
 msgid "Enable background"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:123
+#: awesome-widget/package/contents/ui/advanced.qml:138
 msgid "Custom time format"
 msgstr "Format de l'heure personnalisé"
 
-#: awesome-widget/package/contents/ui/advanced.qml:140
+#: awesome-widget/package/contents/ui/advanced.qml:155
 msgid "Custom uptime format"
 msgstr "Temps de fonctionnement personalisé"
 
-#: awesome-widget/package/contents/ui/advanced.qml:157
+#: awesome-widget/package/contents/ui/advanced.qml:172
 msgid "Temperature units"
 msgstr "Unités de température"
 
-#: awesome-widget/package/contents/ui/advanced.qml:165
+#: awesome-widget/package/contents/ui/advanced.qml:180
 msgid "Celsius"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:169
+#: awesome-widget/package/contents/ui/advanced.qml:184
 msgid "Fahrenheit"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:173
+#: awesome-widget/package/contents/ui/advanced.qml:188
 msgid "Kelvin"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:177
+#: awesome-widget/package/contents/ui/advanced.qml:192
 msgid "Reaumur"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:181
+#: awesome-widget/package/contents/ui/advanced.qml:196
 msgid "cm^-1"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:185
+#: awesome-widget/package/contents/ui/advanced.qml:200
 msgid "kJ/mol"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:189
+#: awesome-widget/package/contents/ui/advanced.qml:204
 msgid "kcal/mol"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:212
+#: awesome-widget/package/contents/ui/advanced.qml:227
 msgid "AC online tag"
 msgstr "Tag alimentation branchée"
 
-#: awesome-widget/package/contents/ui/advanced.qml:229
+#: awesome-widget/package/contents/ui/advanced.qml:244
 msgid "AC offline tag"
 msgstr "Tag alimentation débranchée"
 
@@ -118,7 +122,7 @@ msgid "Time interval"
 msgstr "Intervalle"
 
 #: awesome-widget/package/contents/ui/appearance.qml:81
-#: awesome-widget/package/contents/ui/widget.qml:79
+#: awesome-widget/package/contents/ui/widget.qml:80
 msgid "Font"
 msgstr "Police"
 
@@ -312,30 +316,30 @@ msgstr ""
 "D'avantage d'informations se trouvent sur <a href=\"http://arcanis.name/"
 "projects/awesome-widgets/\">la page du projet</a>"
 
-#: awesome-widget/package/contents/ui/widget.qml:221
+#: awesome-widget/package/contents/ui/widget.qml:231
 msgid "Add"
 msgstr "Ajouter"
 
-#: awesome-widget/package/contents/ui/widget.qml:234
+#: awesome-widget/package/contents/ui/widget.qml:244
 msgid "Show value"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:239
+#: awesome-widget/package/contents/ui/widget.qml:249
-#: awesome-widget/plugin/awkeys.cpp:653 awesome-widget/plugin/awkeys.cpp:722
+#: awesome-widget/plugin/awkeys.cpp:685 awesome-widget/plugin/awkeys.cpp:752
-#: awesome-widget/plugin/awkeys.cpp:1022
+#: awesome-widget/plugin/awkeys.cpp:1052
 msgid "Tag: %1"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:241
+#: awesome-widget/package/contents/ui/widget.qml:251
-#: awesome-widget/plugin/awkeys.cpp:655
+#: awesome-widget/plugin/awkeys.cpp:687
 msgid "Value: %1"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:243
+#: awesome-widget/package/contents/ui/widget.qml:253
 msgid "Info: %1"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:254
+#: awesome-widget/package/contents/ui/widget.qml:264
 #, fuzzy
 msgid "Edit bars"
 msgstr "Modifiable"
@@ -345,66 +349,70 @@ msgid "Run %1"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:105
-msgid "A set of minimalistic plasmoid widgets"
+msgid "Version %1 (build date %2)"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:107
-msgid "Links:"
+msgid "A set of minimalistic plasmoid widgets"
-msgstr ""
-
-#: awesome-widget/plugin/awactions.cpp:108
-msgid "Homepage"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:109
-msgid "Repository"
+msgid "Links:"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:110
-msgid "Bugtracker"
+msgid "Homepage"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:111
-msgid "Translation issue"
+msgid "Repository"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:112
-msgid "AUR packages"
+msgid "Bugtracker"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:113
+msgid "Translation issue"
+msgstr ""
+
+#: awesome-widget/plugin/awactions.cpp:114
+msgid "AUR packages"
+msgstr ""
+
+#: awesome-widget/plugin/awactions.cpp:115
 msgid "openSUSE packages"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:116
+#: awesome-widget/plugin/awactions.cpp:118
 msgid "This software is licensed under %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:118
+#: awesome-widget/plugin/awactions.cpp:120
 msgid "Translators: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:126
+#: awesome-widget/plugin/awactions.cpp:128
 msgid "This software uses: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:141
+#: awesome-widget/plugin/awactions.cpp:143
 msgid "Select font"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:212
+#: awesome-widget/plugin/awactions.cpp:214
 msgid "Current version : %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:213
+#: awesome-widget/plugin/awactions.cpp:215
 msgid "New version : %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:214
+#: awesome-widget/plugin/awactions.cpp:216
 msgid "Click \"Ok\" to download"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:216
+#: awesome-widget/plugin/awactions.cpp:218
 msgid "There are updates"
 msgstr ""
 
@@ -420,78 +428,78 @@ msgstr ""
 msgid "Remove"
 msgstr "Supprimer"
 
-#: awesome-widget/plugin/awkeys.cpp:364
+#: awesome-widget/plugin/awkeys.cpp:395
 #, fuzzy
 msgid "AC online"
 msgstr "Tag alimentation branchée"
 
-#: awesome-widget/plugin/awkeys.cpp:366
+#: awesome-widget/plugin/awkeys.cpp:397
 #, fuzzy
 msgid "AC offline"
 msgstr "Tag alimentation débranchée"
 
-#: awesome-widget/plugin/awkeys.cpp:383
+#: awesome-widget/plugin/awkeys.cpp:415
 msgid "High CPU load"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:432
+#: awesome-widget/plugin/awkeys.cpp:464
 msgid "High GPU load"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:446
+#: awesome-widget/plugin/awkeys.cpp:478
 msgid "Free space on %1 less than 10%"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:511
+#: awesome-widget/plugin/awkeys.cpp:543
 msgid "High memory usage"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:519
+#: awesome-widget/plugin/awkeys.cpp:551
 msgid "Network device has been changed to %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:589
+#: awesome-widget/plugin/awkeys.cpp:621
 msgid "Swap is used"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:649
+#: awesome-widget/plugin/awkeys.cpp:681
 #, fuzzy
 msgid "Select tag"
 msgstr "Couleur de la police"
 
-#: awesome-widget/plugin/awkeys.cpp:650
+#: awesome-widget/plugin/awkeys.cpp:681
 msgid "Tag"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:723 awesome-widget/plugin/awkeys.cpp:733
+#: awesome-widget/plugin/awkeys.cpp:753 awesome-widget/plugin/awkeys.cpp:763
-#: awesome-widget/plugin/awkeys.cpp:744 awesome-widget/plugin/awkeys.cpp:755
+#: awesome-widget/plugin/awkeys.cpp:774 awesome-widget/plugin/awkeys.cpp:785
-#: awesome-widget/plugin/awkeys.cpp:1023 awesome-widget/plugin/awkeys.cpp:1078
+#: awesome-widget/plugin/awkeys.cpp:1053 awesome-widget/plugin/awkeys.cpp:1108
-#: awesome-widget/plugin/awkeys.cpp:1138 awesome-widget/plugin/awkeys.cpp:1195
+#: awesome-widget/plugin/awkeys.cpp:1168 awesome-widget/plugin/awkeys.cpp:1225
 msgid "Comment: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:732 awesome-widget/plugin/awkeys.cpp:743
+#: awesome-widget/plugin/awkeys.cpp:762 awesome-widget/plugin/awkeys.cpp:773
-#: awesome-widget/plugin/awkeys.cpp:754 awesome-widget/plugin/awkeys.cpp:1077
+#: awesome-widget/plugin/awkeys.cpp:784 awesome-widget/plugin/awkeys.cpp:1107
-#: awesome-widget/plugin/awkeys.cpp:1137 awesome-widget/plugin/awkeys.cpp:1194
+#: awesome-widget/plugin/awkeys.cpp:1167 awesome-widget/plugin/awkeys.cpp:1224
 msgid "Name: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:734 awesome-widget/plugin/awkeys.cpp:1079
+#: awesome-widget/plugin/awkeys.cpp:764 awesome-widget/plugin/awkeys.cpp:1109
 msgid "Ticker: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:745 awesome-widget/plugin/awkeys.cpp:756
+#: awesome-widget/plugin/awkeys.cpp:775 awesome-widget/plugin/awkeys.cpp:786
-#: awesome-widget/plugin/awkeys.cpp:1139 awesome-widget/plugin/awkeys.cpp:1196
+#: awesome-widget/plugin/awkeys.cpp:1169 awesome-widget/plugin/awkeys.cpp:1226
 msgid "Exec: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:982 awesome-widget/plugin/awkeys.cpp:1047
+#: awesome-widget/plugin/awkeys.cpp:1012 awesome-widget/plugin/awkeys.cpp:1077
-#: awesome-widget/plugin/awkeys.cpp:1104 awesome-widget/plugin/awkeys.cpp:1163
+#: awesome-widget/plugin/awkeys.cpp:1134 awesome-widget/plugin/awkeys.cpp:1193
 msgid "Enter file name"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:983 awesome-widget/plugin/awkeys.cpp:1048
+#: awesome-widget/plugin/awkeys.cpp:1013 awesome-widget/plugin/awkeys.cpp:1078
-#: awesome-widget/plugin/awkeys.cpp:1105 awesome-widget/plugin/awkeys.cpp:1164
+#: awesome-widget/plugin/awkeys.cpp:1135 awesome-widget/plugin/awkeys.cpp:1194
 msgid "File name"
 msgstr ""
 

sources/translations/awesome-widget/plasma_applet_awesome-widget.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2015-05-22 00:07+0300\n"
+"POT-Creation-Date: 2015-06-01 01:48+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,71 +42,75 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/about.qml:75
+#: awesome-widget/package/contents/ui/about.qml:83
 msgid "Acknowledgment"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:55
+#: awesome-widget/package/contents/ui/advanced.qml:56
 msgid "Widget height, px"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:75
+#: awesome-widget/package/contents/ui/advanced.qml:76
 msgid "Widget width, px"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:97
+#: awesome-widget/package/contents/ui/advanced.qml:98
 msgid "Enable notifications"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:111
+#: awesome-widget/package/contents/ui/advanced.qml:112
+msgid "Wrap new lines"
+msgstr ""
+
+#: awesome-widget/package/contents/ui/advanced.qml:126
 msgid "Enable background"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:123
+#: awesome-widget/package/contents/ui/advanced.qml:138
 msgid "Custom time format"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:140
+#: awesome-widget/package/contents/ui/advanced.qml:155
 msgid "Custom uptime format"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:157
+#: awesome-widget/package/contents/ui/advanced.qml:172
 msgid "Temperature units"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:165
+#: awesome-widget/package/contents/ui/advanced.qml:180
 msgid "Celsius"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:169
+#: awesome-widget/package/contents/ui/advanced.qml:184
 msgid "Fahrenheit"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:173
+#: awesome-widget/package/contents/ui/advanced.qml:188
 msgid "Kelvin"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:177
+#: awesome-widget/package/contents/ui/advanced.qml:192
 msgid "Reaumur"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:181
+#: awesome-widget/package/contents/ui/advanced.qml:196
 msgid "cm^-1"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:185
+#: awesome-widget/package/contents/ui/advanced.qml:200
 msgid "kJ/mol"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:189
+#: awesome-widget/package/contents/ui/advanced.qml:204
 msgid "kcal/mol"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:212
+#: awesome-widget/package/contents/ui/advanced.qml:227
 msgid "AC online tag"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:229
+#: awesome-widget/package/contents/ui/advanced.qml:244
 msgid "AC offline tag"
 msgstr ""
 
@@ -115,7 +119,7 @@ msgid "Time interval"
 msgstr ""
 
 #: awesome-widget/package/contents/ui/appearance.qml:81
-#: awesome-widget/package/contents/ui/widget.qml:79
+#: awesome-widget/package/contents/ui/widget.qml:80
 msgid "Font"
 msgstr ""
 
@@ -297,30 +301,30 @@ msgid ""
 "awesome-widgets/\">project homepage</a>"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:221
+#: awesome-widget/package/contents/ui/widget.qml:231
 msgid "Add"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:234
+#: awesome-widget/package/contents/ui/widget.qml:244
 msgid "Show value"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:239
+#: awesome-widget/package/contents/ui/widget.qml:249
-#: awesome-widget/plugin/awkeys.cpp:653 awesome-widget/plugin/awkeys.cpp:722
+#: awesome-widget/plugin/awkeys.cpp:685 awesome-widget/plugin/awkeys.cpp:752
-#: awesome-widget/plugin/awkeys.cpp:1022
+#: awesome-widget/plugin/awkeys.cpp:1052
 msgid "Tag: %1"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:241
+#: awesome-widget/package/contents/ui/widget.qml:251
-#: awesome-widget/plugin/awkeys.cpp:655
+#: awesome-widget/plugin/awkeys.cpp:687
 msgid "Value: %1"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:243
+#: awesome-widget/package/contents/ui/widget.qml:253
 msgid "Info: %1"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:254
+#: awesome-widget/package/contents/ui/widget.qml:264
 msgid "Edit bars"
 msgstr ""
 
@@ -329,66 +333,70 @@ msgid "Run %1"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:105
-msgid "A set of minimalistic plasmoid widgets"
+msgid "Version %1 (build date %2)"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:107
-msgid "Links:"
+msgid "A set of minimalistic plasmoid widgets"
-msgstr ""
-
-#: awesome-widget/plugin/awactions.cpp:108
-msgid "Homepage"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:109
-msgid "Repository"
+msgid "Links:"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:110
-msgid "Bugtracker"
+msgid "Homepage"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:111
-msgid "Translation issue"
+msgid "Repository"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:112
-msgid "AUR packages"
+msgid "Bugtracker"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:113
+msgid "Translation issue"
+msgstr ""
+
+#: awesome-widget/plugin/awactions.cpp:114
+msgid "AUR packages"
+msgstr ""
+
+#: awesome-widget/plugin/awactions.cpp:115
 msgid "openSUSE packages"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:116
+#: awesome-widget/plugin/awactions.cpp:118
 msgid "This software is licensed under %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:118
+#: awesome-widget/plugin/awactions.cpp:120
 msgid "Translators: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:126
+#: awesome-widget/plugin/awactions.cpp:128
 msgid "This software uses: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:141
+#: awesome-widget/plugin/awactions.cpp:143
 msgid "Select font"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:212
+#: awesome-widget/plugin/awactions.cpp:214
 msgid "Current version : %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:213
+#: awesome-widget/plugin/awactions.cpp:215
 msgid "New version : %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:214
+#: awesome-widget/plugin/awactions.cpp:216
 msgid "Click \"Ok\" to download"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:216
+#: awesome-widget/plugin/awactions.cpp:218
 msgid "There are updates"
 msgstr ""
 
@@ -404,75 +412,75 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:364
+#: awesome-widget/plugin/awkeys.cpp:395
 msgid "AC online"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:366
+#: awesome-widget/plugin/awkeys.cpp:397
 msgid "AC offline"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:383
+#: awesome-widget/plugin/awkeys.cpp:415
 msgid "High CPU load"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:432
+#: awesome-widget/plugin/awkeys.cpp:464
 msgid "High GPU load"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:446
+#: awesome-widget/plugin/awkeys.cpp:478
 msgid "Free space on %1 less than 10%"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:511
+#: awesome-widget/plugin/awkeys.cpp:543
 msgid "High memory usage"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:519
+#: awesome-widget/plugin/awkeys.cpp:551
 msgid "Network device has been changed to %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:589
+#: awesome-widget/plugin/awkeys.cpp:621
 msgid "Swap is used"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:649
+#: awesome-widget/plugin/awkeys.cpp:681
 msgid "Select tag"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:650
+#: awesome-widget/plugin/awkeys.cpp:681
 msgid "Tag"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:723 awesome-widget/plugin/awkeys.cpp:733
+#: awesome-widget/plugin/awkeys.cpp:753 awesome-widget/plugin/awkeys.cpp:763
-#: awesome-widget/plugin/awkeys.cpp:744 awesome-widget/plugin/awkeys.cpp:755
+#: awesome-widget/plugin/awkeys.cpp:774 awesome-widget/plugin/awkeys.cpp:785
-#: awesome-widget/plugin/awkeys.cpp:1023 awesome-widget/plugin/awkeys.cpp:1078
+#: awesome-widget/plugin/awkeys.cpp:1053 awesome-widget/plugin/awkeys.cpp:1108
-#: awesome-widget/plugin/awkeys.cpp:1138 awesome-widget/plugin/awkeys.cpp:1195
+#: awesome-widget/plugin/awkeys.cpp:1168 awesome-widget/plugin/awkeys.cpp:1225
 msgid "Comment: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:732 awesome-widget/plugin/awkeys.cpp:743
+#: awesome-widget/plugin/awkeys.cpp:762 awesome-widget/plugin/awkeys.cpp:773
-#: awesome-widget/plugin/awkeys.cpp:754 awesome-widget/plugin/awkeys.cpp:1077
+#: awesome-widget/plugin/awkeys.cpp:784 awesome-widget/plugin/awkeys.cpp:1107
-#: awesome-widget/plugin/awkeys.cpp:1137 awesome-widget/plugin/awkeys.cpp:1194
+#: awesome-widget/plugin/awkeys.cpp:1167 awesome-widget/plugin/awkeys.cpp:1224
 msgid "Name: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:734 awesome-widget/plugin/awkeys.cpp:1079
+#: awesome-widget/plugin/awkeys.cpp:764 awesome-widget/plugin/awkeys.cpp:1109
 msgid "Ticker: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:745 awesome-widget/plugin/awkeys.cpp:756
+#: awesome-widget/plugin/awkeys.cpp:775 awesome-widget/plugin/awkeys.cpp:786
-#: awesome-widget/plugin/awkeys.cpp:1139 awesome-widget/plugin/awkeys.cpp:1196
+#: awesome-widget/plugin/awkeys.cpp:1169 awesome-widget/plugin/awkeys.cpp:1226
 msgid "Exec: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:982 awesome-widget/plugin/awkeys.cpp:1047
+#: awesome-widget/plugin/awkeys.cpp:1012 awesome-widget/plugin/awkeys.cpp:1077
-#: awesome-widget/plugin/awkeys.cpp:1104 awesome-widget/plugin/awkeys.cpp:1163
+#: awesome-widget/plugin/awkeys.cpp:1134 awesome-widget/plugin/awkeys.cpp:1193
 msgid "Enter file name"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:983 awesome-widget/plugin/awkeys.cpp:1048
+#: awesome-widget/plugin/awkeys.cpp:1013 awesome-widget/plugin/awkeys.cpp:1078
-#: awesome-widget/plugin/awkeys.cpp:1105 awesome-widget/plugin/awkeys.cpp:1164
+#: awesome-widget/plugin/awkeys.cpp:1135 awesome-widget/plugin/awkeys.cpp:1194
 msgid "File name"
 msgstr ""
 

sources/translations/awesome-widget/pt_BR.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2015-05-22 00:07+0300\n"
+"POT-Creation-Date: 2015-06-01 01:48+0300\n"
 "PO-Revision-Date: 2014-12-24 00:04+0300\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-russian@lists.kde.ru>\n"
@@ -44,71 +44,87 @@ msgstr "Engine de dados"
 msgid "About"
 msgstr "Sobre"
 
-#: awesome-widget/package/contents/ui/about.qml:75
+#: awesome-widget/package/contents/ui/about.qml:83
+#, fuzzy
 msgid "Acknowledgment"
-msgstr ""
+msgstr "Confirmação"
 
-#: awesome-widget/package/contents/ui/advanced.qml:55
+#: awesome-widget/package/contents/ui/advanced.qml:56
+#, fuzzy
 msgid "Widget height, px"
-msgstr ""
+msgstr "Altura do widget, px"
 
-#: awesome-widget/package/contents/ui/advanced.qml:75
+#: awesome-widget/package/contents/ui/advanced.qml:76
+#, fuzzy
 msgid "Widget width, px"
-msgstr ""
+msgstr "Largura do widget, px"
 
-#: awesome-widget/package/contents/ui/advanced.qml:97
+#: awesome-widget/package/contents/ui/advanced.qml:98
+#, fuzzy
 msgid "Enable notifications"
-msgstr ""
+msgstr "Ativar notificações"
 
-#: awesome-widget/package/contents/ui/advanced.qml:111
+#: awesome-widget/package/contents/ui/advanced.qml:112
+#, fuzzy
+msgid "Wrap new lines"
+msgstr "Cobrir novas linhas"
+
+#: awesome-widget/package/contents/ui/advanced.qml:126
 msgid "Enable background"
 msgstr "Ativar plano de fundo"
 
-#: awesome-widget/package/contents/ui/advanced.qml:123
+#: awesome-widget/package/contents/ui/advanced.qml:138
 msgid "Custom time format"
 msgstr "Formato de hora personalizado"
 
-#: awesome-widget/package/contents/ui/advanced.qml:140
+#: awesome-widget/package/contents/ui/advanced.qml:155
 msgid "Custom uptime format"
 msgstr "Tempo em atividade com formato personalizado"
 
-#: awesome-widget/package/contents/ui/advanced.qml:157
+#: awesome-widget/package/contents/ui/advanced.qml:172
 msgid "Temperature units"
 msgstr "Unidades de temperatura"
 
-#: awesome-widget/package/contents/ui/advanced.qml:165
+#: awesome-widget/package/contents/ui/advanced.qml:180
+#, fuzzy
 msgid "Celsius"
-msgstr ""
+msgstr "Celsius"
 
-#: awesome-widget/package/contents/ui/advanced.qml:169
+#: awesome-widget/package/contents/ui/advanced.qml:184
+#, fuzzy
 msgid "Fahrenheit"
-msgstr ""
+msgstr "Fahrenheit"
 
-#: awesome-widget/package/contents/ui/advanced.qml:173
+#: awesome-widget/package/contents/ui/advanced.qml:188
+#, fuzzy
 msgid "Kelvin"
-msgstr ""
+msgstr "Kelvin"
 
-#: awesome-widget/package/contents/ui/advanced.qml:177
+#: awesome-widget/package/contents/ui/advanced.qml:192
+#, fuzzy
 msgid "Reaumur"
-msgstr ""
+msgstr "Reaumur"
 
-#: awesome-widget/package/contents/ui/advanced.qml:181
+#: awesome-widget/package/contents/ui/advanced.qml:196
+#, fuzzy
 msgid "cm^-1"
-msgstr ""
+msgstr "cm^-1"
 
-#: awesome-widget/package/contents/ui/advanced.qml:185
+#: awesome-widget/package/contents/ui/advanced.qml:200
+#, fuzzy
 msgid "kJ/mol"
-msgstr ""
+msgstr "KJ/mol"
 
-#: awesome-widget/package/contents/ui/advanced.qml:189
+#: awesome-widget/package/contents/ui/advanced.qml:204
+#, fuzzy
 msgid "kcal/mol"
-msgstr ""
+msgstr "kcal/mol"
 
-#: awesome-widget/package/contents/ui/advanced.qml:212
+#: awesome-widget/package/contents/ui/advanced.qml:227
 msgid "AC online tag"
 msgstr "Rótulo com carregador conectado"
 
-#: awesome-widget/package/contents/ui/advanced.qml:229
+#: awesome-widget/package/contents/ui/advanced.qml:244
 msgid "AC offline tag"
 msgstr "Rótulo com carregador desconectado"
 
@@ -117,7 +133,7 @@ msgid "Time interval"
 msgstr "Intervalo de tempo"
 
 #: awesome-widget/package/contents/ui/appearance.qml:81
-#: awesome-widget/package/contents/ui/widget.qml:79
+#: awesome-widget/package/contents/ui/widget.qml:80
 msgid "Font"
 msgstr "Tamanho da fonte"
 
@@ -132,32 +148,37 @@ msgstr "Grossura da fonte"
 #: awesome-widget/package/contents/ui/appearance.qml:127
 #, fuzzy
 msgid "light"
-msgstr "Altura"
+msgstr "leve"
 
 #: awesome-widget/package/contents/ui/appearance.qml:131
 #: awesome-widget/package/contents/ui/appearance.qml:174
+#, fuzzy
 msgid "normal"
-msgstr ""
+msgstr "normal"
 
 #: awesome-widget/package/contents/ui/appearance.qml:135
+#, fuzzy
 msgid "demi bold"
-msgstr ""
+msgstr "demi negrito"
 
 #: awesome-widget/package/contents/ui/appearance.qml:139
+#, fuzzy
 msgid "bold"
-msgstr ""
+msgstr "negrito"
 
 #: awesome-widget/package/contents/ui/appearance.qml:143
+#, fuzzy
 msgid "black"
-msgstr ""
+msgstr "preto"
 
 #: awesome-widget/package/contents/ui/appearance.qml:166
 msgid "Font style"
 msgstr "Estilo da fonte"
 
 #: awesome-widget/package/contents/ui/appearance.qml:178
+#, fuzzy
 msgid "italic"
-msgstr ""
+msgstr "itálico"
 
 #: awesome-widget/package/contents/ui/appearance.qml:201
 msgid "Font color"
@@ -175,12 +196,12 @@ msgstr "Cor da fonte"
 #: awesome-widget/package/contents/ui/tooltip.qml:503
 #, fuzzy
 msgid "Select a color"
-msgstr "Selecionar cor"
+msgstr "Selecionar uma cor"
 
 #: awesome-widget/package/contents/ui/appearance.qml:226
 #, fuzzy
 msgid "Select a font"
-msgstr "Selecionar fonte"
+msgstr "Selecionar uma fonte"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:69
 msgid "ACPI path"
@@ -193,7 +214,7 @@ msgstr "Scripts customizados"
 #: awesome-widget/package/contents/ui/dataengine.qml:89
 #, fuzzy
 msgid "Edit scripts"
-msgstr "Scripts customizados"
+msgstr "Editar scripts"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:102
 msgid "GPU device"
@@ -204,8 +225,9 @@ msgid "HDD"
 msgstr "HDD"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:150
+#, fuzzy
 msgid "hddtemp cmd"
-msgstr "comando hddtemp "
+msgstr "comando hddtemp"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:166
 msgid "MPD address"
@@ -224,13 +246,14 @@ msgid "Music player"
 msgstr "Reprodutor de áudio"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:245
+#, fuzzy
 msgid "Quotes monitor"
-msgstr ""
+msgstr "Monitor de citações"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:249
 #, fuzzy
 msgid "Edit tickers"
-msgstr "Editar"
+msgstr "Editar relógios"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:262
 msgid "Package manager"
@@ -239,11 +262,12 @@ msgstr "Gerenciador de pacotes"
 #: awesome-widget/package/contents/ui/dataengine.qml:266
 #, fuzzy
 msgid "Edit command"
-msgstr "Comando personalizado"
+msgstr "Editar comandos"
 
 #: awesome-widget/package/contents/ui/main.qml:161
+#, fuzzy
 msgid "Request key"
-msgstr ""
+msgstr "Solicitar chave"
 
 #: awesome-widget/package/contents/ui/main.qml:162
 msgid "Show README"
@@ -304,107 +328,121 @@ msgstr "Cor da bateria inativa"
 
 #: awesome-widget/package/contents/ui/widget.qml:72
 msgid ""
-"Detailed information may be found on <a href=\"http://arcanis.name/projects/"
+"Detailed information may be found on <a "
-"awesome-widgets/\">project homepage</a>"
+"href=\"http://arcanis.name/projects/awesome-widgets/\">project homepage</a>"
 msgstr ""
-"Informações detalhadas podem ser encontradas na <a href=\"http://arcanis."
+"Informações detalhadas podem ser encontradas na <a "
-"name/projects/awesome-widgets/\">página do projeto</a>"
+"href=\"http://arcanis.name/projects/awesome-widgets/\">página do projeto</a>"
 
-#: awesome-widget/package/contents/ui/widget.qml:221
+#: awesome-widget/package/contents/ui/widget.qml:231
 msgid "Add"
 msgstr "Adicionar"
 
-#: awesome-widget/package/contents/ui/widget.qml:234
+#: awesome-widget/package/contents/ui/widget.qml:244
+#, fuzzy
 msgid "Show value"
-msgstr ""
+msgstr "Mostrar valor"
 
-#: awesome-widget/package/contents/ui/widget.qml:239
+#: awesome-widget/package/contents/ui/widget.qml:249
-#: awesome-widget/plugin/awkeys.cpp:653 awesome-widget/plugin/awkeys.cpp:722
+#: awesome-widget/plugin/awkeys.cpp:685 awesome-widget/plugin/awkeys.cpp:752
-#: awesome-widget/plugin/awkeys.cpp:1022
+#: awesome-widget/plugin/awkeys.cpp:1052
+#, qt-format
 msgid "Tag: %1"
 msgstr "Tag: %1"
 
-#: awesome-widget/package/contents/ui/widget.qml:241
+#: awesome-widget/package/contents/ui/widget.qml:251
-#: awesome-widget/plugin/awkeys.cpp:655
+#: awesome-widget/plugin/awkeys.cpp:687
-#, fuzzy
+#, fuzzy, qt-format
 msgid "Value: %1"
-msgstr "Valor"
+msgstr "Valor: %1"
 
-#: awesome-widget/package/contents/ui/widget.qml:243
+#: awesome-widget/package/contents/ui/widget.qml:253
+#, fuzzy, qt-format
 msgid "Info: %1"
-msgstr ""
+msgstr "Info: %1"
 
-#: awesome-widget/package/contents/ui/widget.qml:254
+#: awesome-widget/package/contents/ui/widget.qml:264
 #, fuzzy
 msgid "Edit bars"
-msgstr "Editar"
+msgstr "Editar barras"
 
 #: awesome-widget/plugin/awactions.cpp:76
+#, fuzzy, qt-format
 msgid "Run %1"
-msgstr ""
+msgstr "Rodar %1"
 
 #: awesome-widget/plugin/awactions.cpp:105
+#, fuzzy, qt-format
+msgid "Version %1 (build date %2)"
+msgstr "Versão: %1 (data de compilação %2)"
+
+#: awesome-widget/plugin/awactions.cpp:107
 msgid "A set of minimalistic plasmoid widgets"
 msgstr "Um conjunto de widgets plasmoid minimalistas."
 
-#: awesome-widget/plugin/awactions.cpp:107
+#: awesome-widget/plugin/awactions.cpp:109
 msgid "Links:"
 msgstr "Links:"
 
-#: awesome-widget/plugin/awactions.cpp:108
+#: awesome-widget/plugin/awactions.cpp:110
 msgid "Homepage"
 msgstr "Homepage"
 
-#: awesome-widget/plugin/awactions.cpp:109
+#: awesome-widget/plugin/awactions.cpp:111
 msgid "Repository"
 msgstr "Repositório"
 
-#: awesome-widget/plugin/awactions.cpp:110
+#: awesome-widget/plugin/awactions.cpp:112
 msgid "Bugtracker"
 msgstr "Bugtracker"
 
-#: awesome-widget/plugin/awactions.cpp:111
+#: awesome-widget/plugin/awactions.cpp:113
 msgid "Translation issue"
 msgstr "Problema na tradução"
 
-#: awesome-widget/plugin/awactions.cpp:112
+#: awesome-widget/plugin/awactions.cpp:114
 msgid "AUR packages"
 msgstr "Pacotes AUR"
 
-#: awesome-widget/plugin/awactions.cpp:113
+#: awesome-widget/plugin/awactions.cpp:115
 #, fuzzy
 msgid "openSUSE packages"
-msgstr "Pacotes AUR"
+msgstr "Pacotes openSUSE"
 
-#: awesome-widget/plugin/awactions.cpp:116
+#: awesome-widget/plugin/awactions.cpp:118
+#, qt-format
 msgid "This software is licensed under %1"
 msgstr "Este software é licenciado sob %1"
 
-#: awesome-widget/plugin/awactions.cpp:118
+#: awesome-widget/plugin/awactions.cpp:120
+#, qt-format
 msgid "Translators: %1"
 msgstr "Tradutores: %1"
 
-#: awesome-widget/plugin/awactions.cpp:126
+#: awesome-widget/plugin/awactions.cpp:128
+#, qt-format
 msgid "This software uses: %1"
 msgstr "Este software usa: %1"
 
-#: awesome-widget/plugin/awactions.cpp:141
+#: awesome-widget/plugin/awactions.cpp:143
 msgid "Select font"
 msgstr "Selecionar fonte"
 
-#: awesome-widget/plugin/awactions.cpp:212
+#: awesome-widget/plugin/awactions.cpp:214
+#, qt-format
 msgid "Current version : %1"
 msgstr "Versão atual: %1"
 
-#: awesome-widget/plugin/awactions.cpp:213
+#: awesome-widget/plugin/awactions.cpp:215
+#, qt-format
 msgid "New version : %1"
 msgstr "Nova versão: %1"
 
-#: awesome-widget/plugin/awactions.cpp:214
+#: awesome-widget/plugin/awactions.cpp:216
 msgid "Click \"Ok\" to download"
 msgstr "Clique \"Ok\" para baixar"
 
-#: awesome-widget/plugin/awactions.cpp:216
+#: awesome-widget/plugin/awactions.cpp:218
 msgid "There are updates"
 msgstr "Há atualizações disponíveis"
 
@@ -413,86 +451,97 @@ msgid "Copy"
 msgstr "Copiar"
 
 #: awesome-widget/plugin/awkeys.cpp:60
+#, fuzzy
 msgid "Create"
-msgstr ""
+msgstr "Criar"
 
 #: awesome-widget/plugin/awkeys.cpp:61
 msgid "Remove"
 msgstr "Remover"
 
-#: awesome-widget/plugin/awkeys.cpp:364
+#: awesome-widget/plugin/awkeys.cpp:395
 #, fuzzy
 msgid "AC online"
-msgstr "Rótulo com carregador conectado"
+msgstr "Carregador conectado"
 
-#: awesome-widget/plugin/awkeys.cpp:366
+#: awesome-widget/plugin/awkeys.cpp:397
 #, fuzzy
 msgid "AC offline"
-msgstr "Rótulo com carregador desconectado"
+msgstr "Carregador desconectado"
 
-#: awesome-widget/plugin/awkeys.cpp:383
+#: awesome-widget/plugin/awkeys.cpp:415
+#, fuzzy
 msgid "High CPU load"
-msgstr ""
+msgstr "Alta carga da CPU"
 
-#: awesome-widget/plugin/awkeys.cpp:432
+#: awesome-widget/plugin/awkeys.cpp:464
+#, fuzzy
 msgid "High GPU load"
-msgstr ""
+msgstr "Alta carga da GPU"
 
-#: awesome-widget/plugin/awkeys.cpp:446
+#: awesome-widget/plugin/awkeys.cpp:478
+#, fuzzy, qt-format
 msgid "Free space on %1 less than 10%"
-msgstr ""
+msgstr "O espaço livre em %1 é menor que 10%"
 
-#: awesome-widget/plugin/awkeys.cpp:511
+#: awesome-widget/plugin/awkeys.cpp:543
+#, fuzzy
 msgid "High memory usage"
-msgstr ""
+msgstr "Alto uso de memória"
 
-#: awesome-widget/plugin/awkeys.cpp:519
+#: awesome-widget/plugin/awkeys.cpp:551
+#, fuzzy, qt-format
 msgid "Network device has been changed to %1"
-msgstr ""
+msgstr "O dispositivo de rede mudou para %1"
 
-#: awesome-widget/plugin/awkeys.cpp:589
+#: awesome-widget/plugin/awkeys.cpp:621
+#, fuzzy
 msgid "Swap is used"
-msgstr ""
+msgstr "Swap está sendo usado"
 
-#: awesome-widget/plugin/awkeys.cpp:649
+#: awesome-widget/plugin/awkeys.cpp:681
 #, fuzzy
 msgid "Select tag"
-msgstr "Selecionar fonte"
+msgstr "Selecionar tag"
 
-#: awesome-widget/plugin/awkeys.cpp:650
+#: awesome-widget/plugin/awkeys.cpp:681
 #, fuzzy
 msgid "Tag"
-msgstr "Tag: %1"
+msgstr "Tag"
 
-#: awesome-widget/plugin/awkeys.cpp:723 awesome-widget/plugin/awkeys.cpp:733
+#: awesome-widget/plugin/awkeys.cpp:753 awesome-widget/plugin/awkeys.cpp:763
-#: awesome-widget/plugin/awkeys.cpp:744 awesome-widget/plugin/awkeys.cpp:755
+#: awesome-widget/plugin/awkeys.cpp:774 awesome-widget/plugin/awkeys.cpp:785
-#: awesome-widget/plugin/awkeys.cpp:1023 awesome-widget/plugin/awkeys.cpp:1078
+#: awesome-widget/plugin/awkeys.cpp:1053 awesome-widget/plugin/awkeys.cpp:1108
-#: awesome-widget/plugin/awkeys.cpp:1138 awesome-widget/plugin/awkeys.cpp:1195
+#: awesome-widget/plugin/awkeys.cpp:1168 awesome-widget/plugin/awkeys.cpp:1225
+#, qt-format
 msgid "Comment: %1"
 msgstr "Comentário: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:732 awesome-widget/plugin/awkeys.cpp:743
+#: awesome-widget/plugin/awkeys.cpp:762 awesome-widget/plugin/awkeys.cpp:773
-#: awesome-widget/plugin/awkeys.cpp:754 awesome-widget/plugin/awkeys.cpp:1077
+#: awesome-widget/plugin/awkeys.cpp:784 awesome-widget/plugin/awkeys.cpp:1107
-#: awesome-widget/plugin/awkeys.cpp:1137 awesome-widget/plugin/awkeys.cpp:1194
+#: awesome-widget/plugin/awkeys.cpp:1167 awesome-widget/plugin/awkeys.cpp:1224
+#, qt-format
 msgid "Name: %1"
 msgstr "Nome: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:734 awesome-widget/plugin/awkeys.cpp:1079
+#: awesome-widget/plugin/awkeys.cpp:764 awesome-widget/plugin/awkeys.cpp:1109
+#, fuzzy, qt-format
 msgid "Ticker: %1"
-msgstr ""
+msgstr "Relógio: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:745 awesome-widget/plugin/awkeys.cpp:756
+#: awesome-widget/plugin/awkeys.cpp:775 awesome-widget/plugin/awkeys.cpp:786
-#: awesome-widget/plugin/awkeys.cpp:1139 awesome-widget/plugin/awkeys.cpp:1196
+#: awesome-widget/plugin/awkeys.cpp:1169 awesome-widget/plugin/awkeys.cpp:1226
+#, qt-format
 msgid "Exec: %1"
 msgstr "Exec: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:982 awesome-widget/plugin/awkeys.cpp:1047
+#: awesome-widget/plugin/awkeys.cpp:1012 awesome-widget/plugin/awkeys.cpp:1077
-#: awesome-widget/plugin/awkeys.cpp:1104 awesome-widget/plugin/awkeys.cpp:1163
+#: awesome-widget/plugin/awkeys.cpp:1134 awesome-widget/plugin/awkeys.cpp:1193
 msgid "Enter file name"
 msgstr "Digite o nome de arquivo"
 
-#: awesome-widget/plugin/awkeys.cpp:983 awesome-widget/plugin/awkeys.cpp:1048
+#: awesome-widget/plugin/awkeys.cpp:1013 awesome-widget/plugin/awkeys.cpp:1078
-#: awesome-widget/plugin/awkeys.cpp:1105 awesome-widget/plugin/awkeys.cpp:1164
+#: awesome-widget/plugin/awkeys.cpp:1135 awesome-widget/plugin/awkeys.cpp:1194
 msgid "File name"
 msgstr "Nome de arquivo"
 
@@ -519,13 +568,6 @@ msgstr "under@insicuri.net"
 #~ msgid "Check for updates"
 #~ msgstr "Checar por atualizações"
 
-#~ msgid ""
-#~ "Version %1\n"
-#~ "(build date %2)"
-#~ msgstr ""
-#~ "Versão: %1\n"
-#~ "(data de compilação %2)"
-
 #~ msgid "Edit"
 #~ msgstr "Editar"
 

sources/translations/awesome-widget/ru.po

@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2015-05-22 00:07+0300\n"
+"POT-Creation-Date: 2015-06-01 01:48+0300\n"
-"PO-Revision-Date: 2015-05-22 00:07+0300\n"
+"PO-Revision-Date: 2015-06-01 01:49+0300\n"
-"Last-Translator: Evgeniy <darkarcanis@exante.eu>\n"
+"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -43,71 +43,75 @@ msgstr "DataEngine"
 msgid "About"
 msgstr "О программе"
 
-#: awesome-widget/package/contents/ui/about.qml:75
+#: awesome-widget/package/contents/ui/about.qml:83
 msgid "Acknowledgment"
 msgstr "Благодарности"
 
-#: awesome-widget/package/contents/ui/advanced.qml:55
+#: awesome-widget/package/contents/ui/advanced.qml:56
 msgid "Widget height, px"
 msgstr "Высота виджета, пиксели"
 
-#: awesome-widget/package/contents/ui/advanced.qml:75
+#: awesome-widget/package/contents/ui/advanced.qml:76
 msgid "Widget width, px"
 msgstr "Ширина виджета, пиксели"
 
-#: awesome-widget/package/contents/ui/advanced.qml:97
+#: awesome-widget/package/contents/ui/advanced.qml:98
 msgid "Enable notifications"
 msgstr "Включить уведомления "
 
-#: awesome-widget/package/contents/ui/advanced.qml:111
+#: awesome-widget/package/contents/ui/advanced.qml:112
+msgid "Wrap new lines"
+msgstr "Заменить символ перевода строки"
+
+#: awesome-widget/package/contents/ui/advanced.qml:126
 msgid "Enable background"
 msgstr "Включить фон"
 
-#: awesome-widget/package/contents/ui/advanced.qml:123
+#: awesome-widget/package/contents/ui/advanced.qml:138
 msgid "Custom time format"
 msgstr "Свой формат времени"
 
-#: awesome-widget/package/contents/ui/advanced.qml:140
+#: awesome-widget/package/contents/ui/advanced.qml:155
 msgid "Custom uptime format"
 msgstr "Свой формат аптайма"
 
-#: awesome-widget/package/contents/ui/advanced.qml:157
+#: awesome-widget/package/contents/ui/advanced.qml:172
 msgid "Temperature units"
 msgstr "Температурные единицы"
 
-#: awesome-widget/package/contents/ui/advanced.qml:165
+#: awesome-widget/package/contents/ui/advanced.qml:180
 msgid "Celsius"
 msgstr "Цельсий"
 
-#: awesome-widget/package/contents/ui/advanced.qml:169
+#: awesome-widget/package/contents/ui/advanced.qml:184
 msgid "Fahrenheit"
 msgstr "Фаренгейт"
 
-#: awesome-widget/package/contents/ui/advanced.qml:173
+#: awesome-widget/package/contents/ui/advanced.qml:188
 msgid "Kelvin"
 msgstr "Кельвин"
 
-#: awesome-widget/package/contents/ui/advanced.qml:177
+#: awesome-widget/package/contents/ui/advanced.qml:192
 msgid "Reaumur"
 msgstr "Реамюр"
 
-#: awesome-widget/package/contents/ui/advanced.qml:181
+#: awesome-widget/package/contents/ui/advanced.qml:196
 msgid "cm^-1"
 msgstr "см^-1"
 
-#: awesome-widget/package/contents/ui/advanced.qml:185
+#: awesome-widget/package/contents/ui/advanced.qml:200
 msgid "kJ/mol"
 msgstr "кДж/моль"
 
-#: awesome-widget/package/contents/ui/advanced.qml:189
+#: awesome-widget/package/contents/ui/advanced.qml:204
 msgid "kcal/mol"
 msgstr "ккал/моль"
 
-#: awesome-widget/package/contents/ui/advanced.qml:212
+#: awesome-widget/package/contents/ui/advanced.qml:227
 msgid "AC online tag"
 msgstr "AC подключен"
 
-#: awesome-widget/package/contents/ui/advanced.qml:229
+#: awesome-widget/package/contents/ui/advanced.qml:244
 msgid "AC offline tag"
 msgstr "AC отключен"
 
@@ -116,7 +120,7 @@ msgid "Time interval"
 msgstr "Интервал обновления"
 
 #: awesome-widget/package/contents/ui/appearance.qml:81
-#: awesome-widget/package/contents/ui/widget.qml:79
+#: awesome-widget/package/contents/ui/widget.qml:80
 msgid "Font"
 msgstr "Шрифт"
 
@@ -303,30 +307,30 @@ msgstr ""
 "Подробная информация может быть найдена на <a href=\"http://arcanis.name/ru/"
 "projects/awesome-widgets/\">домашней странице проекта</a>"
 
-#: awesome-widget/package/contents/ui/widget.qml:221
+#: awesome-widget/package/contents/ui/widget.qml:231
 msgid "Add"
 msgstr "Добавить"
 
-#: awesome-widget/package/contents/ui/widget.qml:234
+#: awesome-widget/package/contents/ui/widget.qml:244
 msgid "Show value"
 msgstr "Показать значение"
 
-#: awesome-widget/package/contents/ui/widget.qml:239
+#: awesome-widget/package/contents/ui/widget.qml:249
-#: awesome-widget/plugin/awkeys.cpp:653 awesome-widget/plugin/awkeys.cpp:722
+#: awesome-widget/plugin/awkeys.cpp:685 awesome-widget/plugin/awkeys.cpp:752
-#: awesome-widget/plugin/awkeys.cpp:1022
+#: awesome-widget/plugin/awkeys.cpp:1052
 msgid "Tag: %1"
 msgstr "Тег: %1"
 
-#: awesome-widget/package/contents/ui/widget.qml:241
+#: awesome-widget/package/contents/ui/widget.qml:251
-#: awesome-widget/plugin/awkeys.cpp:655
+#: awesome-widget/plugin/awkeys.cpp:687
 msgid "Value: %1"
 msgstr "Значение: %1"
 
-#: awesome-widget/package/contents/ui/widget.qml:243
+#: awesome-widget/package/contents/ui/widget.qml:253
 msgid "Info: %1"
 msgstr "Информация: %1"
 
-#: awesome-widget/package/contents/ui/widget.qml:254
+#: awesome-widget/package/contents/ui/widget.qml:264
 msgid "Edit bars"
 msgstr "Редактировать бары"
 
@@ -335,66 +339,70 @@ msgid "Run %1"
 msgstr "Запуск %1"
 
 #: awesome-widget/plugin/awactions.cpp:105
+msgid "Version %1 (build date %2)"
+msgstr "Версия %1 (дата сборки %2)"
+
+#: awesome-widget/plugin/awactions.cpp:107
 msgid "A set of minimalistic plasmoid widgets"
 msgstr "Коллекция минималистичных плазмоидов"
 
-#: awesome-widget/plugin/awactions.cpp:107
+#: awesome-widget/plugin/awactions.cpp:109
 msgid "Links:"
 msgstr "Ссылки:"
 
-#: awesome-widget/plugin/awactions.cpp:108
+#: awesome-widget/plugin/awactions.cpp:110
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: awesome-widget/plugin/awactions.cpp:109
+#: awesome-widget/plugin/awactions.cpp:111
 msgid "Repository"
 msgstr "Репозиторий"
 
-#: awesome-widget/plugin/awactions.cpp:110
+#: awesome-widget/plugin/awactions.cpp:112
 msgid "Bugtracker"
 msgstr "Баг-трекер"
 
-#: awesome-widget/plugin/awactions.cpp:111
+#: awesome-widget/plugin/awactions.cpp:113
 msgid "Translation issue"
 msgstr "Тикет перевода"
 
-#: awesome-widget/plugin/awactions.cpp:112
+#: awesome-widget/plugin/awactions.cpp:114
 msgid "AUR packages"
 msgstr "Пакеты в AUR"
 
-#: awesome-widget/plugin/awactions.cpp:113
+#: awesome-widget/plugin/awactions.cpp:115
 msgid "openSUSE packages"
 msgstr "Пакеты для openSUSE"
 
-#: awesome-widget/plugin/awactions.cpp:116
+#: awesome-widget/plugin/awactions.cpp:118
 msgid "This software is licensed under %1"
 msgstr "Данное приложение лицензировано под %1"
 
-#: awesome-widget/plugin/awactions.cpp:118
+#: awesome-widget/plugin/awactions.cpp:120
 msgid "Translators: %1"
 msgstr "Переводчики: %1"
 
-#: awesome-widget/plugin/awactions.cpp:126
+#: awesome-widget/plugin/awactions.cpp:128
 msgid "This software uses: %1"
 msgstr "Данное приложение использует: %1"
 
-#: awesome-widget/plugin/awactions.cpp:141
+#: awesome-widget/plugin/awactions.cpp:143
 msgid "Select font"
 msgstr "Выберете шрифт"
 
-#: awesome-widget/plugin/awactions.cpp:212
+#: awesome-widget/plugin/awactions.cpp:214
 msgid "Current version : %1"
 msgstr "Текущая версия : %1"
 
-#: awesome-widget/plugin/awactions.cpp:213
+#: awesome-widget/plugin/awactions.cpp:215
 msgid "New version : %1"
 msgstr "Новая версия : %1"
 
-#: awesome-widget/plugin/awactions.cpp:214
+#: awesome-widget/plugin/awactions.cpp:216
 msgid "Click \"Ok\" to download"
 msgstr "Нажмите \"Ok\" для загрузки"
 
-#: awesome-widget/plugin/awactions.cpp:216
+#: awesome-widget/plugin/awactions.cpp:218
 msgid "There are updates"
 msgstr "Найдены обновления"
 
@@ -410,75 +418,75 @@ msgstr "Создать"
 msgid "Remove"
 msgstr "Удалить"
 
-#: awesome-widget/plugin/awkeys.cpp:364
+#: awesome-widget/plugin/awkeys.cpp:395
 msgid "AC online"
 msgstr "AC подключен"
 
-#: awesome-widget/plugin/awkeys.cpp:366
+#: awesome-widget/plugin/awkeys.cpp:397
 msgid "AC offline"
 msgstr "AC отключен"
 
-#: awesome-widget/plugin/awkeys.cpp:383
+#: awesome-widget/plugin/awkeys.cpp:415
 msgid "High CPU load"
 msgstr "Высокая загрузка CPU"
 
-#: awesome-widget/plugin/awkeys.cpp:432
+#: awesome-widget/plugin/awkeys.cpp:464
 msgid "High GPU load"
 msgstr "Высокая загрузка GPU"
 
-#: awesome-widget/plugin/awkeys.cpp:446
+#: awesome-widget/plugin/awkeys.cpp:478
 msgid "Free space on %1 less than 10%"
 msgstr "Свободное место на диске %1 меньше 10%"
 
-#: awesome-widget/plugin/awkeys.cpp:511
+#: awesome-widget/plugin/awkeys.cpp:543
 msgid "High memory usage"
 msgstr "Большое потребление памяти"
 
-#: awesome-widget/plugin/awkeys.cpp:519
+#: awesome-widget/plugin/awkeys.cpp:551
 msgid "Network device has been changed to %1"
 msgstr "Сетевое устройство было изменено на %1"
 
-#: awesome-widget/plugin/awkeys.cpp:589
+#: awesome-widget/plugin/awkeys.cpp:621
 msgid "Swap is used"
 msgstr "Используется своп"
 
-#: awesome-widget/plugin/awkeys.cpp:649
+#: awesome-widget/plugin/awkeys.cpp:681
 msgid "Select tag"
 msgstr "Выберете тег"
 
-#: awesome-widget/plugin/awkeys.cpp:650
+#: awesome-widget/plugin/awkeys.cpp:681
 msgid "Tag"
 msgstr "Тег"
 
-#: awesome-widget/plugin/awkeys.cpp:723 awesome-widget/plugin/awkeys.cpp:733
+#: awesome-widget/plugin/awkeys.cpp:753 awesome-widget/plugin/awkeys.cpp:763
-#: awesome-widget/plugin/awkeys.cpp:744 awesome-widget/plugin/awkeys.cpp:755
+#: awesome-widget/plugin/awkeys.cpp:774 awesome-widget/plugin/awkeys.cpp:785
-#: awesome-widget/plugin/awkeys.cpp:1023 awesome-widget/plugin/awkeys.cpp:1078
+#: awesome-widget/plugin/awkeys.cpp:1053 awesome-widget/plugin/awkeys.cpp:1108
-#: awesome-widget/plugin/awkeys.cpp:1138 awesome-widget/plugin/awkeys.cpp:1195
+#: awesome-widget/plugin/awkeys.cpp:1168 awesome-widget/plugin/awkeys.cpp:1225
 msgid "Comment: %1"
 msgstr "Комментарий: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:732 awesome-widget/plugin/awkeys.cpp:743
+#: awesome-widget/plugin/awkeys.cpp:762 awesome-widget/plugin/awkeys.cpp:773
-#: awesome-widget/plugin/awkeys.cpp:754 awesome-widget/plugin/awkeys.cpp:1077
+#: awesome-widget/plugin/awkeys.cpp:784 awesome-widget/plugin/awkeys.cpp:1107
-#: awesome-widget/plugin/awkeys.cpp:1137 awesome-widget/plugin/awkeys.cpp:1194
+#: awesome-widget/plugin/awkeys.cpp:1167 awesome-widget/plugin/awkeys.cpp:1224
 msgid "Name: %1"
 msgstr "Имя: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:734 awesome-widget/plugin/awkeys.cpp:1079
+#: awesome-widget/plugin/awkeys.cpp:764 awesome-widget/plugin/awkeys.cpp:1109
 msgid "Ticker: %1"
 msgstr "Тикер: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:745 awesome-widget/plugin/awkeys.cpp:756
+#: awesome-widget/plugin/awkeys.cpp:775 awesome-widget/plugin/awkeys.cpp:786
-#: awesome-widget/plugin/awkeys.cpp:1139 awesome-widget/plugin/awkeys.cpp:1196
+#: awesome-widget/plugin/awkeys.cpp:1169 awesome-widget/plugin/awkeys.cpp:1226
 msgid "Exec: %1"
 msgstr "Команда: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:982 awesome-widget/plugin/awkeys.cpp:1047
+#: awesome-widget/plugin/awkeys.cpp:1012 awesome-widget/plugin/awkeys.cpp:1077
-#: awesome-widget/plugin/awkeys.cpp:1104 awesome-widget/plugin/awkeys.cpp:1163
+#: awesome-widget/plugin/awkeys.cpp:1134 awesome-widget/plugin/awkeys.cpp:1193
 msgid "Enter file name"
 msgstr "Введите имя файла"
 
-#: awesome-widget/plugin/awkeys.cpp:983 awesome-widget/plugin/awkeys.cpp:1048
+#: awesome-widget/plugin/awkeys.cpp:1013 awesome-widget/plugin/awkeys.cpp:1078
-#: awesome-widget/plugin/awkeys.cpp:1105 awesome-widget/plugin/awkeys.cpp:1164
+#: awesome-widget/plugin/awkeys.cpp:1135 awesome-widget/plugin/awkeys.cpp:1194
 msgid "File name"
 msgstr "Имя файла"
 
@@ -505,13 +513,6 @@ msgstr "esalexeev@gmail.com"
 #~ msgid "Check for updates"
 #~ msgstr "Проверить обновления"
 
-#~ msgid ""
-#~ "Version %1\n"
-#~ "(build date %2)"
-#~ msgstr ""
-#~ "Версия %1\n"
-#~ "(дата сборки %2)"
-
 #~ msgid "Edit"
 #~ msgstr "Править"
 

sources/translations/awesome-widget/uk.po

@@ -1,13 +1,13 @@
 # Copyright (C) 2014
 # This file is distributed under the same license as the PyTextMonitor package.
 #
-# Evgeniy Alekseev <esalexeev@gmail.com>, 2014.
+# Evgeniy Alekseev <esalexeev@gmail.com>, 2014, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2015-05-22 00:07+0300\n"
+"POT-Creation-Date: 2015-06-01 01:48+0300\n"
-"PO-Revision-Date: 2014-09-05 11:22+0400\n"
+"PO-Revision-Date: 2015-06-04 01:49+0300\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Ukrainian <kde-russian@lists.kde.ru>\n"
 "Language: ua\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 
 #: awesome-widget/package/contents/config/config.qml:25
 msgid "Widget"
@@ -43,72 +43,75 @@ msgstr "DataEngine"
 msgid "About"
 msgstr "Про програму"
 
-#: awesome-widget/package/contents/ui/about.qml:75
+#: awesome-widget/package/contents/ui/about.qml:83
 msgid "Acknowledgment"
-msgstr ""
+msgstr "Подяка"
 
-#: awesome-widget/package/contents/ui/advanced.qml:55
+#: awesome-widget/package/contents/ui/advanced.qml:56
-#, fuzzy
 msgid "Widget height, px"
-msgstr "Налаштування віджету"
+msgstr "Висота віджету, пікселі"
 
-#: awesome-widget/package/contents/ui/advanced.qml:75
+#: awesome-widget/package/contents/ui/advanced.qml:76
 msgid "Widget width, px"
-msgstr ""
+msgstr "Ширина віджету, пікселі"
 
-#: awesome-widget/package/contents/ui/advanced.qml:97
+#: awesome-widget/package/contents/ui/advanced.qml:98
 msgid "Enable notifications"
-msgstr ""
+msgstr "Включити повідомлення"
 
-#: awesome-widget/package/contents/ui/advanced.qml:111
+#: awesome-widget/package/contents/ui/advanced.qml:112
+msgid "Wrap new lines"
+msgstr "Замінити символ переводу рядка"
+
+#: awesome-widget/package/contents/ui/advanced.qml:126
 msgid "Enable background"
 msgstr "Включити фон"
 
-#: awesome-widget/package/contents/ui/advanced.qml:123
+#: awesome-widget/package/contents/ui/advanced.qml:138
 msgid "Custom time format"
 msgstr "Свій формат часу"
 
-#: awesome-widget/package/contents/ui/advanced.qml:140
+#: awesome-widget/package/contents/ui/advanced.qml:155
 msgid "Custom uptime format"
 msgstr "Свій формат аптайму (uptime)"
 
-#: awesome-widget/package/contents/ui/advanced.qml:157
+#: awesome-widget/package/contents/ui/advanced.qml:172
 msgid "Temperature units"
 msgstr "Одиниці виміру температури"
 
-#: awesome-widget/package/contents/ui/advanced.qml:165
+#: awesome-widget/package/contents/ui/advanced.qml:180
 msgid "Celsius"
-msgstr ""
+msgstr "Цельсій"
 
-#: awesome-widget/package/contents/ui/advanced.qml:169
+#: awesome-widget/package/contents/ui/advanced.qml:184
 msgid "Fahrenheit"
-msgstr ""
+msgstr "Фаренгейт"
 
-#: awesome-widget/package/contents/ui/advanced.qml:173
+#: awesome-widget/package/contents/ui/advanced.qml:188
 msgid "Kelvin"
-msgstr ""
+msgstr "Кельвін"
 
-#: awesome-widget/package/contents/ui/advanced.qml:177
+#: awesome-widget/package/contents/ui/advanced.qml:192
 msgid "Reaumur"
-msgstr ""
+msgstr "Реамюр"
 
-#: awesome-widget/package/contents/ui/advanced.qml:181
+#: awesome-widget/package/contents/ui/advanced.qml:196
 msgid "cm^-1"
-msgstr ""
+msgstr "см^-1"
 
-#: awesome-widget/package/contents/ui/advanced.qml:185
+#: awesome-widget/package/contents/ui/advanced.qml:200
 msgid "kJ/mol"
-msgstr ""
+msgstr "кДж/моль"
 
-#: awesome-widget/package/contents/ui/advanced.qml:189
+#: awesome-widget/package/contents/ui/advanced.qml:204
 msgid "kcal/mol"
-msgstr ""
+msgstr "ккал/моль"
 
-#: awesome-widget/package/contents/ui/advanced.qml:212
+#: awesome-widget/package/contents/ui/advanced.qml:227
 msgid "AC online tag"
 msgstr "AC підключений"
 
-#: awesome-widget/package/contents/ui/advanced.qml:229
+#: awesome-widget/package/contents/ui/advanced.qml:244
 msgid "AC offline tag"
 msgstr "AC відключений"
 
@@ -117,7 +120,7 @@ msgid "Time interval"
 msgstr "Інтервал оновлення"
 
 #: awesome-widget/package/contents/ui/appearance.qml:81
-#: awesome-widget/package/contents/ui/widget.qml:79
+#: awesome-widget/package/contents/ui/widget.qml:80
 msgid "Font"
 msgstr "Шрифт"
 
@@ -130,26 +133,25 @@ msgid "Font weight"
 msgstr "Ширина шрифту"
 
 #: awesome-widget/package/contents/ui/appearance.qml:127
-#, fuzzy
 msgid "light"
-msgstr "Висота"
+msgstr "тонкий"
 
 #: awesome-widget/package/contents/ui/appearance.qml:131
 #: awesome-widget/package/contents/ui/appearance.qml:174
 msgid "normal"
-msgstr ""
+msgstr "нормальний"
 
 #: awesome-widget/package/contents/ui/appearance.qml:135
 msgid "demi bold"
-msgstr ""
+msgstr "напівжирний"
 
 #: awesome-widget/package/contents/ui/appearance.qml:139
 msgid "bold"
-msgstr ""
+msgstr "жирний"
 
 #: awesome-widget/package/contents/ui/appearance.qml:143
 msgid "black"
-msgstr ""
+msgstr "дуже жирний"
 
 #: awesome-widget/package/contents/ui/appearance.qml:166
 msgid "Font style"
@@ -157,7 +159,7 @@ msgstr "Стиль шрифту"
 
 #: awesome-widget/package/contents/ui/appearance.qml:178
 msgid "italic"
-msgstr ""
+msgstr "курсив"
 
 #: awesome-widget/package/contents/ui/appearance.qml:201
 msgid "Font color"
@@ -173,12 +175,10 @@ msgstr "Колір шрифту"
 #: awesome-widget/package/contents/ui/tooltip.qml:421
 #: awesome-widget/package/contents/ui/tooltip.qml:473
 #: awesome-widget/package/contents/ui/tooltip.qml:503
-#, fuzzy
 msgid "Select a color"
 msgstr "Оберіть колір"
 
 #: awesome-widget/package/contents/ui/appearance.qml:226
-#, fuzzy
 msgid "Select a font"
 msgstr "Оберіть шрифт"
 
@@ -187,14 +187,12 @@ msgid "ACPI path"
 msgstr "Шлях до ICPI"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:85
-#, fuzzy
 msgid "Custom scripts"
 msgstr "Свої скрипти"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:89
-#, fuzzy
 msgid "Edit scripts"
-msgstr "Свої скрипти"
+msgstr "Редагувати скрипти"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:102
 msgid "GPU device"
@@ -226,37 +224,33 @@ msgstr "Музичний плеєр"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:245
 msgid "Quotes monitor"
-msgstr ""
+msgstr "Монітор котирувань"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:249
-#, fuzzy
 msgid "Edit tickers"
-msgstr "Редагувати"
+msgstr "Редагувати тікети"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:262
 msgid "Package manager"
 msgstr "Пакетний менеджер"
 
 #: awesome-widget/package/contents/ui/dataengine.qml:266
-#, fuzzy
 msgid "Edit command"
-msgstr "Своя команда"
+msgstr "Редагувати команду"
 
 #: awesome-widget/package/contents/ui/main.qml:161
 msgid "Request key"
-msgstr ""
+msgstr "Показати ключ"
 
 #: awesome-widget/package/contents/ui/main.qml:162
 msgid "Show README"
 msgstr "Показати README"
 
 #: awesome-widget/package/contents/ui/main.qml:163
-#, fuzzy
 msgid "Check updates"
 msgstr "Шукати оновлення"
 
 #: awesome-widget/package/contents/ui/tooltip.qml:62
-#, fuzzy
 msgid ""
 "CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
 "To enable them just make needed checkbox fully checked."
@@ -302,7 +296,6 @@ msgid "Battery active color"
 msgstr "Колір батареї, що заряджається"
 
 #: awesome-widget/package/contents/ui/tooltip.qml:487
-#, fuzzy
 msgid "Battery inactive color"
 msgstr "Колір батарєї, що розряджається"
 
@@ -314,101 +307,102 @@ msgstr ""
 "Детальна інформація може бути знайдена на <a href=\"http://arcanis.name/"
 "projects/awesome-widgets/\">домашній сторінці проекту</a>"
 
-#: awesome-widget/package/contents/ui/widget.qml:221
+#: awesome-widget/package/contents/ui/widget.qml:231
 msgid "Add"
 msgstr "Додати"
 
-#: awesome-widget/package/contents/ui/widget.qml:234
+#: awesome-widget/package/contents/ui/widget.qml:244
 msgid "Show value"
-msgstr ""
+msgstr "Показати значення"
 
-#: awesome-widget/package/contents/ui/widget.qml:239
+#: awesome-widget/package/contents/ui/widget.qml:249
-#: awesome-widget/plugin/awkeys.cpp:653 awesome-widget/plugin/awkeys.cpp:722
+#: awesome-widget/plugin/awkeys.cpp:685 awesome-widget/plugin/awkeys.cpp:752
-#: awesome-widget/plugin/awkeys.cpp:1022
+#: awesome-widget/plugin/awkeys.cpp:1052
 msgid "Tag: %1"
 msgstr "Тег: %1"
 
-#: awesome-widget/package/contents/ui/widget.qml:241
+#: awesome-widget/package/contents/ui/widget.qml:251
-#: awesome-widget/plugin/awkeys.cpp:655
+#: awesome-widget/plugin/awkeys.cpp:687
-#, fuzzy
 msgid "Value: %1"
-msgstr "Значення"
+msgstr "Значення: %1"
 
-#: awesome-widget/package/contents/ui/widget.qml:243
+#: awesome-widget/package/contents/ui/widget.qml:253
 msgid "Info: %1"
-msgstr ""
+msgstr "Інформація: %1"
 
-#: awesome-widget/package/contents/ui/widget.qml:254
+#: awesome-widget/package/contents/ui/widget.qml:264
-#, fuzzy
 msgid "Edit bars"
-msgstr "Редагувати"
+msgstr "Редагувати бари"
 
 #: awesome-widget/plugin/awactions.cpp:76
 msgid "Run %1"
-msgstr ""
+msgstr "Запуск %1"
 
 #: awesome-widget/plugin/awactions.cpp:105
+msgid "Version %1 (build date %2)"
+msgstr "Версія %1 (дата створення %2)"
+
+#: awesome-widget/plugin/awactions.cpp:107
 msgid "A set of minimalistic plasmoid widgets"
 msgstr "Набір мінімалістичних плазмоїдів"
 
-#: awesome-widget/plugin/awactions.cpp:107
+#: awesome-widget/plugin/awactions.cpp:109
 msgid "Links:"
 msgstr "Посилання:"
 
-#: awesome-widget/plugin/awactions.cpp:108
+#: awesome-widget/plugin/awactions.cpp:110
 msgid "Homepage"
 msgstr "Домашня сторінка"
 
-#: awesome-widget/plugin/awactions.cpp:109
+#: awesome-widget/plugin/awactions.cpp:111
 msgid "Repository"
 msgstr "Репозиторій"
 
-#: awesome-widget/plugin/awactions.cpp:110
+#: awesome-widget/plugin/awactions.cpp:112
 msgid "Bugtracker"
 msgstr "Баг-трекер"
 
-#: awesome-widget/plugin/awactions.cpp:111
+#: awesome-widget/plugin/awactions.cpp:113
 msgid "Translation issue"
 msgstr "Тікет перекладу"
 
-#: awesome-widget/plugin/awactions.cpp:112
+#: awesome-widget/plugin/awactions.cpp:114
 msgid "AUR packages"
 msgstr "Пакети в AUR"
 
-#: awesome-widget/plugin/awactions.cpp:113
+#: awesome-widget/plugin/awactions.cpp:115
-#, fuzzy
 msgid "openSUSE packages"
-msgstr "Пакети в AUR"
+msgstr "Пакети для openSUSE"
 
-#: awesome-widget/plugin/awactions.cpp:116
+#: awesome-widget/plugin/awactions.cpp:118
 msgid "This software is licensed under %1"
 msgstr "Цю програму ліцензовано під %1"
 
-#: awesome-widget/plugin/awactions.cpp:118
+#: awesome-widget/plugin/awactions.cpp:120
 msgid "Translators: %1"
 msgstr "Перекладачі: %1"
 
-#: awesome-widget/plugin/awactions.cpp:126
+#: awesome-widget/plugin/awactions.cpp:128
 msgid "This software uses: %1"
 msgstr "Ця програма використовує: %1"
 
-#: awesome-widget/plugin/awactions.cpp:141
+#: awesome-widget/plugin/awactions.cpp:143
 msgid "Select font"
 msgstr "Оберіть шрифт"
 
-#: awesome-widget/plugin/awactions.cpp:212
+#: awesome-widget/plugin/awactions.cpp:214
 msgid "Current version : %1"
 msgstr "Поточна версія : %1"
 
-#: awesome-widget/plugin/awactions.cpp:213
+#: awesome-widget/plugin/awactions.cpp:215
 msgid "New version : %1"
 msgstr "Нова версія : %1"
 
-#: awesome-widget/plugin/awactions.cpp:214
+#: awesome-widget/plugin/awactions.cpp:216
 msgid "Click \"Ok\" to download"
 msgstr "Натисніть \"Ok\" для завантаження"
 
-#: awesome-widget/plugin/awactions.cpp:216
+#: awesome-widget/plugin/awactions.cpp:218
 msgid "There are updates"
 msgstr "Знайдені оновлення"
 
@@ -418,90 +412,85 @@ msgstr "Копіювати"
 
 #: awesome-widget/plugin/awkeys.cpp:60
 msgid "Create"
-msgstr ""
+msgstr "Створити"
 
 #: awesome-widget/plugin/awkeys.cpp:61
 msgid "Remove"
 msgstr "Видалити"
 
-#: awesome-widget/plugin/awkeys.cpp:364
+#: awesome-widget/plugin/awkeys.cpp:395
-#, fuzzy
 msgid "AC online"
 msgstr "AC підключений"
 
-#: awesome-widget/plugin/awkeys.cpp:366
+#: awesome-widget/plugin/awkeys.cpp:397
-#, fuzzy
 msgid "AC offline"
 msgstr "AC відключений"
 
-#: awesome-widget/plugin/awkeys.cpp:383
+#: awesome-widget/plugin/awkeys.cpp:415
 msgid "High CPU load"
-msgstr ""
+msgstr "Високе завантаження CPU"
 
-#: awesome-widget/plugin/awkeys.cpp:432
+#: awesome-widget/plugin/awkeys.cpp:464
 msgid "High GPU load"
-msgstr ""
+msgstr "Високе завантаження GPU"
 
-#: awesome-widget/plugin/awkeys.cpp:446
+#: awesome-widget/plugin/awkeys.cpp:478
 msgid "Free space on %1 less than 10%"
-msgstr ""
+msgstr "Вільний простір на диску %1 меньше ніж 10%"
 
-#: awesome-widget/plugin/awkeys.cpp:511
+#: awesome-widget/plugin/awkeys.cpp:543
 msgid "High memory usage"
-msgstr ""
+msgstr "Велике споживання пам’яті"
 
-#: awesome-widget/plugin/awkeys.cpp:519
+#: awesome-widget/plugin/awkeys.cpp:551
 msgid "Network device has been changed to %1"
-msgstr ""
+msgstr "Мережевий пристрій було змінено на %1"
 
-#: awesome-widget/plugin/awkeys.cpp:589
+#: awesome-widget/plugin/awkeys.cpp:621
 msgid "Swap is used"
-msgstr ""
+msgstr "Використовується swap"
 
-#: awesome-widget/plugin/awkeys.cpp:649
+#: awesome-widget/plugin/awkeys.cpp:681
-#, fuzzy
 msgid "Select tag"
-msgstr "Оберіть шрифт"
+msgstr "Оберіть тег"
 
-#: awesome-widget/plugin/awkeys.cpp:650
+#: awesome-widget/plugin/awkeys.cpp:681
-#, fuzzy
 msgid "Tag"
-msgstr "Тег: %1"
+msgstr "Тег"
 
-#: awesome-widget/plugin/awkeys.cpp:723 awesome-widget/plugin/awkeys.cpp:733
+#: awesome-widget/plugin/awkeys.cpp:753 awesome-widget/plugin/awkeys.cpp:763
-#: awesome-widget/plugin/awkeys.cpp:744 awesome-widget/plugin/awkeys.cpp:755
+#: awesome-widget/plugin/awkeys.cpp:774 awesome-widget/plugin/awkeys.cpp:785
-#: awesome-widget/plugin/awkeys.cpp:1023 awesome-widget/plugin/awkeys.cpp:1078
+#: awesome-widget/plugin/awkeys.cpp:1053 awesome-widget/plugin/awkeys.cpp:1108
-#: awesome-widget/plugin/awkeys.cpp:1138 awesome-widget/plugin/awkeys.cpp:1195
+#: awesome-widget/plugin/awkeys.cpp:1168 awesome-widget/plugin/awkeys.cpp:1225
 msgid "Comment: %1"
 msgstr "Коментар: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:732 awesome-widget/plugin/awkeys.cpp:743
+#: awesome-widget/plugin/awkeys.cpp:762 awesome-widget/plugin/awkeys.cpp:773
-#: awesome-widget/plugin/awkeys.cpp:754 awesome-widget/plugin/awkeys.cpp:1077
+#: awesome-widget/plugin/awkeys.cpp:784 awesome-widget/plugin/awkeys.cpp:1107
-#: awesome-widget/plugin/awkeys.cpp:1137 awesome-widget/plugin/awkeys.cpp:1194
+#: awesome-widget/plugin/awkeys.cpp:1167 awesome-widget/plugin/awkeys.cpp:1224
 msgid "Name: %1"
 msgstr "Ім’я: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:734 awesome-widget/plugin/awkeys.cpp:1079
+#: awesome-widget/plugin/awkeys.cpp:764 awesome-widget/plugin/awkeys.cpp:1109
 msgid "Ticker: %1"
-msgstr ""
+msgstr "Тікер: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:745 awesome-widget/plugin/awkeys.cpp:756
+#: awesome-widget/plugin/awkeys.cpp:775 awesome-widget/plugin/awkeys.cpp:786
-#: awesome-widget/plugin/awkeys.cpp:1139 awesome-widget/plugin/awkeys.cpp:1196
+#: awesome-widget/plugin/awkeys.cpp:1169 awesome-widget/plugin/awkeys.cpp:1226
 msgid "Exec: %1"
 msgstr "Команда: %1"
 
-#: awesome-widget/plugin/awkeys.cpp:982 awesome-widget/plugin/awkeys.cpp:1047
+#: awesome-widget/plugin/awkeys.cpp:1012 awesome-widget/plugin/awkeys.cpp:1077
-#: awesome-widget/plugin/awkeys.cpp:1104 awesome-widget/plugin/awkeys.cpp:1163
+#: awesome-widget/plugin/awkeys.cpp:1134 awesome-widget/plugin/awkeys.cpp:1193
 msgid "Enter file name"
 msgstr "Введіть ім’я файлу"
 
-#: awesome-widget/plugin/awkeys.cpp:983 awesome-widget/plugin/awkeys.cpp:1048
+#: awesome-widget/plugin/awkeys.cpp:1013 awesome-widget/plugin/awkeys.cpp:1078
-#: awesome-widget/plugin/awkeys.cpp:1105 awesome-widget/plugin/awkeys.cpp:1164
+#: awesome-widget/plugin/awkeys.cpp:1135 awesome-widget/plugin/awkeys.cpp:1194
 msgid "File name"
 msgstr "Ім’я файлу"
 
 #: awesome-widget/plugin/graphicalitem.cpp:497
-#, fuzzy
 msgid "Select color"
 msgstr "Оберіть колір"
 
@@ -524,13 +513,6 @@ msgstr "sarumyan@i.ua"
 #~ msgid "Check for updates"
 #~ msgstr "Шукати оновлення"
 
-#~ msgid ""
-#~ "Version %1\n"
-#~ "(build date %2)"
-#~ msgstr ""
-#~ "Версія %1\n"
-#~ "(дата створення %2)"
-
 #, fuzzy
 #~ msgid "Edit"
 #~ msgstr "Редагувати"

sources/translations/awesome-widget/zh.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2015-05-22 00:07+0300\n"
+"POT-Creation-Date: 2015-06-01 01:48+0300\n"
 "PO-Revision-Date: 2014-09-10 22:50+0800\n"
 "Last-Translator: Steve Lemuel <wlemuel@hotmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -42,71 +42,75 @@ msgstr "数据引擎"
 msgid "About"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/about.qml:75
+#: awesome-widget/package/contents/ui/about.qml:83
 msgid "Acknowledgment"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:55
+#: awesome-widget/package/contents/ui/advanced.qml:56
 msgid "Widget height, px"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:75
+#: awesome-widget/package/contents/ui/advanced.qml:76
 msgid "Widget width, px"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:97
+#: awesome-widget/package/contents/ui/advanced.qml:98
 msgid "Enable notifications"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:111
+#: awesome-widget/package/contents/ui/advanced.qml:112
+msgid "Wrap new lines"
+msgstr ""
+
+#: awesome-widget/package/contents/ui/advanced.qml:126
 msgid "Enable background"
 msgstr "启用背景"
 
-#: awesome-widget/package/contents/ui/advanced.qml:123
+#: awesome-widget/package/contents/ui/advanced.qml:138
 msgid "Custom time format"
 msgstr "自定义时间格式"
 
-#: awesome-widget/package/contents/ui/advanced.qml:140
+#: awesome-widget/package/contents/ui/advanced.qml:155
 msgid "Custom uptime format"
 msgstr "自定义启动时间显示格式"
 
-#: awesome-widget/package/contents/ui/advanced.qml:157
+#: awesome-widget/package/contents/ui/advanced.qml:172
 msgid "Temperature units"
 msgstr "温度单位"
 
-#: awesome-widget/package/contents/ui/advanced.qml:165
+#: awesome-widget/package/contents/ui/advanced.qml:180
 msgid "Celsius"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:169
+#: awesome-widget/package/contents/ui/advanced.qml:184
 msgid "Fahrenheit"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:173
+#: awesome-widget/package/contents/ui/advanced.qml:188
 msgid "Kelvin"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:177
+#: awesome-widget/package/contents/ui/advanced.qml:192
 msgid "Reaumur"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:181
+#: awesome-widget/package/contents/ui/advanced.qml:196
 msgid "cm^-1"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:185
+#: awesome-widget/package/contents/ui/advanced.qml:200
 msgid "kJ/mol"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:189
+#: awesome-widget/package/contents/ui/advanced.qml:204
 msgid "kcal/mol"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/advanced.qml:212
+#: awesome-widget/package/contents/ui/advanced.qml:227
 msgid "AC online tag"
 msgstr "外接电源使用中标签"
 
-#: awesome-widget/package/contents/ui/advanced.qml:229
+#: awesome-widget/package/contents/ui/advanced.qml:244
 msgid "AC offline tag"
 msgstr "外接电源未使用标签"
 
@@ -115,7 +119,7 @@ msgid "Time interval"
 msgstr "时间周期"
 
 #: awesome-widget/package/contents/ui/appearance.qml:81
-#: awesome-widget/package/contents/ui/widget.qml:79
+#: awesome-widget/package/contents/ui/widget.qml:80
 msgid "Font"
 msgstr "字体"
 
@@ -305,30 +309,30 @@ msgstr ""
 "详情请参照 <a href=\"http://arcanis.name/projects/ awesome-widgets/\">项目主"
 "页</a>"
 
-#: awesome-widget/package/contents/ui/widget.qml:221
+#: awesome-widget/package/contents/ui/widget.qml:231
 msgid "Add"
 msgstr "添加"
 
-#: awesome-widget/package/contents/ui/widget.qml:234
+#: awesome-widget/package/contents/ui/widget.qml:244
 msgid "Show value"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:239
+#: awesome-widget/package/contents/ui/widget.qml:249
-#: awesome-widget/plugin/awkeys.cpp:653 awesome-widget/plugin/awkeys.cpp:722
+#: awesome-widget/plugin/awkeys.cpp:685 awesome-widget/plugin/awkeys.cpp:752
-#: awesome-widget/plugin/awkeys.cpp:1022
+#: awesome-widget/plugin/awkeys.cpp:1052
 msgid "Tag: %1"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:241
+#: awesome-widget/package/contents/ui/widget.qml:251
-#: awesome-widget/plugin/awkeys.cpp:655
+#: awesome-widget/plugin/awkeys.cpp:687
 msgid "Value: %1"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:243
+#: awesome-widget/package/contents/ui/widget.qml:253
 msgid "Info: %1"
 msgstr ""
 
-#: awesome-widget/package/contents/ui/widget.qml:254
+#: awesome-widget/package/contents/ui/widget.qml:264
 #, fuzzy
 msgid "Edit bars"
 msgstr "可编辑的"
@@ -338,66 +342,70 @@ msgid "Run %1"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:105
-msgid "A set of minimalistic plasmoid widgets"
+msgid "Version %1 (build date %2)"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:107
-msgid "Links:"
+msgid "A set of minimalistic plasmoid widgets"
-msgstr ""
-
-#: awesome-widget/plugin/awactions.cpp:108
-msgid "Homepage"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:109
-msgid "Repository"
+msgid "Links:"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:110
-msgid "Bugtracker"
+msgid "Homepage"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:111
-msgid "Translation issue"
+msgid "Repository"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:112
-msgid "AUR packages"
+msgid "Bugtracker"
 msgstr ""
 
 #: awesome-widget/plugin/awactions.cpp:113
+msgid "Translation issue"
+msgstr ""
+
+#: awesome-widget/plugin/awactions.cpp:114
+msgid "AUR packages"
+msgstr ""
+
+#: awesome-widget/plugin/awactions.cpp:115
 msgid "openSUSE packages"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:116
+#: awesome-widget/plugin/awactions.cpp:118
 msgid "This software is licensed under %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:118
+#: awesome-widget/plugin/awactions.cpp:120
 msgid "Translators: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:126
+#: awesome-widget/plugin/awactions.cpp:128
 msgid "This software uses: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:141
+#: awesome-widget/plugin/awactions.cpp:143
 msgid "Select font"
 msgstr "选择字体"
 
-#: awesome-widget/plugin/awactions.cpp:212
+#: awesome-widget/plugin/awactions.cpp:214
 msgid "Current version : %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:213
+#: awesome-widget/plugin/awactions.cpp:215
 msgid "New version : %1"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:214
+#: awesome-widget/plugin/awactions.cpp:216
 msgid "Click \"Ok\" to download"
 msgstr ""
 
-#: awesome-widget/plugin/awactions.cpp:216
+#: awesome-widget/plugin/awactions.cpp:218
 msgid "There are updates"
 msgstr ""
 
@@ -413,78 +421,78 @@ msgstr ""
 msgid "Remove"
 msgstr "移除"
 
-#: awesome-widget/plugin/awkeys.cpp:364
+#: awesome-widget/plugin/awkeys.cpp:395
 #, fuzzy
 msgid "AC online"
 msgstr "外接电源使用中标签"
 
-#: awesome-widget/plugin/awkeys.cpp:366
+#: awesome-widget/plugin/awkeys.cpp:397
 #, fuzzy
 msgid "AC offline"
 msgstr "外接电源未使用标签"
 
-#: awesome-widget/plugin/awkeys.cpp:383
+#: awesome-widget/plugin/awkeys.cpp:415
 msgid "High CPU load"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:432
+#: awesome-widget/plugin/awkeys.cpp:464
 msgid "High GPU load"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:446
+#: awesome-widget/plugin/awkeys.cpp:478
 msgid "Free space on %1 less than 10%"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:511
+#: awesome-widget/plugin/awkeys.cpp:543
 msgid "High memory usage"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:519
+#: awesome-widget/plugin/awkeys.cpp:551
 msgid "Network device has been changed to %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:589
+#: awesome-widget/plugin/awkeys.cpp:621
 msgid "Swap is used"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:649
+#: awesome-widget/plugin/awkeys.cpp:681
 #, fuzzy
 msgid "Select tag"
 msgstr "选择字体"
 
-#: awesome-widget/plugin/awkeys.cpp:650
+#: awesome-widget/plugin/awkeys.cpp:681
 msgid "Tag"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:723 awesome-widget/plugin/awkeys.cpp:733
+#: awesome-widget/plugin/awkeys.cpp:753 awesome-widget/plugin/awkeys.cpp:763
-#: awesome-widget/plugin/awkeys.cpp:744 awesome-widget/plugin/awkeys.cpp:755
+#: awesome-widget/plugin/awkeys.cpp:774 awesome-widget/plugin/awkeys.cpp:785
-#: awesome-widget/plugin/awkeys.cpp:1023 awesome-widget/plugin/awkeys.cpp:1078
+#: awesome-widget/plugin/awkeys.cpp:1053 awesome-widget/plugin/awkeys.cpp:1108
-#: awesome-widget/plugin/awkeys.cpp:1138 awesome-widget/plugin/awkeys.cpp:1195
+#: awesome-widget/plugin/awkeys.cpp:1168 awesome-widget/plugin/awkeys.cpp:1225
 msgid "Comment: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:732 awesome-widget/plugin/awkeys.cpp:743
+#: awesome-widget/plugin/awkeys.cpp:762 awesome-widget/plugin/awkeys.cpp:773
-#: awesome-widget/plugin/awkeys.cpp:754 awesome-widget/plugin/awkeys.cpp:1077
+#: awesome-widget/plugin/awkeys.cpp:784 awesome-widget/plugin/awkeys.cpp:1107
-#: awesome-widget/plugin/awkeys.cpp:1137 awesome-widget/plugin/awkeys.cpp:1194
+#: awesome-widget/plugin/awkeys.cpp:1167 awesome-widget/plugin/awkeys.cpp:1224
 msgid "Name: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:734 awesome-widget/plugin/awkeys.cpp:1079
+#: awesome-widget/plugin/awkeys.cpp:764 awesome-widget/plugin/awkeys.cpp:1109
 msgid "Ticker: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:745 awesome-widget/plugin/awkeys.cpp:756
+#: awesome-widget/plugin/awkeys.cpp:775 awesome-widget/plugin/awkeys.cpp:786
-#: awesome-widget/plugin/awkeys.cpp:1139 awesome-widget/plugin/awkeys.cpp:1196
+#: awesome-widget/plugin/awkeys.cpp:1169 awesome-widget/plugin/awkeys.cpp:1226
 msgid "Exec: %1"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:982 awesome-widget/plugin/awkeys.cpp:1047
+#: awesome-widget/plugin/awkeys.cpp:1012 awesome-widget/plugin/awkeys.cpp:1077
-#: awesome-widget/plugin/awkeys.cpp:1104 awesome-widget/plugin/awkeys.cpp:1163
+#: awesome-widget/plugin/awkeys.cpp:1134 awesome-widget/plugin/awkeys.cpp:1193
 msgid "Enter file name"
 msgstr ""
 
-#: awesome-widget/plugin/awkeys.cpp:983 awesome-widget/plugin/awkeys.cpp:1048
+#: awesome-widget/plugin/awkeys.cpp:1013 awesome-widget/plugin/awkeys.cpp:1078
-#: awesome-widget/plugin/awkeys.cpp:1105 awesome-widget/plugin/awkeys.cpp:1164
+#: awesome-widget/plugin/awkeys.cpp:1135 awesome-widget/plugin/awkeys.cpp:1194
 msgid "File name"
 msgstr ""
 

sources/translations/desktop-panel/en.po

@@ -8,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
 "POT-Creation-Date: 2015-05-22 00:05+0300\n"
 "PO-Revision-Date: 2015-05-22 00:06+0300\n"
-"Last-Translator: Evgeniy <darkarcanis@exante.eu>\n"
+"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: English <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"

sources/translations/desktop-panel/es.po

@@ -1,322 +1,316 @@
-# Copyright (C) 2014
+# Copyright (C) 2014
-# This file is distributed under the same license as the PyTextMonitor package.
+# This file is distributed under the same license as the PyTextMonitor package.
-#
+#
-# Ernesto Avilés Vzqz <whippiii@gmail.com>, 2014.
+# Ernesto Avilés Vzqz <whippiii@gmail.com>, 2014.
-# Evgeniy Alekseev <esalexeev@gmail.com>, 2014.
+# Evgeniy Alekseev <esalexeev@gmail.com>, 2014.
-msgid ""
+msgid ""
-msgstr ""
+msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
+"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2015-05-22 00:05+0300\n"
+"POT-Creation-Date: 2015-05-22 00:05+0300\n"
-"PO-Revision-Date: 2014-12-15 19:56-0500\n"
+"PO-Revision-Date: 2015-06-03 21:06-0500\n"
-"Last-Translator: Ernesto Avilés Vázquez\n"
+"Last-Translator: Ernesto Avilés Vázquez <whippiii@gmail.com>\n"
-"Language-Team: Spanish <kde-i18n-doc@kde.org>\n"
+"Language-Team: Spanish <kde-i18n-doc@kde.org>\n"
-"Language: es\n"
+"Language: es\n"
-"MIME-Version: 1.0\n"
+"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Poedit 1.7.6\n"
-
+
-#: desktop-panel/package/contents/config/config.qml:25
+#: desktop-panel/package/contents/config/config.qml:25
-msgid "Widget"
+msgid "Widget"
-msgstr "Widget"
+msgstr "Widget"
-
+
-#: desktop-panel/package/contents/config/config.qml:31
+#: desktop-panel/package/contents/config/config.qml:31
-msgid "Advanced"
+msgid "Advanced"
-msgstr ""
+msgstr "Avanzado"
-
+
-#: desktop-panel/package/contents/config/config.qml:37
+#: desktop-panel/package/contents/config/config.qml:37
-msgid "Active desktop"
+msgid "Active desktop"
-msgstr "Escritorio activo"
+msgstr "Escritorio activo"
-
+
-#: desktop-panel/package/contents/config/config.qml:43
+#: desktop-panel/package/contents/config/config.qml:43
-msgid "Inactive desktop"
+msgid "Inactive desktop"
-msgstr "Escritorio inactivo"
+msgstr "Escritorio inactivo"
-
+
-#: desktop-panel/package/contents/config/config.qml:49
+#: desktop-panel/package/contents/config/config.qml:49
-#: desktop-panel/package/contents/ui/about.qml:42
+#: desktop-panel/package/contents/ui/about.qml:42
-msgid "About"
+msgid "About"
-msgstr ""
+msgstr "Acerca de"
-
+
-#: desktop-panel/package/contents/ui/about.qml:75
+#: desktop-panel/package/contents/ui/about.qml:75
-msgid "Acknowledgment"
+msgid "Acknowledgment"
-msgstr ""
+msgstr "Reconocimiento"
-
+
-#: desktop-panel/package/contents/ui/activeapp.qml:60
+#: desktop-panel/package/contents/ui/activeapp.qml:60
-#: desktop-panel/package/contents/ui/inactiveapp.qml:60
+#: desktop-panel/package/contents/ui/inactiveapp.qml:60
-#: desktop-panel/package/contents/ui/widget.qml:51
+#: desktop-panel/package/contents/ui/widget.qml:51
-msgid "Font"
+msgid "Font"
-msgstr "Tipo de letra"
+msgstr "Tipo de letra"
-
+
-#: desktop-panel/package/contents/ui/activeapp.qml:78
+#: desktop-panel/package/contents/ui/activeapp.qml:78
-#: desktop-panel/package/contents/ui/inactiveapp.qml:78
+#: desktop-panel/package/contents/ui/inactiveapp.qml:78
-msgid "Font size"
+msgid "Font size"
-msgstr "Tamaño de letra"
+msgstr "Tamaño de letra"
-
+
-#: desktop-panel/package/contents/ui/activeapp.qml:98
+#: desktop-panel/package/contents/ui/activeapp.qml:98
-#: desktop-panel/package/contents/ui/inactiveapp.qml:98
+#: desktop-panel/package/contents/ui/inactiveapp.qml:98
-msgid "Font weight"
+msgid "Font weight"
-msgstr "Grosor de letra"
+msgstr "Grosor de letra"
-
+
-#: desktop-panel/package/contents/ui/activeapp.qml:106
+#: desktop-panel/package/contents/ui/activeapp.qml:106
-#: desktop-panel/package/contents/ui/inactiveapp.qml:106
+#: desktop-panel/package/contents/ui/inactiveapp.qml:106
-msgid "light"
+msgid "light"
-msgstr ""
+msgstr "fina"
-
+
-#: desktop-panel/package/contents/ui/activeapp.qml:110
+#: desktop-panel/package/contents/ui/activeapp.qml:110
-#: desktop-panel/package/contents/ui/activeapp.qml:153
+#: desktop-panel/package/contents/ui/activeapp.qml:153
-#: desktop-panel/package/contents/ui/inactiveapp.qml:110
+#: desktop-panel/package/contents/ui/inactiveapp.qml:110
-#: desktop-panel/package/contents/ui/inactiveapp.qml:153
+#: desktop-panel/package/contents/ui/inactiveapp.qml:153
-msgid "normal"
+msgid "normal"
-msgstr ""
+msgstr "normal"
-
+
-#: desktop-panel/package/contents/ui/activeapp.qml:114
+#: desktop-panel/package/contents/ui/activeapp.qml:114
-#: desktop-panel/package/contents/ui/inactiveapp.qml:114
+#: desktop-panel/package/contents/ui/inactiveapp.qml:114
-msgid "demi bold"
+msgid "demi bold"
-msgstr ""
+msgstr "medio negrita"
-
+
-#: desktop-panel/package/contents/ui/activeapp.qml:118
+#: desktop-panel/package/contents/ui/activeapp.qml:118
-#: desktop-panel/package/contents/ui/inactiveapp.qml:118
+#: desktop-panel/package/contents/ui/inactiveapp.qml:118
-msgid "bold"
+msgid "bold"
-msgstr ""
+msgstr "negrita"
-
+
-#: desktop-panel/package/contents/ui/activeapp.qml:122
+#: desktop-panel/package/contents/ui/activeapp.qml:122
-#: desktop-panel/package/contents/ui/inactiveapp.qml:122
+#: desktop-panel/package/contents/ui/inactiveapp.qml:122
-msgid "black"
+msgid "black"
-msgstr ""
+msgstr "negro"
-
+
-#: desktop-panel/package/contents/ui/activeapp.qml:145
+#: desktop-panel/package/contents/ui/activeapp.qml:145
-#: desktop-panel/package/contents/ui/inactiveapp.qml:145
+#: desktop-panel/package/contents/ui/inactiveapp.qml:145
-msgid "Font style"
+msgid "Font style"
-msgstr "Estilo de letra"
+msgstr "Estilo de letra"
-
+
-#: desktop-panel/package/contents/ui/activeapp.qml:157
+#: desktop-panel/package/contents/ui/activeapp.qml:157
-#: desktop-panel/package/contents/ui/inactiveapp.qml:157
+#: desktop-panel/package/contents/ui/inactiveapp.qml:157
-msgid "italic"
+msgid "italic"
-msgstr ""
+msgstr "cursiva"
-
+
-#: desktop-panel/package/contents/ui/activeapp.qml:180
+#: desktop-panel/package/contents/ui/activeapp.qml:180
-#: desktop-panel/package/contents/ui/advanced.qml:163
+#: desktop-panel/package/contents/ui/advanced.qml:163
-#: desktop-panel/package/contents/ui/inactiveapp.qml:180
+#: desktop-panel/package/contents/ui/inactiveapp.qml:180
-msgid "Font color"
+msgid "Font color"
-msgstr "Color de letra"
+msgstr "Color de letra"
-
+
-#: desktop-panel/package/contents/ui/activeapp.qml:198
+#: desktop-panel/package/contents/ui/activeapp.qml:198
-#: desktop-panel/package/contents/ui/advanced.qml:247
+#: desktop-panel/package/contents/ui/advanced.qml:247
-#: desktop-panel/package/contents/ui/inactiveapp.qml:198
+#: desktop-panel/package/contents/ui/inactiveapp.qml:198
-#, fuzzy
+msgid "Select a color"
-msgid "Select a color"
+msgstr "Elige un color"
-msgstr "Elegir tipo de letra"
+
-
+#: desktop-panel/package/contents/ui/activeapp.qml:205
-#: desktop-panel/package/contents/ui/activeapp.qml:205
+#: desktop-panel/package/contents/ui/inactiveapp.qml:205
-#: desktop-panel/package/contents/ui/inactiveapp.qml:205
+msgid "Select a font"
-#, fuzzy
+msgstr "Elige un tipo de letra"
-msgid "Select a font"
+
-msgstr "Elegir tipo de letra"
+#: desktop-panel/package/contents/ui/advanced.qml:56
-
+msgid "Widget height, px"
-#: desktop-panel/package/contents/ui/advanced.qml:56
+msgstr "Alto del widget, px"
-msgid "Widget height, px"
+
-msgstr ""
+#: desktop-panel/package/contents/ui/advanced.qml:76
-
+msgid "Widget width, px"
-#: desktop-panel/package/contents/ui/advanced.qml:76
+msgstr "Ancho del widget, px"
-msgid "Widget width, px"
+
-msgstr ""
+#: desktop-panel/package/contents/ui/advanced.qml:96
-
+msgid "Tooltip type"
-#: desktop-panel/package/contents/ui/advanced.qml:96
+msgstr "Tipo de ventana emergente"
-#, fuzzy
+
-msgid "Tooltip type"
+#: desktop-panel/package/contents/ui/advanced.qml:104
-msgstr "Ancho de la ventana emergente"
+msgid "contours"
-
+msgstr "contornos"
-#: desktop-panel/package/contents/ui/advanced.qml:104
+
-#, fuzzy
+#: desktop-panel/package/contents/ui/advanced.qml:108
-msgid "contours"
+msgid "windows"
-msgstr "Contornos"
+msgstr "ventanas"
-
+
-#: desktop-panel/package/contents/ui/advanced.qml:108
+#: desktop-panel/package/contents/ui/advanced.qml:112
-#, fuzzy
+msgid "clean desktop"
-msgid "windows"
+msgstr "limpiar escritorio"
-msgstr "Ventanas"
+
-
+#: desktop-panel/package/contents/ui/advanced.qml:116
-#: desktop-panel/package/contents/ui/advanced.qml:112
+msgid "names"
-#, fuzzy
+msgstr "nombres"
-msgid "clean desktop"
+
-msgstr "Limpiar escritorio"
+#: desktop-panel/package/contents/ui/advanced.qml:120
-
+msgid "none"
-#: desktop-panel/package/contents/ui/advanced.qml:116
+msgstr "ninguno"
-#, fuzzy
+
-msgid "names"
+#: desktop-panel/package/contents/ui/advanced.qml:143
-msgstr "Tu nombre"
+msgid "Tooltip width"
-
+msgstr "Ancho de la ventana emergente"
-#: desktop-panel/package/contents/ui/advanced.qml:120
+
-msgid "none"
+#: desktop-panel/package/contents/ui/advanced.qml:188
-msgstr ""
+msgid "Enable background"
-
+msgstr "Habilitar fondo"
-#: desktop-panel/package/contents/ui/advanced.qml:143
+
-msgid "Tooltip width"
+#: desktop-panel/package/contents/ui/advanced.qml:202
-msgstr "Ancho de la ventana emergente"
+msgid "Vertical layout"
-
+msgstr "Orientación vertical"
-#: desktop-panel/package/contents/ui/advanced.qml:188
+
-msgid "Enable background"
+#: desktop-panel/package/contents/ui/advanced.qml:214
-msgstr "Habilitar fondo"
+msgid "Mark"
-
+msgstr "Marca"
-#: desktop-panel/package/contents/ui/advanced.qml:202
+
-msgid "Vertical layout"
+#: desktop-panel/package/contents/ui/widget.qml:44
-msgstr "Orientación vertical"
+msgid ""
-
+"Detailed information may be found on <a href=\"http://arcanis.name/projects/"
-#: desktop-panel/package/contents/ui/advanced.qml:214
+"awesome-widgets/\">project homepage</a>"
-msgid "Mark"
+msgstr ""
-msgstr "Marca"
+"Puedes encontrar información detallada en el <a href=\"http://arcanis.name/"
-
+"projects/awesome-widgets/\">sitio del proyecto</a>"
-#: desktop-panel/package/contents/ui/widget.qml:44
+
-msgid ""
+#: desktop-panel/package/contents/ui/widget.qml:194
-"Detailed information may be found on <a href=\"http://arcanis.name/projects/"
+msgid "Add"
-"awesome-widgets/\">project homepage</a>"
+msgstr "Añadir"
-msgstr ""
+
-
+#: desktop-panel/package/contents/ui/widget.qml:207
-#: desktop-panel/package/contents/ui/widget.qml:194
+msgid "Show value"
-msgid "Add"
+msgstr "Mostrar valor"
-msgstr "Añadir"
+
-
+#: desktop-panel/package/contents/ui/widget.qml:212
-#: desktop-panel/package/contents/ui/widget.qml:207
+msgid "Tag: %1"
-msgid "Show value"
+msgstr "Etiqueta: %1"
-msgstr ""
+
-
+#: desktop-panel/package/contents/ui/widget.qml:214
-#: desktop-panel/package/contents/ui/widget.qml:212
+msgid "Value: %1"
-msgid "Tag: %1"
+msgstr "Valor: %1"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:314
-#: desktop-panel/package/contents/ui/widget.qml:214
+msgid "A set of minimalistic plasmoid widgets"
-msgid "Value: %1"
+msgstr "Un conjunto de plasmoides minimalistas"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:316
-#: desktop-panel/plugin/dpadds.cpp:314
+msgid "Links:"
-msgid "A set of minimalistic plasmoid widgets"
+msgstr "Enlaces:"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:317
-#: desktop-panel/plugin/dpadds.cpp:316
+msgid "Homepage"
-msgid "Links:"
+msgstr "Página principal"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:318
-#: desktop-panel/plugin/dpadds.cpp:317
+msgid "Repository"
-msgid "Homepage"
+msgstr "Repositorio"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:319
-#: desktop-panel/plugin/dpadds.cpp:318
+msgid "Bugtracker"
-msgid "Repository"
+msgstr "Reporte de errores"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:320
-#: desktop-panel/plugin/dpadds.cpp:319
+msgid "Translation issue"
-msgid "Bugtracker"
+msgstr "Problemas de traducción"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:321
-#: desktop-panel/plugin/dpadds.cpp:320
+msgid "AUR packages"
-msgid "Translation issue"
+msgstr "Paquetes AUR"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:322
-#: desktop-panel/plugin/dpadds.cpp:321
+msgid "openSUSE packages"
-msgid "AUR packages"
+msgstr "Paquetes de openSUSE"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:325
-#: desktop-panel/plugin/dpadds.cpp:322
+msgid "This software is licensed under %1"
-msgid "openSUSE packages"
+msgstr "Este software está licenciado bajo %1"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:327
-#: desktop-panel/plugin/dpadds.cpp:325
+msgid "Translators: %1"
-msgid "This software is licensed under %1"
+msgstr "Traductores: %1"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:335
-#: desktop-panel/plugin/dpadds.cpp:327
+msgid "This software uses: %1"
-msgid "Translators: %1"
+msgstr "Este software usa: %1"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:350
-#: desktop-panel/plugin/dpadds.cpp:335
+msgid "Select font"
-msgid "This software uses: %1"
+msgstr "Elegir tipo de letra"
-msgstr ""
+
-
+#: desktop-panel/plugin/dpadds.cpp:475
-#: desktop-panel/plugin/dpadds.cpp:350
+msgid "Top Edge"
-msgid "Select font"
+msgstr "Borde superior"
-msgstr "Elegir tipo de letra"
+
-
+#: desktop-panel/plugin/dpadds.cpp:477
-#: desktop-panel/plugin/dpadds.cpp:475
+msgid "Bottom Edge"
-msgid "Top Edge"
+msgstr "Borde inferior"
-msgstr "Borde superior"
+
-
+#: desktop-panel/plugin/dpadds.cpp:479
-#: desktop-panel/plugin/dpadds.cpp:477
+msgid "Left Edge"
-msgid "Bottom Edge"
+msgstr "Borde izquierdo"
-msgstr "Borde inferior"
+
-
+#: desktop-panel/plugin/dpadds.cpp:481
-#: desktop-panel/plugin/dpadds.cpp:479
+msgid "Right Edge"
-msgid "Left Edge"
+msgstr "Borde derecho"
-msgstr "Borde izquierdo"
+
-
+#: desktop-panel/plugin/dpadds.cpp:483
-#: desktop-panel/plugin/dpadds.cpp:481
+msgid "Unknown location (%1)"
-msgid "Right Edge"
+msgstr "Ubicación desconocida (%1)"
-msgstr "Borde derecho"
+
-
+#: translations/desktop-panel/rc.cpp:1 rc.cpp:1
-#: desktop-panel/plugin/dpadds.cpp:483
+msgctxt "NAME OF TRANSLATORS"
-#, fuzzy
+msgid "Your names"
-msgid "Unknown location (%1)"
+msgstr "Tu nombre"
-msgstr "Posición desconocida (%1)"
+
-
+#: translations/desktop-panel/rc.cpp:2 rc.cpp:2
-#: translations/desktop-panel/rc.cpp:1 rc.cpp:1
+msgctxt "EMAIL OF TRANSLATORS"
-msgctxt "NAME OF TRANSLATORS"
+msgid "Your emails"
-msgid "Your names"
+msgstr "Tu correo electrónico"
-msgstr "Tu nombre"
+
-
+#~ msgid "Unknown Position (%1)"
-#: translations/desktop-panel/rc.cpp:2 rc.cpp:2
+#~ msgstr "Posición desconocida (%1)"
-msgctxt "EMAIL OF TRANSLATORS"
+
-msgid "Your emails"
+#~ msgid "Appearance"
-msgstr "Tu email"
+#~ msgstr "Apariencia"
-
+
-#~ msgid "Unknown Position (%1)"
+#~ msgid "Toggle panels"
-#~ msgstr "Posición desconocida (%1)"
+#~ msgstr "Conmutar paneles"
-
+
-#~ msgid "Appearance"
+#~ msgid "To control panels please set widget shortcut."
-#~ msgstr "Apariencia"
+#~ msgstr ""
-
+#~ "Para controlar los paneles establece el atajo del teclado para el widget."
-#~ msgid "Toggle panels"
+
-#~ msgstr "Conmutar paneles"
+#~ msgid "A mark which will be shown if this desktop is active"
-
+#~ msgstr "Una marca será mostrada si este escritorio está activo"
-#~ msgid "To control panels please set widget shortcut."
+
-#~ msgstr ""
+#~ msgid "Ctrl+B"
-#~ "Para controlar los paneles establece el atajo del teclado para el widget."
+#~ msgstr "Ctrl+B"
-
+
-#~ msgid "A mark which will be shown if this desktop is active"
+#~ msgid "Ctrl+I"
-#~ msgstr "Una marca será mostrada si este escritorio está activo"
+#~ msgstr "Ctrl+I"
-
+
-#~ msgid "Ctrl+B"
+#~ msgid "Ctrl+U"
-#~ msgstr "Ctrl+B"
+#~ msgstr "Ctrl+U"
-
+
-#~ msgid "Ctrl+I"
+#~ msgid "px"
-#~ msgstr "Ctrl+I"
+#~ msgstr "px"
-
+
-#~ msgid "Ctrl+U"
+#~ msgid "Window border color on tooltip"
-#~ msgstr "Ctrl+U"
+#~ msgstr "Color del borde de la ventana emergente"
-
+
-#~ msgid "px"
+#~ msgid "Enable tooltip"
-#~ msgstr "px"
+#~ msgstr "Habilitar ventana emergente"
-
+
-#~ msgid "Window border color on tooltip"
+#~ msgid "Windows"
-#~ msgstr "Color del borde de la ventana emergente"
+#~ msgstr "Ventanas"
-
+
-#~ msgid "Enable tooltip"
+#~ msgid "Contours"
-#~ msgstr "Habilitar ventana emergente"
+#~ msgstr "Contornos"
-
+
-#~ msgid "Windows"
+#~ msgid "Clean desktop"
-#~ msgstr "Ventanas"
+#~ msgstr "Limpiar escritorio"
-
+
-#~ msgid "Contours"
+#~ msgid "Time interval"
-#~ msgstr "Contornos"
+#~ msgstr "Intervalo de tiempo"
-
+
-#~ msgid "Clean desktop"
+#~ msgid "Add stretch to left/top of the layout"
-#~ msgstr "Limpiar escritorio"
+#~ msgstr "Añadir extensión a la izquierda/superior de la distribución"
-
+
-#~ msgid "Time interval"
+#~ msgid "Add stretch to right/bottom of the layout"
-#~ msgstr "Intervalo de tiempo"
+#~ msgstr "Añadir extensión a la derecha/inferior de la distribución"
-
-#~ msgid "Add stretch to left/top of the layout"
-#~ msgstr "Añadir extensión a la izquierda/superior de la distribución"
-
-#~ msgid "Add stretch to right/bottom of the layout"
-#~ msgstr "Añadir extensión a la derecha/inferior de la distribución"

sources/translations/desktop-panel/pt_BR.po

@@ -24,8 +24,9 @@ msgid "Widget"
 msgstr "Widget"
 
 #: desktop-panel/package/contents/config/config.qml:31
+#, fuzzy
 msgid "Advanced"
-msgstr ""
+msgstr "Avançado"
 
 #: desktop-panel/package/contents/config/config.qml:37
 msgid "Active desktop"
@@ -37,12 +38,14 @@ msgstr "Desktop inativo"
 
 #: desktop-panel/package/contents/config/config.qml:49
 #: desktop-panel/package/contents/ui/about.qml:42
+#, fuzzy
 msgid "About"
-msgstr ""
+msgstr "Sobre"
 
 #: desktop-panel/package/contents/ui/about.qml:75
+#, fuzzy
 msgid "Acknowledgment"
-msgstr ""
+msgstr "Confirmação"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:60
 #: desktop-panel/package/contents/ui/inactiveapp.qml:60
@@ -62,30 +65,35 @@ msgstr "Grossura da fonte"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:106
 #: desktop-panel/package/contents/ui/inactiveapp.qml:106
+#, fuzzy
 msgid "light"
-msgstr ""
+msgstr "leve"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:110
 #: desktop-panel/package/contents/ui/activeapp.qml:153
 #: desktop-panel/package/contents/ui/inactiveapp.qml:110
 #: desktop-panel/package/contents/ui/inactiveapp.qml:153
+#, fuzzy
 msgid "normal"
-msgstr ""
+msgstr "normal"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:114
 #: desktop-panel/package/contents/ui/inactiveapp.qml:114
+#, fuzzy
 msgid "demi bold"
-msgstr ""
+msgstr "demi negrito"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:118
 #: desktop-panel/package/contents/ui/inactiveapp.qml:118
+#, fuzzy
 msgid "bold"
-msgstr ""
+msgstr "negrito"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:122
 #: desktop-panel/package/contents/ui/inactiveapp.qml:122
+#, fuzzy
 msgid "black"
-msgstr ""
+msgstr "preto"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:145
 #: desktop-panel/package/contents/ui/inactiveapp.qml:145
@@ -94,8 +102,9 @@ msgstr "Estilo da fonte"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:157
 #: desktop-panel/package/contents/ui/inactiveapp.qml:157
+#, fuzzy
 msgid "italic"
-msgstr ""
+msgstr "itálico"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:180
 #: desktop-panel/package/contents/ui/advanced.qml:163
@@ -108,26 +117,28 @@ msgstr "Cor da fonte"
 #: desktop-panel/package/contents/ui/inactiveapp.qml:198
 #, fuzzy
 msgid "Select a color"
-msgstr "Selecionar fonte"
+msgstr "Selecione uma cor"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:205
 #: desktop-panel/package/contents/ui/inactiveapp.qml:205
 #, fuzzy
 msgid "Select a font"
-msgstr "Selecionar fonte"
+msgstr "Selecione uma fonte"
 
 #: desktop-panel/package/contents/ui/advanced.qml:56
+#, fuzzy
 msgid "Widget height, px"
-msgstr ""
+msgstr "Largura do widget, px"
 
 #: desktop-panel/package/contents/ui/advanced.qml:76
+#, fuzzy
 msgid "Widget width, px"
-msgstr ""
+msgstr "Altura do widget, px"
 
 #: desktop-panel/package/contents/ui/advanced.qml:96
 #, fuzzy
 msgid "Tooltip type"
-msgstr "Largura da dica de contexto"
+msgstr "Tipo de dica de contexto"
 
 #: desktop-panel/package/contents/ui/advanced.qml:104
 #, fuzzy
@@ -147,11 +158,12 @@ msgstr "Limpar desktop"
 #: desktop-panel/package/contents/ui/advanced.qml:116
 #, fuzzy
 msgid "names"
-msgstr "under"
+msgstr "nomes"
 
 #: desktop-panel/package/contents/ui/advanced.qml:120
+#, fuzzy
 msgid "none"
-msgstr ""
+msgstr "nenhum"
 
 #: desktop-panel/package/contents/ui/advanced.qml:143
 msgid "Tooltip width"
@@ -170,70 +182,87 @@ msgid "Mark"
 msgstr "Marca"
 
 #: desktop-panel/package/contents/ui/widget.qml:44
+#, fuzzy
 msgid ""
-"Detailed information may be found on <a href=\"http://arcanis.name/projects/"
+"Detailed information may be found on <a "
-"awesome-widgets/\">project homepage</a>"
+"href=\"http://arcanis.name/projects/awesome-widgets/\">project homepage</a>"
 msgstr ""
+"Informações detalhadas podem ser encontradas na <a "
+"href=\"http://arcanis.name/projects/awesome-widgets/\">página do projeto</a>"
 
 #: desktop-panel/package/contents/ui/widget.qml:194
 msgid "Add"
 msgstr "Adicionar"
 
 #: desktop-panel/package/contents/ui/widget.qml:207
+#, fuzzy
 msgid "Show value"
-msgstr ""
+msgstr "Mostrar valor"
 
 #: desktop-panel/package/contents/ui/widget.qml:212
+#, fuzzy, qt-format
 msgid "Tag: %1"
-msgstr ""
+msgstr "Tag: %1"
 
 #: desktop-panel/package/contents/ui/widget.qml:214
+#, fuzzy, qt-format
 msgid "Value: %1"
-msgstr ""
+msgstr "Valor: %1"
 
 #: desktop-panel/plugin/dpadds.cpp:314
+#, fuzzy
 msgid "A set of minimalistic plasmoid widgets"
-msgstr ""
+msgstr "Um conjunto de widgets plasmoid minimalistas"
 
 #: desktop-panel/plugin/dpadds.cpp:316
+#, fuzzy
 msgid "Links:"
-msgstr ""
+msgstr "Links: "
 
 #: desktop-panel/plugin/dpadds.cpp:317
+#, fuzzy
 msgid "Homepage"
-msgstr ""
+msgstr "Homepage"
 
 #: desktop-panel/plugin/dpadds.cpp:318
+#, fuzzy
 msgid "Repository"
-msgstr ""
+msgstr "Repositório"
 
 #: desktop-panel/plugin/dpadds.cpp:319
+#, fuzzy
 msgid "Bugtracker"
-msgstr ""
+msgstr "Tracker de bugs"
 
 #: desktop-panel/plugin/dpadds.cpp:320
+#, fuzzy
 msgid "Translation issue"
-msgstr ""
+msgstr "Problema de tradução"
 
 #: desktop-panel/plugin/dpadds.cpp:321
+#, fuzzy
 msgid "AUR packages"
-msgstr ""
+msgstr "Pacotes da AUR"
 
 #: desktop-panel/plugin/dpadds.cpp:322
+#, fuzzy
 msgid "openSUSE packages"
-msgstr ""
+msgstr "Pacotes openSUSE"
 
 #: desktop-panel/plugin/dpadds.cpp:325
+#, fuzzy, qt-format
 msgid "This software is licensed under %1"
-msgstr ""
+msgstr "Este software é licenciado sob %1"
 
 #: desktop-panel/plugin/dpadds.cpp:327
+#, fuzzy, qt-format
 msgid "Translators: %1"
-msgstr ""
+msgstr "Tradutores: %1"
 
 #: desktop-panel/plugin/dpadds.cpp:335
+#, fuzzy, qt-format
 msgid "This software uses: %1"
-msgstr ""
+msgstr "Este software usa: %1"
 
 #: desktop-panel/plugin/dpadds.cpp:350
 msgid "Select font"
@@ -256,9 +285,9 @@ msgid "Right Edge"
 msgstr "Canto direito"
 
 #: desktop-panel/plugin/dpadds.cpp:483
-#, fuzzy
+#, fuzzy, qt-format
 msgid "Unknown location (%1)"
-msgstr "Posição desconhecida (%1)"
+msgstr "Localização desconhecida (%1)"
 
 #: translations/desktop-panel/rc.cpp:1 rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -270,6 +299,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "under@insicuri.net"
 
+#, qt-format
 #~ msgid "Unknown Position (%1)"
 #~ msgstr "Posição desconhecida (%1)"
 

sources/translations/desktop-panel/ru.po

@@ -8,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
 "POT-Creation-Date: 2015-05-22 00:05+0300\n"
 "PO-Revision-Date: 2015-05-22 00:06+0300\n"
-"Last-Translator: Evgeniy <darkarcanis@exante.eu>\n"
+"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"

sources/translations/desktop-panel/uk.po

@@ -1,22 +1,22 @@
-# Copyright (C) 2014
+# Copyright (C) 2014
-# This file is distributed under the same license as the PyTextMonitor package.
+# This file is distributed under the same license as the PyTextMonitor package.
-# 
+#
-# Evgeniy Alekseev <esalexeev@gmail.com>, 2014.
+# Evgeniy Alekseev <esalexeev@gmail.com>, 2014, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
 "POT-Creation-Date: 2015-05-22 00:05+0300\n"
-"PO-Revision-Date: 2014-06-06 01:23+0400\n"
+"PO-Revision-Date: 2015-06-04 01:49+0300\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
-"Language-Team: Ukrainian <kde-ukrainian@lists.kde.ru>\n"
+"Language-Team: Ukrainian <kde-russian@lists.kde.ru>\n"
 "Language: ua\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 
 #: desktop-panel/package/contents/config/config.qml:25
 msgid "Widget"
@@ -24,7 +24,7 @@ msgstr "Віджет"
 
 #: desktop-panel/package/contents/config/config.qml:31
 msgid "Advanced"
-msgstr ""
+msgstr "Розширені"
 
 #: desktop-panel/package/contents/config/config.qml:37
 msgid "Active desktop"
@@ -37,11 +37,11 @@ msgstr "Неактивний робочий стіл"
 #: desktop-panel/package/contents/config/config.qml:49
 #: desktop-panel/package/contents/ui/about.qml:42
 msgid "About"
-msgstr ""
+msgstr "Про програму"
 
 #: desktop-panel/package/contents/ui/about.qml:75
 msgid "Acknowledgment"
-msgstr ""
+msgstr "Подяка"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:60
 #: desktop-panel/package/contents/ui/inactiveapp.qml:60
@@ -62,29 +62,29 @@ msgstr "Ширина шрифту"
 #: desktop-panel/package/contents/ui/activeapp.qml:106
 #: desktop-panel/package/contents/ui/inactiveapp.qml:106
 msgid "light"
-msgstr ""
+msgstr "тонкий"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:110
 #: desktop-panel/package/contents/ui/activeapp.qml:153
 #: desktop-panel/package/contents/ui/inactiveapp.qml:110
 #: desktop-panel/package/contents/ui/inactiveapp.qml:153
 msgid "normal"
-msgstr ""
+msgstr "нормальний"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:114
 #: desktop-panel/package/contents/ui/inactiveapp.qml:114
 msgid "demi bold"
-msgstr ""
+msgstr "напівжирний"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:118
 #: desktop-panel/package/contents/ui/inactiveapp.qml:118
 msgid "bold"
-msgstr ""
+msgstr "жирний"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:122
 #: desktop-panel/package/contents/ui/inactiveapp.qml:122
 msgid "black"
-msgstr ""
+msgstr "дуже жирний"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:145
 #: desktop-panel/package/contents/ui/inactiveapp.qml:145
@@ -94,7 +94,7 @@ msgstr "Стиль шрифту"
 #: desktop-panel/package/contents/ui/activeapp.qml:157
 #: desktop-panel/package/contents/ui/inactiveapp.qml:157
 msgid "italic"
-msgstr ""
+msgstr "курсив"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:180
 #: desktop-panel/package/contents/ui/advanced.qml:163
@@ -105,52 +105,45 @@ msgstr "Колір шрифту"
 #: desktop-panel/package/contents/ui/activeapp.qml:198
 #: desktop-panel/package/contents/ui/advanced.qml:247
 #: desktop-panel/package/contents/ui/inactiveapp.qml:198
-#, fuzzy
 msgid "Select a color"
-msgstr "Вибрати шрифт"
+msgstr "Вибрати колір"
 
 #: desktop-panel/package/contents/ui/activeapp.qml:205
 #: desktop-panel/package/contents/ui/inactiveapp.qml:205
-#, fuzzy
 msgid "Select a font"
 msgstr "Вибрати шрифт"
 
 #: desktop-panel/package/contents/ui/advanced.qml:56
 msgid "Widget height, px"
-msgstr ""
+msgstr "Висота віджету, пікселі"
 
 #: desktop-panel/package/contents/ui/advanced.qml:76
 msgid "Widget width, px"
-msgstr ""
+msgstr "Ширина віджету, пікселі"
 
 #: desktop-panel/package/contents/ui/advanced.qml:96
-#, fuzzy
 msgid "Tooltip type"
-msgstr "Ширина підказки"
+msgstr "Тип підказки"
 
 #: desktop-panel/package/contents/ui/advanced.qml:104
-#, fuzzy
 msgid "contours"
 msgstr "Контури"
 
 #: desktop-panel/package/contents/ui/advanced.qml:108
-#, fuzzy
 msgid "windows"
 msgstr "Вікна"
 
 #: desktop-panel/package/contents/ui/advanced.qml:112
-#, fuzzy
 msgid "clean desktop"
-msgstr "Очистити робочий стіл"
+msgstr "пустий робочий стіл"
 
 #: desktop-panel/package/contents/ui/advanced.qml:116
-#, fuzzy
 msgid "names"
-msgstr "Slobodyan Victor"
+msgstr "назви"
 
 #: desktop-panel/package/contents/ui/advanced.qml:120
 msgid "none"
-msgstr ""
+msgstr "немає"
 
 #: desktop-panel/package/contents/ui/advanced.qml:143
 msgid "Tooltip width"
@@ -173,6 +166,8 @@ msgid ""
 "Detailed information may be found on <a href=\"http://arcanis.name/projects/"
 "awesome-widgets/\">project homepage</a>"
 msgstr ""
+"Детальна інформація може бути знайдена на <a href=\"http://arcanis.name/"
+"projects/awesome-widgets/\">домашній сторінці</a> проекту"
 
 #: desktop-panel/package/contents/ui/widget.qml:194
 msgid "Add"
@@ -180,59 +175,59 @@ msgstr "Додати"
 
 #: desktop-panel/package/contents/ui/widget.qml:207
 msgid "Show value"
-msgstr ""
+msgstr "Показати значення"
 
 #: desktop-panel/package/contents/ui/widget.qml:212
 msgid "Tag: %1"
-msgstr ""
+msgstr "Тег: %1"
 
 #: desktop-panel/package/contents/ui/widget.qml:214
 msgid "Value: %1"
-msgstr ""
+msgstr "Значення: %1"
 
 #: desktop-panel/plugin/dpadds.cpp:314
 msgid "A set of minimalistic plasmoid widgets"
-msgstr ""
+msgstr "Колекція мінімалістичних плазмоідів"
 
 #: desktop-panel/plugin/dpadds.cpp:316
 msgid "Links:"
-msgstr ""
+msgstr "Посилання:"
 
 #: desktop-panel/plugin/dpadds.cpp:317
 msgid "Homepage"
-msgstr ""
+msgstr "Домашня сторінка"
 
 #: desktop-panel/plugin/dpadds.cpp:318
 msgid "Repository"
-msgstr ""
+msgstr "Репозіторій"
 
 #: desktop-panel/plugin/dpadds.cpp:319
 msgid "Bugtracker"
-msgstr ""
+msgstr "Багтрекер"
 
 #: desktop-panel/plugin/dpadds.cpp:320
 msgid "Translation issue"
-msgstr ""
+msgstr "Тікет перекладу"
 
 #: desktop-panel/plugin/dpadds.cpp:321
 msgid "AUR packages"
-msgstr ""
+msgstr "Пакети в AUR"
 
 #: desktop-panel/plugin/dpadds.cpp:322
 msgid "openSUSE packages"
-msgstr ""
+msgstr "Пакети для openSUSE"
 
 #: desktop-panel/plugin/dpadds.cpp:325
 msgid "This software is licensed under %1"
-msgstr ""
+msgstr "Цю програму ліцензовано під %1"
 
 #: desktop-panel/plugin/dpadds.cpp:327
 msgid "Translators: %1"
-msgstr ""
+msgstr "Перекладачі: %1"
 
 #: desktop-panel/plugin/dpadds.cpp:335
 msgid "This software uses: %1"
-msgstr ""
+msgstr "Ця програма використовує: %1"
 
 #: desktop-panel/plugin/dpadds.cpp:350
 msgid "Select font"
@@ -255,7 +250,6 @@ msgid "Right Edge"
 msgstr "Правий край"
 
 #: desktop-panel/plugin/dpadds.cpp:483
-#, fuzzy
 msgid "Unknown location (%1)"
 msgstr "Невідоме положення (%1)"
 

sources/version.h.in

@@ -12,9 +12,9 @@
 // graphical items api version
 #define AWGIAPI 1
 // extquotes api version
-#define AWEQAPI 1
+#define AWEQAPI 2
 // extscript api version
-#define AWESAPI 2
+#define AWESAPI 3
 // extupgrade api version
 #define AWEUAPI 2