From 5fe7ba478b9a46842dcceff99f010a416307d6af Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 14 Jan 2021 10:25:39 +0100
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        | 4 ++++
 org.kde.neochat.desktop | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 5a4fb870e..c136e976d 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -22,6 +22,7 @@ Name[sl]=Neochat
 Name[sv]=Neochat
 Name[uk]=Neochat
 Name[x-test]=xxNeochatxx
+Name[zh_CN]=Neochat
 DesktopEntry=org.kde.neochat
 Comment=IM client for the Matrix protocol
 Comment[ca]=Client de MI per al protocol Matrix
@@ -44,6 +45,7 @@ Comment[sl]=Odjemalec neposrednega sporočanja po protokolu Matrix
 Comment[sv]=Direktmeddelandeklient för protokollet Matrix
 Comment[uk]=Клієнт служби миттєвого обміну повідомленнями для протоколу Matrix
 Comment[x-test]=xxIM client for the Matrix protocolxx
+Comment[zh_CN]=为 Matrix 协议打造的 IM 客户端
 
 [Event/message]
 Name=New message
@@ -67,6 +69,7 @@ Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
 Name[uk]=Нове повідомлення
 Name[x-test]=xxNew messagexx
+Name[zh_CN]=新消息
 Comment=There is a new message
 Comment[ca]=Hi ha un missatge nou
 Comment[ca@valencia]=Hi ha un missatge nou
@@ -88,4 +91,5 @@ Comment[sl]=Prišlo je novo sporočilo
 Comment[sv]=Det finns ett nytt meddelande
 Comment[uk]=Надійшло нове повідомлення
 Comment[x-test]=xxThere is a new messagexx
+Comment[zh_CN]=有新消息
 Action=Popup
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 22404e45a..75c0ed582 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -21,6 +21,7 @@ Name[sl]=Neochat
 Name[sv]=Neochat
 Name[uk]=Neochat
 Name[x-test]=xxNeochatxx
+Name[zh_CN]=Neochat
 GenericName=Matrix Client
 GenericName[ca]=Client del Matrix
 GenericName[ca@valencia]=Client del Matrix
@@ -42,6 +43,7 @@ GenericName[sl]=Odjemalec Matrix
 GenericName[sv]=Matrix-klient
 GenericName[uk]=Клієнт Matrix
 GenericName[x-test]=xxMatrix Clientxx
+GenericName[zh_CN]=Matrix 客户端
 Comment=Client for the Matrix protocol
 Comment[ca]=Client per al protocol Matrix
 Comment[ca@valencia]=Client per al protocol Matrix
@@ -63,6 +65,7 @@ Comment[sl]=Odjemalec za protokol Matrix
 Comment[sv]=Klient för protokollet Matrix
 Comment[uk]=Клієнт протоколу Matrix
 Comment[x-test]=xxClient for the Matrix protocolxx
+Comment[zh_CN]=为 Matrix 协议打造的客户端
 Exec=neochat
 Terminal=false
 Icon=org.kde.neochat