From c5a3fc04310d61dc2f8c409142133a48cd05a1d9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 25 May 2021 02:21:15 +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        | 3 +++
 org.kde.neochat.desktop | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 7684a722b..17364749a 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -5,7 +5,10 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[es]=NeoChat
 Name[fi]=NeoChat
+Name[ia]=Neochat
+Name[ko]=NeoChat
 Name[nl]=NeoChat
+Name[nn]=NeoChat
 Name[pl]=NeoChat
 Name[sv]=NeoChat
 Name[uk]=NeoChat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 84420da04..41716fa3a 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -4,7 +4,10 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[es]=NeoChat
 Name[fi]=NeoChat
+Name[ia]=Neochat
+Name[ko]=NeoChat
 Name[nl]=NeoChat
+Name[nn]=NeoChat
 Name[pl]=NeoChat
 Name[sv]=NeoChat
 Name[uk]=NeoChat