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"
10 jobs for master in 26 minutes and 18 seconds (queued for 6 minutes and 38 seconds)
Status Job ID Name Coverage
  Test
failed #27473
allowed to fail
clazy

00:00:53

passed #27474
qmllint

00:00:22

 
  Build
passed #27478
archlinux

00:01:25

passed #27477
debian-sid

00:01:06

passed #27476
neon-bionic

00:01:22

passed #27475
ubuntu-trusty

00:01:11

 
  Deploy
passed #27481
android

00:09:57

failed #27479
allowed to fail
linux-appimage

00:11:10

passed #27482
mac-osxcross

00:07:09

passed #27480
windows-mxe

00:05:43

 
Name Stage Failure
failed
linux-appimage Deploy
Copied "/builds/kde/kaidan/AppDir/usr/share/icons/hicolor/scalable/apps/kaidan.svg" to "/builds/kde/kaidan/AppDir/kaidan.svg"
WARNING: Plugin "/opt/Qt/5.12.6/gcc_64/plugins/platformthemes/libqgtk2.so" not found, skipping
WARNING: Plugin "/opt/Qt/5.12.6/gcc_64/plugins/styles/libqgtk2style.so" not found, skipping
appimagetool, continuous build (commit 9f1857f), build 2102 built on 2019-11-19 08:44:28 UTC
/builds/kde/kaidan/AppDir/kaidan.desktop: error: value "chatt;direktmeddelanden;jabber;xmpp;qt;n?tverk" for locale string list key "Keywords[sv]" in group "Desktop Entry" does not have a semicolon (';') as trailing character
Desktop file: /builds/kde/kaidan/AppDir/kaidan.desktop
ERROR: Desktop file contains errors. Please fix them. Please see
https://standards.freedesktop.org/desktop-entry-spec/1.0/n for more information.
ERROR: Job failed: exit code 1
failed
clazy Test
  CMake will not be able to correctly generate this project.
Call Stack (most recent call first):
CMakeLists.txt:9 (project)


-- Configuring incomplete, errors occurred!
See also "/builds/kde/kaidan/build/CMakeFiles/CMakeOutput.log".
See also "/builds/kde/kaidan/build/CMakeFiles/CMakeError.log".
ERROR: Job failed: exit code 1