Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libksysguard5 for openSUSE:Factory checked in at 2021-03-19 16:42:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksysguard5 (Old) and /work/SRC/openSUSE:Factory/.libksysguard5.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksysguard5" Fri Mar 19 16:42:09 2021 rev:121 rq:879922 version:5.21.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libksysguard5/libksysguard5.changes 2021-03-10 08:52:48.270613339 +0100 +++ /work/SRC/openSUSE:Factory/.libksysguard5.new.2401/libksysguard5.changes 2021-03-19 16:42:11.138035410 +0100 @@ -1,0 +2,16 @@ +Tue Mar 16 13:55:25 UTC 2021 - Fabian Vogt <[email protected]> + +- Update to 5.21.3.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.21.3 +- Changes since 5.21.2: + * SensorFaceController: Save on destruction if the face requests it (kde#433768,kde#433536,kde#434005) + * Avoid emitting configurationChanged during save (kde#422672) + * SensorDataModel: Do not insert columns that are out of range (kde#433064) + * Properly initialize the parent widget to nullptr in ProcessController (kde#434074) + * Also emit showTitleChanged when reloading the config (kde#433954) + * Fix build + * Move CGroup pid fetching callback to the controller (kde#430615) + +------------------------------------------------------------------- Old: ---- libksysguard-5.21.2.tar.xz libksysguard-5.21.2.tar.xz.sig New: ---- libksysguard-5.21.3.1.tar.xz libksysguard-5.21.3.1.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksysguard5.spec ++++++ --- /var/tmp/diff_new_pack.4aAH5D/_old 2021-03-19 16:42:11.754036241 +0100 +++ /var/tmp/diff_new_pack.4aAH5D/_new 2021-03-19 16:42:11.758036247 +0100 @@ -18,15 +18,15 @@ %bcond_without lang Name: libksysguard5 -Version: 5.21.2 +Version: 5.21.3.1 Release: 0 Summary: Task management and system monitoring library License: GPL-2.0-or-later Group: Development/Libraries/C and C++ URL: http://www.kde.org -Source: libksysguard-%{version}.tar.xz +Source: https://download.kde.org/stable/plasma/5.21.3/libksysguard-%{version}.tar.xz %if %{with lang} -Source1: libksysguard-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/plasma/5.21.3/libksysguard-%{version}.tar.xz.sig Source2: plasma.keyring %endif BuildRequires: extra-cmake-modules >= 1.2.0 ++++++ libksysguard-5.21.2.tar.xz -> libksysguard-5.21.3.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/CMakeLists.txt new/libksysguard-5.21.3.1/CMakeLists.txt --- old/libksysguard-5.21.2/CMakeLists.txt 2021-03-02 14:03:54.000000000 +0100 +++ new/libksysguard-5.21.3.1/CMakeLists.txt 2021-03-16 15:16:03.000000000 +0100 @@ -2,7 +2,7 @@ project(libksysguard) -set(PROJECT_VERSION "5.21.2") +set(PROJECT_VERSION "5.21.3") set(PROJECT_VERSION_MAJOR 5) # check with non-Plasma consumers (e.g. KDevelop) before bumping these versions to make sure the KDE CI does not break diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/faces/ConfigSensors.qml new/libksysguard-5.21.3.1/faces/ConfigSensors.qml --- old/libksysguard-5.21.2/faces/ConfigSensors.qml 2021-03-02 14:03:21.000000000 +0100 +++ new/libksysguard-5.21.3.1/faces/ConfigSensors.qml 2021-03-16 15:15:31.000000000 +0100 @@ -44,8 +44,7 @@ property var cfg_totalSensors: [] property var cfg_highPrioritySensorIds: [] - property var cfg_sensorColors: {} - + property var cfg_sensorColors: new Object() property var cfg_lowPrioritySensorIds: [] onCfg_totalSensorsChanged: configurationChanged(); @@ -55,7 +54,17 @@ property Faces.SensorFaceController controller - function saveConfig() { + // In QML someArray = someOtherArray will always trigger a changed signal + // even if the two arrays are the same + // to avoid that we implement an explicit check + function arrayCompare(array1, array2) { + if (array1.length !== array2.length) { + return false; + } + return array1.every(function(value, index) { return value === array2[index]}); + } + + function saveConfig() { controller.totalSensors = cfg_totalSensors; controller.highPrioritySensorIds = cfg_highPrioritySensorIds; controller.sensorColors = cfg_sensorColors; @@ -63,16 +72,24 @@ } function loadConfig() { - cfg_totalSensors = controller.totalSensors; - totalChoice.selected = controller.totalSensors; + if (!arrayCompare(cfg_totalSensors, controller.totalSensors)) { + cfg_totalSensors = controller.totalSensors; + totalChoice.selected = controller.totalSensors; + } - cfg_highPrioritySensorIds = controller.highPrioritySensorIds; - highPriorityChoice.selected = controller.highPrioritySensorIds; + if (!arrayCompare(cfg_highPrioritySensorIds, controller.highPrioritySensorIds)) { + cfg_highPrioritySensorIds = controller.highPrioritySensorIds; + highPriorityChoice.selected = controller.highPrioritySensorIds; + } - cfg_sensorColors = controller.sensorColors; + if(JSON.stringify(cfg_sensorColors) != JSON.stringify(controller.sensorColors)) { + cfg_sensorColors = controller.sensorColors; + } - cfg_lowPrioritySensorIds = controller.lowPrioritySensorIds; - lowPriorityChoice.selected = controller.lowPrioritySensorIds; + if (!arrayCompare(cfg_lowPrioritySensorIds, controller.lowPrioritySensorIds)) { + cfg_lowPrioritySensorIds = controller.lowPrioritySensorIds; + lowPriorityChoice.selected = controller.lowPrioritySensorIds; + } } // When the ui is open in systemsettings and the page is switched around, @@ -108,7 +125,7 @@ currentColor: destinationSensor != "" ? controller.sensorColors[destinationSensor] : "" onAccepted: { - cfg_sensorColors[destinationSensor] = color + cfg_sensorColors[destinationSensor] = color; root.cfg_sensorColorsChanged(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/faces/SensorFaceController.cpp new/libksysguard-5.21.3.1/faces/SensorFaceController.cpp --- old/libksysguard-5.21.2/faces/SensorFaceController.cpp 2021-03-02 14:03:21.000000000 +0100 +++ new/libksysguard-5.21.3.1/faces/SensorFaceController.cpp 2021-03-16 15:15:31.000000000 +0100 @@ -386,7 +386,8 @@ SensorFaceController::~SensorFaceController() { - if (!d->shouldSync) { + auto forceSave = d->faceProperties.readEntry(QStringLiteral("ForceSaveOnDestroy"), false); + if (!d->shouldSync && !forceSave) { // If we should not sync automatically, clear all changes before we // destroy the config objects, otherwise they will be written during // destruction. @@ -776,8 +777,9 @@ //Force to re-read all the values setFaceId(d->appearanceGroup.readEntry("chartFace", QStringLiteral("org.kde.ksysguard.textonly"))); - titleChanged(); - sensorColorsChanged(); + Q_EMIT titleChanged(); + Q_EMIT sensorColorsChanged(); + Q_EMIT showTitleChanged(); } void SensorFaceController::loadPreset(const QString &preset) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/ca/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/ca/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/ca/KSysGuardSensorFaces.po 2021-03-02 14:03:26.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/ca/KSysGuardSensorFaces.po 2021-03-16 15:15:36.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-06 11:45+0100\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" @@ -72,19 +72,19 @@ msgid "Get New Display Styles..." msgstr "Obt??n estils de vista nous..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "Sensor total" msgstr[1] "Sensors totals" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Sensors" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Sensors de nom??s text" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/ca@valencia/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/ca@valencia/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/ca@valencia/KSysGuardSensorFaces.po 2021-03-02 14:03:26.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/ca@valencia/KSysGuardSensorFaces.po 2021-03-16 15:15:36.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2020-07-30 13:01+0100\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" @@ -73,19 +73,19 @@ msgid "Get New Display Styles..." msgstr "Obt??n estils de vista nous..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "Sensor total" msgstr[1] "Sensors totals" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Sensors" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Sensors de nom??s text" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/cs/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/cs/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/cs/KSysGuardSensorFaces.po 2021-03-02 14:03:27.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/cs/KSysGuardSensorFaces.po 2021-03-16 15:15:37.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2020-09-02 13:41+0200\n" "Last-Translator: Vit Pelcak <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" @@ -68,7 +68,7 @@ msgid "Get New Display Styles..." msgstr "Z??skat nov?? styly zobrazen??..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" @@ -76,12 +76,12 @@ msgstr[1] "" msgstr[2] "" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Senzory" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Pouze textov?? senzory" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/en_GB/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/en_GB/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/en_GB/KSysGuardSensorFaces.po 2021-03-02 14:03:28.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/en_GB/KSysGuardSensorFaces.po 2021-03-16 15:15:39.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-10 12:29+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" "Language-Team: British English <[email protected]>\n" @@ -68,19 +68,19 @@ msgid "Get New Display Styles..." msgstr "Get New Display Styles..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "Total Sensor" msgstr[1] "Total Sensors" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Sensors" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Text-Only Sensors" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/es/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/es/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/es/KSysGuardSensorFaces.po 2021-03-02 14:03:29.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/es/KSysGuardSensorFaces.po 2021-03-16 15:15:39.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: KSysGuardSensorFaces\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-06 12:44+0100\n" "Last-Translator: Eloy Cuadra <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" @@ -70,19 +70,19 @@ msgid "Get New Display Styles..." msgstr "Obtener nuevos estilos de visor..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "Sensor total" msgstr[1] "Sensores totales" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Sensores" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Sensores de texto" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/et/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/et/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/et/KSysGuardSensorFaces.po 2021-03-02 14:03:30.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/et/KSysGuardSensorFaces.po 2021-03-16 15:15:39.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2020-09-28 13:31+0200\n" "Last-Translator: Mihkel T??nnov <[email protected]>\n" "Language-Team: Estonian <>\n" @@ -70,7 +70,7 @@ msgid "Get New Display Styles..." msgstr "Hangi uusi esitusstiile ..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, fuzzy, kde-format #| msgid "Total Sensor:" msgid "Total Sensor" @@ -78,12 +78,12 @@ msgstr[0] "??ldsensor" msgstr[1] "??ldsensorid" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Sensorid" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Tekstisensorid" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/eu/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/eu/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/eu/KSysGuardSensorFaces.po 2021-03-02 14:03:30.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/eu/KSysGuardSensorFaces.po 2021-03-16 15:15:39.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2020-10-31 12:27+0100\n" "Last-Translator: I??igo Salvador Azurmendi <[email protected]>\n" "Language-Team: Basque\n" @@ -71,19 +71,19 @@ msgid "Get New Display Styles..." msgstr "Lortu azaltzeko estilo berriak..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "Guztizkoen sentsorea" msgstr[1] "Guztizkoen sentsoreak" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Sentsoreak" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Testu-soileko sentsoreak" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/fi/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/fi/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/fi/KSysGuardSensorFaces.po 2021-03-02 14:03:30.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/fi/KSysGuardSensorFaces.po 2021-03-16 15:15:40.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-04 16:48+0200\n" "Last-Translator: Tommi Nieminen <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" @@ -68,7 +68,7 @@ msgid "Get New Display Styles..." msgstr "Hae uusia n??ytt??tyylej?????" -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, fuzzy, kde-format #| msgid "All Sensors" msgid "Total Sensor" @@ -76,12 +76,12 @@ msgstr[0] "Kaikki anturit" msgstr[1] "Kaikki anturit" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Anturit" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Vain teksti -anturit" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/fr/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/fr/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/fr/KSysGuardSensorFaces.po 2021-03-02 14:03:31.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/fr/KSysGuardSensorFaces.po 2021-03-16 15:15:40.000000000 +0100 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-07 23:05+0100\n" "Last-Translator: Xavier Besnard <[email protected]>\n" "Language-Team: French <[email protected]>\n" @@ -65,19 +65,19 @@ msgid "Get New Display Styles..." msgstr "Obtenir de nouveaux styles d'affichage..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "Totalit?? des senseurs" msgstr[1] "Totalit?? des senseurs" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Senseurs" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Senseurs de texte uniquement" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/it/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/it/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/it/KSysGuardSensorFaces.po 2021-03-02 14:03:37.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/it/KSysGuardSensorFaces.po 2021-03-16 15:15:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-07 01:16+0100\n" "Last-Translator: Vincenzo Reale <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" @@ -68,19 +68,19 @@ msgid "Get New Display Styles..." msgstr "Ottieni nuovi stili di visualizzazione..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "Sensore totale" msgstr[1] "Sensori totali" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Sensori" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Sensori di solo testo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/ko/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/ko/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/ko/KSysGuardSensorFaces.po 2021-03-02 14:03:39.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/ko/KSysGuardSensorFaces.po 2021-03-16 15:15:47.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2020-09-06 01:18+0200\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" @@ -69,18 +69,18 @@ msgid "Get New Display Styles..." msgstr "??? ?????? ????????? ????????????..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "??? ??????" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "??????" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "???????????? ???????????? ??????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/lt/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/lt/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/lt/KSysGuardSensorFaces.po 2021-03-02 14:03:40.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/lt/KSysGuardSensorFaces.po 2021-03-16 15:15:48.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2020-10-14 02:29+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -69,7 +69,7 @@ msgid "Get New Display Styles..." msgstr "" -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" @@ -77,12 +77,12 @@ msgstr[1] "" msgstr[2] "" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/nl/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/nl/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/nl/KSysGuardSensorFaces.po 2021-03-02 14:03:43.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/nl/KSysGuardSensorFaces.po 2021-03-16 15:15:51.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-06 13:26+0100\n" "Last-Translator: Freek de Kruijf <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" @@ -68,19 +68,19 @@ msgid "Get New Display Styles..." msgstr "Nieuwe weergavestijlen ophalen..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "Totaal van sensor" msgstr[1] "Totaal van sensoren" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Sensoren" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Alleen-tekst sensoren" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/nn/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/nn/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/nn/KSysGuardSensorFaces.po 2021-03-02 14:03:43.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/nn/KSysGuardSensorFaces.po 2021-03-16 15:15:51.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-08 21:37+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" @@ -70,19 +70,19 @@ msgid "Get New Display Styles..." msgstr "Hent nye visingsstilar?????" -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "Totalsensor" msgstr[1] "Totalsensorar" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Sensorar" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Tekstsensorar" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/pl/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/pl/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/pl/KSysGuardSensorFaces.po 2021-03-02 14:03:44.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/pl/KSysGuardSensorFaces.po 2021-03-16 15:15:53.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-16 11:39+0100\n" "Last-Translator: ??ukasz Wojni??owicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" @@ -69,7 +69,7 @@ msgid "Get New Display Styles..." msgstr "Pobierz nowe wygl??dy..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" @@ -77,12 +77,12 @@ msgstr[1] "Razem miernik??w" msgstr[2] "Razem miernik??w" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Mierniki" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Tylko mierniki tekstowe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/pl/processui.po new/libksysguard-5.21.3.1/po/pl/processui.po --- old/libksysguard-5.21.2/po/pl/processui.po 2021-03-02 14:03:44.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/pl/processui.po 2021-03-16 15:15:53.000000000 +0100 @@ -5,13 +5,13 @@ # # Marta Rybczy??ska <[email protected]>, 2007, 2008, 2009. # Marta Rybczynska <[email protected]>, 2010. -# ??ukasz Wojni??owicz <[email protected]>, 2011, 2014, 2015, 2017, 2018, 2019. +# ??ukasz Wojni??owicz <[email protected]>, 2011, 2014, 2015, 2017, 2018, 2019, 2021. msgid "" msgstr "" "Project-Id-Version: processui\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-11-08 02:33+0100\n" -"PO-Revision-Date: 2019-12-02 10:12+0100\n" +"PO-Revision-Date: 2021-03-07 08:06+0100\n" "Last-Translator: ??ukasz Wojni??owicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -20,7 +20,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 19.07.70\n" +"X-Generator: Lokalize 20.12.1\n" #: ksysguardprocesslist.cpp:208 ksysguardprocesslist.cpp:536 #, kde-format @@ -346,7 +346,7 @@ #: ProcessModel.cpp:70 #, kde-format msgid "%1 K" -msgstr "%1 k" +msgstr "%1 K" #: ProcessModel.cpp:71 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/pt/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/pt/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/pt/KSysGuardSensorFaces.po 2021-03-02 14:03:45.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/pt/KSysGuardSensorFaces.po 2021-03-16 15:15:54.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-07 10:39+0000\n" "Last-Translator: Jos?? Nuno Coelho Pires <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" @@ -64,19 +64,19 @@ msgid "Get New Display Styles..." msgstr "Obter Novos Estilos de Apresenta????o..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "Total do Sensor" msgstr[1] "Total dos Sensores" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Sensores" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Sensores Apenas de Texto" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/pt_BR/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/pt_BR/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/pt_BR/KSysGuardSensorFaces.po 2021-03-02 14:03:45.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/pt_BR/KSysGuardSensorFaces.po 2021-03-16 15:15:54.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-02-01 16:00-0300\n" "Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" "Language-Team: Brazilian Portuguese <[email protected]>\n" @@ -68,19 +68,19 @@ msgid "Get New Display Styles..." msgstr "Baixar novos estilos de exibi????o..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "Sensor total" msgstr[1] "Sensores totais" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Sensores" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Sensores apenas texto" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/ro/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/ro/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/ro/KSysGuardSensorFaces.po 2021-03-02 14:03:45.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/ro/KSysGuardSensorFaces.po 2021-03-16 15:15:54.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2020-11-12 23:35+0000\n" "Last-Translator: Sergiu Bivol <[email protected]>\n" "Language-Team: Romanian\n" @@ -69,7 +69,7 @@ msgid "Get New Display Styles..." msgstr "Ob??ine stiluri de afi??are noi..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" @@ -77,12 +77,12 @@ msgstr[1] "Total senzori" msgstr[2] "Total senzori" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Senzori" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/ru/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/ru/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/ru/KSysGuardSensorFaces.po 2021-03-02 14:03:45.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/ru/KSysGuardSensorFaces.po 2021-03-16 15:15:55.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-02-08 09:38+0300\n" "Last-Translator: Alexander Yavorsky <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" @@ -70,7 +70,7 @@ msgid "Get New Display Styles..." msgstr "?????????????????? ?????????????? ??????????????????????..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" @@ -79,12 +79,12 @@ msgstr[2] "" msgstr[3] "" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "??????????????" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/sk/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/sk/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/sk/KSysGuardSensorFaces.po 2021-03-02 14:03:46.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/sk/KSysGuardSensorFaces.po 2021-03-16 15:15:56.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: KSysGuardSensorFaces\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2020-08-11 08:38+0200\n" "Last-Translator: Matej Mrenica <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" @@ -68,7 +68,7 @@ msgid "Get New Display Styles..." msgstr "Z??ska?? nov?? ??t??ly zobrazenia..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, fuzzy, kde-format #| msgid "Total Sensor:" msgid "Total Sensor" @@ -77,12 +77,12 @@ msgstr[1] "Celkov?? senzor:" msgstr[2] "Celkov?? senzor:" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Senzory" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Iba textov?? senzory" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/sl/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/sl/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/sl/KSysGuardSensorFaces.po 2021-03-02 14:03:46.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/sl/KSysGuardSensorFaces.po 2021-03-16 15:15:56.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-08 15:11+0100\n" "Last-Translator: Matja?? Jeran <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" @@ -69,7 +69,7 @@ msgid "Get New Display Styles..." msgstr "Dobi nove sloge prikaza..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" @@ -78,12 +78,12 @@ msgstr[2] "Totalni senzorji" msgstr[3] "Totalni senzorji" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Senzorji" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Senzorji samo kot besedilo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/sv/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/sv/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/sv/KSysGuardSensorFaces.po 2021-03-02 14:03:48.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/sv/KSysGuardSensorFaces.po 2021-03-16 15:15:57.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksysguard\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-06 12:18+0100\n" "Last-Translator: Stefan Asserh??ll <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" @@ -68,19 +68,19 @@ msgid "Get New Display Styles..." msgstr "H??mta nya visningsstilar..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "Totalsensor" msgstr[1] "Totalsensorer" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "Sensorer" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "Textsensorer" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/uk/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/uk/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/uk/KSysGuardSensorFaces.po 2021-03-02 14:03:50.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/uk/KSysGuardSensorFaces.po 2021-03-16 15:16:00.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: KSysGuardSensorFaces\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" "PO-Revision-Date: 2021-01-06 09:01+0200\n" "Last-Translator: Yuri Chornoivan <[email protected]>\n" "Language-Team: Ukrainian <[email protected]>\n" @@ -71,7 +71,7 @@ msgid "Get New Display Styles..." msgstr "???????????????? ???????? ?????????? ???????????????" -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" @@ -80,12 +80,12 @@ msgstr[2] "???????????????? ??????????????" msgstr[3] "?????????????????? ????????????" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "??????????????" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "???????? ???????????????? ??????????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/zh_CN/KSysGuardSensorFaces.po new/libksysguard-5.21.3.1/po/zh_CN/KSysGuardSensorFaces.po --- old/libksysguard-5.21.2/po/zh_CN/KSysGuardSensorFaces.po 2021-03-02 14:03:52.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/zh_CN/KSysGuardSensorFaces.po 2021-03-16 15:16:01.000000000 +0100 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-02-27 08:18+0100\n" -"PO-Revision-Date: 2021-02-04 12:00\n" +"POT-Creation-Date: 2021-03-12 09:07+0100\n" +"PO-Revision-Date: 2021-03-14 15:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -68,18 +68,18 @@ msgid "Get New Display Styles..." msgstr "?????????????????????..." -#: ConfigSensors.qml:118 +#: ConfigSensors.qml:135 #, kde-format msgid "Total Sensor" msgid_plural "Total Sensors" msgstr[0] "???????????????" -#: ConfigSensors.qml:132 +#: ConfigSensors.qml:149 #, kde-format msgid "Sensors" msgstr "?????????" -#: ConfigSensors.qml:153 +#: ConfigSensors.qml:170 #, kde-format msgid "Text-Only Sensors" msgstr "??????????????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/zh_CN/ksgrd.po new/libksysguard-5.21.3.1/po/zh_CN/ksgrd.po --- old/libksysguard-5.21.2/po/zh_CN/ksgrd.po 2021-03-02 14:03:51.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/zh_CN/ksgrd.po 2021-03-16 15:16:01.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-10-24 02:30+0200\n" -"PO-Revision-Date: 2021-02-04 12:00\n" +"PO-Revision-Date: 2021-03-14 15:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/zh_CN/ksysguard_face_org.kde.ksysguard.barchart.po new/libksysguard-5.21.3.1/po/zh_CN/ksysguard_face_org.kde.ksysguard.barchart.po --- old/libksysguard-5.21.2/po/zh_CN/ksysguard_face_org.kde.ksysguard.barchart.po 2021-03-02 14:03:52.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/zh_CN/ksysguard_face_org.kde.ksysguard.barchart.po 2021-03-16 15:16:01.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-07-25 02:21+0200\n" -"PO-Revision-Date: 2021-02-04 12:00\n" +"PO-Revision-Date: 2021-03-14 15:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/zh_CN/ksysguard_face_org.kde.ksysguard.linechart.po new/libksysguard-5.21.3.1/po/zh_CN/ksysguard_face_org.kde.ksysguard.linechart.po --- old/libksysguard-5.21.2/po/zh_CN/ksysguard_face_org.kde.ksysguard.linechart.po 2021-03-02 14:03:52.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/zh_CN/ksysguard_face_org.kde.ksysguard.linechart.po 2021-03-16 15:16:01.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-06 03:01+0100\n" -"PO-Revision-Date: 2021-02-04 12:00\n" +"PO-Revision-Date: 2021-03-14 15:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/zh_CN/ksysguard_face_org.kde.ksysguard.piechart.po new/libksysguard-5.21.3.1/po/zh_CN/ksysguard_face_org.kde.ksysguard.piechart.po --- old/libksysguard-5.21.2/po/zh_CN/ksysguard_face_org.kde.ksysguard.piechart.po 2021-03-02 14:03:51.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/zh_CN/ksysguard_face_org.kde.ksysguard.piechart.po 2021-03-16 15:16:01.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-02-27 08:18+0100\n" -"PO-Revision-Date: 2021-02-04 12:00\n" +"PO-Revision-Date: 2021-03-14 15:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/zh_CN/ksysguard_face_org.kde.ksysguard.textonly.po new/libksysguard-5.21.3.1/po/zh_CN/ksysguard_face_org.kde.ksysguard.textonly.po --- old/libksysguard-5.21.2/po/zh_CN/ksysguard_face_org.kde.ksysguard.textonly.po 2021-03-02 14:03:51.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/zh_CN/ksysguard_face_org.kde.ksysguard.textonly.po 2021-03-16 15:16:01.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-07-30 02:25+0200\n" -"PO-Revision-Date: 2021-02-04 12:00\n" +"PO-Revision-Date: 2021-03-14 15:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/zh_CN/ksysguardlsofwidgets.po new/libksysguard-5.21.3.1/po/zh_CN/ksysguardlsofwidgets.po --- old/libksysguard-5.21.2/po/zh_CN/ksysguardlsofwidgets.po 2021-03-02 14:03:52.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/zh_CN/ksysguardlsofwidgets.po 2021-03-16 15:16:01.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-10-24 02:30+0200\n" -"PO-Revision-Date: 2021-02-04 12:00\n" +"PO-Revision-Date: 2021-03-14 15:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/zh_CN/processcore.po new/libksysguard-5.21.3.1/po/zh_CN/processcore.po --- old/libksysguard-5.21.2/po/zh_CN/processcore.po 2021-03-02 14:03:52.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/zh_CN/processcore.po 2021-03-16 15:16:01.000000000 +0100 @@ -5,7 +5,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-02-18 10:31+0100\n" -"PO-Revision-Date: 2021-02-04 12:00\n" +"PO-Revision-Date: 2021-03-14 15:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/po/zh_CN/processui.po new/libksysguard-5.21.3.1/po/zh_CN/processui.po --- old/libksysguard-5.21.2/po/zh_CN/processui.po 2021-03-02 14:03:52.000000000 +0100 +++ new/libksysguard-5.21.3.1/po/zh_CN/processui.po 2021-03-16 15:16:01.000000000 +0100 @@ -10,7 +10,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-11-08 02:33+0100\n" -"PO-Revision-Date: 2021-02-04 12:00\n" +"PO-Revision-Date: 2021-03-14 15:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/processcore/cgroup.cpp new/libksysguard-5.21.3.1/processcore/cgroup.cpp --- old/libksysguard-5.21.2/processcore/cgroup.cpp 2021-03-02 14:03:21.000000000 +0100 +++ new/libksysguard-5.21.3.1/processcore/cgroup.cpp 2021-03-16 15:15:31.000000000 +0100 @@ -43,7 +43,6 @@ const QString processGroupId; const KService::Ptr service; QVector<pid_t> pids; - std::mutex pidsLock; static KService::Ptr serviceFromAppId(const QString &appId); @@ -51,15 +50,13 @@ static QString unescapeName(const QString &cgroupId); class ReadPidsRunnable; - ReadPidsRunnable *readPids = nullptr; }; class CGroupPrivate::ReadPidsRunnable : public QRunnable { public: - ReadPidsRunnable(CGroupPrivate *cgroup, QPointer<QObject> context, const QString &path, std::function<void()> callback) - : m_cgroupPrivate(cgroup) - , m_context(context) + ReadPidsRunnable(QObject *context, const QString &path, std::function<void(QVector<pid_t>)> callback) + : m_context(context) , m_path(path) , m_callback(callback) { @@ -77,34 +74,16 @@ pids.append(line.toLong()); line = stream.readLine(); } - m_cgroupPrivate->pids = pids; - // Ensure we call the callback on the thread the context object lives on. if (m_context) { - QMetaObject::invokeMethod(m_context, m_callback); + QMetaObject::invokeMethod(m_context, std::bind(m_callback, pids)); } - - std::lock_guard<std::mutex> lock{m_lock}; - m_finished = true; - m_cgroupPrivate->readPids = nullptr; - m_condition.notify_all(); - } - - void wait() - { - std::unique_lock<std::mutex> lock{m_lock}; - m_condition.wait(lock, [this]() { return m_finished; }); } private: - CGroupPrivate *m_cgroupPrivate; QPointer<QObject> m_context; QString m_path; - std::function<void()> m_callback; - - std::mutex m_lock; - std::condition_variable m_condition; - bool m_finished = false; + std::function<void(QVector<pid_t>)> m_callback; }; class CGroupSystemInformation @@ -131,9 +110,6 @@ CGroup::~CGroup() { - if (d->readPids) { - d->readPids->wait(); - } } QString KSysGuard::CGroup::id() const @@ -148,21 +124,19 @@ QVector<pid_t> CGroup::pids() const { - if (d->readPids) { - d->readPids->wait(); - } return d->pids; } -void CGroup::requestPids(QPointer<QObject> context, std::function<void()> callback) +void CGroup::setPids(const QVector<pid_t> &pids) { - if (d->readPids) { - d->readPids->wait(); - } + d->pids = pids; +} +void CGroup::requestPids(QObject *context, std::function<void(QVector<pid_t>)> callback) +{ QString path = cgroupSysBasePath() + d->processGroupId + QLatin1String("/cgroup.procs"); - d->readPids = new CGroupPrivate::ReadPidsRunnable(d.get(), context, path, callback); - QThreadPool::globalInstance()->start(d->readPids); + auto readPidsRunnable = new CGroupPrivate::ReadPidsRunnable(context, path, callback); + QThreadPool::globalInstance()->start(readPidsRunnable); } QString CGroupPrivate::unescapeName(const QString &name) { @@ -187,8 +161,6 @@ return rc; } - - KService::Ptr CGroupPrivate::serviceFromAppId(const QString &processGroup) { const int lastSlash = processGroup.lastIndexOf(QLatin1Char('/')); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/processcore/cgroup.h new/libksysguard-5.21.3.1/processcore/cgroup.h --- old/libksysguard-5.21.2/processcore/cgroup.h 2021-03-02 14:03:21.000000000 +0100 +++ new/libksysguard-5.21.3.1/processcore/cgroup.h 2021-03-16 15:15:31.000000000 +0100 @@ -60,16 +60,23 @@ QVector<pid_t> pids() const; /** + * @internal + */ + void setPids(const QVector<pid_t> &pids); + + /** * Request fetching the list of processes associated with this cgroup. * * This is done in a separate thread. Once it has completed, \p callback is * called with the list of pids of this cgroup. * + * It is the callers responsibility to call setPids in response. + * * \param context An object that is used to track if the caller still exists. * \param callback A callback that gets called once the list of pids has * been retrieved. */ - void requestPids(QPointer<QObject> context, std::function<void()> callback); + void requestPids(QObject *context, std::function<void(QVector<pid_t>)> callback); /** * Returns the base path to exposed cgroup information. Either /sys/fs/cgroup or /sys/fs/cgroup/unified as applicable @@ -85,11 +92,6 @@ */ CGroup(const QString &id); - /** - * Set the list of PIDs of this cgroup object. - */ - void setPids(const QVector<pid_t> &pids); - QScopedPointer<CGroupPrivate> d; friend class CGroupDataModel; friend class CGroupDataModelPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/processcore/cgroup_data_model.cpp new/libksysguard-5.21.3.1/processcore/cgroup_data_model.cpp --- old/libksysguard-5.21.2/processcore/cgroup_data_model.cpp 2021-03-02 14:03:21.000000000 +0100 +++ new/libksysguard-5.21.3.1/processcore/cgroup_data_model.cpp 2021-03-16 15:15:31.000000000 +0100 @@ -429,9 +429,12 @@ // Update our own stat info // This may trigger some dataChanged - node->requestPids(this, [this, node]() { + node->requestPids(this, [this, node](QVector<pid_t> pids) { auto row = d->m_cGroups.indexOf(node); - Q_EMIT dataChanged(index(row, 0, QModelIndex()), index(row, columnCount()-1, QModelIndex())); + if (row >= 0) { + d->m_cGroups[row]->setPids(pids); + Q_EMIT dataChanged(index(row, 0, QModelIndex()), index(row, columnCount()-1, QModelIndex())); + } }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/processcore/process_controller.cpp new/libksysguard-5.21.3.1/processcore/process_controller.cpp --- old/libksysguard-5.21.2/processcore/process_controller.cpp 2021-03-02 14:03:21.000000000 +0100 +++ new/libksysguard-5.21.3.1/processcore/process_controller.cpp 2021-03-16 15:15:31.000000000 +0100 @@ -46,7 +46,7 @@ QVector<int> listToVector(const QList<long long> &list); QVector<int> listToVector(const QVariantList &list); - QWidget *widget; + QWidget *widget = nullptr; }; // Note: This instance is only to have access to the platform-specific code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.21.2/sensors/SensorDataModel.cpp new/libksysguard-5.21.3.1/sensors/SensorDataModel.cpp --- old/libksysguard-5.21.2/sensors/SensorDataModel.cpp 2021-03-02 14:03:21.000000000 +0100 +++ new/libksysguard-5.21.3.1/sensors/SensorDataModel.cpp 2021-03-16 15:15:31.000000000 +0100 @@ -400,6 +400,12 @@ } // Otherwise, it's a new sensor that was added + + // Ensure we do not insert columns that are out of range. + while (d->sensorInfos.count() + 1 <= column && column > 0) { + column--; + } + beginInsertColumns(QModelIndex{}, column, column); d->sensorInfos[sensorId] = info; d->sensorData[sensorId] = QVariant{};
