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

@@ -88,6 +88,14 @@ GenericName[x-test]=xxMatrix Clientxx
 GenericName[zh_CN]=Matrix 客户端
 GenericName[zh_TW]=Matrix 用戶端
 Comment=Chat on Matrix
+Comment[ca]=Xat a Matrix
+Comment[es]=Chat en Matrix
+Comment[eu]=Berriketa Matrix-en
+Comment[gl]=Charle en Matrix
+Comment[pl]=Rozmawiaj na Matriksie
+Comment[sl]=Klepet na Matrixu
+Comment[tr]=Matrix Üzerinde Sohbet Et
+Comment[uk]=Спілкування у Matrix
 MimeType=x-scheme-handler/matrix;
 Exec=neochat %u
 Terminal=false