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 Applications/19.04 in 4 minutes and 53 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #4576
linux stable-kf5-qt5 qt5.10

00:04:53

2.0%