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 15 minutes and 55 seconds (queued for 9 minutes and 53 seconds)
Status Job ID Name Coverage
  Build
passed #49725
flatpak
flatpak

00:15:55