diff -Nru kiwix-2.2.1~bionic/ChangeLog kiwix-2.2.2~bionic/ChangeLog --- kiwix-2.2.1~bionic/ChangeLog 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/ChangeLog 2022-06-22 14:13:21.000000000 +0000 @@ -1,3 +1,12 @@ +kiwix-desktop 2.2.2 +=================== + + * Remove usage of deprecated libkiwix function (@juzz0 @mgautiefr #831) + * Adapt kiwix-desktop to last libkiwix api (@mgautierfr #842, @veloman-yunkan #844) + * Do not search (and crash) on a zim file without fulltext index (@mgautierfr #830) + * Update translations. + * [Flathub] Update link to screenshot + kiwix-desktop 2.2.1 =================== diff -Nru kiwix-2.2.1~bionic/debian/changelog kiwix-2.2.2~bionic/debian/changelog --- kiwix-2.2.1~bionic/debian/changelog 2022-03-11 16:25:39.000000000 +0000 +++ kiwix-2.2.2~bionic/debian/changelog 2022-06-22 14:13:23.000000000 +0000 @@ -1,8 +1,8 @@ -kiwix (2.2.1~bionic) bionic; urgency=medium +kiwix (2.2.2~bionic) bionic; urgency=medium * New automated build - -- Kiwix builder Fri, 11 Mar 2022 16:25:39 +0000 + -- Kiwix builder Wed, 22 Jun 2022 14:13:23 +0000 kiwix (0.0.0) unstable; urgency=medium diff -Nru kiwix-2.2.1~bionic/debian/control kiwix-2.2.2~bionic/debian/control --- kiwix-2.2.1~bionic/debian/control 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/debian/control 2022-06-22 14:13:21.000000000 +0000 @@ -6,7 +6,7 @@ pkg-config, qtbase5-dev, qtwebengine5-dev, - libkiwix-dev (>= 10.0.0~) + libkiwix-dev (>= 11.0.0~) Standards-Version: 4.5.0 Homepage: https://www.kiwix.org/ Rules-Requires-Root: no Binary files /tmp/tmp0xi0nkxz/jt5wVlpA7t/kiwix-2.2.1~bionic/kiwix-build-deps_2.2.1~bionic_all.deb and /tmp/tmp0xi0nkxz/1814vQoXeZ/kiwix-2.2.2~bionic/kiwix-build-deps_2.2.1~bionic_all.deb differ Binary files /tmp/tmp0xi0nkxz/jt5wVlpA7t/kiwix-2.2.1~bionic/kiwix-build-deps_2.2.2~bionic_all.deb and /tmp/tmp0xi0nkxz/1814vQoXeZ/kiwix-2.2.2~bionic/kiwix-build-deps_2.2.2~bionic_all.deb differ diff -Nru kiwix-2.2.1~bionic/kiwix-desktop.pro kiwix-2.2.2~bionic/kiwix-desktop.pro --- kiwix-2.2.1~bionic/kiwix-desktop.pro 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/kiwix-desktop.pro 2022-06-22 14:13:21.000000000 +0000 @@ -18,7 +18,8 @@ QMAKE_CXXFLAGS += -std=c++11 QMAKE_LFLAGS += -std=c++11 -DEFINES += VERSION="2.2.1" +# Also change resources/org.kiwix.desktop.appdata.xml +DEFINES += VERSION="2.2.2" # The following define makes your compiler emit warnings if you use # any feature of Qt which has been marked as deprecated (the exact warnings @@ -153,12 +154,12 @@ INSTALLS += mime_file } -PKGCONFIG_CFLAGS = $$system(pkg-config --cflags $$PKGCONFIG_OPTION \"kiwix >= 10.0.0 libzim >= 7.2.0\") +PKGCONFIG_CFLAGS = $$system(pkg-config --cflags $$PKGCONFIG_OPTION \"kiwix >= 11.0.0 libzim >= 7.2.0\") QMAKE_CXXFLAGS += $$PKGCONFIG_CFLAGS QMAKE_CFLAGS += $$PKGCONFIG_CFLAGS -LIBS += $$system(pkg-config --libs $$PKGCONFIG_OPTION \"kiwix >= 10.0.0 libzim >= 7.2.0\") +LIBS += $$system(pkg-config --libs $$PKGCONFIG_OPTION \"kiwix >= 11.0.0 libzim >= 7.2.0\") RESOURCES += \ resources/kiwix.qrc \ diff -Nru kiwix-2.2.1~bionic/README.md kiwix-2.2.2~bionic/README.md --- kiwix-2.2.1~bionic/README.md 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/README.md 2022-06-22 14:13:21.000000000 +0000 @@ -8,6 +8,7 @@ The Kiwix Desktop is a viewer/manager of ZIM files for GNU/Linux and Microsoft Windows OSes. +[![Release](https://img.shields.io/github/v/tag/kiwix/kiwix-desktop?label=release&sort=semver)](https://download.kiwix.org/release/kiwix-desktop/) [![Repositories](https://img.shields.io/repology/repositories/kiwix-desktop?label=repositories)](https://github.com/kiwix/kiwix-desktop/wiki/Repology) [![Build Status](https://github.com/kiwix/kiwix-desktop/workflows/CI/badge.svg?query=branch%3Amaster)](https://github.com/kiwix/kiwix-desktop/actions?query=branch%3Amaster) [![CodeFactor](https://www.codefactor.io/repository/github/kiwix/kiwix-desktop/badge)](https://www.codefactor.io/repository/github/kiwix/kiwix-desktop) @@ -106,7 +107,7 @@ * [Web Public Chat channel](https://chat.kiwix.org) * [Email](mailto:contact+android@kiwix.org) * [Mailing list](mailto:kiwix-developer@lists.sourceforge.net) -* [Slack](https://kiwixoffline.slack.com): #android channel [Get an invite](https://join.slack.com/t/kiwixoffline/shared_invite/enQtOTUyMTg4NzMxMTM4LTU0MzYyZDliYjdmMDYzYWMzNDA0MDc4MWE5OGM0ODFhYjAxNWIxMjVjZTU4MTkyODJlZWFkMmQ2YTZkYTUzZDY) +* [Slack](https://kiwixoffline.slack.com): #android channel [Get an invite](https://join.slack.com/t/kiwixoffline/shared_invite/zt-19s7tsi68-xlgHdmDr5c6MJ7uFmJuBkg) * IRC: #kiwix on irc.freenode.net For more information, please refer to diff -Nru kiwix-2.2.1~bionic/resources/i18n/cs.json kiwix-2.2.2~bionic/resources/i18n/cs.json --- kiwix-2.2.1~bionic/resources/i18n/cs.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/cs.json 2022-06-22 14:13:21.000000000 +0000 @@ -71,7 +71,9 @@ "port-for-local-kiwix-server-setting": "Port pro místní server Kiwix", "zoom-level-setting": "Výchozí stupeň přiblížení", "download-directory-setting": "Složka stahování", + "monitor-directory-default": "Nenastaveno", "reset": "Resetovat", + "clear": "Vymazat", "browse": "Procházet", "about-kiwix-desktop-title": "Kiwix Desktop", "about-kiwix-desktop-description": "Kiwix vám umožňuje mít po ruce celou Wikipedii, ať už jste kdekoli! Na lodi, uprostřed ničeho nebo ve vězení, Kiwix vám poskytuje přístup k celému lidskému poznání. Nepotřebujete internet, vše je uloženo v počítači.", @@ -126,5 +128,7 @@ "download-dir-dialog-msg": "Nová cesta ke složce pro stahování bude:\n{{DIRECTORY}}", "invalid-port": "Neplatný port", "zim-open-fail-title": "Neplatný soubor", - "zim-open-fail-text": "Soubor ZIM {{ZIM}} nelze správně otevřít. Bude z vaší knihovny odstraněn." + "zim-open-fail-text": "Soubor ZIM {{ZIM}} nelze správně otevřít. Bude z vaší knihovny odstraněn.", + "monitor-dir-dialog-title": "Opravdu chcete změnit adresář monitorování?", + "monitor-clear-dir-dialog-title": "Opravdu chcete vymazat adresář monitorování?" } diff -Nru kiwix-2.2.1~bionic/resources/i18n/de.json kiwix-2.2.2~bionic/resources/i18n/de.json --- kiwix-2.2.1~bionic/resources/i18n/de.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/de.json 2022-06-22 14:13:21.000000000 +0000 @@ -71,8 +71,8 @@ "cancel": "Abbrechen", "apply": "Anwenden", "port-for-local-kiwix-server-setting": "Port für den lokalen Kiwix-Server:", - "zoom-level-setting": "Zoom-Einstellung:", - "download-directory-setting": "Verzeichnis für Downloads:", + "zoom-level-setting": "Zoom-Einstellung", + "download-directory-setting": "Verzeichnis für Downloads", "reset": "Zurücksetzen", "browse": "Durchsuchen", "about-kiwix-desktop-title": "Kiwix Desktop", diff -Nru kiwix-2.2.1~bionic/resources/i18n/diq.json kiwix-2.2.2~bionic/resources/i18n/diq.json --- kiwix-2.2.1~bionic/resources/i18n/diq.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/diq.json 2022-06-22 14:13:21.000000000 +0000 @@ -9,7 +9,7 @@ "name": "Zazaki", "error-title": "Xeta", "error-downloader-window-title": "Ronayoğ nêvırazeno", - "error-downloader-launch-message": "Kewtışê ronayoği mıkum niyo, Kiwix destser do bıguriyo, feqet karê ronayışi pêro do nêguriyeno!", + "error-downloader-launch-message": "Kewtışê ronayoği mımkın niyo ke serê masaya Kiwixi bıguriyo, feqet karê ronayışi pêro nêguriyeno!", "error-launch-server-message": "Yew xeta biye!", "open-zim": "Zim'i akerê", "local-kiwix-server": "Mehali Serverê Kiwixi", @@ -46,7 +46,7 @@ "download-finished-message": "Dokuman roniya", "file": "Dosya", "edit": "Bıvurnê", - "view": "Bıvinê", + "view": "Bıvêne", "tools": "Haceti", "window-title": "Kıtıbxane - Kiwix", "search": "Cıgeyrayış", @@ -57,7 +57,7 @@ "search-files": "Dosya cıgeyrayış", "title": "Serey", "size": "Ebad", - "date": "Terıx", + "date": "Tarix", "content-type": "Tewrê zerreki", "reset-sort": "Rêzer reset ke", "open": "Ake", @@ -67,10 +67,11 @@ "pause": "Bıvındarne", "cancel": "Bıtexelne", "apply": "Tetbiq bıkerê", - "port-for-local-kiwix-server-setting": "Mehali Serverê Kiwixi nuqtay gırey:", - "zoom-level-setting": "Sewiyey zoomi:", - "download-directory-setting": "Rêzey ronayışi:", + "port-for-local-kiwix-server-setting": "Nuxta gıreyê ardoğê Kiwixiyo mehali", + "zoom-level-setting": "Sewiyaya nêzdikerdışiya hesebiyayiye", + "download-directory-setting": "Zerrekê ronayışi", "reset": "Reset kerê", + "clear": "Pak ke", "browse": "Çımberze", "about-kiwix-desktop-title": "Kiwix Desktop", "about-kiwix-desktop-description": "Kiwix şıma koti ke vanê se şırê wikipedia daba şıma desti bın! Yee kelek de, warte dê cayê de ya zi hebısxane de, Kiwik şıma rê resayışê insanan pêroyın kena. İhtiyacê şıma interneti ra zi çıniyo, pêro komputerê şıma de nımneyêno.", @@ -82,7 +83,7 @@ "about-report-issue": "Yew mewzu akerdışi rê Kiwix Desktopi Seyriyan mewzu ziyaret kerê u persê ho izah kerdê yew mewzu akerê.", "about-report-issue-2": "Xerpiyaye versiyoni bınısne", "about-libraries-title": "Kıtabxaney", - "kiwix-server-running-message": "Serverê kiwixiyo guriyeno pirıka mahalli ra eno adres ra şenê cıresê", + "kiwix-server-running-message": "Serverê kiwixiyo guriyeno, pirıka mehaliye de be adrese ra şenê cı resê:", "kiwix-server-description": "Serveri sıftekerdış, tora mehalli de komputeranê binan ra standard yew rovıteri ra kıtabxaney Kiwixê şıma resayışi re mısade dano.", "fullscreen-notification": "Enewke modê tam ekranı derê.veciyayışi rê ESC bıpıloğne", "all-files": "Dosyay pêro", @@ -104,7 +105,7 @@ "vikidia": "Vikidia", "wikibooks": "Wikikıtab", "wikinews": "Wikixeber", - "wikipedia": "Wikipedia", + "wikipedia": "Wikipediya", "wikiquote": "Wikivate", "wikisource": "Wikiçıme", "wikispecies": "Wikitewri", @@ -120,7 +121,7 @@ "no": "nê", "no-filter": "parzûn çıniyo", "open-link-in-web-browser": "Browserê webi de gırey akerê", - "download-dir-dialog-title": "Şıma qayılê rêza ronayışi bıvurne?", - "download-dir-dialog-msg": "Rêza ronayışiya newi do ena ray bo:\n {{DIRECTORY}}", + "download-dir-dialog-title": "Şıma qayılê ke zerrekê ronayışi bıvurnê?", + "download-dir-dialog-msg": "Zerrekê ronayışiyo newe do wına bo:\n{{DIRECTORY}}", "invalid-port": "Nuqtaya xırab" } diff -Nru kiwix-2.2.1~bionic/resources/i18n/en.json kiwix-2.2.2~bionic/resources/i18n/en.json --- kiwix-2.2.1~bionic/resources/i18n/en.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/en.json 2022-06-22 14:13:21.000000000 +0000 @@ -8,6 +8,7 @@ "error-downloader-window-title":"Cannot create downloader", "error-downloader-launch-message":"Impossible to launch downloader, Kiwix-desktop will start but all download functions will not working!", "error-launch-server-message":"An error has occured!", + "error-archive":"Cannot get the archive", "open-zim":"Open Zim", "local-kiwix-server":"Local Kiwix Server", "random-article":"Random Article", diff -Nru kiwix-2.2.1~bionic/resources/i18n/es.json kiwix-2.2.2~bionic/resources/i18n/es.json --- kiwix-2.2.1~bionic/resources/i18n/es.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/es.json 2022-06-22 14:13:21.000000000 +0000 @@ -7,10 +7,11 @@ "Fitoschido", "Geryescalier", "Ice bulldog", + "Josuert", "Ncr" ] }, - "name": "Español", + "name": "español", "error-downloader-window-title": "No se puede crear el descargador", "error-downloader-launch-message": "No se puede iniciar el descargador. Kiwix-desktop se iniciará pero no funcionarán las prestaciones de descarga!", "open-zim": "Abrir Zim", @@ -20,6 +21,7 @@ "print": "Imprimir", "new-tab": "Pestaña nueva", "close-tab": "Cerrar pestaña", + "close": "Cerrar", "reopen-closed-tab": "Reabrir pestaña cerrada", "browse-library": "Explorar biblioteca", "open-file": "Abrir archivo", @@ -68,12 +70,15 @@ "cancel": "Cancelar", "apply": "Aplicar", "port-for-local-kiwix-server-setting": "Puerto del servidor Kiwix local", - "zoom-level-setting": "Nivel de escala:", + "zoom-level-setting": "Nivel de escala predeterminado", "download-directory-setting": "Directorio de descargas", + "monitor-directory-setting": "Supervisar directorio", + "monitor-directory-default": "No establecido", "reset": "Restablecer", + "clear": "Limpiar", "browse": "Explorar", "about-kiwix-desktop-title": "Escritorio Kiwix", - "about-kiwix-desktop-description": "¡Kiwix te permite tener toda la Wikipedia a mano donde quiera que vayas! En un bote, en medio de la nada o en la cárcel, Kiwix te da acceso a todo el conocimiento humano. No necesita Internet, todo está almacenado en su computadora.", + "about-kiwix-desktop-description": "¡Kiwix te permite tener toda la Wikipedia a mano donde quiera que vayas! En un barco, en medio de la nada o en la cárcel, Kiwix te da acceso a todo el conocimiento humano. No necesitas Internet, todo está almacenado en tu computadora.", "about-learn-more-about-kiwix": "Para conocer más sobre Kiwix", "about-release-title": "Lanzamiento", "about-source-code": "Este software se ha publicado en virtud de la Licencia Pública General de GNU, versión 3. El código fuente puede verse en GitHub.", @@ -101,6 +106,7 @@ "ted": "Ted", "vikidia": "Vikidia", "wikibooks": "Wikilibros", + "wikihow": "wikiHow", "wikinews": "Wikinoticias", "wikipedia": "Wikipedia", "wikiquote": "Wikiquote", @@ -117,5 +123,6 @@ "no": "no", "no-filter": "Sin filtro", "open-link-in-web-browser": "Abrir enlace en navegador web", - "invalid-port": "Puerto no válido" + "invalid-port": "Puerto no válido", + "zim-open-fail-title": "Archivo invalido" } diff -Nru kiwix-2.2.1~bionic/resources/i18n/fr.json kiwix-2.2.2~bionic/resources/i18n/fr.json --- kiwix-2.2.1~bionic/resources/i18n/fr.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/fr.json 2022-06-22 14:13:21.000000000 +0000 @@ -13,6 +13,7 @@ "error-downloader-window-title": "Impossible de lancer le téléchargeur", "error-downloader-launch-message": "Impossible de lancer le téléchargeur, Kiwix-desktop démarrera mais toutes les fonctions de téléchargement ne fonctionneront pas !", "error-launch-server-message": "Une erreur s’est produite !", + "error-archive": "Impossible d’obtenir l’archive", "open-zim": "Ouvrir un Zim", "local-kiwix-server": "Serveur local Kiwix", "random-article": "Article au hasard", diff -Nru kiwix-2.2.1~bionic/resources/i18n/id.json kiwix-2.2.2~bionic/resources/i18n/id.json --- kiwix-2.2.1~bionic/resources/i18n/id.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/id.json 2022-06-22 14:13:21.000000000 +0000 @@ -1,11 +1,13 @@ { "@metadata": { "authors": [ - "Esiahaan" + "Esiahaan", + "Farras" ] }, "name": "Bahasa Inggris", "error-downloader-window-title": "Tidak dapat membuat pengunduh", + "error-archive": "Gagal memuat arsip", "open-zim": "Buka Zim", "random-article": "Artikel Acak", "home-page": "Beranda", diff -Nru kiwix-2.2.1~bionic/resources/i18n/it.json kiwix-2.2.2~bionic/resources/i18n/it.json --- kiwix-2.2.1~bionic/resources/i18n/it.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/it.json 2022-06-22 14:13:21.000000000 +0000 @@ -5,19 +5,24 @@ "Albe Albe460", "Beta16", "Gianfranco", + "IrsY", "Scompo", "Stefano" ] }, - "name": "Italiano", + "name": "italiano", + "error-title": "Errore", "error-downloader-launch-message": "Impossibile avviare il downloader, Kiwix-desktop si avvierà ma tutte le funzioni di download non funzioneranno!", "error-launch-server-message": "Si è verificato un errore.", "local-kiwix-server": "Server Kiwix locale", + "random-article": "Voce a caso", "home-page": "Pagina principale", "main-menu": "Menu principale", "print": "Stampa", + "print-page-error": "Si è verificato un errore durante la stampa.", "new-tab": "Nuova scheda", "close-tab": "Chiudi scheda", + "close": "Chiudi", "reopen-closed-tab": "Riapri scheda chiusa", "browse-library": "Esplora libreria", "open-file": "Apri file", @@ -26,6 +31,8 @@ "find-in-page": "Trova nella pagina", "set-fullscreen": "Imposta a schermo intero", "quit-fullscreen": "Esci da schermo intero", + "table-of-content": "Indice", + "reading-list": "Elenco di lettura", "reading-list-title": "Elenco di lettura", "zoom-in": "Ingrandisci", "zoom-out": "Rimpicciolisci", @@ -67,7 +74,9 @@ "reset": "Ripristina", "clear": "Pulisci", "browse": "Esplora", + "about-kiwix-desktop-title": "Kiwix Desktop", "about-learn-more-about-kiwix": "Leggi di più su Kiwix", + "about-release-title": "Versione", "about-version": "Versione: {{VERSION}}", "about-reporting-problem-title": "Segnala un problema", "about-libraries-title": "Biblioteche", @@ -79,11 +88,15 @@ "start-kiwix-server": "Avvia server Kiwix", "all": "Tutto", "other": "Altro", + "gutenberg": "Gutenberg", + "mooc": "MOOC", + "stack_exchange": "Stack Exchange", "vikidia": "Vikidia", "wikibooks": "Wikibooks", "wikihow": "wikiHow", "wikinews": "Wikinotizie", "wikipedia": "Wikipedia", + "wikiquote": "Wikiquote", "wikisource": "Wikisource", "wikiversity": "Wikiversità", "wikivoyage": "Wikivoyage", diff -Nru kiwix-2.2.1~bionic/resources/i18n/ja.json kiwix-2.2.2~bionic/resources/i18n/ja.json --- kiwix-2.2.1~bionic/resources/i18n/ja.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/ja.json 2022-06-22 14:13:21.000000000 +0000 @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "Funa-enpitu", "MathXplore", "Object＊tofu", "Omotecho", @@ -8,6 +9,7 @@ ] }, "error-launch-server-message": "エラーが発生しました。", + "error-archive": "アーカイブを取得できない", "print": "印刷", "print-page-error": "印刷中にエラーが発生しました。", "new-tab": "新しいタブ", diff -Nru kiwix-2.2.1~bionic/resources/i18n/ku-latn.json kiwix-2.2.2~bionic/resources/i18n/ku-latn.json --- kiwix-2.2.1~bionic/resources/i18n/ku-latn.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/ku-latn.json 2022-06-22 14:13:21.000000000 +0000 @@ -7,16 +7,21 @@ ] }, "name": "Kurdî", + "error-title": "Çewtî", "error-downloader-window-title": "Nikare daxînerê çêke", - "error-downloader-launch-message": "Nemimkun e ku daxînerê veke, wê Kîwîks-sermase dest pê bike lê wê hemû fonksiyonên daxistinê nexebitin !", + "error-downloader-launch-message": "Nemimkun e ku daxînerê veke, wê Kîwîks-sermase dest pê bike lê wê hemû fonksiyonên daxistinê nexebitin!", + "error-launch-server-message": "Çewtiyekê rû da!", "open-zim": "Zim-ê Veke", "local-kiwix-server": "Servera Kiwixê ya Herêmî", "random-article": "Gotara Ketober", + "random-article-error": "Bi ser neket ku gotareke ketober veke.", "home-page": "Serûpel", "main-menu": "Menuya esasî", "print": "Çap bike", + "print-page-error": "Çewtiyeke qewimî gava çapkirinê.", "new-tab": "Hilpekîna nû", "close-tab": "Hilpekînê bigire", + "close": "Bigire", "reopen-closed-tab": "Hilpekîna girtî ji nû ve veke", "browse-library": "Çavê xwe li kitêbxaneyê bigerîne", "open-file": "Dosyeyê veke", @@ -64,22 +69,25 @@ "pause": "Rawestîne", "cancel": "Betal bike", "apply": "Bisepîne", - "port-for-local-kiwix-server-setting": "Nuqteya girêdanê ji bo servera Kiwixê yê lokal :", - "zoom-level-setting": "Dereceya nêzîkkirinê :", - "download-directory-setting": "Pelrêçê daxîne :", + "port-for-local-kiwix-server-setting": "Nuqteya girêdanê ji bo servera Kiwixê yê lokal", + "zoom-level-setting": "Dereceya nêzîkkirinê", + "download-directory-setting": "Pelrêçê daxîne", + "monitor-directory-setting": "Pelrêça monîtorê", + "monitor-directory-default": "Nemîhengkirî ye", "reset": "Sifir bike", + "clear": "Paqij bike", "browse": "Çav pê bixe", "about-kiwix-desktop-title": "Kiwix Sermase", "about-kiwix-desktop-description": "Kiwix îmkan dide mirov ku mirov here ku jî temamiya Wîkîpediyayê di destê mirov de be! Li ser qayikekê, di nîvê cihekî de an di hepsê de, Kiwix rê dide ku xwe bigihînî temamiya zanînên însanan. Ihtîyaciya te bi înternetê tine ye, her tişt li ser kombersa te tê depokirin.", "about-learn-more-about-kiwix": "Zêdetir hîn bibe derbarê Kiwixê de", "about-release-title": "Versiyon", "about-source-code": "Nivîsbarî di bin banê şertên Lîsansa Giştî ya GNUyê versiyon 3 de hate belavkirin. Koda çavkanî bibîne li ser Githubê.", - "about-version": "Versiyon : {{VERSION}}", + "about-version": "Versiyon: {{VERSION}}", "about-reporting-problem-title": "Raporkirina problemê", "about-report-issue": "Ji bo vekirina pirsgirêkekî, serdana Kiwix-sermase şopgera probleman bike û pirsgirêka ku problema te îzah dike veke.", "about-report-issue-2": "Ji kerema xwe di pirsgirêkê de behsa versiyonê jî bike", "about-libraries-title": "Kitêbxane", - "kiwix-server-running-message": "Servera Kiwixê dixebite û dikare were gihîn di tora lokal de li :", + "kiwix-server-running-message": "Servera Kiwixê dixebite û dikare were gihîn di tora lokal de li:", "kiwix-server-description": "Destpêkirina serverekê rê dide kombersên din yên di tora lokal de ku bi gerokeke webê ya standard re xwe bigihînin kitêbxaneya te ya Kiwixê.", "fullscreen-notification": "Tu vêga di moda ekrana dagirtî de yî. Ji bo derketinê pêlî ESC-ê bike!", "all-files": "Hemû Dosye", @@ -100,6 +108,7 @@ "ted": "Ted", "vikidia": "Vikidia", "wikibooks": "Wîkîpirtûk", + "wikihow": "wikiHow", "wikinews": "Wîkînûçe", "wikipedia": "Wîkîpediya", "wikiquote": "Wîkîgotin", @@ -118,6 +127,13 @@ "no-filter": "bêparzûn", "open-link-in-web-browser": "Lînkê di geroka webê de veke", "download-dir-dialog-title": "Tu jê piştrast î ku tu dixwazî pelrêça daxistinê biguherînî?", - "download-dir-dialog-msg": "Pelrêça daxistinê yê nû wê bibe :\n{{DIRECTORY}}", - "invalid-port": "Nuqteya girêdanê yê nederbasdar" + "download-dir-dialog-msg": "Pelrêça daxistinê yê nû wê bibe:\n{{DIRECTORY}}", + "invalid-port": "Nuqteya girêdanê yê nederbasdar", + "zim-open-fail-title": "Dosyeya nederbasdar", + "zim-open-fail-text": "Dosyeya ZIMê ya {{ZIM}} nikare bi awayekî rast were vekirin. Ew wê ji kitêbxaneya te were rakirin.", + "monitor-dir-dialog-title": "Tu emîn î ku tu dixwazî pelrêça monîtorê biguherînî?", + "monitor-dir-dialog-msg": "Pelrêça monîtorê yê nû wê bibe:\n{{DIRECTORY}}", + "monitor-clear-dir-dialog-title": "Tu jê piştrast î ku tu dixwazî pelrêça monîtorê paqij bikî?", + "monitor-clear-dir-dialog-msg": "Ev wê kontrolkirina pelrêça monîtorê ji bo dosyeyên nû yên ZIMê bisekinîne.", + "monitor-directory-tooltip": "Temamê dosyeyên ZIMê yên di vê pelrêçê de wê bi otomatîkî tevlî kitêbxaneyê bên kirin." } diff -Nru kiwix-2.2.1~bionic/resources/i18n/mk.json kiwix-2.2.2~bionic/resources/i18n/mk.json --- kiwix-2.2.1~bionic/resources/i18n/mk.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/mk.json 2022-06-22 14:13:21.000000000 +0000 @@ -9,6 +9,7 @@ "error-downloader-window-title": "Не можам да го создадам преземачот", "error-downloader-launch-message": "Не можам да го пуштам преземачот. Кивикс за сметач ќе се пушти, нема да работи ниедна од можностите за преземање!", "error-launch-server-message": "Се појави грешка!", + "error-archive": "Не можам да го добијам архивот", "open-zim": "Отвори Zim", "local-kiwix-server": "Месен опслужувач на Кивикс", "random-article": "Случајна статија", diff -Nru kiwix-2.2.1~bionic/resources/i18n/ms.json kiwix-2.2.2~bionic/resources/i18n/ms.json --- kiwix-2.2.1~bionic/resources/i18n/ms.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/ms.json 2022-06-22 14:13:21.000000000 +0000 @@ -1,7 +1,8 @@ { "@metadata": { "authors": [ - "Tofeiku" + "Tofeiku", + "Ultron90" ] }, "name": "Bahasa Melayu", @@ -55,7 +56,7 @@ "wikisource": "Wikisumber", "wikispecies": "Wikispesies", "wikiversity": "Wikiversiti", - "wikivoyage": "Wikilayar", + "wikivoyage": "Wikikembara", "wiktionary": "Wikikamus", "pictures": "Gambar", "videos": "Video", diff -Nru kiwix-2.2.1~bionic/resources/i18n/nqo.json kiwix-2.2.2~bionic/resources/i18n/nqo.json --- kiwix-2.2.1~bionic/resources/i18n/nqo.json 1970-01-01 00:00:00.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/nqo.json 2022-06-22 14:13:21.000000000 +0000 @@ -0,0 +1,56 @@ +{ + "@metadata": { + "authors": [ + "Aboubacar.banamoridou.toure", + "Lancine.kounfantoh.fofana" + ] + }, + "error-title": "ߝߎ߬ߕߎ߲߬ߕߌ", + "random-article": "ߓߍ߲߬ߛߋ߲߬ߡߊ߫ ߞߎߡߘߊ", + "random-article-error": "ߓߍ߲߬ߛߋ߲߬ߡߊ߬ ߞߎߡߘߊ ߘߊߦߟߍߟߌ ߓߘߊ߫ ߗߌߙߏ߲߫.", + "home-page": "ߓߏ߬ߟߏ߲߬ߘߊ ߞߐߜߍ", + "main-menu": "ߓߏ߬ߟߏ߲߬ߘߊ ߛߙߍߘߍ", + "print": "ߜߌ߬ߙߌ߲߬ߘߌ߬ߟߌ", + "print-page-error": "ߝߎ߬ߕߎ߲߬ߕߌ ߘߏ߫ ߓߘߊ߫ ߓߌ߬ߟߴߊ߬ ߘߐ߫ ߞߊ߬ ߜߌ߬ߙߌ߲߬ߘߌ߬ߟߌ ߕߴߌ ߘߐ߫.", + "new-tab": "ߝߢߐߘߊ߫ ߞߎߘߊ", + "close-tab": "ߝߢߐߘߊ ߘߊߕߎ߲߯", + "close": "ߊ߬ ߘߊߕߎ߲߯", + "browse-library": "ߛߓߍߘߊ ߛߏ߲߯ߓߊ߫", + "open-file": "ߞߐߕߐ߮ ߘߊߦߟߍ߬", + "open-recent": "ߞߐ߯ߟߊ߫ ߘߊߦߟߍߣߍ߲", + "search-article": "ߞߎߡߘߊ ߢߌߣߌ߲߫", + "search-in-library": "ߕߌߙߌ߲ߠߌ߲ ߞߍ߫ ߛߓߍߘߊ ߞߣߐ߫", + "find-in-page": "ߊ߬ ߢߌߣߌ߲߫ ߞߐߜߍ ߘߐ߫", + "set-fullscreen": "ߘߊ߬ߣߊ߲߬ߥߟߊ ߘߝߊߣߍ߲ ߞߍߗߏ߮", + "quit-fullscreen": "ߓߐ߫ ߘߊ߬ߣߊ߲߬ߥߟߊ ߘߝߊߣߍ߲ ߘߐ߫", + "table-of-content": "ߞߣߐߘߐ ߟߎ߬ ߥߟߊ߬ߟߋ߲", + "reading-list": "ߘߐ߬ߞߊ߬ߙߊ߲߬ߠߌ߲߬ ߛߙߍߘߍ", + "reading-list-title": "ߘߐ߬ߞߊ߬ߙߊ߲߬ߠߌ߲߬ ߛߙߍߘߍ", + "zoom-in": "ߊ߬ ߡߊߛߊ߬ߡߊ߲߫", + "zoom-out": "ߊ߬ ߡߊߓߐ߫", + "help": "ߘߍ߬ߡߍ߲߬ߠߌ߲", + "feedback": "ߞߙߐ߬ߛߌ߬ߕߊ", + "report-a-bug": "ߝߍ߭ ߘߏ߫ ߟߊߞߏߝߐ߫", + "request-a-feature": "ߗߋߘߊ ߘߏ߫ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫", + "about-kiwix": "ߞߊ߬ ߓߍ߲߬ ߞߥߌߞߛ ߡߊ߬", + "donate-to-support-kiwix": "ߣߌ߬ߟߌ ߞߍ߫ ߞߊ߬ ߞߥߌߞߛ ߞߐߡߊߓߌ߲ߓߌ߲߫", + "exit": "ߓߐ߫", + "save-file-as-window-title": "ߞߐߕߐ߮ ߟߊߞߎ߲߬ߘߎ߬ ߦߏ߫", + "download-finished-message": "ߘߐ߬ߛߙߋ ߓߘߊ߫ ߓߊ߲߫ ߟߊߖߌ߰ ߟߴߌ ߞߎ߲߬.", + "file": "ߞߐߕߐ߮", + "edit": "ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫", + "view": "ߊ߬ ߦߋ߫", + "tools": "ߖߐ߯ߙߊ߲ ߠߎ߬", + "window-title": "ߞߥߌߞߛ – ߛߓߍߘߊ", + "search": "ߢߌߣߌ߲ߠߌ߲", + "browse-directory": "ߘߐ߬ߛߙߋ ߘߏ߫ ߓߍ߬ߙߍ߲߬ߓߍߙߍ߲߫", + "settings": "ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߬", + "back": "ߌ ߞߐߛߊ߬ߦߌ߬", + "search-files": "ߞߐߕߐ߮ ߟߎ߬ ߢߌߣߌ߲߫", + "title": "ߞߎ߲߬ߕߐ߮", + "size": "ߢߊ߲ߞߊ߲", + "date": "ߕߎ߬ߡߊ߬ߘߊ", + "content-type": "ߞߣߐߘߐ߫ ߛߎ߯ߦߊ", + "about-version": "ߦߌߟߡߊ {{VERSION}}", + "wikihow": "ߥߞߌߘߌ߬" +} diff -Nru kiwix-2.2.1~bionic/resources/i18n/pl.json kiwix-2.2.2~bionic/resources/i18n/pl.json --- kiwix-2.2.1~bionic/resources/i18n/pl.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/pl.json 2022-06-22 14:13:21.000000000 +0000 @@ -5,6 +5,7 @@ "Rail", "Rainbow P", "SRakestraw", + "Strebski", "WaldiSt" ] }, @@ -16,9 +17,11 @@ "open-zim": "Otwórz Zim", "local-kiwix-server": "Lokalny serwer Kiwix", "random-article": "Losowy artykuł", + "random-article-error": "Nie udało się otworzyć losowego artykułu.", "home-page": "Strona główna", "main-menu": "Menu główne", "print": "Drukuj", + "print-page-error": "Wystąpił błąd podczas drukowania.", "new-tab": "Nowa zakładka", "close-tab": "Zamknij kartę", "close": "Zamknij", @@ -69,10 +72,13 @@ "pause": "Pauza", "cancel": "Anuluj", "apply": "Zastosuj", - "port-for-local-kiwix-server-setting": "Port dla lokalnego serwera Kiwix:", - "zoom-level-setting": "Poziom powiększenia", - "download-directory-setting": "Pobierz katalog:", + "port-for-local-kiwix-server-setting": "Port dla lokalnego serwera Kiwix", + "zoom-level-setting": "Domyślny poziom powiększenia", + "download-directory-setting": "Pobierz katalog", + "monitor-directory-setting": "Katalog monitorowany", + "monitor-directory-default": "Nie ustawione", "reset": "Resetuj", + "clear": "Wyczyść", "browse": "Przeglądaj", "about-kiwix-desktop-title": "Pulpit Kiwix", "about-kiwix-desktop-description": "Kiwix pozwala mieć pod ręką całą Wikipedię, gdziekolwiek jesteś! Na łodzi, w szczerym polu lub w więzieniu, Kiwix daje ci dostęp do całej ludzkiej wiedzy. Nie potrzebujesz Internetu, wszystko jest przechowywane na Twoim komputerze.", @@ -105,6 +111,7 @@ "ted": "Ted", "vikidia": "Vikidia", "wikibooks": "Wikiksiążki", + "wikihow": "wikiHow", "wikinews": "Wikinews", "wikipedia": "Wikipedia", "wikiquote": "Wikicytaty", @@ -123,6 +130,13 @@ "no-filter": "brak filtra", "open-link-in-web-browser": "Otwórz link w przeglądarce", "download-dir-dialog-title": "Czy na pewno chcesz zmienić katalog pobierania?", - "download-dir-dialog-msg": "Nową ścieżką katalogu pobieranych plików będzie: {{DIRECTORY}}", - "invalid-port": "Nieprawidłowy port" + "download-dir-dialog-msg": "Nową ścieżką katalogu pobieranych plików będzie:\n{{DIRECTORY}}", + "invalid-port": "Nieprawidłowy port", + "zim-open-fail-title": "Niepoprawny plik", + "zim-open-fail-text": "Nie można poprawnie otworzyć pliku ZIM {{ZIM}}. Zostanie usunięty z Twojej biblioteki.", + "monitor-dir-dialog-title": "Czy na pewno chcesz zmienić katalog monitorowany?", + "monitor-dir-dialog-msg": "Nową ścieżką katalogu monitorowanego będzie:\n{{DIRECTORY}}", + "monitor-clear-dir-dialog-title": "Czy na pewno chcesz wyczyścić katalog monitorowany?", + "monitor-clear-dir-dialog-msg": "Spowoduje to zatrzymanie sprawdzania katalogu monitora w poszukiwaniu nowych plików ZIM.", + "monitor-directory-tooltip": "Wszystkie pliki ZIM w tym katalogu zostaną automatycznie dodane do biblioteki." } diff -Nru kiwix-2.2.1~bionic/resources/i18n/pt.json kiwix-2.2.2~bionic/resources/i18n/pt.json --- kiwix-2.2.1~bionic/resources/i18n/pt.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/pt.json 2022-06-22 14:13:21.000000000 +0000 @@ -5,7 +5,7 @@ "Unamane" ] }, - "name": "Inglês", + "name": "português", "open-zim": "Abrir Zim", "local-kiwix-server": "Servidor Kiwix local", "random-article": "Artigo aleatório", diff -Nru kiwix-2.2.1~bionic/resources/i18n/qqq.json kiwix-2.2.2~bionic/resources/i18n/qqq.json --- kiwix-2.2.1~bionic/resources/i18n/qqq.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/qqq.json 2022-06-22 14:13:21.000000000 +0000 @@ -4,10 +4,11 @@ "Abijeet Patro", "Ajeje Brazorf", "Eihel", - "Robby" + "Robby", + "Verdy p" ] }, - "name": "Current language to which the string is being translated to.", + "name": "{{Doc-important|Don't write \"English\" in your language!}}\n\n'''Write the name of ''your'' language in its native script.'''\n\nCurrent language to which the string is being translated to.\n\nFor example, write \"français\" when translating to French, or \"Deutsch\" when translating to German.\n\n'''Important:''' Do not use your language’s word for “English”. Use the word that your language uses to refer to itself. If you translate this message to mean “English” in your language, your change will be reverted.", "error-title": "{{Identical|Error}}", "print": "{{identical|Print}}", "help": "{{identical|Help}}", diff -Nru kiwix-2.2.1~bionic/resources/i18n/ru.json kiwix-2.2.2~bionic/resources/i18n/ru.json --- kiwix-2.2.1~bionic/resources/i18n/ru.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/ru.json 2022-06-22 14:13:21.000000000 +0000 @@ -8,14 +8,17 @@ "Kareyac", "Pacha Tchernof", "Smavrina", - "Tanzun" + "StarryFairy", + "Tanzun", + "Артём 13327" ] }, - "name": "английский", + "name": "русский", "error-title": "Ошибка", "error-downloader-window-title": "Невозможно создать загрузчик", "error-downloader-launch-message": "Невозможно запустить загрузчик, Kiwix для рабочего стола будет запущен, но все функции скачивания будут недоступны!", "error-launch-server-message": "Произошла ошибка!", + "error-archive": "Не удалось получить архив", "open-zim": "Открыть Zim", "local-kiwix-server": "Локальный сервер Kiwix", "random-article": "Случайная статья", @@ -23,6 +26,7 @@ "home-page": "Домашняя страница", "main-menu": "Главное меню", "print": "Печать", + "print-page-error": "Во время печати возникла ошибка.", "new-tab": "Новая вкладка", "close-tab": "Закрыть вкладку", "close": "Закрыть", @@ -133,6 +137,8 @@ "download-dir-dialog-title": "Вы действительно хотите изменить директорию для загрузки?", "download-dir-dialog-msg": "Новая директория для загрузки будет установлена на: {{DIRECTORY}}", "invalid-port": "Некорректный порт", + "zim-open-fail-title": "Недопустимый файл", + "zim-open-fail-text": "Указанный ZIM-файл {{ZIM}} не может быть открыт корректно. Он будет удалён из вашей библиотеки.", "monitor-dir-dialog-title": "Вы действительно хотите изменить директорию монитора?", "monitor-dir-dialog-msg": "Путь к новой директории монитора: \n{{DIRECTORY}}", "monitor-clear-dir-dialog-title": "Вы действительно хотите очистить директорию монитора?", diff -Nru kiwix-2.2.1~bionic/resources/i18n/sdc.json kiwix-2.2.2~bionic/resources/i18n/sdc.json --- kiwix-2.2.1~bionic/resources/i18n/sdc.json 1970-01-01 00:00:00.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/sdc.json 2022-06-22 14:13:21.000000000 +0000 @@ -0,0 +1,43 @@ +{ + "@metadata": { + "authors": [ + "F Samaritani" + ] + }, + "name": "Sassaresu", + "error-title": "Errori", + "print": "Sthampa", + "find-in-page": "Acciappà in pàgina", + "help": "Aggiuddu", + "feedback": "Feedback", + "file": "File", + "view": "Liggì", + "tools": "Isthrumenti", + "search": "Zercha", + "settings": "Prifirènzi", + "back": "Indareddu", + "search-files": "Zirchà dati", + "title": "Tìturu", + "size": "Misuri in byte", + "date": "Data", + "content-type": "Pagina di cuntinuddu", + "delete": "Canzella", + "download": "Ischarriggà", + "cancel": "Annullà", + "clear": "Ibbiuddà", + "browse": "Iffuglia", + "hide": "Cuà", + "other": "Althru", + "wikibooks": "Vichilibri", + "wikinews": "Vichinobiddai", + "wikipedia": "Vichipedìa", + "wikiquote": "Vichizitazioni", + "wikisource": "Vichifonti", + "wikiversity": "Vichiunibèssiddai", + "wikivoyage": "Vichiviàggiu", + "wiktionary": "Vichizionàriu", + "videos": "Vìdeo", + "yes": "eja", + "no": "no", + "zim-open-fail-title": "Tìturu nò vàriddu" +} diff -Nru kiwix-2.2.1~bionic/resources/i18n/sro.json kiwix-2.2.2~bionic/resources/i18n/sro.json --- kiwix-2.2.1~bionic/resources/i18n/sro.json 1970-01-01 00:00:00.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/sro.json 2022-06-22 14:13:21.000000000 +0000 @@ -0,0 +1,48 @@ +{ + "@metadata": { + "authors": [ + "F Samaritani" + ] + }, + "name": "Sardu campidanesu", + "new-tab": "Sceda noa", + "search-article": "Cumpartzi sa boxi", + "find-in-page": "Agata in sa pàgina", + "table-of-content": "Ìndixi", + "reading-list": "Listas de ligidura", + "reading-list-title": "Listas de ligidura", + "help": "Agiudu", + "feedback": "Feedback", + "exit": "Muda", + "file": "File", + "edit": "Muda", + "view": "Càstia", + "tools": "Ainas", + "search": "Circa", + "settings": "Impostatzionis", + "back": "Acoa", + "forward": "Ainnantis", + "open": "Aberi", + "cancel": "Annudda", + "browse": "Browser", + "hide": "Cua", + "all": "Totu", + "gutenberg": "Gutenberg", + "mooc": "MOOC", + "phet": "Phet", + "psiram": "Psiram", + "vikidia": "Vikidia", + "wikibooks": "Wikibooks", + "wikihow": "wikiHow", + "wikinews": "Wikinews", + "wikipedia": "Wikipèdia", + "wikiquote": "Wikiquote", + "wikisource": "Wikisource", + "wikispecies": "Wikispecies", + "wikiversity": "Wikiversity", + "wikivoyage": "Wikivoyage", + "pictures": "màginis", + "videos": "Videos", + "yes": "eja", + "no": "no" +} diff -Nru kiwix-2.2.1~bionic/resources/i18n/sv.json kiwix-2.2.2~bionic/resources/i18n/sv.json --- kiwix-2.2.1~bionic/resources/i18n/sv.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/sv.json 2022-06-22 14:13:21.000000000 +0000 @@ -107,6 +107,7 @@ "ted": "Ted", "vikidia": "Vikidia", "wikibooks": "Wikibooks", + "wikihow": "wikiHow", "wikinews": "Wikinews", "wikipedia": "Wikipedia", "wikiquote": "Wikiquote", diff -Nru kiwix-2.2.1~bionic/resources/i18n/ta.json kiwix-2.2.2~bionic/resources/i18n/ta.json --- kiwix-2.2.1~bionic/resources/i18n/ta.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/ta.json 2022-06-22 14:13:21.000000000 +0000 @@ -1,13 +1,15 @@ { "@metadata": { "authors": [ - "Gurulenin" + "Gurulenin", + "Siddhan" ] }, "name": "ஆங்கிலம்", "error-title": "பிழை", "error-downloader-window-title": "பதிவிறக்கியை உருவாக்க முடியவில்லை", "error-downloader-launch-message": "பதிவிறக்கியைத் தொடங்க சாத்தியமில்லை, கிவிக்ஸ்-டெஸ்க்டாப் தொடங்கும், ஆனால் அனைத்து பதிவிறக்க செயல்பாடுகளும் இயங்காது!", + "error-archive": "இந்த காப்பகத்தை பெற இயலவில்லை", "open-zim": "Zim கோப்பினைத் திற", "local-kiwix-server": "உள்ளிட கிவிக்ஸ் சேவையகம்", "random-article": "ஏதாவதொரு கட்டுரை", diff -Nru kiwix-2.2.1~bionic/resources/i18n/tr.json kiwix-2.2.2~bionic/resources/i18n/tr.json --- kiwix-2.2.1~bionic/resources/i18n/tr.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/tr.json 2022-06-22 14:13:21.000000000 +0000 @@ -77,7 +77,9 @@ "port-for-local-kiwix-server-setting": "Yerel Kiwix sunucusu için bağlantı noktası", "zoom-level-setting": "Varsayılan yakınlaştırma düzeyi", "download-directory-setting": "İndirme dizini", + "monitor-directory-default": "Ayarlı değil", "reset": "Sıfırla", + "clear": "Temizle", "browse": "Göz at", "about-kiwix-desktop-title": "Kiwix Masaüstü", "about-kiwix-desktop-description": "Kiwix nereye giderseniz gidin tüm Vikipedi'nin elinizde olmasını sağlar! Bir teknede, hiçbir yerin ortasında veya hapiste, Kiwix size tüm insan bilgisine erişmenizi sağlar. İnternete ihtiyacınız yok, her şey bilgisayarınızda saklanıyor.", diff -Nru kiwix-2.2.1~bionic/resources/i18n/zh-hans.json kiwix-2.2.2~bionic/resources/i18n/zh-hans.json --- kiwix-2.2.1~bionic/resources/i18n/zh-hans.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/zh-hans.json 2022-06-22 14:13:21.000000000 +0000 @@ -3,10 +3,12 @@ "authors": [ "GuoPC", "Josephine W.", + "Lynzrand", "Nadine Siak", "Shuiwater", "SomeyaMako", "Stang", + "StarrySky", "Zhang8569" ] }, @@ -15,9 +17,14 @@ "error-downloader-window-title": "无法创建下载器", "error-downloader-launch-message": "发送一个下载器是不可能的，Kiwix-座机将开始但是下载功能将不会工作！", "error-launch-server-message": "发生错误！", + "open-zim": "开放Zim", + "local-kiwix-server": "本地 Kiwix 服务器", "random-article": "随机条目", + "random-article-error": "无法打开随机文章。", "home-page": "主页", + "main-menu": "主菜单", "print": "打印", + "print-page-error": "打印时发生错误。", "new-tab": "新建标签页", "close-tab": "关闭标签页", "close": "关闭", @@ -46,9 +53,11 @@ "edit": "编辑", "view": "查看", "tools": "工具", + "window-title": "图书馆 - Kiwix", "search": "搜索", "browse-directory": "浏览文件夹", "settings": "设置", + "back": "返回", "forward": "前进", "search-files": "搜索文件", "title": "标题", @@ -66,12 +75,16 @@ "port-for-local-kiwix-server-setting": "本地Kiwix服务器端口", "zoom-level-setting": "默认缩放级别", "download-directory-setting": "下载文件夹", + "monitor-directory-default": "尚未设置", "reset": "重置", + "clear": "清除", "browse": "浏览", "about-kiwix-desktop-title": "Kiwix 桌面", "about-release-title": "发布", "about-version": "版本：{{VERSION}}", "about-reporting-problem-title": "报告问题", + "about-libraries-title": "图书馆", + "kiwix-server-description": "开启服务器可以允许局域网中的其他电脑使用普通的网页浏览器来访问你的 Kiwix 图书馆", "fullscreen-notification": "您现已进入全屏模式。点击Esc键以退出全屏！", "all-files": "所有文件", "local-files": "本地文件", @@ -82,7 +95,13 @@ "all": "全部", "other": "其他", "gutenberg": "古登堡", + "phet": "Phet", + "psiram": "Psiram", + "stack_exchange": "堆栈交换", + "ted": "Ted", + "vikidia": "Vikidia", "wikibooks": "维基教科书", + "wikihow": "wikiHow", "wikinews": "维基新闻", "wikipedia": "维基百科", "wikiquote": "维基语录", @@ -94,6 +113,7 @@ "fulltext-search": "全文搜索", "pictures": "图片", "videos": "视频", + "ftindex": "全文索引", "details": "完整条目", "yes": "是", "no": "否", @@ -101,5 +121,12 @@ "open-link-in-web-browser": "在网页浏览器中打开链接", "download-dir-dialog-title": "您确定您要更改下载路径吗？", "download-dir-dialog-msg": "新的下载路径为：\n{{DIRECTORY}}", - "invalid-port": "无效的接口" + "invalid-port": "无效的接口", + "zim-open-fail-title": "无效文件", + "zim-open-fail-text": "ZIM 文件 {{ZIM}} 打开失败。我们将把它从你的图书馆中移除。", + "monitor-dir-dialog-title": "您确定您要更改下载路径吗？", + "monitor-dir-dialog-msg": "新的下载路径为：\n{{DIRECTORY}}", + "monitor-clear-dir-dialog-title": "您确定您要更改下载路径吗？", + "monitor-clear-dir-dialog-msg": "这将停止检查新 ZIM 文件的监视器目录。", + "monitor-directory-tooltip": "这个文件夹下的所有 ZIM 文件都将加入你的图书馆。" } diff -Nru kiwix-2.2.1~bionic/resources/i18n/zh-hant.json kiwix-2.2.2~bionic/resources/i18n/zh-hant.json --- kiwix-2.2.1~bionic/resources/i18n/zh-hant.json 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/i18n/zh-hant.json 2022-06-22 14:13:21.000000000 +0000 @@ -72,7 +72,10 @@ "port-for-local-kiwix-server-setting": "本地 Kiwix 伺服器通訊埠", "zoom-level-setting": "縮放層級", "download-directory-setting": "下載目錄", + "monitor-directory-setting": "監視目錄", + "monitor-directory-default": "未設定", "reset": "重新設定", + "clear": "清除", "browse": "瀏覽", "about-kiwix-desktop-title": "Kiwix 桌機版", "about-kiwix-desktop-description": "Kiwix 能讓您隨時隨地擁有整個維基百科！不論是在船上、荒郊野外、甚至是待在監獄，Kiwix 都可讓您取用全人類的知識。您不必需要網際網路，因為所有一切內容都可以存放在您的電腦裡。", @@ -127,5 +130,10 @@ "download-dir-dialog-msg": "新目錄路徑會是：\n{{DIRECTORY}}", "invalid-port": "無效通訊埠", "zim-open-fail-title": "無效檔案", - "zim-open-fail-text": "ZIM 檔案 {{ZIM}} 無法正常開啓。這將會從您的圖書館裡移除。" + "zim-open-fail-text": "ZIM 檔案 {{ZIM}} 無法正常開啓。這將會從您的圖書館裡移除。", + "monitor-dir-dialog-title": "您確定您要更改監視目錄嗎？", + "monitor-dir-dialog-msg": "新監視目錄路徑會是：\n{{DIRECTORY}}", + "monitor-clear-dir-dialog-title": "您確定您要更改監視目錄嗎？", + "monitor-clear-dir-dialog-msg": "這將會停止檢查用於新 ZIM 檔案的監視目錄。", + "monitor-directory-tooltip": "所有在此目錄的 ZIM 檔案將會自動添加到圖書館裡。" } diff -Nru kiwix-2.2.1~bionic/resources/org.kiwix.desktop.appdata.xml kiwix-2.2.2~bionic/resources/org.kiwix.desktop.appdata.xml --- kiwix-2.2.1~bionic/resources/org.kiwix.desktop.appdata.xml 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/org.kiwix.desktop.appdata.xml 2022-06-22 14:13:21.000000000 +0000 @@ -13,7 +13,7 @@

- + org.kiwix.desktop.desktop @@ -26,13 +26,13 @@ mgautier_AT_kymeria.fr - https://download.kiwix.org/screenshots/kiwix_desktop_library.png + https://upload.wikimedia.org/wikipedia/commons/3/38/Kiwix-desktop_showing_its_local_Library.png - https://download.kiwix.org/screenshots/kiwix_desktop_remote_library.png + https://upload.wikimedia.org/wikipedia/commons/c/cd/Kiwix-desktop_showing_the_remote_Library.png - https://download.kiwix.org/screenshots/kiwix_desktop_ted.png + https://upload.wikimedia.org/wikipedia/commons/3/3e/Kiwix_desktop_reading_a_TED_ZIM_file.png diff -Nru kiwix-2.2.1~bionic/resources/translations.qrc kiwix-2.2.2~bionic/resources/translations.qrc --- kiwix-2.2.1~bionic/resources/translations.qrc 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/resources/translations.qrc 2022-06-22 14:13:21.000000000 +0000 @@ -40,6 +40,7 @@ i18n/ru.json i18n/sc.json i18n/scn.json + i18n/sdc.json i18n/sk.json i18n/skr-arab.json i18n/sq.json diff -Nru kiwix-2.2.1~bionic/src/contentmanager.cpp kiwix-2.2.2~bionic/src/contentmanager.cpp --- kiwix-2.2.1~bionic/src/contentmanager.cpp 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/src/contentmanager.cpp 2022-06-22 14:13:21.000000000 +0000 @@ -63,6 +63,7 @@ if (nullptr == b){ for(auto& key:keys) { + (void) key; values.append(""); } return values; @@ -80,12 +81,36 @@ ADD_V("url", getUrl); ADD_V("name", getName); ADD_V("origId", getOrigId); - ADD_V("faviconMimeType", getFaviconMimeType); ADD_V("downloadId", getDownloadId); - ADD_V("faviconUrl", getFaviconUrl); if (key == "favicon") { - auto s = b->getFavicon(); - values.append(QByteArray::fromStdString(s).toBase64()); + try { + auto s = b->getIllustration(48)->getData(); + values.append(QByteArray::fromStdString(s).toBase64()); + } catch(...) { + values.append(QByteArray()); + } + } + if (key == "faviconMimeType") { + std::string mimeType; + try { + auto item = b->getIllustration(48); + mimeType = item->mimeType; + } catch (...) { + const kiwix::Book::Illustration tempIllustration; + mimeType = tempIllustration.mimeType; + } + values.append(QString::fromStdString(mimeType)); + } + if (key == "faviconUrl") { + std::string url; + try { + auto item = b->getIllustration(48); + url = item->url; + } catch (...) { + const kiwix::Book::Illustration tempIllustration; + url = tempIllustration.url; + } + values.append(QString::fromStdString(url)); } if (key == "size") { values.append(QString::number(b->getSize())); @@ -141,8 +166,10 @@ { QStringList values; if (!mp_downloader) { - for(auto& key: keys) + for(auto& key: keys) { + (void) key; values.append(""); + } return values; } auto& b = mp_library->getBookById(id); @@ -235,7 +262,8 @@ }(); auto downloadPath = KiwixApp::instance()->getSettingsManager()->getDownloadDir(); QStorageInfo storage(downloadPath); - if (book.getSize() > storage.bytesAvailable()) { + auto bytesAvailable = storage.bytesAvailable(); + if (bytesAvailable == -1 || book.getSize() > (unsigned) bytesAvailable) { return "storage_error"; } auto booksList = mp_library->getBookIds(); diff -Nru kiwix-2.2.1~bionic/src/kiwixapp.cpp kiwix-2.2.2~bionic/src/kiwixapp.cpp --- kiwix-2.2.1~bionic/src/kiwixapp.cpp 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/src/kiwixapp.cpp 2022-06-22 14:13:21.000000000 +0000 @@ -236,17 +236,20 @@ if (zimId.isEmpty()) { return; } - auto reader = m_library.getReader(zimId); + try { - auto entry = reader->getRandomPage(); + auto archive = m_library.getArchive(zimId); + auto entry = archive->getRandomEntry(); QUrl url; url.setScheme("zim"); url.setHost(zimId + ".zim"); url.setPath("/" + QString::fromStdString(entry.getPath())); openUrl(url, newTab); - } catch ( const kiwix::NoEntry& ) { + } catch (const zim::EntryNotFound& e) { showMessage(gt("random-article-error"), gt("error-title"), QMessageBox::Information); + } catch (std::out_of_range& e) { + showMessage(gt("error-archive"), gt("error-title"), QMessageBox::Information); } } diff -Nru kiwix-2.2.1~bionic/src/library.cpp kiwix-2.2.2~bionic/src/library.cpp --- kiwix-2.2.1~bionic/src/library.cpp 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/src/library.cpp 2022-06-22 14:13:21.000000000 +0000 @@ -58,24 +58,14 @@ return QString::fromStdString(id); } -std::shared_ptr Library::getReader(const QString &zimId) +std::shared_ptr Library::getArchive(const QString &zimId) { - try { - return m_library.getReaderById(zimId.toStdString()); - } catch (std::out_of_range& e) { - return nullptr; - } + return m_library.getArchiveById(zimId.toStdString()); } -std::shared_ptr Library::getSearcher(const QString &zimId) +std::shared_ptr Library::getSearcher(const QString &zimId) { - auto searcher = std::make_shared(); - try { - searcher->add_reader(m_library.getReaderById(zimId.toStdString()).get()); - } catch(std::out_of_range& e) { - return nullptr; - } - return searcher; + return m_library.getSearcherById(zimId.toStdString()); } QStringList Library::getBookIds() const diff -Nru kiwix-2.2.1~bionic/src/library.h kiwix-2.2.2~bionic/src/library.h --- kiwix-2.2.1~bionic/src/library.h 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/src/library.h 2022-06-22 14:13:21.000000000 +0000 @@ -5,6 +5,8 @@ #include #include #include +#include +#include #include #include @@ -28,8 +30,8 @@ Library(const QString& libraryDirectory); virtual ~Library(); QString openBookFromPath(const QString& zimPath); - std::shared_ptr getReader(const QString& zimId); - std::shared_ptr getSearcher(const QString& zimId); + std::shared_ptr getArchive(const QString& zimId); + std::shared_ptr getSearcher(const QString& zimId); QStringList getBookIds() const; QStringList listBookIds(const kiwix::Filter& filter, kiwix::supportedListSortBy sortBy, bool ascending) const; const std::vector getBookmarks(bool onlyValidBookmarks = false) const { return m_library.getBookmarks(onlyValidBookmarks); } diff -Nru kiwix-2.2.1~bionic/src/readinglistbar.cpp kiwix-2.2.2~bionic/src/readinglistbar.cpp --- kiwix-2.2.1~bionic/src/readinglistbar.cpp 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/src/readinglistbar.cpp 2022-06-22 14:13:21.000000000 +0000 @@ -1,6 +1,7 @@ #include "readinglistbar.h" #include "ui_readinglistbar.h" #include "kiwixapp.h" +#include "zim/error.h" #include @@ -31,20 +32,30 @@ auto listWidget = ui->listWidget; listWidget->clear(); for(auto& bookmark:bookmarks) { - auto reader = library->getReader(QString::fromStdString(bookmark.getBookId())); - if (reader == nullptr) + std::shared_ptr archive; + try { + archive = library->getArchive(QString::fromStdString(bookmark.getBookId())); + } catch (std::out_of_range& e) { continue; - std::string content; - std::string mimeType; - reader->getFavicon(content, mimeType); - QPixmap pixmap; - pixmap.loadFromData(reinterpret_cast(content.data()), content.size()); - auto icon = QIcon(pixmap); - auto item = new QListWidgetItem( - icon, - QString::fromStdString(bookmark.getTitle()), - listWidget); - item->setTextAlignment(Qt::TextWordWrap); + } + try { + auto illustration = archive->getIllustrationItem(48); + std::string content = illustration.getData(); + std::string mimeType = illustration.getMimetype(); + QPixmap pixmap; + pixmap.loadFromData(reinterpret_cast(content.data()), content.size()); + auto icon = QIcon(pixmap); + auto item = new QListWidgetItem( + icon, + QString::fromStdString(bookmark.getTitle()), + listWidget); + item->setTextAlignment(Qt::TextWordWrap); + } catch (zim::EntryNotFound& e) { + auto item = new QListWidgetItem( + QString::fromStdString(bookmark.getTitle()), + listWidget); + item->setTextAlignment(Qt::TextWordWrap); + } } } diff -Nru kiwix-2.2.1~bionic/src/suggestionlistworker.cpp kiwix-2.2.2~bionic/src/suggestionlistworker.cpp --- kiwix-2.2.1~bionic/src/suggestionlistworker.cpp 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/src/suggestionlistworker.cpp 2022-06-22 14:13:21.000000000 +0000 @@ -1,5 +1,6 @@ #include "suggestionlistworker.h" #include "kiwixapp.h" +#include SuggestionListWorker::SuggestionListWorker(const QString& text, int token, QObject *parent) : QThread(parent), @@ -18,36 +19,42 @@ return; auto qurl = current->url(); auto currentZimId = qurl.host().split(".")[0]; - auto reader = KiwixApp::instance()->getLibrary()->getReader(currentZimId); - QUrl url; - url.setScheme("zim"); - if (reader) { + try { + auto archive = KiwixApp::instance()->getLibrary()->getArchive(currentZimId); + QUrl url; + url.setScheme("zim"); url.setHost(currentZimId + ".zim"); - kiwix::SuggestionsList_t suggestions; - reader->searchSuggestionsSmart(m_text.toStdString(), 15, suggestions); - for (auto& suggestion: suggestions) { - QString path = QString("/") + QString::fromStdString(suggestion.getPath()); + int suggestionsCount = 15; + auto prefix = m_text.toStdString(); + auto suggestionSearcher = zim::SuggestionSearcher(*archive); + auto suggestionSearch = suggestionSearcher.suggest(prefix); + const auto suggestions = suggestionSearch.getResults(0, suggestionsCount); + for (auto current : suggestions) { + QString path = QString("/") + QString::fromStdString(current.getPath()); url.setPath(path); - suggestionList.append(QString::fromStdString(suggestion.getTitle())); + suggestionList.append(QString::fromStdString(current.getTitle())); urlList.append(url); } + + // Propose fulltext search + url.setPath(""); + if (archive->hasFulltextIndex()) { + // The host is used to determine the currentZimId + // The content query item is used to know in which zim search (as for kiwix-serve) + url.setHost(currentZimId + ".search"); + QUrlQuery query; + query.addQueryItem("content", currentZimId); + query.addQueryItem("pattern", m_text); + url.setQuery(query); + suggestionList.append(m_text + " (" + gt("fulltext-search") + ")"); + urlList.append(url); + } + } catch (std::out_of_range& e) { + // Impossible to find the requested archive (bug ?) + // We could propose a suggestion to do multi-zim search with: + // url.setHost("library.search"); + // but we don't have a correct UI to select on which zim search, how to display results, ... + // So do nothing for now } - QUrlQuery query; - url.setPath(""); - if (reader) { - // The host is used to determine the currentZimId - // The content query item is used to know in which zim search (as for kiwix-serve) - url.setHost(currentZimId + ".search"); - query.addQueryItem("content", currentZimId); - } else { - // We do not allow multi zim search for now. - // We don't have a correct UI to select on which zim search, - // how to display results, ... - //url.setHost("library.search"); - } - query.addQueryItem("pattern", m_text); - url.setQuery(query); - suggestionList.append(m_text + " (" + gt("fulltext-search") + ")"); - urlList.append(url); emit(searchFinished(suggestionList, urlList, m_token)); } diff -Nru kiwix-2.2.1~bionic/src/urlschemehandler.cpp kiwix-2.2.2~bionic/src/urlschemehandler.cpp --- kiwix-2.2.1~bionic/src/urlschemehandler.cpp 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/src/urlschemehandler.cpp 2022-06-22 14:13:21.000000000 +0000 @@ -8,11 +8,27 @@ #include #include +#include +#include +#include + UrlSchemeHandler::UrlSchemeHandler() { } +zim::Entry getEntryFromPath(const zim::Archive& archive, const std::string& path) +{ + try { + return archive.getEntryByPath(path); + } catch (zim::EntryNotFound& e) { + if (path.empty() || path == "/") { + return archive.getMainEntry(); + } + } + throw zim::EntryNotFound("Cannot find entry for non empty path"); +} + void UrlSchemeHandler::handleContentRequest(QWebEngineUrlRequestJob *request) { @@ -23,27 +39,29 @@ auto library = KiwixApp::instance()->getLibrary(); auto zim_id = qurl.host(); zim_id.resize(zim_id.length()-4); - auto reader = library->getReader(zim_id); - if ( reader == nullptr) { - request->fail(QWebEngineUrlRequestJob::UrlNotFound); - return; + std::shared_ptr archive; + try { + archive = library->getArchive(zim_id); + } catch (std::out_of_range& e) { + request->fail(QWebEngineUrlRequestJob::UrlNotFound); + return; } try { - kiwix::Entry entry = reader->getEntryFromPath(url); + auto entry = getEntryFromPath(*archive, url); + auto item = entry.getItem(true); if (entry.isRedirect()) { - entry = entry.getFinalEntry(); - auto path = QString("/") + QString::fromStdString(entry.getPath()); + auto path = QString("/") + QString::fromStdString(item.getPath()); qurl.setPath(path); request->redirect(qurl); return; } - BlobBuffer* buffer = new BlobBuffer(entry.getBlob()); - auto mimeType = QByteArray::fromStdString(entry.getMimetype()); + BlobBuffer* buffer = new BlobBuffer(item.getData(0)); + auto mimeType = QByteArray::fromStdString(item.getMimetype()); mimeType = mimeType.split(';')[0]; connect(request, &QObject::destroyed, buffer, &QObject::deleteLater); request->reply(mimeType, buffer); - } catch (kiwix::NoEntry&) { + } catch (zim::EntryNotFound&) { request->fail(QWebEngineUrlRequestJob::UrlNotFound); } } @@ -61,8 +79,9 @@ try { auto library = KiwixApp::instance()->getLibrary(); auto book = library->getBookById(zimId); - std::string content= book.getFavicon(); - std::string mimeType = book.getFaviconMimeType(); + auto illustration = book.getIllustration(48); + std::string content = illustration->getData(); + std::string mimeType = illustration->mimeType; QBuffer* buffer = new QBuffer; buffer->setData(content.data(), content.size()); connect(request, &QObject::destroyed, buffer, &QObject::deleteLater); @@ -103,17 +122,21 @@ if (ok) pageLength = temp; - auto end = start + pageLength; - - auto searcher = app->getLibrary()->getSearcher(bookId); - searcher->search(searchQuery, start, end); - + std::shared_ptr search; + try { + auto searcher = app->getLibrary()->getSearcher(bookId); + search = make_shared(searcher->search(searchQuery)); + } catch(...) { + request->fail(QWebEngineUrlRequestJob::UrlInvalid); + return; + } IdNameMapper nameMapper; - kiwix::SearchRenderer renderer(searcher.get(), &nameMapper); + kiwix::SearchRenderer renderer(search->getResults(start, pageLength), &nameMapper, search->getEstimatedMatches(), + start); renderer.setSearchPattern(searchQuery); - renderer.setSearchContent(bookId.toStdString()); + renderer.setSearchBookQuery("content="+bookId.toStdString()); renderer.setProtocolPrefix("zim://"); - renderer.setSearchProtocolPrefix("zim://" + host.toStdString() + "/?"); + renderer.setSearchProtocolPrefix("zim://" + host.toStdString() + "/"); renderer.setPageLength(pageLength); auto content = renderer.getHtml(); QBuffer *buffer = new QBuffer; diff -Nru kiwix-2.2.1~bionic/src/webpage.cpp kiwix-2.2.2~bionic/src/webpage.cpp --- kiwix-2.2.1~bionic/src/webpage.cpp 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/src/webpage.cpp 2022-06-22 14:13:21.000000000 +0000 @@ -14,7 +14,7 @@ action(QWebEnginePage::Reload)->setVisible(false); } -bool WebPage::acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame) +bool WebPage::acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType /*type*/, bool /*isMainFrame*/) { if (url.scheme() != "zim") { QDesktopServices::openUrl(url); diff -Nru kiwix-2.2.1~bionic/src/webview.cpp kiwix-2.2.2~bionic/src/webview.cpp --- kiwix-2.2.1~bionic/src/webview.cpp 2022-03-11 16:25:37.000000000 +0000 +++ kiwix-2.2.2~bionic/src/webview.cpp 2022-06-22 14:13:21.000000000 +0000 @@ -9,7 +9,7 @@ #include #include #include - +#include void WebViewBackMenu::showEvent(QShowEvent *) { @@ -167,18 +167,24 @@ m_currentZimId = zimId; emit zimIdChanged(m_currentZimId); auto app = KiwixApp::instance(); - auto reader = app->getLibrary()->getReader(m_currentZimId); - if (!reader) { + std::shared_ptr archive; + try { + archive = app->getLibrary()->getArchive(m_currentZimId); + } catch (std::out_of_range& e) { return; } - std::string favicon, _mimetype; - reader->getFavicon(favicon, _mimetype); - QPixmap pixmap; - pixmap.loadFromData((const uchar*)favicon.data(), favicon.size()); - m_icon = QIcon(pixmap); - emit iconChanged(m_icon); auto zoomFactor = app->getSettingsManager()->getZoomFactorByZimId(zimId); this->setZoomFactor(zoomFactor); + try { + std::string favicon, _mimetype; + auto item = archive->getIllustrationItem(48); + favicon = item.getData(); + _mimetype = item.getMimetype(); + QPixmap pixmap; + pixmap.loadFromData((const uchar*)favicon.data(), favicon.size()); + m_icon = QIcon(pixmap); + emit iconChanged(m_icon); + } catch (zim::EntryNotFound& e) {} } void WebView::wheelEvent(QWheelEvent *event) {