From 774bcbc4ef0c5e9c707f1fa06c29c90ce7a22bcd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Aug 2019 05:20:53 +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 + 2 files changed, 2 insertions(+) diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index 506c74822..99e156202 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -167,6 +167,7 @@ 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[cs]=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 diff --git a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop index cb09ed97f..f9f67495a 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, cb7, Comic Book X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[cs]=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