From ecc6c6e2ebcd290eb64f97c4a4ef509149b5dd0c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 12 Oct 2021 01:18:05 +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        | 1 +
 org.kde.neochat.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 1675b2362..6d21fd334 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -11,6 +11,7 @@ Name[es]=NeoChat
 Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
+Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[it]=NeoChat
 Name[ko]=NeoChat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 092805f93..94725fca0 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -12,6 +12,7 @@ Name[es]=NeoChat
 Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
+Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[it]=NeoChat
 Name[ko]=NeoChat