From 9b448f43aa14422fd8bfd5f142cc5e899d489a19 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 20 Jun 2019 09:22:28 +0200 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" --- kcmkwin/kwinoptions/kwinoptions.desktop | 2 +- kcmkwin/kwinrules/kwinrules.desktop | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index e8f4d71928..b5da379e69 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -32,7 +32,7 @@ Name[de]=Fensterverhalten Name[el]=Συμπεριφορά παραθύρων Name[en_GB]=Window Behaviour Name[eo]=Fenestrokonduto -Name[es]=Comportamiento de la ventana +Name[es]=Comportamiento de las ventanas Name[et]=Akende käitumine Name[eu]=Leihoaren portaera Name[fa]=رفتار پنجره diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop index 191e75970a..dd4fe82a69 100644 --- a/kcmkwin/kwinrules/kwinrules.desktop +++ b/kcmkwin/kwinrules/kwinrules.desktop @@ -22,7 +22,7 @@ Name[da]=Vinduesregler Name[de]=Fensterregeln Name[el]=Κανόνες παραθύρου Name[en_GB]=Window Rules -Name[es]=Reglas de la ventana +Name[es]=Reglas de las ventanas Name[et]=Akna reeglid Name[eu]=Leihoaren arauak Name[fi]=Ikkunasäännöt @@ -126,7 +126,7 @@ X-KDE-Keywords[da]=størrelse,position,tilstand,vinduesopførsel,vinduer,specifi X-KDE-Keywords[de]=Größe,Position,Status,Fensterverhalten,Fenster,Regeln X-KDE-Keywords[el]=μέγεθος,θέση,κατάσταση,συμπεριφορά παραθύρου,παράθυρα,ειδική,εναλλακτικές,απομνημόνευση,κανόνες X-KDE-Keywords[en_GB]=size,position,state,window behaviour,windows,specific,workarounds,remember,rules -X-KDE-Keywords[es]=tamaño,posición,estado,comportamiento de la ventana,ventanas,específicos,soluciones,recordatorio,reglas +X-KDE-Keywords[es]=tamaño,posición,estado,comportamiento de las ventanas,ventanas,específicos,soluciones,recordatorio,reglas X-KDE-Keywords[et]=suurus,asukoht,olek,akende käitumine,aknad,meeldejätmine,reeglid X-KDE-Keywords[eu]=tamaina,posizio,egoera,leihoaren portaera,leihoak,zehatz,konponbide,gogorarazpen,arau X-KDE-Keywords[fi]=koko,sijainti,tila,ikkunoiden toiminta,ikkunat,erikoisasetukset,ikkunakohtaiset,korjaukset,muista,muistaminen,säännöt From acd25f07fde0b8c6b976f48e774de97eae0807f8 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 9 Jul 2019 15:51:51 +0100 Subject: [PATCH 2/3] Update version number for 5.16.3 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 120a20f0c1..d628cd5b93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) project(KWIN) -set(PROJECT_VERSION "5.16.2") +set(PROJECT_VERSION "5.16.3") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.12.0") From c3c030d8b5953e4f2181e45fdc399ea786ac9352 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 3 Jul 2019 14:01:07 +0200 Subject: [PATCH 3/3] Fix creation of kdeglobals if /etc/xdg/kdeglobals present Summary: If /etc/xdg/kdeglobals exists but ~/.config/kdeglobals does not (like on the first start of kwin_wayland), it did not notice changes to kdeglobals. This lead to KWin using the wrong color scheme for the window decoration on the first login, which also could not be changed without a session restart. Test Plan: Cleared ~ and logged in again, title bar color is now correct. Reviewers: #plasma, romangg Reviewed By: #plasma, romangg Subscribers: sitter, broulik, rikmills, kwin, plasma-devel Tags: #kwin Differential Revision: https://phabricator.kde.org/D22238 --- decorations/decorationpalette.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decorations/decorationpalette.cpp b/decorations/decorationpalette.cpp index e37eeaf88f..f7036d6be8 100644 --- a/decorations/decorationpalette.cpp +++ b/decorations/decorationpalette.cpp @@ -41,7 +41,7 @@ DecorationPalette::DecorationPalette(const QString &colorScheme) ? colorScheme : QStandardPaths::locate(QStandardPaths::GenericConfigLocation, colorScheme)) { - if (m_colorScheme.isEmpty() && colorScheme == QStringLiteral("kdeglobals")) { + if (!m_colorScheme.startsWith(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation)) && colorScheme == QStringLiteral("kdeglobals")) { // kdeglobals doesn't exist so create it. This is needed to monitor it using QFileSystemWatcher. auto config = KSharedConfig::openConfig(colorScheme, KConfig::SimpleConfig); KConfigGroup wmConfig(config, QStringLiteral("WM"));