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.4 in 2 minutes and 1 second (queued for 6 minutes and 24 seconds)
latest