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

@@ -21,6 +21,7 @@ Name[sl]=Neochat
 Name[sv]=Neochat
 Name[uk]=Neochat
 Name[x-test]=xxNeochatxx
+Name[zh_CN]=Neochat
 DesktopEntry=org.kde.neochat
 Comment=A client for matrix, the decentralized communication protocol
 
@@ -46,6 +47,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
@@ -66,4 +68,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

org.kde.neochat.desktop

@@ -20,6 +20,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
@@ -40,6 +41,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
@@ -60,6 +62,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