From 91e0ad9a9d14ca7288c4cdf1a0f2f7bbfb09cd28 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Sep 2019 09:03:32 +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 37e003576..4997376cb 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -169,6 +169,7 @@ 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 X-KDE-Keywords[fi]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[fr]=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 c98432df5..f86e903ab 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -160,6 +160,7 @@ 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 X-KDE-Keywords[fi]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book