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 6 minutes and 33 seconds (queued for 9 minutes and 8 seconds)
Status Job ID Name Coverage
  Build
passed #41950
flatpak
flatpak

00:06:33