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

@@ -99,6 +99,7 @@ Comment[gl]=Charle en Matrix
 Comment[hu]=Csevegés Matrixon
 Comment[ia]=Conversation en ditecto sur Matrix
 Comment[it]= su Matrix
+Comment[ka]=საუბარი Matrix-ზე
 Comment[pl]=Rozmawiaj na Matriksie
 Comment[sl]=Klepet na Matrixu
 Comment[sv]=Chatta på Matrix