From a76d4496da60c588667228204018049b6e20d925 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 8 Apr 2025 03:15:18 +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"
---
 org.kde.neochat.desktop | 1 +
 src/neochat.notifyrc    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 4a86bc94f..d27ffc0a5 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -109,6 +109,7 @@ Comment[hu]=Csevegés Matrixon
 Comment[ia]=Conversation en ditecto sur Matrix
 Comment[it]= su Matrix
 Comment[ka]=ჩატი Matrix-ზე
+Comment[ko]=Matrix에서 대화하기
 Comment[lv]=Tērzējiet „Matrix“ tīklā
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie
diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc
index 48d2e0917..b093fe096 100644
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -290,6 +290,7 @@ Name[hu]=Megosztás
 Name[ia]=Comparti
 Name[it]=Condivisione
 Name[ka]=გაზიარება
+Name[ko]=공유
 Name[lv]=Kopīgot
 Name[nl]=Gedeelde
 Name[nn]=Del
@@ -324,6 +325,7 @@ Comment[hu]=Tartalom megosztásának eredménye
 Comment[ia]=Le exito de compartir un pecietta de contento
 Comment[it]=Il risultato della condivisione di un contenuto
 Comment[ka]=შემცველობის ნაწილის გაზიარების შედეგი
+Comment[ko]=콘텐츠 공유 결과
 Comment[lv]=Satura kopīgošanas rezultāts
 Comment[nl]=Het resultaat van het delen van een stukje inhoud
 Comment[nn]=Resultatet av deling av innhald