From 87f80c34185c4737a8f1d0335318e898d45f5749 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 18 Aug 2019 05:05:25 +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 470e93c26..5c5dfbb52 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -179,6 +179,7 @@ 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 +X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Kniha komiksov X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,комікс X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx diff --git a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop index c7d50b12b..a7d069841 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -170,6 +170,7 @@ 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 +X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Kniha komiksov X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,комікс X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx