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 master in 11 minutes and 26 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #4566
flatpak
flatpak

00:10:23

passed #4565
linux kf5-qt5 qt5.10

00:09:07

2.0%