From ad863cc6b107e97fdcb903d571d4bc6b633f74f5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 19 Mar 2018 05:09:05 +0100 Subject: [PATCH 1/3] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/plugins/dummy/pmdummybackendplugin.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/dummy/pmdummybackendplugin.json b/src/plugins/dummy/pmdummybackendplugin.json index c230985..ed23869 100644 --- a/src/plugins/dummy/pmdummybackendplugin.json +++ b/src/plugins/dummy/pmdummybackendplugin.json @@ -12,6 +12,7 @@ "Description[ca@valencia]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.", "Description[ca]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.", "Description[de]": "Ein Dummy-Backend für die KDE-Partitionsverwaltung zu Testzwecken.", + "Description[es]": "Un motor de simulación para el gestor de particiones de KDE para hacer pruebas.", "Description[nl]": "Dummy backend van KDE-partitiebeheerder voor testdoeleinden", "Description[pt]": "Uma infra-estrutura de testes para o Gestor de Partições do KDE.", "Description[sk]": "Testovací program v pozadí KDE Správcu partícií", @@ -26,6 +27,7 @@ "Name[ca@valencia]": "Dorsal fals del gestor de particions del KDE", "Name[ca]": "Dorsal fals del gestor de particions del KDE", "Name[de]": "KDE-Partitionsverwaltung Dummy-Backend", + "Name[es]": "Motor de simulación para el gestor de particiones de KDE", "Name[fi]": "KDE:n osionhallinnan valetaustaosa", "Name[fr]": "Moteur de test pour le gestionnaire de partitions de KDE", "Name[id]": "Backend Tiruan Pengelola Partisi KDE", From 8658743a49532182d522eed809fbc064414bbc96 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Mar 2018 05:19:57 +0200 Subject: [PATCH 2/3] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/plugins/dummy/pmdummybackendplugin.json | 1 + src/plugins/libparted/pmlibpartedbackendplugin.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/plugins/dummy/pmdummybackendplugin.json b/src/plugins/dummy/pmdummybackendplugin.json index ed23869..5bb0fb6 100644 --- a/src/plugins/dummy/pmdummybackendplugin.json +++ b/src/plugins/dummy/pmdummybackendplugin.json @@ -26,6 +26,7 @@ "Name": "KDE Partition Manager Dummy Backend", "Name[ca@valencia]": "Dorsal fals del gestor de particions del KDE", "Name[ca]": "Dorsal fals del gestor de particions del KDE", + "Name[cs]": "Podpůrná vrstva pro správce diskových oddílů pro KDE", "Name[de]": "KDE-Partitionsverwaltung Dummy-Backend", "Name[es]": "Motor de simulación para el gestor de particiones de KDE", "Name[fi]": "KDE:n osionhallinnan valetaustaosa", diff --git a/src/plugins/libparted/pmlibpartedbackendplugin.json b/src/plugins/libparted/pmlibpartedbackendplugin.json index 2593eef..38526f3 100644 --- a/src/plugins/libparted/pmlibpartedbackendplugin.json +++ b/src/plugins/libparted/pmlibpartedbackendplugin.json @@ -26,6 +26,7 @@ "Name": "KDE Partition Manager LibParted Backend", "Name[ca@valencia]": "Dorsal pel LibParted del gestor de particions del KDE", "Name[ca]": "Dorsal pel LibParted del gestor de particions del KDE", + "Name[cs]": "Podpůrná vrstva LibParted pro správce diskových oddílů pro KDE", "Name[de]": "KDE-Partitionsverwaltung LibParted-Backend", "Name[es]": "Motor LibParted para el gestor de particiones de KDE", "Name[fi]": "KDE:n osionhallinnan LibParted-taustaosa", From c1f4b36305d663f5b407d30d1a843a23525ff626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 31 Mar 2018 20:17:43 +0100 Subject: [PATCH 3/3] Fix mutex logic for cancelling operations. --- src/core/operationrunner.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/core/operationrunner.cpp b/src/core/operationrunner.cpp index 01771c7..7906172 100644 --- a/src/core/operationrunner.cpp +++ b/src/core/operationrunner.cpp @@ -73,9 +73,9 @@ void OperationRunner::run() for (int i = 0; i < numOperations(); i++) { suspendMutex().lock(); + suspendMutex().unlock(); if (!status || isCancelling()) { - suspendMutex().unlock(); break; } @@ -92,13 +92,6 @@ void OperationRunner::run() disconnect(op, &Operation::progress, this, &OperationRunner::progressSub); emit opFinished(i + 1, op); - - suspendMutex().unlock(); - - // Sleep a little to give others a chance to suspend us. This should normally not be - // required -- is it possible that the compiler just optimizes our unlock/lock away - // if we don't sleep? - msleep(5); } if (automounter)