From c2479a733bbae369ec1bd4cd9feb8cc9e810f259 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 16 Aug 2019 05:11:44 +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 2d3899eff..8a95bb189 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -171,6 +171,7 @@ 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[eu]=cbr, cbz, cbt, cb7, komiki-liburua X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal X-KDE-Keywords[nn]=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 ea0ede50e..564e9f51f 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[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[eu]=cbr, cbz, cbt, cb7, komiki-liburua X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book