From 82723be8db99bf5cfb33129eb8a08846dadefad1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 15 Apr 2021 01:16:21 +0000
Subject: [PATCH] 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"
---
 src/kcmkwin/kwinoptions/kwinmoving.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/kcmkwin/kwinoptions/kwinmoving.desktop b/src/kcmkwin/kwinoptions/kwinmoving.desktop
index a2387e5141..8155ec38cb 100644
--- a/src/kcmkwin/kwinoptions/kwinmoving.desktop
+++ b/src/kcmkwin/kwinoptions/kwinmoving.desktop
@@ -13,6 +13,7 @@ Name[az]=Pəncərə yerdəyişdirilməsi
 Name[ca]=Moviment de les finestres
 Name[cs]=Pohyb oken
 Name[da]=Flytning af vinduer
+Name[de]=Fensterverschiebung
 Name[en_GB]=Window Movement
 Name[es]=Movimiento de las ventanas
 Name[et]=Akna liigutamine
@@ -45,6 +46,7 @@ Comment[az]=Pəncərə yerdəyişdirilməsinin tənzimlənməsi
 Comment[ca]=Configura les opcions de moviment de les finestres
 Comment[cs]=Nastavit volby pohybu oken
 Comment[da]=Indstil flytning af vinduer
+Comment[de]=Fensterverschiebung einrichten
 Comment[en_GB]=Configure window movement options
 Comment[es]=Configurar las opciones del movimiento de las ventanas
 Comment[et]=Akende liigutamise seadistamine