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 10 minutes and 17 seconds (queued for 28 seconds)
Status Job ID Name Coverage
  Build
passed #15388
linux kf5-qt5 qt5.12

00:10:17

40.0%