From 3c756a44d1de8c7e76e2570be5568a3de22cc972 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 3 Sep 2020 06:07:27 +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 | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/kwin.notifyrc b/kwin.notifyrc
index eae0b17c7c..e28b0f0d03 100644
--- a/kwin.notifyrc
+++ b/kwin.notifyrc
@@ -290,5 +290,19 @@ Action=Popup
 
 [Event/xwaylandcrash]
 Name=Xwayland Crash
+Name[az]=Xwayland Qəzası
+Name[ca]=Fallada de l'Xwayland
+Name[es]=Fallo de Xwayland
+Name[nl]=Xwayland-crash
+Name[sv]=Krasch av Xwayland
+Name[uk]=Аварія Xwayland
+Name[x-test]=xxXwayland Crashxx
 Comment=Xwayland has crashed
+Comment[az]=Xwayland qəzaya uğradı
+Comment[ca]=L'Xwayland ha fallat
+Comment[es]=Xwayland ha fallado
+Comment[nl]=Xwayland is gecrasht
+Comment[sv]=Xwayland har kraschat
+Comment[uk]=Xwayland завершив роботу в аварійному режимі
+Comment[x-test]=xxXwayland has crashedxx
 Action=Popup