From 40f08930487eef2b30e1c646e82c9ed543b6ef4f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 28 Jul 2021 01:18:55 +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 2cd47d3ec..1675b2362 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -8,6 +8,7 @@ Name[cs]=NeoChat
 Name[de]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
+Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index a5ab0d882..092805f93 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -9,6 +9,7 @@ Name[cs]=NeoChat
 Name[de]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
+Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat