From c98d2ccdac75ea69599150fed275880783189fca Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 26 Feb 2019 08:28: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" --- lookandfeel/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index 4077aeee2..1685bda31 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -17,7 +17,7 @@ Comment[gl]=Linguaxe de deseño do escritorio para Breeze de KDE VDG Comment[hu]=Breeze asztali designnyelv a KDE VDG-től Comment[id]=Bahasa Desain Desktop Breeze oleh KDE VDG Comment[is]=Breeze skjáborðshönnunarmálið frá KDE VDG -Comment[it]=Linguaggio di progettazione del desktop Brezza del KDE VDG +Comment[it]=Linguaggio di progettazione del desktop Brezza a cura del VDG di KDE Comment[ko]=KDE 시각 디자인 그룹의 Breeze 데스크톱 디자인 언어 Comment[lt]=Breeze darbalaukio dizaino kalba, kurią sukūrė KDE VDG Comment[nb]=Breeze-språk for skrivebordsutforming fra KDE-gruppa for visuell design From ed4e8a29e28151f56cb306d7582f9c87004a5119 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 26 Feb 2019 09:07:01 +0000 Subject: [PATCH 2/3] Update version number for 5.15.2 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7107f1a3d..234e2a5ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) project(plasma-workspace) -set(PROJECT_VERSION "5.15.1") +set(PROJECT_VERSION "5.15.2") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.11.0") From 70ef0829982e395ca1243bf9ff84d9368726239b Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Tue, 26 Feb 2019 14:37:35 +0000 Subject: [PATCH 3/3] [shell] Show kactivies warning only on error Summary: load() is called a few times and different states. After the change I also get the warning on a regular load. This patch returns early whilst we're in the loading state, but still prints the warning should kactivitymanagerd fail. Reviewers: #plasma, mart Reviewed By: #plasma, mart Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D18922 --- shell/shellcorona.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp index 3d109ca37..b1fca4f93 100644 --- a/shell/shellcorona.cpp +++ b/shell/shellcorona.cpp @@ -643,10 +643,13 @@ void ShellCorona::load() return; } - if (m_activityController->serviceStatus() != KActivities::Controller::Running && + auto activityStatus = m_activityController->serviceStatus(); + if (activityStatus != KActivities::Controller::Running && !qApp->property("org.kde.KActivities.core.disableAutostart").toBool()) { - qWarning("Aborting shell load: The activity manager daemon (kactivitymanagerd) is not running."); - qWarning("If this Plasma has been installed into a custom prefix, verify that its D-Bus services dir is known to the system for the daemon to be activatable."); + if (activityStatus == KActivities::Controller::NotRunning) { + qWarning("Aborting shell load: The activity manager daemon (kactivitymanagerd) is not running."); + qWarning("If this Plasma has been installed into a custom prefix, verify that its D-Bus services dir is known to the system for the daemon to be activatable."); + } return; }