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"
2 jobs for v5.24.4 in 1 minute and 2 seconds (queued for 37 minutes and 24 seconds)
latest