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/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 後端介面",