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 7 minutes and 16 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #16023
linux kf5-qt5 qt5.12

00:06:46

34.0%
passed #16024
windows
windows kf5-qt5 qt5.13

00:07:15