From 3b57e3a73186964b8a82befe2aed68d36029d4c8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 5 May 2020 10:22:59 +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/org.kde.mobile.okular_comicbook.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop index f1ed792db..5304b3efc 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -162,6 +162,7 @@ X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[da]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[de]=cbr, cbz, cbt, Comic-Book +X-KDE-Keywords[el]=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[et]=cbr, cbz, cbt, Comic Book, koomiks