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 14 minutes and 19 seconds
Status Job ID Name Coverage
  Build
passed #3848
linux kf5-qt5 qt5.10

00:06:16

26.0%
passed #3849
windows
windows kf5-qt5 qt5.11

00:14:19