From f353ed2a9b06c5bcb135fddf03283145682ea2c0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 Apr 2020 09:50:10 +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 af1d82230..f1ed792db 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[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[it]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[ja]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ko]=cbr, cbz, cbt, Comic Book,만화책 X-KDE-Keywords[lt]=cbr, cbz, cbt, Comic Book, komiksų knygos, komiksu knygos X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie