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.5 in 2 minutes and 38 seconds (queued for 2 minutes and 9 seconds)
latest