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 Applications/18.12 in 7 minutes and 35 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #446
freebsd
freebsd stable-kf5-qt5 qt5.12

00:01:48

passed #445
linux stable-kf5-qt5 qt5.10

00:07:33

2.0%