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[en_GB]=Chat on Matrix
 Comment[es]=Chat en Matrix
 Comment[eu]=Berriketa Matrix-en
 Comment[fr]=Clavarder sur Matrix
@@ -101,6 +102,7 @@ Comment[ka]=ჩატი Matrix-ზე
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie
 Comment[sl]=Klepet na Matrixu
+Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவும்
 Comment[tr]=Matrix Üzerinde Sohbet Et
 Comment[uk]=Спілкування у Matrix
 Comment[x-test]=xxChat on Matrixxx