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 8 minutes and 59 seconds (queued for 25 seconds)
Status Job ID Name Coverage
  Build
passed #9837
linux kf5-qt5 qt5.10

00:08:59

36.0%
failed #9838
windows
windows kf5-qt5 qt5.11

 
Name Stage Failure
failed
windows kf5-qt5 qt5.11 Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log