From 0fbe40dfb441a6dd70950345e0bb8178443732c1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 13 Aug 2019 05:25:02 +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 | 5 +++++ generators/comicbook/org.kde.mobile.okular_comicbook.desktop | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index 5a0eb5ad2..30be72fe1 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -167,10 +167,15 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[de]=cbr, cbz, cbt, cb7, Comic-Book +X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book 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_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 fc67078d7..fd16ccd3d 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -158,10 +158,15 @@ InitialPreference=2 NoDisplay=true X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[de]=cbr, cbz, cbt, cb7, Comic-Book +X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book 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_TW]=cbr, cbz, cbt, cb7, Comic Book, 漫畫, 漫畫書