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

@@ -179,6 +179,7 @@ X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie
 X-KDE-Keywords[nl]=cbr, cbz, cbt, Stripverhaal
 X-KDE-Keywords[nn]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[sk]=cbr, cbz, cbt, Comic Book, Kniha komiksov
 X-KDE-Keywords[sr]=cbr, cbz, cbt, Comic Book,комикбук
 X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, Comic Book,комикбук
 X-KDE-Keywords[sr@ijekavianlatin]=cbr, cbz, cbt, Comic Book,ComicBook
@@ -186,3 +187,4 @@ X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, Comic Book,ComicBook
 X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[uk]=cbr,cbz,cbt,Comic Book,комікс
 X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx
+X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画

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

@@ -170,6 +170,7 @@ X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie
 X-KDE-Keywords[nl]=cbr, cbz, cbt, Stripverhaal
 X-KDE-Keywords[nn]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[sk]=cbr, cbz, cbt, Comic Book, Kniha komiksov
 X-KDE-Keywords[sr]=cbr, cbz, cbt, Comic Book,комикбук
 X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, Comic Book,комикбук
 X-KDE-Keywords[sr@ijekavianlatin]=cbr, cbz, cbt, Comic Book,ComicBook
@@ -177,3 +178,4 @@ X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, Comic Book,ComicBook
 X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[uk]=cbr,cbz,cbt,Comic Book,комікс
 X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx
+X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画