From 9ca27c6690fa112a133ce62d0f51eeb21be3e4e0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 31 Jan 2020 09:47:38 +0100
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"
---
 kcmkwin/kwinoptions/kwinactions.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop
index 13f7f0b2f3..287a926022 100644
--- a/kcmkwin/kwinoptions/kwinactions.desktop
+++ b/kcmkwin/kwinoptions/kwinactions.desktop
@@ -12,6 +12,7 @@ X-KDE-PluginKeyword=kwinactions
 Name=Window Actions
 Name[ca]=Accions de la finestra
 Name[cs]=Činnosti oken
+Name[da]=Vindueshandlinger
 Name[de]=Fensteraktionen
 Name[en_GB]=Window Actions
 Name[es]=Acciones de ventanas