From 98672cf8709f047c9956bc0b367f1adbdf705920 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 24 May 2021 02:13:42 +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        | 9 +++++++++
 org.kde.neochat.desktop | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index b0e1d23c1..7684a722b 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -1,6 +1,15 @@
 [Global]
 IconName=org.kde.neochat
 Name=NeoChat
+Name[ca]=NeoChat
+Name[ca@valencia]=NeoChat
+Name[es]=NeoChat
+Name[fi]=NeoChat
+Name[nl]=NeoChat
+Name[pl]=NeoChat
+Name[sv]=NeoChat
+Name[uk]=NeoChat
+Name[x-test]=xxNeoChatxx
 DesktopEntry=org.kde.neochat
 Comment=A client for matrix, the decentralized communication protocol
 Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index d8ecbabbe..84420da04 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -1,5 +1,14 @@
 [Desktop Entry]
 Name=NeoChat
+Name[ca]=NeoChat
+Name[ca@valencia]=NeoChat
+Name[es]=NeoChat
+Name[fi]=NeoChat
+Name[nl]=NeoChat
+Name[pl]=NeoChat
+Name[sv]=NeoChat
+Name[uk]=NeoChat
+Name[x-test]=xxNeoChatxx
 GenericName=Matrix Client
 GenericName[ca]=Client del Matrix
 GenericName[ca@valencia]=Client del Matrix