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

@@ -90,6 +90,7 @@ GenericName[zh_TW]=Matrix 用戶端
 Comment=Chat on Matrix
 Comment[ca]=Xat a Matrix
 Comment[ca@valencia]=Xat a Matrix
+Comment[de]=Über Matrix unterhalten
 Comment[en_GB]=Chat on Matrix
 Comment[es]=Chat en Matrix
 Comment[eu]=Berriketa Matrix-en