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

00:06:44

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

00:09:03