From 6f33ad529e7447006c2430807a07a7200e99c8ca Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 24 Nov 2021 01:36:52 +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"
---
 neochat.notifyrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 24c293537..02b1f9444 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -130,6 +130,7 @@ Name[ca@valencia]=Invitació nova
 Name[es]=Nueva invitación
 Name[fr]=Nouvelle invitation
 Name[ia]=Nove invitation
+Name[ko]=새 초대장
 Name[nl]=Nieuwe uitnodiging
 Name[pt]=Novo Convite
 Name[sl]=Novo povabilo
@@ -142,6 +143,7 @@ Comment[ca@valencia]=Hi ha una invitació nova a una sala
 Comment[es]=Hay una nueva invitación a una sala
 Comment[fr]=Il y a une nouvelle invitation dans un salon.
 Comment[ia]=Il ha un nove invitation a un sala
+Comment[ko]=새로운 대화방 초대장을 받음
 Comment[nl]=Er is een nieuwe uitnodiging naar een room
 Comment[pt]=Existe um novo convite para uma sala
 Comment[sl]=Tam je novo povabilo v sobo