mirror of
				https://github.com/arcan1s/awesome-widgets.git
				synced 2025-11-03 22:33:42 +00:00 
			
		
		
		
	prerelease updates
* update Ukrainian translation * update patches * merge qt5.3-qtconcurrent-and-qlogging-category.patch into qt5.4-replace-qml-dialogs.patch * update cmake files * update README
This commit is contained in:
		@ -1,6 +1,9 @@
 | 
			
		||||
awesome-widgets (ex-pytextmonitor)
 | 
			
		||||
==================================
 | 
			
		||||
 | 
			
		||||
[](https://travis-ci.org/arcan1s/awesome-widgets)
 | 
			
		||||
[](https://scan.coverity.com/projects/awesome-widgets)
 | 
			
		||||
 | 
			
		||||
Information
 | 
			
		||||
-----------
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,45 +0,0 @@
 | 
			
		||||
diff --git a/sources/awdebug.cpp b/sources/awdebug.cpp
 | 
			
		||||
index eee61e1..9da8dad 100644
 | 
			
		||||
--- a/sources/awdebug.cpp
 | 
			
		||||
+++ b/sources/awdebug.cpp
 | 
			
		||||
@@ -20,13 +20,10 @@
 | 
			
		||||
 #include "version.h"
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
-Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget",
 | 
			
		||||
-                   QtMsgType::QtWarningMsg)
 | 
			
		||||
-Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel",
 | 
			
		||||
-                   QtMsgType::QtWarningMsg)
 | 
			
		||||
-Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon", QtMsgType::QtWarningMsg)
 | 
			
		||||
-Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets",
 | 
			
		||||
-                   QtMsgType::QtWarningMsg)
 | 
			
		||||
+Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget")
 | 
			
		||||
+Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel")
 | 
			
		||||
+Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon")
 | 
			
		||||
+Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets")
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
 const QStringList getBuildData()
 | 
			
		||||
diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
 | 
			
		||||
index e5b9861..eb73073 100644
 | 
			
		||||
--- a/sources/awesome-widget/plugin/awkeys.cpp
 | 
			
		||||
+++ b/sources/awesome-widget/plugin/awkeys.cpp
 | 
			
		||||
@@ -439,4 +439,4 @@ void AWKeys::dataUpdated(const QString &sourceName,
 | 
			
		||||
 
 | 
			
		||||
     // run concurrent data update
 | 
			
		||||
-    QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, sourceName,
 | 
			
		||||
+    QtConcurrent::run(this, &AWKeys::setDataBySource, sourceName,
 | 
			
		||||
                       data);
 | 
			
		||||
diff --git a/sources/libraries.cmake b/sources/libraries.cmake
 | 
			
		||||
index 33192f7..46e2b1e 100644
 | 
			
		||||
--- a/sources/libraries.cmake
 | 
			
		||||
+++ b/sources/libraries.cmake
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 find_package(Gettext REQUIRED)
 | 
			
		||||
 
 | 
			
		||||
 # main qt libraries
 | 
			
		||||
-find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
 | 
			
		||||
+find_package(Qt5 5.3.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
 | 
			
		||||
 add_definitions(
 | 
			
		||||
         ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
 | 
			
		||||
         ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}
 | 
			
		||||
@ -352,3 +352,48 @@ index a8300f1..8edc3bd 100644
 | 
			
		||||
     // values
 | 
			
		||||
     Q_INVOKABLE QString infoByKey(QString key) const;
 | 
			
		||||
     Q_INVOKABLE QString valueByKey(QString key) const;
 | 
			
		||||
diff --git a/sources/awdebug.cpp b/sources/awdebug.cpp
 | 
			
		||||
index eee61e1..9da8dad 100644
 | 
			
		||||
--- a/sources/awdebug.cpp
 | 
			
		||||
+++ b/sources/awdebug.cpp
 | 
			
		||||
@@ -20,13 +20,10 @@
 | 
			
		||||
 #include "awdebug.h"
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
-Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget",
 | 
			
		||||
-                   QtMsgType::QtWarningMsg)
 | 
			
		||||
-Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel",
 | 
			
		||||
-                   QtMsgType::QtWarningMsg)
 | 
			
		||||
-Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon", QtMsgType::QtWarningMsg)
 | 
			
		||||
-Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets",
 | 
			
		||||
-                   QtMsgType::QtWarningMsg)
 | 
			
		||||
+Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget")
 | 
			
		||||
+Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel")
 | 
			
		||||
+Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon")
 | 
			
		||||
+Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets")
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
 const QStringList getBuildData()
 | 
			
		||||
diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
 | 
			
		||||
index e5b9861..eb73073 100644
 | 
			
		||||
--- a/sources/awesome-widget/plugin/awkeys.cpp
 | 
			
		||||
+++ b/sources/awesome-widget/plugin/awkeys.cpp
 | 
			
		||||
@@ -439,4 +439,4 @@ void AWKeys::dataUpdated(const QString &sourceName,
 | 
			
		||||
 {
 | 
			
		||||
     // run concurrent data update
 | 
			
		||||
-    QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, sourceName,
 | 
			
		||||
+    QtConcurrent::run(this, &AWKeys::setDataBySource, sourceName,
 | 
			
		||||
                       data);
 | 
			
		||||
diff --git a/sources/libraries.cmake b/sources/libraries.cmake
 | 
			
		||||
index 33192f7..46e2b1e 100644
 | 
			
		||||
--- a/sources/libraries.cmake
 | 
			
		||||
+++ b/sources/libraries.cmake
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 find_package(Gettext REQUIRED)
 | 
			
		||||
 
 | 
			
		||||
 # main qt libraries
 | 
			
		||||
-find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
 | 
			
		||||
+find_package(Qt5 5.3.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
 | 
			
		||||
 add_definitions(
 | 
			
		||||
         ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
 | 
			
		||||
         ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}
 | 
			
		||||
@ -16,7 +16,7 @@ index 43944ce..c679281 100644
 | 
			
		||||
+++ b/sources/awdebug.h
 | 
			
		||||
@@ -21,9 +21,13 @@
 | 
			
		||||
 
 | 
			
		||||
 #include <QLoggingCategory>
 | 
			
		||||
 #include "version.h"
 | 
			
		||||
 
 | 
			
		||||
+#ifndef qCInfo
 | 
			
		||||
+#define qCInfo qCDebug
 | 
			
		||||
 | 
			
		||||
@ -11,7 +11,7 @@ index 3698602..42871c8 100644
 | 
			
		||||
     m_genericConfig = QString("%1/awesomewidgets/general.ini")
 | 
			
		||||
                           .arg(QStandardPaths::writableLocation(
 | 
			
		||||
                               QStandardPaths::GenericDataLocation));
 | 
			
		||||
@@ -69,14 +69,14 @@ void AWUpdateHelper::checkUpdates(const bool showAnyway)
 | 
			
		||||
@@ -69,15 +69,15 @@ void AWUpdateHelper::checkUpdates(const bool showAnyway)
 | 
			
		||||
 bool AWUpdateHelper::checkVersion()
 | 
			
		||||
 {
 | 
			
		||||
     QSettings settings(m_genericConfig, QSettings::IniFormat);
 | 
			
		||||
@ -22,10 +22,11 @@ index 3698602..42871c8 100644
 | 
			
		||||
     // update version
 | 
			
		||||
     settings.setValue(QString("Version"), QString(VERSION));
 | 
			
		||||
     settings.sync();
 | 
			
		||||
     qCInfo(LOG_AW) << "Found version" << version << "actual one is"
 | 
			
		||||
                    << m_foundVersion;
 | 
			
		||||
 
 | 
			
		||||
     qCInfo(LOG_AW) << "Found version" << version << "actual one is" << VERSION;
 | 
			
		||||
-    if (version != QVersionNumber::fromString(VERSION)) {
 | 
			
		||||
+    if (version != QString(VERSION)) {
 | 
			
		||||
-    if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
 | 
			
		||||
+    if ((version != QString(VERSION)) && (!QString(CHANGELOG).isEmpty())) {
 | 
			
		||||
         genMessageBox(i18n("Changelog of %1", QString(VERSION)),
 | 
			
		||||
                       QString(CHANGELOG).replace(QChar('@'), QChar('\n')),
 | 
			
		||||
                       QMessageBox::Ok)
 | 
			
		||||
@ -65,12 +66,12 @@ index 3698602..42871c8 100644
 | 
			
		||||
@@ -128,8 +127,7 @@ void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *button)
 | 
			
		||||
 
 | 
			
		||||
     switch (ret) {
 | 
			
		||||
     case QMessageBox::Ok:
 | 
			
		||||
     case QMessageBox::AcceptRole:
 | 
			
		||||
-        QDesktopServices::openUrl(QString(RELEASES)
 | 
			
		||||
-                                  + m_foundVersion.toString());
 | 
			
		||||
+        QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion);
 | 
			
		||||
         break;
 | 
			
		||||
     case QMessageBox::Cancel:
 | 
			
		||||
     case QMessageBox::RejectRole:
 | 
			
		||||
     default:
 | 
			
		||||
@@ -157,14 +155,23 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *reply,
 | 
			
		||||
     QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
 | 
			
		||||
 | 
			
		||||
@ -1,37 +0,0 @@
 | 
			
		||||
diff --git a/sources/awesome-widget/plugin/awkeysaggregator.cpp b/sources/awesome-widget/plugin/awkeysaggregator.cpp
 | 
			
		||||
index 7a1887b..9f39e2f 100644
 | 
			
		||||
--- a/sources/awesome-widget/plugin/awkeysaggregator.cpp
 | 
			
		||||
+++ b/sources/awesome-widget/plugin/awkeysaggregator.cpp
 | 
			
		||||
@@ -34,8 +34,8 @@ AWKeysAggregator::AWKeysAggregator(QObject *parent)
 | 
			
		||||
     // default formaters
 | 
			
		||||
     // memory
 | 
			
		||||
     m_formater[QString("mem")] = Float;
 | 
			
		||||
-    m_formater[QString("memtotmb")] = IntegerFive;
 | 
			
		||||
-    m_formater[QString("memtotgb")] = Float;
 | 
			
		||||
+    m_formater[QString("memtotmb")] = MemMBFormat;
 | 
			
		||||
+    m_formater[QString("memtotgb")] = MemGBFormat;
 | 
			
		||||
     // network
 | 
			
		||||
     m_formater[QString("down")] = NetSmartFormat;
 | 
			
		||||
     m_formater[QString("downkb")] = Integer;
 | 
			
		||||
@@ -45,8 +45,8 @@ AWKeysAggregator::AWKeysAggregator(QObject *parent)
 | 
			
		||||
     m_formater[QString("upunits")] = NetSmartUnits;
 | 
			
		||||
     // swap
 | 
			
		||||
     m_formater[QString("swap")] = Float;
 | 
			
		||||
-    m_formater[QString("swaptotmb")] = IntegerFive;
 | 
			
		||||
-    m_formater[QString("swaptotgb")] = Float;
 | 
			
		||||
+    m_formater[QString("swaptotmb")] = MemMBFormat;
 | 
			
		||||
+    m_formater[QString("swaptotgb")] = MemGBFormat;
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -338,8 +338,8 @@ QStringList AWKeysAggregator::registerSource(const QString &source,
 | 
			
		||||
             m_map[source] = key;
 | 
			
		||||
             m_formater[key] = Float;
 | 
			
		||||
             // additional keys
 | 
			
		||||
-            m_formater[QString("hddtotmb%1").arg(index)] = IntegerFive;
 | 
			
		||||
-            m_formater[QString("hddtotgb%1").arg(index)] = Float;
 | 
			
		||||
+            m_formater[QString("hddtotmb%1").arg(index)] = MemMBFormat;
 | 
			
		||||
+            m_formater[QString("hddtotgb%1").arg(index)] = MemGBFormat;
 | 
			
		||||
         }
 | 
			
		||||
     } else if (source.contains(mountFreeRegExp)) {
 | 
			
		||||
         // free space
 | 
			
		||||
@ -15,7 +15,7 @@ set(PROJECT_CONTACT "esalexeev@gmail.com")
 | 
			
		||||
set(PROJECT_LICENSE "GPL3")
 | 
			
		||||
set(PROJECT_VERSION_MAJOR "3")
 | 
			
		||||
set(PROJECT_VERSION_MINOR "1")
 | 
			
		||||
set(PROJECT_VERSION_PATCH "1")
 | 
			
		||||
set(PROJECT_VERSION_PATCH "2")
 | 
			
		||||
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 | 
			
		||||
# append git version if any
 | 
			
		||||
set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")
 | 
			
		||||
 | 
			
		||||
@ -45,6 +45,7 @@ const QStringList getBuildData()
 | 
			
		||||
    metadata.append(QString("    AWEUAPI: %1").arg(AWEUAPI));
 | 
			
		||||
    metadata.append(QString("    AWEWAPI: %1").arg(AWEWAPI));
 | 
			
		||||
    metadata.append(QString("    TIME_KEYS: %1").arg(TIME_KEYS));
 | 
			
		||||
    metadata.append(QString("    STATIC_KEYS: %1").arg(STATIC_KEYS));
 | 
			
		||||
    // cmake properties
 | 
			
		||||
    metadata.append(QString("cmake properties:"));
 | 
			
		||||
    metadata.append(QString("    CMAKE_BUILD_TYPE: %1").arg(CMAKE_BUILD_TYPE));
 | 
			
		||||
@ -67,6 +68,7 @@ const QStringList getBuildData()
 | 
			
		||||
                        .arg(CMAKE_SHARED_LINKER_FLAGS));
 | 
			
		||||
    // components
 | 
			
		||||
    metadata.append(QString("Components data:"));
 | 
			
		||||
    metadata.append(QString("    BUILD_COVERAGE: %1").arg(BUILD_COVERAGE));
 | 
			
		||||
    metadata.append(QString("    BUILD_PLASMOIDS: %1").arg(BUILD_PLASMOIDS));
 | 
			
		||||
    metadata.append(
 | 
			
		||||
        QString("    BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE));
 | 
			
		||||
@ -74,8 +76,16 @@ const QStringList getBuildData()
 | 
			
		||||
        QString("    BUILD_RPM_PACKAGE: %1").arg(BUILD_RPM_PACKAGE));
 | 
			
		||||
    metadata.append(
 | 
			
		||||
        QString("    CLANGFORMAT_EXECUTABLE: %1").arg(CLANGFORMAT_EXECUTABLE));
 | 
			
		||||
    metadata.append(QString("    COVERITY_COMMENT: %1").arg(COVERITY_COMMENT));
 | 
			
		||||
    metadata.append(
 | 
			
		||||
        QString("    COVERITY_DIRECTORY: %1").arg(COVERITY_DIRECTORY));
 | 
			
		||||
    metadata.append(QString("    COVERITY_EMAIL: %1").arg(COVERITY_EMAIL));
 | 
			
		||||
    metadata.append(
 | 
			
		||||
        QString("    COVERITY_EXECUTABLE: %1").arg(COVERITY_EXECUTABLE));
 | 
			
		||||
    metadata.append(QString("    COVERITY_URL: %1").arg(COVERITY_URL));
 | 
			
		||||
    metadata.append(
 | 
			
		||||
        QString("    CPPCHECK_EXECUTABLE: %1").arg(CPPCHECK_EXECUTABLE));
 | 
			
		||||
    // additional functions
 | 
			
		||||
    metadata.append(QString("    PROP_FUTURE: %1").arg(PROP_FUTURE));
 | 
			
		||||
    metadata.append(QString("    PROP_TEST: %1").arg(PROP_TEST));
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,6 @@ set(COVERITY_EMAIL "" CACHE STRING "Coverity user email")
 | 
			
		||||
set(COVERITY_EXECUTABLE "cov-build" CACHE STRING "Path to coverity build tool")
 | 
			
		||||
set(COVERITY_TOKEN "" CACHE STRING "Coverity token")
 | 
			
		||||
set(COVERITY_URL "https://scan.coverity.com/builds?project=Awesome+Widgets" CACHE STRING "Coverity project url")
 | 
			
		||||
set(CURL_EXECUTABLE "/usr/bin/curl" CACHE STRING "Path to curl executable")
 | 
			
		||||
 | 
			
		||||
add_custom_target(
 | 
			
		||||
        coverity
 | 
			
		||||
@ -19,7 +18,7 @@ add_custom_target(
 | 
			
		||||
 | 
			
		||||
add_custom_target(
 | 
			
		||||
        coverity-upload
 | 
			
		||||
        COMMAND ${CURL_EXECUTABLE}
 | 
			
		||||
        COMMAND curl
 | 
			
		||||
        --form token=${COVERITY_TOKEN}
 | 
			
		||||
        --form email=${COVERITY_EMAIL}
 | 
			
		||||
        --form file=@${PROJECT_NAME}.zip
 | 
			
		||||
 | 
			
		||||
@ -7,16 +7,16 @@ msgstr ""
 | 
			
		||||
"Project-Id-Version: \n"
 | 
			
		||||
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
 | 
			
		||||
"POT-Creation-Date: 2016-04-29 12:21+0300\n"
 | 
			
		||||
"PO-Revision-Date: 2015-09-27 12:37+0300\n"
 | 
			
		||||
"PO-Revision-Date: 2016-05-05 17:18+0300\n"
 | 
			
		||||
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 | 
			
		||||
"Language-Team: Ukrainian <kde-russian@lists.kde.ru>\n"
 | 
			
		||||
"Language: ua\n"
 | 
			
		||||
"Language: uk\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 2.0\n"
 | 
			
		||||
"X-Generator: Poedit 1.8.7.1\n"
 | 
			
		||||
 | 
			
		||||
msgid "Widget"
 | 
			
		||||
msgstr "Віджет"
 | 
			
		||||
@ -42,7 +42,6 @@ msgstr "Подяка"
 | 
			
		||||
msgid "Enable background"
 | 
			
		||||
msgstr "Включити фон"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Translate strings"
 | 
			
		||||
msgstr "Перекладати рядки"
 | 
			
		||||
 | 
			
		||||
@ -55,12 +54,11 @@ msgstr "Включити перенос слів"
 | 
			
		||||
msgid "Enable notifications"
 | 
			
		||||
msgstr "Включити повідомлення"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Check updates on startup"
 | 
			
		||||
msgstr "Перевіряти оновлення при запуску"
 | 
			
		||||
 | 
			
		||||
msgid "Optimize subscription"
 | 
			
		||||
msgstr ""
 | 
			
		||||
msgstr "Оптимізувати підписку"
 | 
			
		||||
 | 
			
		||||
msgid "Widget height, px"
 | 
			
		||||
msgstr "Висота віджету, пікселі"
 | 
			
		||||
@ -113,43 +111,38 @@ msgstr "AC відключений"
 | 
			
		||||
msgid "Drop key cache"
 | 
			
		||||
msgstr "Скинути кеш ключів"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Export configuration"
 | 
			
		||||
msgstr "Налаштування"
 | 
			
		||||
msgstr "Експорт налаштувань"
 | 
			
		||||
 | 
			
		||||
msgid "Export"
 | 
			
		||||
msgstr ""
 | 
			
		||||
msgstr "Експорт"
 | 
			
		||||
 | 
			
		||||
msgid "Success"
 | 
			
		||||
msgstr ""
 | 
			
		||||
msgstr "Успішно"
 | 
			
		||||
 | 
			
		||||
msgid "Please note that binary files were not copied"
 | 
			
		||||
msgstr ""
 | 
			
		||||
msgstr "Будь ласка, зверніть увагу, що бінарні файли не були скопійовані"
 | 
			
		||||
 | 
			
		||||
msgid "Ooops..."
 | 
			
		||||
msgstr ""
 | 
			
		||||
msgstr "Ууупс..."
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Could not save configuration file"
 | 
			
		||||
msgstr "Налаштування"
 | 
			
		||||
msgstr "Не можу зберегти файл налаштувань"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Import configuration"
 | 
			
		||||
msgstr "Налаштування"
 | 
			
		||||
msgstr "Імпорт налаштувань"
 | 
			
		||||
 | 
			
		||||
msgid "Import"
 | 
			
		||||
msgstr ""
 | 
			
		||||
msgstr "Імпорт"
 | 
			
		||||
 | 
			
		||||
msgid "Import plasmoid settings"
 | 
			
		||||
msgstr ""
 | 
			
		||||
msgstr "Імпорт налаштувань плазмоїда"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Import extensions"
 | 
			
		||||
msgstr "Розширення"
 | 
			
		||||
msgstr "Імпорт розширень"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Import additional files"
 | 
			
		||||
msgstr "Додаткові фільтри"
 | 
			
		||||
msgstr "Імпорт додаткових файлів"
 | 
			
		||||
 | 
			
		||||
msgid "Font"
 | 
			
		||||
msgstr "Шрифт"
 | 
			
		||||
@ -190,9 +183,8 @@ msgstr "Оберіть колір"
 | 
			
		||||
msgid "Select a font"
 | 
			
		||||
msgstr "Оберіть шрифт"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "ACPI"
 | 
			
		||||
msgstr "Шлях до ACPI"
 | 
			
		||||
msgstr "ACPI"
 | 
			
		||||
 | 
			
		||||
msgid "ACPI path"
 | 
			
		||||
msgstr "Шлях до ACPI"
 | 
			
		||||
@ -203,7 +195,6 @@ msgstr "GPU"
 | 
			
		||||
msgid "GPU device"
 | 
			
		||||
msgstr "Пристій GPU"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "HDD temperature"
 | 
			
		||||
msgstr "Температура HDD"
 | 
			
		||||
 | 
			
		||||
@ -255,7 +246,6 @@ msgstr "Редагувати команду"
 | 
			
		||||
msgid "Weather"
 | 
			
		||||
msgstr "Погода"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Edit weather"
 | 
			
		||||
msgstr "Редагувати погоду"
 | 
			
		||||
 | 
			
		||||
@ -280,14 +270,13 @@ msgstr "Показати README"
 | 
			
		||||
msgid "Check updates"
 | 
			
		||||
msgstr "Шукати оновлення"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid ""
 | 
			
		||||
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
 | 
			
		||||
"To enable them just make needed checkbox checked."
 | 
			
		||||
msgstr ""
 | 
			
		||||
"Поля \"CPU\", \"Частота CPU\", \"Пам’ять\", \"Swap\" та \"Мережа\" "
 | 
			
		||||
"підтримують графічні підказки. Щоб їх задіяти, просто зробіть необхідні "
 | 
			
		||||
"чекбокси повністю чекнутими."
 | 
			
		||||
"підтримують графічні підказки. Щоб їх задіяти, просто виділіть необхідні "
 | 
			
		||||
"чекбокси."
 | 
			
		||||
 | 
			
		||||
msgid "Number of values for tooltips"
 | 
			
		||||
msgstr "Кількість значень для підказки"
 | 
			
		||||
@ -295,7 +284,6 @@ msgstr "Кількість значень для підказки"
 | 
			
		||||
msgid "Background"
 | 
			
		||||
msgstr "Фон"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Background color"
 | 
			
		||||
msgstr "Колір фону"
 | 
			
		||||
 | 
			
		||||
@ -305,7 +293,6 @@ msgstr "CPU"
 | 
			
		||||
msgid "CPU color"
 | 
			
		||||
msgstr "Колір CPU"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "CPU clock"
 | 
			
		||||
msgstr "Частота CPU"
 | 
			
		||||
 | 
			
		||||
@ -349,9 +336,8 @@ msgstr ""
 | 
			
		||||
"Детальна інформація може бути знайдена на <a href=\"https://arcanis.me/"
 | 
			
		||||
"projects/awesome-widgets/\">домашній сторінці проекту</a>"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Bgcolor"
 | 
			
		||||
msgstr "Колір CPU"
 | 
			
		||||
msgstr "Колір фону"
 | 
			
		||||
 | 
			
		||||
msgid "AC"
 | 
			
		||||
msgstr "Адаптер живлення"
 | 
			
		||||
@ -362,27 +348,23 @@ msgstr "Бари"
 | 
			
		||||
msgid "Desktops"
 | 
			
		||||
msgstr "Робочі столи"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Scripts"
 | 
			
		||||
msgstr "Скрипти"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Time"
 | 
			
		||||
msgstr "Час"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Quotes"
 | 
			
		||||
msgstr "Котирування"
 | 
			
		||||
 | 
			
		||||
msgid "Upgrades"
 | 
			
		||||
msgstr "Оновлення"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Weathers"
 | 
			
		||||
msgstr "Погода"
 | 
			
		||||
 | 
			
		||||
msgid "Functions"
 | 
			
		||||
msgstr ""
 | 
			
		||||
msgstr "Функції"
 | 
			
		||||
 | 
			
		||||
msgid "Add"
 | 
			
		||||
msgstr "Додати"
 | 
			
		||||
@ -436,7 +418,7 @@ msgid "This software uses: %1"
 | 
			
		||||
msgstr "Ця програма використовує: %1"
 | 
			
		||||
 | 
			
		||||
msgid "Special thanks to %1"
 | 
			
		||||
msgstr ""
 | 
			
		||||
msgstr "Особлива подяка %1"
 | 
			
		||||
 | 
			
		||||
msgid "Select font"
 | 
			
		||||
msgstr "Оберіть шрифт"
 | 
			
		||||
@ -469,12 +451,11 @@ msgid "KB/s"
 | 
			
		||||
msgstr "КБ/с"
 | 
			
		||||
 | 
			
		||||
msgid "Changelog of %1"
 | 
			
		||||
msgstr ""
 | 
			
		||||
msgstr "Список змін %1"
 | 
			
		||||
 | 
			
		||||
msgid "You are using the actual version %1"
 | 
			
		||||
msgstr "Ви використовуєте актуальну версію %1"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "No new version found"
 | 
			
		||||
msgstr "Оновлень не знайдено"
 | 
			
		||||
 | 
			
		||||
@ -511,7 +492,6 @@ msgstr "Ім’я: %1"
 | 
			
		||||
msgid "Comment: %1"
 | 
			
		||||
msgstr "Коментар: %1"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Identity: %1"
 | 
			
		||||
msgstr "Ідентифікатор: %1"
 | 
			
		||||
 | 
			
		||||
@ -535,19 +515,15 @@ msgstr ""
 | 
			
		||||
"style=\" text-decoration: underline; color:#0057ae;\">http://finance.yahoo."
 | 
			
		||||
"com/</span></a></p></body></html>"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Ticker"
 | 
			
		||||
msgstr "Тікер: %1"
 | 
			
		||||
msgstr "Тікер"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Active"
 | 
			
		||||
msgstr "Активний"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Interval"
 | 
			
		||||
msgstr "Інтервал"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Command"
 | 
			
		||||
msgstr "Команда"
 | 
			
		||||
 | 
			
		||||
@ -560,7 +536,6 @@ msgstr "Перенаправлення"
 | 
			
		||||
msgid "Additional filters"
 | 
			
		||||
msgstr "Додаткові фільтри"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Wrap colors"
 | 
			
		||||
msgstr "Обробити кольори"
 | 
			
		||||
 | 
			
		||||
@ -579,41 +554,35 @@ msgstr "Місто"
 | 
			
		||||
msgid "Country"
 | 
			
		||||
msgstr "Країна"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Timestamp"
 | 
			
		||||
msgstr "Відмітка часу"
 | 
			
		||||
 | 
			
		||||
msgid "Use images"
 | 
			
		||||
msgstr "Використовувати зображення"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Use custom formula"
 | 
			
		||||
msgstr "Свій формат часу"
 | 
			
		||||
msgstr "Використовувати свою формулу"
 | 
			
		||||
 | 
			
		||||
msgid "Value"
 | 
			
		||||
msgstr "Значення"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Max value"
 | 
			
		||||
msgstr "Показати значення"
 | 
			
		||||
msgstr "Максимальне значення"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Min value"
 | 
			
		||||
msgstr "Показати значення"
 | 
			
		||||
msgstr "Мінімальне значення"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Active filling type"
 | 
			
		||||
msgstr "Активний"
 | 
			
		||||
msgstr "Тип активного заповнення"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "Inctive filling type"
 | 
			
		||||
msgstr "Неактивний робочий стіл"
 | 
			
		||||
msgstr "Тип неактивного заповнення"
 | 
			
		||||
 | 
			
		||||
msgid "Type"
 | 
			
		||||
msgstr "Тип"
 | 
			
		||||
 | 
			
		||||
msgid "Points count"
 | 
			
		||||
msgstr ""
 | 
			
		||||
msgstr "Кількість точок"
 | 
			
		||||
 | 
			
		||||
msgid "Direction"
 | 
			
		||||
msgstr "Напрямок"
 | 
			
		||||
@ -624,13 +593,11 @@ msgstr "Висота"
 | 
			
		||||
msgid "Width"
 | 
			
		||||
msgstr "Ширина"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "color"
 | 
			
		||||
msgstr "Колір CPU"
 | 
			
		||||
msgstr "колір"
 | 
			
		||||
 | 
			
		||||
#, fuzzy
 | 
			
		||||
msgid "image"
 | 
			
		||||
msgstr "Використовувати зображення"
 | 
			
		||||
msgstr "зображення"
 | 
			
		||||
 | 
			
		||||
msgid "Active desktop"
 | 
			
		||||
msgstr "Активний робочий стіл"
 | 
			
		||||
 | 
			
		||||
@ -78,10 +78,16 @@
 | 
			
		||||
#define CMAKE_MODULE_LINKER_FLAGS "@CMAKE_MODULE_LINKER_FLAGS@"
 | 
			
		||||
#define CMAKE_SHARED_LINKER_FLAGS "@CMAKE_SHARED_LINKER_FLAGS@"
 | 
			
		||||
// components
 | 
			
		||||
#define BUILD_COVERAGE "@BUILD_COVERAGE@"
 | 
			
		||||
#define BUILD_PLASMOIDS "@BUILD_PLASMOIDS@"
 | 
			
		||||
#define BUILD_DEB_PACKAGE "@BUILD_DEB_PACKAGE@"
 | 
			
		||||
#define BUILD_RPM_PACKAGE "@BUILD_RPM_PACKAGE@"
 | 
			
		||||
#define CLANGFORMAT_EXECUTABLE "@CLANGFORMAT_EXECUTABLE@"
 | 
			
		||||
#define COVERITY_COMMENT "@COVERITY_COMMENT@"
 | 
			
		||||
#define COVERITY_DIRECTORY "@COVERITY_DIRECTORY@"
 | 
			
		||||
#define COVERITY_EMAIL "@COVERITY_EMAIL@"
 | 
			
		||||
#define COVERITY_EXECUTABLE "@COVERITY_EXECUTABLE@"
 | 
			
		||||
#define COVERITY_URL "@COVERITY_URL@"
 | 
			
		||||
#define CPPCHECK_EXECUTABLE "@CPPCHECK_EXECUTABLE@"
 | 
			
		||||
// additional functions
 | 
			
		||||
#define PROP_FUTURE "@BUILD_FUTURE@"
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user