From a90bf7fe0252d2a4e79de245450889e5b12adff4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 9 Oct 2019 05:35:12 +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 036217a39..58333697a 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -163,6 +163,7 @@ X-KDE-Keywords[en_GB]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[gl]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie X-KDE-Keywords[nl]=cbr, cbz, cbt, Stripverhaal X-KDE-Keywords[nn]=cbr, cbz, cbt, Comic Book