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"
3 jobs for v5.25.1 in 1 minute and 37 seconds (queued for 11 minutes and 33 seconds)
latest