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/org.kde.mobile.okular_comicbook.desktop

@@ -174,6 +174,7 @@ X-KDE-Keywords[nn]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[pl]=cbr, cbz, cbt, Komiks
 X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[sk]=cbr, cbz, cbt, 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