From 5dfbee0a0039fb3258edc0814fe814e3c7be793a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 1 Feb 2020 05:46:42 +0100 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 deletion(-) diff --git a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop index 445633a07..3c8cb2033 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -167,7 +167,6 @@ 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(Libro de Comic) X-KDE-Keywords[it]=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