From b5b4cff18c55e7c598b770668a61c0860c866cfd Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 15 Feb 2019 09:22:45 +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"
---
 kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
index 07643677e1..f74d57f092 100644
--- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
+++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
@@ -69,7 +69,7 @@ Comment[nn]=Fingerrørsler på trykkskjerm
 Comment[pa]=ਟੱਚ ਸਕਰੀਨ ਸਕਰਾਉਣ ਜੈਸਚਰ
 Comment[pl]=Gesty na ekranie dotykowym
 Comment[pt]=Gestos para deslizar o ecrã táctil
-Comment[pt_BR]=Gestos no touch screen
+Comment[pt_BR]=Gestos no touchscreen
 Comment[ru]=Действия при проведении по сенсорному экрану
 Comment[sk]=Ťahacie gestá dotykovej obrazovky
 Comment[sl]=Kretnje vlečenja za zaslon na dotik

From 0015ff2ac60bb93d0a5b85abc2014974e8f8dd83 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 17 Feb 2019 08:30:42 +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"
---
 scripts/minimizeall/metadata.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop
index 7c39742c78..3a71e739ca 100644
--- a/scripts/minimizeall/metadata.desktop
+++ b/scripts/minimizeall/metadata.desktop
@@ -7,7 +7,7 @@ Name[da]=Minimér alle
 Name[de]=Alle minimieren
 Name[el]=ΕλαχιστοποίησηΌλων
 Name[en_GB]=MinimiseAll
-Name[es]=Maximizar todo
+Name[es]=Minimizar todo
 Name[et]=Kõigi minimeerimine
 Name[eu]=Minimizatu guztiak
 Name[fi]=Pienennä kaikki

From 55d3f2933f3735958dfa0f99e6d28e02cd083576 Mon Sep 17 00:00:00 2001
From: Vlad Zagorodniy <vladzzag@gmail.com>
Date: Mon, 18 Feb 2019 14:58:30 +0200
Subject: [PATCH 3/3] [effects/desktopgrid] Don't copy windows on X11

Summary:
Currently, the Desktop Grid effect tries to copy a client when user
moves it. But on X11 such behavior doesn't make sense because
a client can't be on multiple desktops (except on all).

BUG: 404442
FIXED-IN: 5.15.1

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D19116
---
 effects/desktopgrid/desktopgrid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index d920bea931..0709974cb4 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -517,7 +517,7 @@ void DesktopGridEffect::windowInputMouseEvent(QEvent* e)
                 effects->moveWindow(windowMove, unscalePos(me->pos(), NULL) + windowMoveDiff, true, 1.0 / scale[screen]);
             }
             if (wasWindowMove) {
-                if (!effects->waylandDisplay() || (me->modifiers() & Qt::ControlModifier)) {
+                if (effects->waylandDisplay() && (me->modifiers() & Qt::ControlModifier)) {
                     wasWindowCopy = true;
                     effects->defineCursor(Qt::DragCopyCursor);
                 } else {