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"
1 job for master in 10 minutes and 58 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #12853
flatpak
flatpak

00:10:58