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"

generators/comicbook/okularApplication_comicbook.desktop

@@ -210,6 +210,7 @@ X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Kniha komiksov
 X-KDE-Keywords[sl]=cbr, cbz, cbt, cbt7, strip
 X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book
 X-KDE-Keywords[ta]=cbr, cbz, cbt, cb7, Comic Book, காமிக் புத்தகம்
+X-KDE-Keywords[tr]=cbr, cbz, cbt, cb7, Comic Book
 X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,комікс
 X-KDE-Keywords[vi]=cbr, cbz, cbt, cb7, Truyện tranh
 X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx

generators/comicbook/org.kde.mobile.okular_comicbook.desktop

@@ -206,6 +206,7 @@ X-KDE-Keywords[sr@ijekavianlatin]=cbr, cbz, cbt, Comic Book,ComicBook
 X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, Comic Book,ComicBook
 X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[ta]=cbr, cbz, cbt, Comic Book, காமிக் புத்தகம்
+X-KDE-Keywords[tr]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[uk]=cbr,cbz,cbt,комікс
 X-KDE-Keywords[vi]=cbr, cbz, cbt, Truyện tranh
 X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx