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

@@ -166,7 +166,15 @@ InitialPreference=7
 Categories=Qt;KDE;Graphics;Viewer;
 NoDisplay=true
 X-KDE-Keywords=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[ca]=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic
+X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie
+X-KDE-Keywords[nn]=cbr, cbz, cbt, Comic Book
 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
 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

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

@@ -157,7 +157,15 @@ Categories=Qt;KDE;Graphics;Office;Viewer;
 InitialPreference=2
 NoDisplay=true
 X-KDE-Keywords=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[ca]=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic
+X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie
+X-KDE-Keywords[nn]=cbr, cbz, cbt, Comic Book
 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
 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