From df7a8d67e7ff5fa9da01110a24327009cab05114 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 14 Aug 2019 05:09:46 +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 | 2 ++ generators/comicbook/org.kde.mobile.okular_comicbook.desktop | 2 ++ 2 files changed, 4 insertions(+) diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index 30be72fe1..2d3899eff 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -171,7 +171,9 @@ 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[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 X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[pt_BR]=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 fd16ccd3d..ea0ede50e 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -162,7 +162,9 @@ 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[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 X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book