From 0ff05b0e39817f072fbbcaffa9dcedab16c4b331 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 5 Jun 2020 05:01:57 +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 3d5cda145..2dc141351 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -191,6 +191,7 @@ X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[ru]=cbr, cbz, cbt, cb7, Comic Book, комикс X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Kniha komiksov +X-KDE-Keywords[sl]=cbr, cbz, cbt, cbt7, strip 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 fbebab46a..080f2dffd 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -183,6 +183,7 @@ X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ru]=cbr, cbz, cbt, Comic Book, комикс X-KDE-Keywords[sk]=cbr, cbz, cbt, Kniha komiksov +X-KDE-Keywords[sl]=cbr, cbz, cbt, strip X-KDE-Keywords[sr]=cbr, cbz, cbt, Comic Book,комикбук X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, Comic Book,комикбук X-KDE-Keywords[sr@ijekavianlatin]=cbr, cbz, cbt, Comic Book,ComicBook