From 86fba9df67b7597a4b5e4d798cd8a50ae0049c38 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 9 Sep 2019 08:45:37 +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/comicbook/okularApplication_comicbook.desktop | 1 + generators/comicbook/org.kde.mobile.okular_comicbook.desktop | 1 + generators/fictionbook/libokularGenerator_fb.json | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index 5d117cd26..37e003576 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/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, 漫畫書 diff --git a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop index e5ea87c27..c98432df5 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/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, 漫畫書 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 後端介面",