From 1f7b1ad29f48d46156a3749db0c93d9c957d4fb9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Jul 2021 02:18:30 +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 768cdf7e6..a12213ab4 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -24,6 +24,7 @@ Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
+Name[zh_CN]=NeoChat
 DesktopEntry=org.kde.neochat
 Comment=A client for matrix, the decentralized communication protocol
 Comment[az]=Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 24b74e46f..e5cbc6573 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -23,6 +23,7 @@ Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
+Name[zh_CN]=NeoChat
 GenericName=Matrix Client
 GenericName[az]=Matrix Müştərisi
 GenericName[ca]=Client del Matrix