From c0f994dafc1529c1a7b28425ae315cdac4825896 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 7 Jul 2019 08:33:47 +0200
Subject: [PATCH 1/2] 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/kwindecoration/kwindecoration.desktop   | 1 +
 kcmkwin/kwindecoration/package/metadata.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index ba7fff99b9..93695dcab3 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -90,6 +90,7 @@ Comment[nn]=Set opp tittellinjer og vindaugsrammer
 Comment[pl]=Ustawienia pasków tytułów i obramowań okien
 Comment[pt]=Configurar as barras de título e contornos das janelas
 Comment[pt_BR]=Configure as barras de títulos e bordas da janela
+Comment[ru]=Настройка заголовка и границ окон
 Comment[sk]=Nastaviť titulné pásy a okraje
 Comment[sv]=Anpassa namnlister och kanter för fönster
 Comment[uk]=Налаштовування смужок заголовків та рамок вікон
diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop
index 6e8d4b232b..3bcc0d3010 100644
--- a/kcmkwin/kwindecoration/package/metadata.desktop
+++ b/kcmkwin/kwindecoration/package/metadata.desktop
@@ -92,6 +92,7 @@ Comment[nn]=Set opp tittellinjer og vindaugsrammer
 Comment[pl]=Ustawienia pasków tytułów i obramowań okien
 Comment[pt]=Configurar as barras de título e contornos das janelas
 Comment[pt_BR]=Configure as barras de títulos e bordas da janela
+Comment[ru]=Настройка заголовка и границ окон
 Comment[sk]=Nastaviť titulné pásy a okraje
 Comment[sv]=Anpassa namnlister och kanter för fönster
 Comment[uk]=Налаштовування смужок заголовків та рамок вікон

From 0a9c25476951ff8e7d0745547252980916233b48 Mon Sep 17 00:00:00 2001
From: Vlad Zagorodniy <vladzzag@gmail.com>
Date: Mon, 8 Jul 2019 12:44:26 +0300
Subject: [PATCH 2/2] Fix maximize Apply Now rule

Summary:
AbstractClient applies maximize rules by running

    maximize(maximizeMode());

but because window rules are checked only in changeMaximize
implementation, the if statement prevents us from applying maximize
rules (m and maximizeMode() are equal).

Reviewers: #kwin, romangg

Reviewed By: #kwin, romangg

Subscribers: romangg, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D22255
---
 geometry.cpp     | 3 ---
 shell_client.cpp | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/geometry.cpp b/geometry.cpp
index e971f9488f..edbb052d2f 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -2142,9 +2142,6 @@ void AbstractClient::blockGeometryUpdates(bool block)
 
 void AbstractClient::maximize(MaximizeMode m)
 {
-    if (m == maximizeMode()) {
-        return;
-    }
     setMaximize(m & MaximizeVertical, m & MaximizeHorizontal);
 }
 
diff --git a/shell_client.cpp b/shell_client.cpp
index 65417d597d..5eb13029e9 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -827,6 +827,10 @@ void ShellClient::changeMaximize(bool horizontal, bool vertical, bool adjust)
     }
     // TODO: add more checks as in Client
 
+    if (m_requestedMaximizeMode == oldMode) {
+        return;
+    }
+
     // call into decoration update borders
     if (isDecorated() && decoration()->client() && !(options->borderlessMaximizedWindows() && m_requestedMaximizeMode == KWin::MaximizeFull)) {
         changeMaximizeRecursion = true;