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"

kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop

@@ -27,6 +27,7 @@ GenericName[uk]=Оновити параметри KMail
 GenericName[x-test]=xxKMail refresh settingsxx
 Comment=Refresh KMail settings
 Comment[ca]=Actualitza els ajustaments del KMail
+Comment[it]=Rinnova le impostazioni di KMail
 Comment[nl]=KMail-instellingen vernieuwen
 Comment[pl]=Ustawienia odświeżania KMaila
 Comment[pt]=Actualizar a configuração do KMail