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

@@ -190,3 +190,4 @@ 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,漫画书,漫画,连环画
+X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book, 漫畫書

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

@@ -181,3 +181,4 @@ 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,漫画书,漫画,连环画
+X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book, 漫畫書

generators/fictionbook/libokularGenerator_fb.json

@@ -146,7 +146,7 @@
         "Name[sr]": "Позадина за фикшнбук",
         "Name[sv]": "Fiction Book-gränssnitt",
         "Name[tr]": "Kurgu Kitabı Arka Ucu",
-        "Name[uk]": "Модуль белетристики",
+        "Name[uk]": "Модуль FictionBook",
         "Name[x-test]": "xxFiction Book Backendxx",
         "Name[zh_CN]": "Fiction Book 后端",
         "Name[zh_TW]": "Fiction Book 後端介面",