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"

org.kde.neochat.desktop

@@ -108,6 +108,7 @@ Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவு
 Comment[tr]=Matrix Üzerinde Sohbet Et
 Comment[uk]=Спілкування у Matrix
 Comment[x-test]=xxChat on Matrixxx
+Comment[zh_TW]=在 Matrix 上聊天
 MimeType=x-scheme-handler/matrix;
 Exec=neochat %u
 Terminal=false