From b720b4237b1e040600c971bf80ad9b23701414da Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 5 Sep 2020 06:17:36 +0200
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"
---
 kwin.notifyrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kwin.notifyrc b/kwin.notifyrc
index 405df307bf..9c7756e997 100644
--- a/kwin.notifyrc
+++ b/kwin.notifyrc
@@ -301,6 +301,7 @@ Name[x-test]=xxXwayland Crashxx
 Comment=Xwayland has crashed
 Comment[az]=Xwayland qəzaya uğradı
 Comment[ca]=L'Xwayland ha fallat
+Comment[cs]=Xwayland spadnul
 Comment[es]=Xwayland ha fallado
 Comment[nl]=Xwayland is gecrasht
 Comment[pt]=O Xwayland estoirou