From fcbbcc30785ce08b3a172bd7c3d82a7f16a5caf4 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 25 Feb 2020 12:34:33 +0000 Subject: [PATCH 1/3] Update version number for 5.18.2 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5f62234fb..d1ee5eb8b4 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.18.1") +set(PROJECT_VERSION "5.18.2") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.12.0") From 4559d3a2d819cb3b597304b992b859b19f2df176 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 2 Mar 2020 09:56:27 +0100 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" --- kcmkwin/kwincompositing/kwincompositing.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index a99043df96..31b8609182 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -111,6 +111,7 @@ X-KDE-Keywords[eu]=kwin,leihoa,kudeatzailea,konposatzailea,efektua,3Dtako efektu X-KDE-Keywords[fi]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,ikkunointiohjelma,ikkunaohjelma,ikkunanhallinta,tehoste,3D-tehosteet,2D-tehosteet,videoasetukset,graafiset tehosteet,työpöytätehosteet X-KDE-Keywords[fr]=Gestionnaire de fenêtres KWin, kwin,window,manager,compositeur, effet, effets 3D,effets 2D,OpenGL,XRender,paramétrage video,effets graphiques ,effects du bureau X-KDE-Keywords[ia]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects +X-KDE-Keywords[id]=kwin,window,pengelola,kompositing,efek,efek 3D,efek 2D,OpenGL,XRender,pengaturan video,efek grafis,efek desktop X-KDE-Keywords[it]=kwin,finestra,gestore,composizione,effetto,effetti 3D,effetti 2D,OpenGL,XRender,impostazioni video,effetti grafici,effetti del desktop X-KDE-Keywords[ko]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,3D 효과,2D 효과,비디오 설정,그래픽 설정,그래픽 효과,데스크톱 효과 X-KDE-Keywords[lt]=kwin,langas,langai,tvarkytuvė,tvarkytuve,komponavimas,kompozicionavimas,efektas,efektai,3D efektai,2D efektai,trimačiai efektai,trimaciai efektai,dvimačiai efektai,dvimaciai efektai,OpenGL,XRender,vaizdo nustatymai,vaizdo nuostatos,video nustatymai,video nuostatos,grafiniai efektai,grafikos efektai,darbalaukio efektai,darbastalio efektai From 76c3174b019fe000f273f68df039088721f709e2 Mon Sep 17 00:00:00 2001 From: Mikhail Zolotukhin Date: Fri, 6 Mar 2020 22:35:20 +0300 Subject: [PATCH 3/3] Notify about decorations button order change Summary: This allows GtkConfig daemon to properly sync decorations buttons order for GTK CSD applications. For 5.18.3 Test Plan: 1. Launch `kcmshell5 kwindecoration` and any GTK CSD app alongside 2. Change order of the buttons. 3. Window button order should be changed in GTK CSD app immediately (if `xsettingsd` is installed). Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D27904 --- kcmkwin/kwindecoration/kwindecorationsettings.kcfgc | 1 + 1 file changed, 1 insertion(+) diff --git a/kcmkwin/kwindecoration/kwindecorationsettings.kcfgc b/kcmkwin/kwindecoration/kwindecorationsettings.kcfgc index 9d45368f47..f42a6f723e 100644 --- a/kcmkwin/kwindecoration/kwindecorationsettings.kcfgc +++ b/kcmkwin/kwindecoration/kwindecorationsettings.kcfgc @@ -4,3 +4,4 @@ Mutators=true DefaultValueGetters=true GenerateProperties=true ParentInConstructor=true +Notifiers=buttonsOnLeft,buttonsOnRight