From ee0c3c0f17d341cc78bcef0050f600d801655d2c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 May 2020 06:20:55 +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 cefd202cd..fbebab46a 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[eu]=cbr, cbz, cbt, komiki-liburua X-KDE-Keywords[fi]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[gl]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[ia]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ja]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ko]=cbr, cbz, cbt, Comic Book,만화책