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 18 minutes and 37 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #11358
flatpak
flatpak

00:18:37