From 527737711f87fa3609cd1de7153ccffbf59f1e2f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 10 Oct 2019 05:29:24 +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 | 3 +++ 2 files changed, 4 insertions(+) diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index f81f8a1c4..7e2aff0f3 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -187,4 +187,5 @@ X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Kniha komiksov X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,комікс X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx +X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, cb7, Comic Book, 漫画书, 漫画, 连环画 X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, cb7, Comic Book, 漫畫, 漫畫書 diff --git a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop index 58333697a..747d489de 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -158,6 +158,7 @@ InitialPreference=2 NoDisplay=true X-KDE-Keywords=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ca]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[de]=cbr, cbz, cbt, Comic-Book X-KDE-Keywords[en_GB]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic @@ -175,3 +176,5 @@ X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, Comic Book,ComicBook X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[uk]=cbr,cbz,cbt,комікс 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, 漫畫, 漫畫書