From 7f97880667329666a0bdc215bbd0bddd9a5fff95 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 9 Sep 2019 05:09:03 +0200
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json
index a0289caa0..41ec83cf0 100644
--- a/generators/fictionbook/libokularGenerator_fb.json
+++ b/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 後端介面",