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"
3 jobs for master in 5 minutes and 56 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #436
flatpak
flatpak

00:05:00

passed #435
freebsd
freebsd kf5-qt5 qt5.12

00:01:48

passed #434
linux kf5-qt5 qt5.10

00:05:56

2.0%