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

@@ -89,10 +89,12 @@ GenericName[zh_CN]=Matrix 客户端
 GenericName[zh_TW]=Matrix 用戶端
 Comment=Chat on Matrix
 Comment[ca]=Xat a Matrix
+Comment[ca@valencia]=Xat a Matrix
 Comment[es]=Chat en Matrix
 Comment[eu]=Berriketa Matrix-en
 Comment[fr]=Clavarder sur Matrix
 Comment[gl]=Charle en Matrix
+Comment[hu]=Csevegés Matrixon
 Comment[it]= su Matrix
 Comment[pl]=Rozmawiaj na Matriksie
 Comment[sl]=Klepet na Matrixu

src/neochat.notifyrc

@@ -261,7 +261,7 @@ Action=Popup
 Name=Share
 Name[ar]=شارك
 Name[ca]=Compartició
-Name[ca@valencia]=Compartició
+Name[ca@valencia]=Compartiu
 Name[cs]=Sdílet
 Name[de]=Teilen
 Name[el]=Κοινοποίηση