From 72ab500ece716b844c17fbc26c6b375d1d38cdb1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 6 Sep 2020 05:57:12 +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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kwin.notifyrc b/kwin.notifyrc
index 9c7756e997..1ad6aa31ff 100644
--- a/kwin.notifyrc
+++ b/kwin.notifyrc
@@ -293,6 +293,7 @@ Name=Xwayland Crash
 Name[az]=Xwayland Qəzası
 Name[ca]=Fallada de l'Xwayland
 Name[es]=Fallo de Xwayland
+Name[ko]=Xwayland 충돌
 Name[nl]=Xwayland-crash
 Name[pt]=Estoiro do Xwayland
 Name[sv]=Krasch av Xwayland
@@ -303,6 +304,7 @@ Comment[az]=Xwayland qəzaya uğradı
 Comment[ca]=L'Xwayland ha fallat
 Comment[cs]=Xwayland spadnul
 Comment[es]=Xwayland ha fallado
+Comment[ko]=Xwayland가 충돌함
 Comment[nl]=Xwayland is gecrasht
 Comment[pt]=O Xwayland estoirou
 Comment[sv]=Xwayland har kraschat