From 25a31b8d880d0534aaa3ba7e5719c502f2e96b5c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 20 Mar 2022 02:43:23 +0000 Subject: [PATCH 1/3] GIT_SILENT made messages (after extraction) --- mobile/app/org.kde.okular.kirigami.appdata.xml | 3 ++- shell/org.kde.okular.appdata.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index a79d1bee3..89cb42f0c 100644 --- a/mobile/app/org.kde.okular.kirigami.appdata.xml +++ b/mobile/app/org.kde.okular.kirigami.appdata.xml @@ -183,6 +183,7 @@
  • Formats de fichiers pris en charge : PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Támogatott formátumok: PDF, PS, Tiff, CHM, DjVu, képek, DVI, XPS, FictionBook, képregények, Plucker, EPub, Fax
  • Formtos supportate: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
    • +
  • Format Yang Didukung: PDF, PS, Tiff, CHM, DjVu, Citra, DVI, XPS, Buku Fiksi, Buku Komik, Plucker, EPub, Fax
  • Formati supportati: PDF, PS, Tiff, CHM, DjVu, immagini, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • 지원하는 형식: PDF, PS, Tiff, CHM, DjVu, 그림, DVI, XPS, Fiction Book, 만화책, Plucker, EPub, 팩스
  • Palaikomi formatai: PDF, PS, Tiff, CHM, DjVu, paveikslai, DVI, XPS, Fiction Book, komiksų knygos, Plucker, EPub, faksas
    • @@ -301,7 +302,7 @@ ओकुलर में सहाय्य पुस्तिका पढ़ना Kézikönyv olvasása Okularban Legente manual in Okular - Membaca manual di Okular + Petunjuk di Okular Consultazione di un manuale in Okular Okular로 설명서 읽기 Vadovo skaitymas programoje Okular diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index 8d50a103e..3accd505e 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -197,7 +197,7 @@
  • Formats de fichiers pris en charge : PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Támogatott formátumok: PDF, PS, Tiff, CHM, DjVu, képek, DVI, XPS, illusztrált könyvek, képregények, Plucker, EPub, Fax
  • Formtos supportate: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
    • -
  • Format Yang Didukung: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax
    • +
  • Format Yang Didukung: PDF, PS, Tiff, CHM, DjVu, Citra, DVI, XPS, Buku Fiksi, Buku Komik, Plucker, EPub, Fax
  • Formati supportati: PDF, PS, Tiff, CHM, DjVu, immagini, DVI, XPS, Fiction Book, fumetti, Plucker, EPub, Fax
  • 지원하는 형식: PDF, PS, Tiff, CHM, DjVu, 사진, DVI, XPS, Fiction Book, 만화책, Plucker, EPub, 팩스
  • Palaikomi formatai: PDF, PS, Tiff, CHM, DjVu, paveikslai, DVI, XPS, Fiction Book, komiksų knygos, Plucker, EPub, faksas
    • @@ -324,7 +324,7 @@ ओकुलर में सहाय्य पुस्तिका पढ़ना Kézikönyv olvasása Okularban Legente manual in Okular - Membaca manual di Okular + Petunjuk di Okular Consultazione di un manuale in Okular Okular로 설명서 읽기 Vadovo skaitymas programoje Okular From 6f279fa725b102dfa01c4c2e7d17f9697b12ab68 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 27 Mar 2022 02:17:20 +0000 Subject: [PATCH 2/3] GIT_SILENT made messages (after extraction) --- mobile/app/org.kde.okular.kirigami.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index 89cb42f0c..b6cd8ae15 100644 --- a/mobile/app/org.kde.okular.kirigami.appdata.xml +++ b/mobile/app/org.kde.okular.kirigami.appdata.xml @@ -38,7 +38,7 @@ Okular Mobile Okular Mobil கைபேசிக்கான ஆக்குலர் - Okular Mobil + Okular Mobile Мобільний Okular Okular Di động xxOkular Mobilexx From dbcda67ab986a46815c154d49d414b4d2cbdcb61 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 28 Mar 2022 22:17:42 +0200 Subject: [PATCH 3/3] Fix opening CHM files on Windows This is part of 451985 the other part is that KF5.91 windows build of khtml was broken, seems the 5.92 one is good, so once we release 22.04.0 it should be all good hopefully. BUGS: 451985 --- generators/chm/lib/ebook_chm.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/generators/chm/lib/ebook_chm.cpp b/generators/chm/lib/ebook_chm.cpp index 98ac53346..5be570bbc 100644 --- a/generators/chm/lib/ebook_chm.cpp +++ b/generators/chm/lib/ebook_chm.cpp @@ -254,13 +254,7 @@ bool EBook_CHM::load(const QString &archiveName) } #if defined(WIN32) - // chm_open on Windows OS uses the following prototype: - // struct chmFile* chm_open(BSTR filename); - // - // however internally it simply passes the filename - // directly to CreateFileW function without any conversion. - // Thus we need to pass it as WCHAR * and not BSTR. - m_chmFile = chm_open((BSTR)filename.toStdWString().c_str()); + m_chmFile = chm_open((BSTR)QFile::encodeName(filename).constData()); #else m_chmFile = chm_open(QFile::encodeName(filename)); #endif