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

@@ -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

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