From: yaydn@protonmail.com
Subject: Re: UPDATE: calibre-8.0.1
To: Rafael Sadowski <rafael@sizeofvoid.org>
Cc: "ports@openbsd.org" <ports@openbsd.org>
Date: Mon, 04 Aug 2025 06:00:02 +0000

På søndag 3. august 2025 kl. 21:08, Rafael Sadowski
<rafael@sizeofvoid.org> skrev:

> Here is a update diff calibre-8.0.1. It depends on devel/py-xxhash
> and textproc/podofo>=0.10. Maybe it needs more things for the
>
> runtime, I can't say.
>
> Cheers Rafael
>


Tested on current/amd64.

Did:
cd /usr/ports/ && patch -l -p1 -E < /tmp/calibre-8.0.1.patch 
cd /usr/ports/textproc/calibre/ && make update clean && make distclean

Tried building a couple times, got as far as:

$ cd /usr/ports/textproc/calibre/ && make clean update clean && make distclean
===>  Cleaning for calibre-8.0.1
===> Building from scratch calibre-8.0.1
===>  Checking files for calibre-8.0.1
`/usr/ports/distfiles/calibre-8.0.1.tar.xz' is up to date.
>> (SHA256) all files: OK
===> calibre-8.0.1 depends on: py3-apsw->=3.35.4 -> py3-apsw-3.50.3.0
===> calibre-8.0.1 depends on: py3-dateutil-* -> py3-dateutil-2.9.0pl0p0
===> calibre-8.0.1 depends on: py3-html5lib-* -> py3-html5lib-1.1p5
===> calibre-8.0.1 depends on: py3-regex-* -> py3-regex-2024.11.6p1
===> calibre-8.0.1 depends on: py3-xxhash-* -> py3-xxhash-3.5.0
===> calibre-8.0.1 depends on: xdg-utils-* -> xdg-utils-1.2.1
===> calibre-8.0.1 depends on: libwmf-* -> libwmf-0.2.8.4p8
===> calibre-8.0.1 depends on: png-* -> png-1.6.49p0
===> calibre-8.0.1 depends on: py3-Pillow-* -> py3-Pillow-11.3.0
===> calibre-8.0.1 depends on: py3-dnspython-* -> py3-dnspython-2.7.0p0
===> calibre-8.0.1 depends on: py3-msgpack-* -> py3-msgpack-1.1.0p1v0
===> calibre-8.0.1 depends on: py3-zeroconf-* -> py3-zeroconf-0.28.8p5
===> calibre-8.0.1 depends on: poppler-* -> poppler-25.07.0
===> calibre-8.0.1 depends on: poppler-qt6-* -> poppler-qt6-25.07.0
===> calibre-8.0.1 depends on: py3-css-parser-* -> py3-css-parser-1.0.10p2
===> calibre-8.0.1 depends on: py3-cssselect-* -> py3-cssselect-1.3.0p0
===> calibre-8.0.1 depends on: py3-cssutils-* -> py3-cssutils-2.11.1p0
===> calibre-8.0.1 depends on: py3-lxml-* -> py3-lxml-5.4.0p0
===> calibre-8.0.1 depends on: py3-markdown-* -> py3-markdown-3.8.2
===> calibre-8.0.1 depends on: py3-toml-* -> py3-toml-0.10.2p6
===> calibre-8.0.1 depends on: py3-webencodings-* -> py3-webencodings-0.5.1p10
===> calibre-8.0.1 depends on: uchardet-* -> uchardet-0.0.8
===> calibre-8.0.1 depends on: py3-CherryPy-* -> py3-CherryPy-18.10.0p0
===> calibre-8.0.1 depends on: py3-beautifulsoup4-* -> py3-beautifulsoup4-4.13.4
===> calibre-8.0.1 depends on: py3-html5-parser-* -> py3-html5-parser-0.4.12p1
===> calibre-8.0.1 depends on: py3-mechanize-* -> py3-mechanize-0.4.10p2
===> calibre-8.0.1 depends on: py3-qt6webengine-* -> py3-qt6webengine-6.8.0
===> calibre-8.0.1 depends on: py3-qt6-* -> py3-qt6-6.8.0
===> calibre-8.0.1 depends on: py3-qt-builder-* -> py3-qt-builder-1.18.0p0
===> calibre-8.0.1 depends on: py3-packaging-* -> py3-packaging-25.0
===> calibre-8.0.1 depends on: python->=3.12,<3.13 -> python-3.12.11
===> calibre-8.0.1 depends on: py3-setuptools->=79v0 -> py3-setuptools-79.0.1v0
===> calibre-8.0.1 depends on: vulkan-loader-* -> vulkan-loader-1.4.304.0p0
===> calibre-8.0.1 depends on: qt6-qttools->=6.8.3,<6.9.0 -> qt6-qttools-6.8.3p0
===> calibre-8.0.1 depends on: xz->=5.4.0 -> xz-5.8.1
===> calibre-8.0.1 depends on: hunspell-* -> hunspell-1.7.2
===> calibre-8.0.1 depends on: hyphen-* -> hyphen-2.8.8p0
===> calibre-8.0.1 depends on: icu4c-* -> icu4c-77.1v0
===> calibre-8.0.1 depends on: libstemmer-* -> libstemmer-2.2.0
===> calibre-8.0.1 depends on: podofo->=0.10 -> podofo-0.10.5
===> calibre-8.0.1 depends on: qt6-qtbase->=6.8.3,<6.9.0 -> qt6-qtbase-6.8.3p2
===>  Verifying specs:  c++ c++abi pthread GL Qt6Core Qt6Gui Qt6Widgets avcodec avformat avutil crypto freetype hunspell-1.7 hyphen icudata icui18n icuio icuuc m podofo python3.12 stemmer swresample uchardet xkbcommon
===>  found c++.11.0 c++abi.8.0 pthread.28.0 GL.19.2 Qt6Core.6.0 Qt6Gui.8.0 Qt6Widgets.4.0 avcodec.26.0 avformat.23.0 avutil.16.0 crypto.57.0 freetype.31.0 hunspell-1.7.1.0 hyphen.0.0 icudata.22.5 icui18n.22.5 icuio.22.5 icuuc.22.5 m.10.1 podofo.5.0 python3.12.0.0 stemmer.0.0 swresample.5.0 uchardet.0.1 xkbcommon.3.2
===>  Extracting for calibre-8.0.1
===>  Patching for calibre-8.0.1
cd /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1 && find . -type f -name '*.py' -exec perl -pi  -e '$. == 1 && s|^.*env +python.*$|#!/usr/local/bin/python3.12|;'  -e '$. == 1 && s|^.*bin/python.*$|#!/usr/local/bin/python3.12|;'  -e 'close ARGV if eof;' -- {} +
===>   Applying OpenBSD patch patch-setup___init___py
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: setup/__init__.py
|--- setup/__init__.py.orig
|+++ setup/__init__.py
--------------------------
Patching file setup/__init__.py using Plan A...
Hunk #1 succeeded at 22.
done
===>   Ignoring patchfile patch-setup___init___py.orig
===>   Applying OpenBSD patch patch-setup_build_py
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: setup/build.py
|--- setup/build.py.orig
|+++ setup/build.py
--------------------------
Patching file setup/build.py using Plan A...
Hunk #1 succeeded at 256.
Hunk #2 succeeded at 283.
done
===>   Ignoring patchfile patch-setup_build_py.orig
===>   Ignoring patchfile patch-setup_extensions_json.orig
===>   Applying OpenBSD patch patch-setup_install_py
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: setup/install.py
|--- setup/install.py.orig
|+++ setup/install.py
--------------------------
Patching file setup/install.py using Plan A...
Hunk #1 succeeded at 269.
done
===>   Ignoring patchfile patch-setup_install_py.orig
===>   Applying OpenBSD patch patch-src_calibre_constants_py
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|- add OpenBSD to list of recognized BSDs.
|
|USB (and probably MTP) support needs more work, the current code only
|supports OSX, Windows, and Linux SYSFS.
|
|Index: src/calibre/constants.py
|--- src/calibre/constants.py.orig
|+++ src/calibre/constants.py
--------------------------
Patching file src/calibre/constants.py using Plan A...
Hunk #1 succeeded at 28.
Hunk #2 succeeded at 281.
done
===>   Ignoring patchfile patch-src_calibre_constants_py.orig
===>   Applying OpenBSD patch patch-src_calibre_gui2___init___py
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|- enable --detach, used by some .desktop files
|
|Index: src/calibre/gui2/__init__.py
|--- src/calibre/gui2/__init__.py.orig
|+++ src/calibre/gui2/__init__.py
--------------------------
Patching file src/calibre/gui2/__init__.py using Plan A...
Hunk #1 succeeded at 1119.
done
===>   Ignoring patchfile patch-src_calibre_gui2___init___py.orig
===>   Applying OpenBSD patch patch-src_calibre_gui2_update_py
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|- upstream's repo is not a useful source of updates for OpenBSD.
|
|Index: src/calibre/gui2/update.py
|--- src/calibre/gui2/update.py.orig
|+++ src/calibre/gui2/update.py
--------------------------
Patching file src/calibre/gui2/update.py using Plan A...
Hunk #1 succeeded at 29.
done
===>   Ignoring patchfile patch-src_calibre_gui2_update_py.orig
===>   Applying OpenBSD patch patch-src_calibre_linux_py
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: src/calibre/linux.py
|--- src/calibre/linux.py.orig
|+++ src/calibre/linux.py
--------------------------
Patching file src/calibre/linux.py using Plan A...
Hunk #1 succeeded at 783.
done
===>   Ignoring patchfile patch-src_calibre_linux_py.orig
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
===>  Generating configure for calibre-8.0.1
===>  Configuring for calibre-8.0.1
cd /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1 && rm -rf src/cherrypy
cd /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/setup && /usr/bin/perl /usr/ports/infrastructure/bin/pkg_subst -DMODPY_PYCACHE=__pycache__/ -DMODPY_COMMENT= -DMODPY_ABI3SO=.abi3 -DMODPY_PYC_MAGIC_TAG=cpython-312. -DMODPY_BIN=/usr/local/bin/python3.12 -DMODPY_DISTV= -DMODPY_VERSION=3.12 -DMODPY_PY_PREFIX=py3- -DMODPY_PYOEXTENSION=opt-1.pyc -DWRKDIR=/usr/ports/pobj/calibre-8.0.1 -DCC=cc -DCXX=c++ -DARCH=amd64 -DBASE_PKGPATH=textproc/calibre -DFLAVOR_EXT= -DFULLPKGNAME=calibre-8.0.1 -DHOMEPAGE=https://calibre-ebook.com/ -DLOCALBASE=/usr/local -DLOCALSTATEDIR=/var -DMACHINE_ARCH=amd64 -DMAINTAINER=The\ OpenBSD\ ports\ mailing-list\ \<ports@openbsd.org\> -DPREFIX=/usr/local -DRCDIR=/etc/rc.d -DSYSCONFDIR=/etc -DTRUEPREFIX=/usr/local -DX11BASE=/usr/X11R6 -DPKGSTEM=calibre -i -B /usr/ports/pobj/calibre-8.0.1 build.py build_environment.py
cp /usr/ports/textproc/calibre/files/fake-xdg /usr/ports/pobj/calibre-8.0.1/bin; chmod +x /usr/ports/pobj/calibre-8.0.1/bin/fake-xdg
ln -s fake-xdg /usr/ports/pobj/calibre-8.0.1/bin/xdg-icon-resource
ln -s fake-xdg /usr/ports/pobj/calibre-8.0.1/bin/xdg-desktop-menu
ln -s fake-xdg /usr/ports/pobj/calibre-8.0.1/bin/xdg-mime
===>  Building for calibre-8.0.1
egg_info is not a recognized command.
Valid commands: bootstrap, build, build_dep, cacerts, check, develop, export_packages, extdev, get_translations, git_version, gui, hyphenation, install, iso639, iso3166, iso_data, liberation_fonts, linux, linux64, linuxarm64, man_pages, manual, mathjax, osx, piper_voices, pot, publish, publish_betas, publish_preview, rapydscript, recent_uas, resources, reupload, sdist, stage1, stage2, stage3, stage4, stage5, stylelint, tag_release, test, test_rs, translations, upgrade_source_code, upload_demo, upload_installers, upload_to_server, upload_user_manual, win, win64, xwin

*
* Running build
*

Building 27 extensions
Compiling 36 files...
c++ -O2 -pipe -fPIC -O2 -pipe -fvisibility=hidden -pthread -I/usr/local/include -I/usr/local/include/python3.12 '-DCALIBRE_MODINIT_FUNC=extern "C" __attribute__ ((visibility ("default"))) PyObject*' -std=c++11 -I/usr/local/include/hunspell -c /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/src/calibre/utils/spell/hunspell_wrapper.cpp -o /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/build/objects/hunspell/hunspell_wrapper.o

cc -O2 -pipe -fPIC -O2 -pipe -fvisibility=hidden -pthread -I/usr/local/include -I/usr/local/include/python3.12 '-DCALIBRE_MODINIT_FUNC= __attribute__ ((visibility ("default"))) PyObject*' -std=c99 -c /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/src/calibre/utils/hyphenation/hyphen.c -o /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/build/objects/hyphen/hyphen.o

cc -O2 -pipe -fPIC -O2 -pipe -fvisibility=hidden -pthread -I/usr/local/include -I/usr/local/include/python3.12 '-DCALIBRE_MODINIT_FUNC= __attribute__ ((visibility ("default"))) PyObject*' -std=c99 -I/usr/local/include -c /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/src/calibre/utils/ffmpeg.c -o /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/build/objects/ffmpeg/ffmpeg.o

cc -O2 -pipe -fPIC -O2 -pipe -fvisibility=hidden -pthread -I/usr/local/include -I/usr/local/include/python3.12 '-DCALIBRE_MODINIT_FUNC= __attribute__ ((visibility ("default"))) PyObject*' -I/usr/local/include/uchardet -c /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/src/calibre/ebooks/uchardet.c -o /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/build/objects/uchardet/uchardet.o

cc -O2 -pipe -fPIC -O2 -pipe -fvisibility=hidden -pthread -I/usr/local/include -I/usr/local/include/python3.12 '-DCALIBRE_MODINIT_FUNC= __attribute__ ((visibility ("default"))) PyObject*' -std=c99 -c /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/src/unicode_names/unicode_names.c -o /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/build/objects/unicode_names/unicode_names.o

cc -O2 -pipe -fPIC -O2 -pipe -fvisibility=hidden -pthread -I/usr/local/include -I/usr/local/include/python3.12 '-DCALIBRE_MODINIT_FUNC= __attribute__ ((visibility ("default"))) PyObject*' -c /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/src/calibre/utils/speedup.c -o /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/build/objects/speedup/speedup.o

cc -O2 -pipe -fPIC -O2 -pipe -fvisibility=hidden -pthread -I/usr/local/include -I/usr/local/include/python3.12 '-DCALIBRE_MODINIT_FUNC= __attribute__ ((visibility ("default"))) PyObject*' -c /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/src/calibre/utils/certgen.c -o /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/build/objects/certgen/certgen.o
/usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/src/calibre/utils/certgen.c:128:37: error: use of undeclared identifier 'X509_REQ_VERSION_1'
  128 |     if (!X509_REQ_set_version(Cert, X509_REQ_VERSION_1)) { set_error("X509_REQ_set_version"); goto error; }
      |                                     ^
1 error generated.

*** Error 1 in . (/usr/ports/lang/python/python.port.mk:395 'do-build': @: ; if [ -e /usr/ports/pobj/calibre-8.0.1/calibre-8.0.1/pyproject.t...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3065 '/usr/ports/pobj/calibre-8.0.1/.build_done': @cd /usr/ports/textproc/calibre...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2241 '/usr/ports/packages/amd64/all/calibre-8.0.1.tgz': @cd /usr/ports/textproc/c...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2733 '_internal-package': @case X${_DEPENDS_CACHE} in  X) _DEPENDS_CACHE=$( mktem...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2271 '/usr/ports/update/amd64/calibre-8.0.1': @cd /usr/ports/textproc/calibre && ...)
*** Error 2 in /usr/ports/textproc/calibre (/usr/ports/infrastructure/mk/bsd.port.mk:2712 'update': @lock=calibre-8.0.1;  export _LOCKS_HELD...)

Sorry, not sure what is missing.

Take care everyone and well wishes.


> diff --git a/textproc/calibre/Makefile b/textproc/calibre/Makefile
> index d4b07b92129..89edcf45cc0 100644
> --- a/textproc/calibre/Makefile
> +++ b/textproc/calibre/Makefile
> @@ -1,8 +1,7 @@
> COMMENT = ebook management application
>
> -V = 5.44.0
> +V = 8.0.1
> DISTNAME = calibre-$V
> -REVISION = 5
>
> CATEGORIES = textproc
>
> @@ -11,22 +10,23 @@ HOMEPAGE = https://calibre-ebook.com/
> # GPLv3
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
> -WANTLIB += GL Qt5Core Qt5DBus Qt5Gui Qt5Widgets crypto fontconfig
> -WANTLIB += freetype glib-2.0 gthread-2.0 hunspell-1.7 hyphen icudata
> -WANTLIB += icui18n icuio icuuc intl m podofo stemmer z
> +WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Widgets avcodec
> +WANTLIB += avformat avutil crypto freetype hunspell-1.7 hyphen
> +WANTLIB += icudata icui18n icuio icuuc m podofo python3.12 stemmer
> +WANTLIB += swresample uchardet xkbcommon
>
> SITES = https://download.calibre-ebook.com/$V/
> PORTROACH = site:https://github.com/kovidgoyal/calibre/archive/
> EXTRACT_SUFX = .tar.xz
>
> MODULES = lang/python \
> - x11/qt5
> + x11/qt6
>
> COMMON_DEPENDS = databases/py-apsw>=3.35.4 \
>
> devel/py-dateutil \
> devel/py-html5lib \
> devel/py-regex \
> + devel/py-xxhash \
> devel/xdg-utils \
> graphics/libwmf \
> graphics/png \
> @@ -35,7 +35,7 @@ COMMON_DEPENDS = databases/py-apsw>=3.35.4 \
>
> net/py-msgpack \
> net/py-zeroconf \
> print/poppler \
> - print/poppler,-qt5 \
> + print/poppler,-qt6 \
> textproc/py-css-parser \
> textproc/py-cssselect \
> textproc/py-cssutils \
> @@ -43,19 +43,20 @@ COMMON_DEPENDS = databases/py-apsw>=3.35.4 \
>
> textproc/py-markdown \
> textproc/py-toml \
> textproc/py-webencodings \
> + textproc/uchardet \
> www/py-CherryPy \
> www/py-beautifulsoup4 \
> www/py-html5-parser \
> www/py-mechanize \
> - www/py-qtwebengine \
> - x11/py-qt5
> + www/py-qt6webengine \
> + x11/py-qt6
>
> -LIB_DEPENDS = devel/gettext,-runtime \
> +LIB_DEPENDS = \
> textproc/hunspell \
> textproc/hyphen \
> textproc/icu4c \
> textproc/libstemmer \
> - textproc/podofo
> + textproc/podofo>=0.10
>
>
> BUILD_DEPENDS = ${COMMON_DEPENDS} \
> devel/py-qt-builder \
> @@ -70,7 +71,7 @@ RUN_DEPENDS = ${COMMON_DEPENDS} \
> print/poppler,-utils \
> x11/gtk+4,-guic
>
> -SUBST_VARS = WRKDIR
> +SUBST_VARS = WRKDIR CC CXX
>
> LDFLAGS += -L${LOCALBASE}/lib
>
> @@ -118,3 +119,4 @@ post-install:
> ${MODPY_COMPILEALL} ${PREFIX}/{lib,share}/calibre
>
> .include <bsd.port.mk>
>
> +LIB_DEPENDS += graphics/ffmpeg lang/python/3 textproc/uchardet x11/xkbcommon
> diff --git a/textproc/calibre/distinfo b/textproc/calibre/distinfo
> index d737ab5d197..dd8821dc6b4 100644
> --- a/textproc/calibre/distinfo
> +++ b/textproc/calibre/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (calibre-5.44.0.tar.xz) = b/qj6v02okNV5ZV/D4ONttttNFbPoXy00Tn9lOuviOw=
> -SIZE (calibre-5.44.0.tar.xz) = 41015696
> +SHA256 (calibre-8.0.1.tar.xz) = opN6nrD7OUqS21cElrLqWzgGagFzU4XkaZO70SEGjSo=
> +SIZE (calibre-8.0.1.tar.xz) = 43932180
> diff --git a/textproc/calibre/patches/patch-setup___init___py b/textproc/calibre/patches/patch-setup___init___py
> index 3e9f39274b1..56f65f560a4 100644
> --- a/textproc/calibre/patches/patch-setup___init___py
> +++ b/textproc/calibre/patches/patch-setup___init___py
> @@ -1,7 +1,7 @@
> Index: setup/init.py
> --- setup/init.py.orig
> +++ setup/init.py
> -@@ -24,7 +24,8 @@ ismacos = 'darwin' in sys.platform
> +@@ -22,7 +22,8 @@ ismacos = 'darwin' in sys.platform
> isfreebsd = 'freebsd' in sys.platform
> isnetbsd = 'netbsd' in sys.platform
> isdragonflybsd = 'dragonfly' in sys.platform
> @@ -10,4 +10,4 @@ Index: setup/init.py
> +isbsd = isnetbsd or isfreebsd or isopenbsd or isdragonflybsd
> ishaiku = 'haiku1' in sys.platform
> islinux = not ismacos and not iswindows and not isbsd and not ishaiku
> - sys.setup_dir = os.path.dirname(os.path.abspath(file))
> + is_ci = os.environ.get('CI', '').lower() == 'true'
> diff --git a/textproc/calibre/patches/patch-setup_build_py b/textproc/calibre/patches/patch-setup_build_py
> index 84a0a375434..bb3a4bdc78c 100644
> --- a/textproc/calibre/patches/patch-setup_build_py
> +++ b/textproc/calibre/patches/patch-setup_build_py
> @@ -1,23 +1,18 @@
> Index: setup/build.py
> --- setup/build.py.orig
> +++ setup/build.py
> -@@ -71,15 +71,7 @@ class Extension:
> -
> - self.ldflags = d['ldflags'] = kwargs.get('ldflags', [])
> - self.optional = d['options'] = kwargs.get('optional', False)
> -- of = kwargs.get('optimize_level', None)
> -- if of is None:
> -- of = '/Ox' if iswindows else '-O3'
> -- else:
> -- flag = '/O%d' if iswindows else '-O%d'
> -- of = flag % of
> -- self.cflags.insert(0, of)
> -
> --
> - def lazy_load(name):
> - if name.startswith('!'):
> - name = name[1:]
> -@@ -206,6 +198,8 @@ def init_env(debug=False, sanitize=False):
> +@@ -256,8 +256,8 @@ def init_env(debug=False, sanitize=False, compiling_fo
> + platform_name = 'linux'
> + dest_ext = '.so'
> + if isunix:
> +- cc = os.environ.get('CC', 'gcc')
> +- cxx = os.environ.get('CXX', 'g++')
> ++ cc = os.environ.get('CC', '${CC}')
> ++ cxx = os.environ.get('CXX', '${CXX}')
> + debug = '-ggdb' if debug else ''
> + cflags = os.environ.get('OVERRIDE_CFLAGS',
> + f'-Wall -DNDEBUG {debug} -fno-strict-aliasing -pipe -O3')
> +@@ -283,6 +283,8 @@ def init_env(debug=False, sanitize=False, compiling_fo
> if isbsd:
> cflags.append('-pthread')
> ldflags.append('-shared')
> diff --git a/textproc/calibre/patches/patch-setup_extensions_json b/textproc/calibre/patches/patch-setup_extensions_json
> deleted file mode 100644
> index 0bbf8740a27..00000000000
> --- a/textproc/calibre/patches/patch-setup_extensions_json
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -Fix build with icu >=75
>
> -
> -Index: setup/extensions.json
> ---- setup/extensions.json.orig
> -+++ setup/extensions.json
> -@@ -6,7 +6,7 @@
> - "lib_dirs": "!hunspell_lib_dirs",
> - "libraries": "hunspell-1.7",
> - "windows_libraries": "libhunspell",
> -- "needs_c++11": true
> -+ "needs_c++17": true
> - },
> - {
> - "name": "hyphen",
> -@@ -75,7 +75,7 @@
> - "name": "sqlite_extension",
> - "headers": "calibre/utils/cpp_binding.h",
> - "sources": "calibre/db/sqlite_extension.cpp",
> -- "needs_c++14": true,
> -+ "needs_c++17": true,
> - "libraries": "icudata icui18n icuuc icuio stemmer",
> - "windows_libraries": "icudt icuin icuuc icuio libstemmer",
> - "lib_dirs": "!icu_lib_dirs",
> -@@ -117,19 +117,19 @@
> - "lib_dirs": "!podofo_lib",
> - "inc_dirs": "!podofo_inc",
> - "error": "!podofo_error",
> -- "needs_c++11": true
> -+ "needs_c++17": true
> - },
> - {
> - "name": "html_as_json",
> - "sources": "calibre/srv/html_as_json.cpp",
> -- "needs_c++11": true
> -+ "needs_c++17": true
> - },
> - {
> - "name": "fast_css_transform",
> - "headers": "calibre/utils/cpp_binding.h calibre/utils/stb_sprintf.h",
> - "sources": "calibre/srv/fast_css_transform.cpp",
> - "inc_dirs": "perfect-hashing",
> -- "needs_c++14": true
> -+ "needs_c++17": true
> - },
> - {
> - "name": "pictureflow",
> diff --git a/textproc/calibre/patches/patch-setup_install_py b/textproc/calibre/patches/patch-setup_install_py
> index 240366a86a5..9afe71fccd5 100644
> --- a/textproc/calibre/patches/patch-setup_install_py
> +++ b/textproc/calibre/patches/patch-setup_install_py
> @@ -1,7 +1,7 @@
> Index: setup/install.py
> --- setup/install.py.orig
> +++ setup/install.py
> -@@ -272,7 +272,7 @@ class Install(Develop):
> +@@ -269,7 +269,7 @@ class Install(Develop):
> reldir = os.path.relpath(x[0], self.SRC)
> destdir = os.path.join(dest, reldir)
> for f in x[-1]:
> diff --git a/textproc/calibre/patches/patch-src_calibre_constants_py b/textproc/calibre/patches/patch-src_calibre_constants_py
> index e9d8c7878ba..8d9b9ddfb09 100644
> --- a/textproc/calibre/patches/patch-src_calibre_constants_py
> +++ b/textproc/calibre/patches/patch-src_calibre_constants_py
> @@ -6,7 +6,7 @@ supports OSX, Windows, and Linux SYSFS.
> Index: src/calibre/constants.py
> --- src/calibre/constants.py.orig
> +++ src/calibre/constants.py
> -@@ -22,7 +22,8 @@ isnewosx = ismacos and getattr(sys, 'new_app_bundle',
> +@@ -28,7 +28,8 @@ isnewosx = ismacos and getattr(sys, 'new_app_bundle',
> isfreebsd = 'freebsd' in plat
> isnetbsd = 'netbsd' in plat
> isdragonflybsd = 'dragonfly' in plat
> @@ -14,10 +14,10 @@ Index: src/calibre/constants.py
> +isopenbsd = 'openbsd' in plat
> +isbsd = isfreebsd or isnetbsd or isdragonflybsd or isopenbsd
> ishaiku = 'haiku1' in plat
> - islinux = not(iswindows or ismacos or isbsd or ishaiku)
> + islinux = not (iswindows or ismacos or isbsd or ishaiku)
> isfrozen = hasattr(sys, 'frozen')
> -@@ -260,7 +261,7 @@ class ExtensionsImporter:
> - extra = ('winutil', 'wpd', 'winfonts', 'winsapi')
> +@@ -280,7 +281,7 @@ class ExtensionsImporter:
> + extra = ('winutil', 'wpd', 'winfonts', 'wintoast')
> elif ismacos:
> extra = ('usbobserver', 'cocoa', 'libusb', 'libmtp')
> - elif isfreebsd or ishaiku or islinux:
> diff --git a/textproc/calibre/patches/patch-src_calibre_gui2___init___py b/textproc/calibre/patches/patch-src_calibre_gui2___init___py
> index 52a77d3759d..77a56faa77a 100644
> --- a/textproc/calibre/patches/patch-src_calibre_gui2___init___py
> +++ b/textproc/calibre/patches/patch-src_calibre_gui2___init___py
> @@ -3,7 +3,7 @@
> Index: src/calibre/gui2/init.py
> --- src/calibre/gui2/init.py.orig
> +++ src/calibre/gui2/init.py
> -@@ -875,7 +875,7 @@ def load_builtin_fonts():
> +@@ -1119,7 +1119,7 @@ def load_builtin_fonts():
>
>
> def setup_gui_option_parser(parser):
> diff --git a/textproc/calibre/patches/patch-src_calibre_gui2_update_py b/textproc/calibre/patches/patch-src_calibre_gui2_update_py
> index fb97c1daa53..6939dddec12 100644
> --- a/textproc/calibre/patches/patch-src_calibre_gui2_update_py
> +++ b/textproc/calibre/patches/patch-src_calibre_gui2_update_py
> @@ -3,13 +3,13 @@
> Index: src/calibre/gui2/update.py
> --- src/calibre/gui2/update.py.orig
> +++ src/calibre/gui2/update.py
> -@@ -32,6 +32,9 @@ def get_download_url():
> +@@ -29,6 +29,9 @@ def get_download_url():
>
>
> def get_newest_version():
> + return NO_CALIBRE_UPDATE
> +
> +def DISABLED_get_newest_version():
> - try:
> - icon_theme_name = json.loads(I('icon-theme.json', data=True))['name']
> - except Exception:
> + icon_theme_name = icon_resource_manager.user_theme_name
> + if icon_theme_name == 'default':
> + icon_theme_name = ''
> diff --git a/textproc/calibre/patches/patch-src_calibre_linux_py b/textproc/calibre/patches/patch-src_calibre_linux_py
> index 3935ed13fc9..d2fe272055d 100644
> --- a/textproc/calibre/patches/patch-src_calibre_linux_py
> +++ b/textproc/calibre/patches/patch-src_calibre_linux_py
> @@ -1,7 +1,7 @@
> Index: src/calibre/linux.py
> --- src/calibre/linux.py.orig
> +++ src/calibre/linux.py
> -@@ -776,19 +776,6 @@ class PostInstall:
> +@@ -783,19 +783,6 @@ class PostInstall:
> self.setup_completion()
> if islinux or isbsd:
> self.setup_desktop_integration()
> @@ -20,4 +20,4 @@ Index: src/calibre/linux.py
> - os.rmdir(config_dir)
>
> if warn is None and self.warnings:
> - self.info('\n\nThere were %d warnings\n'%len(self.warnings))
> + self.info(f'\n\nThere were {len(self.warnings)} warnings\n')
> diff --git a/textproc/calibre/pkg/PLIST b/textproc/calibre/pkg/PLIST
> index 1eda76d13f7..7b9c1c8d8ed 100644
> --- a/textproc/calibre/pkg/PLIST
> +++ b/textproc/calibre/pkg/PLIST
> @@ -87,12 +87,12 @@ lib/calibre/calibre/db/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEX
> lib/calibre/calibre/db/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/${MODPY_PYCACHE}categories.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/db/${MODPY_PYCACHE}categories.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/${MODPY_PYCACHE}copy_to_library.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/db/${MODPY_PYCACHE}copy_to_library.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/${MODPY_PYCACHE}covers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/db/${MODPY_PYCACHE}covers.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/db/${MODPY_PYCACHE}delete_service.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/db/${MODPY_PYCACHE}delete_service.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/db/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -150,6 +150,10 @@ lib/calibre/calibre/db/cli/${MODPY_PYCACHE}cmd_embed_metadata.${MODPY_PYC_MAGIC
> lib/calibre/calibre/db/cli/${MODPY_PYCACHE}cmd_embed_metadata.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/cli/${MODPY_PYCACHE}cmd_export.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/db/cli/${MODPY_PYCACHE}cmd_export.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/cli/${MODPY_PYCACHE}cmd_fts_index.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/cli/${MODPY_PYCACHE}cmd_fts_index.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/cli/${MODPY_PYCACHE}cmd_fts_search.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/cli/${MODPY_PYCACHE}cmd_fts_search.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/cli/${MODPY_PYCACHE}cmd_list.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/db/cli/${MODPY_PYCACHE}cmd_list.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/cli/${MODPY_PYCACHE}cmd_list_categories.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -188,6 +192,8 @@ lib/calibre/calibre/db/cli/cmd_clone.py
> lib/calibre/calibre/db/cli/cmd_custom_columns.py
> lib/calibre/calibre/db/cli/cmd_embed_metadata.py
> lib/calibre/calibre/db/cli/cmd_export.py
> +lib/calibre/calibre/db/cli/cmd_fts_index.py
> +lib/calibre/calibre/db/cli/cmd_fts_search.py
> lib/calibre/calibre/db/cli/cmd_list.py
> lib/calibre/calibre/db/cli/cmd_list_categories.py
> lib/calibre/calibre/db/cli/cmd_remove.py
> @@ -202,15 +208,46 @@ lib/calibre/calibre/db/cli/cmd_show_metadata.py
> lib/calibre/calibre/db/cli/main.py
> lib/calibre/calibre/db/cli/tests.py
> lib/calibre/calibre/db/cli/utils.py
> +lib/calibre/calibre/db/constants.py
> lib/calibre/calibre/db/copy_to_library.py
> lib/calibre/calibre/db/covers.py
> -lib/calibre/calibre/db/delete_service.py
> lib/calibre/calibre/db/errors.py
> lib/calibre/calibre/db/fields.py
> +lib/calibre/calibre/db/fts/
> +lib/calibre/calibre/db/fts/init.py
> +${MODPY_COMMENT}lib/calibre/calibre/db/fts/${MODPY_PYCACHE}/
> +lib/calibre/calibre/db/fts/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/fts/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/fts/${MODPY_PYCACHE}connect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/fts/${MODPY_PYCACHE}connect.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/fts/${MODPY_PYCACHE}pool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/fts/${MODPY_PYCACHE}pool.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/fts/${MODPY_PYCACHE}schema_upgrade.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/fts/${MODPY_PYCACHE}schema_upgrade.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/fts/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/fts/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/fts/connect.py
> +lib/calibre/calibre/db/fts/pool.py
> +lib/calibre/calibre/db/fts/schema_upgrade.py
> +lib/calibre/calibre/db/fts/text.py
> lib/calibre/calibre/db/lazy.py
> lib/calibre/calibre/db/legacy.py
> lib/calibre/calibre/db/listeners.py
> lib/calibre/calibre/db/locking.py
> +lib/calibre/calibre/db/notes/
> +lib/calibre/calibre/db/notes/init.py
> +${MODPY_COMMENT}lib/calibre/calibre/db/notes/${MODPY_PYCACHE}/
> +lib/calibre/calibre/db/notes/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/notes/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/notes/${MODPY_PYCACHE}connect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/notes/${MODPY_PYCACHE}connect.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/notes/${MODPY_PYCACHE}exim.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/notes/${MODPY_PYCACHE}exim.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/notes/${MODPY_PYCACHE}schema_upgrade.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/notes/${MODPY_PYCACHE}schema_upgrade.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/notes/connect.py
> +lib/calibre/calibre/db/notes/exim.py
> +lib/calibre/calibre/db/notes/schema_upgrade.py
> lib/calibre/calibre/db/restore.py
> lib/calibre/calibre/db/schema_upgrades.py
> lib/calibre/calibre/db/search.py
> @@ -228,12 +265,16 @@ lib/calibre/calibre/db/tests/${MODPY_PYCACHE}filesystem.${MODPY_PYC_MAGIC_TAG}${
> lib/calibre/calibre/db/tests/${MODPY_PYCACHE}filesystem.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/tests/${MODPY_PYCACHE}fts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/db/tests/${MODPY_PYCACHE}fts.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/tests/${MODPY_PYCACHE}fts_api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/tests/${MODPY_PYCACHE}fts_api.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/tests/${MODPY_PYCACHE}legacy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/db/tests/${MODPY_PYCACHE}legacy.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/tests/${MODPY_PYCACHE}locking.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/db/tests/${MODPY_PYCACHE}locking.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/tests/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/db/tests/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/db/tests/${MODPY_PYCACHE}notes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/db/tests/${MODPY_PYCACHE}notes.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/tests/${MODPY_PYCACHE}profiling.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/db/tests/${MODPY_PYCACHE}profiling.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/db/tests/${MODPY_PYCACHE}reading.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -246,9 +287,11 @@ lib/calibre/calibre/db/tests/add_remove.py
> lib/calibre/calibre/db/tests/base.py
> lib/calibre/calibre/db/tests/filesystem.py
> lib/calibre/calibre/db/tests/fts.py
> +lib/calibre/calibre/db/tests/fts_api.py
> lib/calibre/calibre/db/tests/legacy.py
> lib/calibre/calibre/db/tests/locking.py
> lib/calibre/calibre/db/tests/main.py
> +lib/calibre/calibre/db/tests/notes.py
> lib/calibre/calibre/db/tests/profiling.py
> lib/calibre/calibre/db/tests/reading.py
> lib/calibre/calibre/db/tests/utils.py
> @@ -421,6 +464,40 @@ lib/calibre/calibre/devices/kindle/${MODPY_PYCACHE}bookmark.${MODPY_PYC_MAGIC_TA
> lib/calibre/calibre/devices/kindle/${MODPY_PYCACHE}driver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/devices/kindle/${MODPY_PYCACHE}driver.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/devices/kindle/apnx.py
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/init.py
> +${MODPY_COMMENT}lib/calibre/calibre/devices/kindle/apnx_page_generator/${MODPY_PYCACHE}/
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/${MODPY_PYCACHE}i_page_generator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/${MODPY_PYCACHE}i_page_generator.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/${MODPY_PYCACHE}page_group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/${MODPY_PYCACHE}page_group.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/${MODPY_PYCACHE}page_number_type.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/${MODPY_PYCACHE}page_number_type.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/${MODPY_PYCACHE}pages.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/${MODPY_PYCACHE}pages.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/init.py
> +${MODPY_COMMENT}lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/${MODPY_PYCACHE}/
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/${MODPY_PYCACHE}a${CC}urate_page_generator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/${MODPY_PYCACHE}a${CC}urate_page_generator.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/${MODPY_PYCACHE}exact_page_generator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/${MODPY_PYCACHE}exact_page_generator.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/${MODPY_PYCACHE}fast_page_generator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/${MODPY_PYCACHE}fast_page_generator.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/${MODPY_PYCACHE}pagebreak_page_generator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/${MODPY_PYCACHE}pagebreak_page_generator.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/a${CC}urate_page_generator.py
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/exact_page_generator.py
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/fast_page_generator.py
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/generators/pagebreak_page_generator.py
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/i_page_generator.py
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/page_group.py
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/page_number_type.py
> +lib/calibre/calibre/devices/kindle/apnx_page_generator/pages.py
> lib/calibre/calibre/devices/kindle/bookmark.py
> lib/calibre/calibre/devices/kindle/driver.py
> lib/calibre/calibre/devices/kobo/
> @@ -432,12 +509,15 @@ lib/calibre/calibre/devices/kobo/${MODPY_PYCACHE}bookmark.${MODPY_PYC_MAGIC_TAG}
> lib/calibre/calibre/devices/kobo/${MODPY_PYCACHE}bookmark.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/devices/kobo/${MODPY_PYCACHE}books.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/devices/kobo/${MODPY_PYCACHE}books.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/devices/kobo/${MODPY_PYCACHE}db.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/devices/kobo/${MODPY_PYCACHE}db.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/devices/kobo/${MODPY_PYCACHE}driver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/devices/kobo/${MODPY_PYCACHE}driver.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/devices/kobo/${MODPY_PYCACHE}kobotouch_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/devices/kobo/${MODPY_PYCACHE}kobotouch_config.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/devices/kobo/bookmark.py
> lib/calibre/calibre/devices/kobo/books.py
> +lib/calibre/calibre/devices/kobo/db.py
> lib/calibre/calibre/devices/kobo/driver.py
> lib/calibre/calibre/devices/kobo/kobotouch_config.py
> lib/calibre/calibre/devices/mime.py
> @@ -670,6 +750,8 @@ lib/calibre/calibre/ebooks/conversion/init.py
> ${MODPY_COMMENT}lib/calibre/calibre/ebooks/conversion/${MODPY_PYCACHE}/
> lib/calibre/calibre/ebooks/conversion/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/conversion/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/ebooks/conversion/${MODPY_PYCACHE}archives.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/ebooks/conversion/${MODPY_PYCACHE}archives.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/conversion/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/conversion/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/conversion/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -682,6 +764,7 @@ lib/calibre/calibre/ebooks/conversion/${MODPY_PYCACHE}search_replace.${MODPY_PYC
> lib/calibre/calibre/ebooks/conversion/${MODPY_PYCACHE}search_replace.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/conversion/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/conversion/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/ebooks/conversion/archives.py
> lib/calibre/calibre/ebooks/conversion/cli.py
> lib/calibre/calibre/ebooks/conversion/config.py
> lib/calibre/calibre/ebooks/conversion/plugins/
> @@ -1467,6 +1550,8 @@ lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}import_book.${MODPY_PYC_MA
> lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}import_book.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}jacket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}jacket.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}kepubify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}kepubify.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}opf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -1489,6 +1574,8 @@ lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}subset.${MODPY_PYC_MAGIC_T
> lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}subset.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}toc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}toc.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}tts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}tts.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}upgrade.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}upgrade.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/oeb/polish/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -1535,6 +1622,7 @@ lib/calibre/calibre/ebooks/oeb/polish/hyphenation.py
> lib/calibre/calibre/ebooks/oeb/polish/images.py
> lib/calibre/calibre/ebooks/oeb/polish/import_book.py
> lib/calibre/calibre/ebooks/oeb/polish/jacket.py
> +lib/calibre/calibre/ebooks/oeb/polish/kepubify.py
> lib/calibre/calibre/ebooks/oeb/polish/main.py
> lib/calibre/calibre/ebooks/oeb/polish/opf.py
> lib/calibre/calibre/ebooks/oeb/polish/parsing.py
> @@ -1556,6 +1644,8 @@ lib/calibre/calibre/ebooks/oeb/polish/tests/${MODPY_PYCACHE}cascade.${MODPY_PYC
> lib/calibre/calibre/ebooks/oeb/polish/tests/${MODPY_PYCACHE}cascade.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/oeb/polish/tests/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/oeb/polish/tests/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/ebooks/oeb/polish/tests/${MODPY_PYCACHE}kepubify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/ebooks/oeb/polish/tests/${MODPY_PYCACHE}kepubify.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/oeb/polish/tests/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/oeb/polish/tests/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/oeb/polish/tests/${MODPY_PYCACHE}parsing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -1565,10 +1655,12 @@ lib/calibre/calibre/ebooks/oeb/polish/tests/${MODPY_PYCACHE}structure.${MODPY_PY
> lib/calibre/calibre/ebooks/oeb/polish/tests/base.py
> lib/calibre/calibre/ebooks/oeb/polish/tests/cascade.py
> lib/calibre/calibre/ebooks/oeb/polish/tests/container.py
> +lib/calibre/calibre/ebooks/oeb/polish/tests/kepubify.py
> lib/calibre/calibre/ebooks/oeb/polish/tests/main.py
> lib/calibre/calibre/ebooks/oeb/polish/tests/parsing.py
> lib/calibre/calibre/ebooks/oeb/polish/tests/structure.py
> lib/calibre/calibre/ebooks/oeb/polish/toc.py
> +lib/calibre/calibre/ebooks/oeb/polish/tts.py
> lib/calibre/calibre/ebooks/oeb/polish/upgrade.py
> lib/calibre/calibre/ebooks/oeb/polish/utils.py
> lib/calibre/calibre/ebooks/oeb/reader.py
> @@ -1578,6 +1670,8 @@ lib/calibre/calibre/ebooks/oeb/transforms/init.py
> ${MODPY_COMMENT}lib/calibre/calibre/ebooks/oeb/transforms/${MODPY_PYCACHE}/
> lib/calibre/calibre/ebooks/oeb/transforms/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/oeb/transforms/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/ebooks/oeb/transforms/${MODPY_PYCACHE}alt_text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/ebooks/oeb/transforms/${MODPY_PYCACHE}alt_text.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/oeb/transforms/${MODPY_PYCACHE}cover.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/oeb/transforms/${MODPY_PYCACHE}cover.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/oeb/transforms/${MODPY_PYCACHE}data_url.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -1616,6 +1710,7 @@ lib/calibre/calibre/ebooks/oeb/transforms/${MODPY_PYCACHE}trimmanifest.${MODPY_P
> lib/calibre/calibre/ebooks/oeb/transforms/${MODPY_PYCACHE}trimmanifest.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/oeb/transforms/${MODPY_PYCACHE}unsmarten.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/oeb/transforms/${MODPY_PYCACHE}unsmarten.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/ebooks/oeb/transforms/alt_text.py
> lib/calibre/calibre/ebooks/oeb/transforms/cover.py
> lib/calibre/calibre/ebooks/oeb/transforms/data_url.py
> lib/calibre/calibre/ebooks/oeb/transforms/embed_fonts.py
> @@ -1727,8 +1822,6 @@ lib/calibre/calibre/ebooks/pdf/${MODPY_PYCACHE}html_writer.${MODPY_PYC_MAGIC_TAG
> lib/calibre/calibre/ebooks/pdf/${MODPY_PYCACHE}html_writer.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/pdf/${MODPY_PYCACHE}image_writer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/pdf/${MODPY_PYCACHE}image_writer.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/ebooks/pdf/${MODPY_PYCACHE}pageoptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/ebooks/pdf/${MODPY_PYCACHE}pageoptions.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/pdf/${MODPY_PYCACHE}pdftohtml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/ebooks/pdf/${MODPY_PYCACHE}pdftohtml.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/pdf/${MODPY_PYCACHE}reflow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -1736,7 +1829,6 @@ lib/calibre/calibre/ebooks/pdf/${MODPY_PYCACHE}reflow.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/ebooks/pdf/develop.py
> lib/calibre/calibre/ebooks/pdf/html_writer.py
> lib/calibre/calibre/ebooks/pdf/image_writer.py
> -lib/calibre/calibre/ebooks/pdf/pageoptions.py
> lib/calibre/calibre/ebooks/pdf/pdftohtml.py
> lib/calibre/calibre/ebooks/pdf/reflow.py
> lib/calibre/calibre/ebooks/pdf/render/
> @@ -2043,26 +2135,6 @@ lib/calibre/calibre/ebooks/unihandecode/jacodepoints.py
> lib/calibre/calibre/ebooks/unihandecode/jadecoder.py
> lib/calibre/calibre/ebooks/unihandecode/krcodepoints.py
> lib/calibre/calibre/ebooks/unihandecode/krdecoder.py
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/init.py
> -${MODPY_COMMENT}lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}/
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}h2a.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}h2a.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}j2h.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}j2h.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}jisyo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}jisyo.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}k2a.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}k2a.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}kakasi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/${MODPY_PYCACHE}kakasi.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/h2a.py
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/j2h.py
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/jisyo.py
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/k2a.py
> -lib/calibre/calibre/ebooks/unihandecode/pykakasi/kakasi.py
> lib/calibre/calibre/ebooks/unihandecode/unicodepoints.py
> lib/calibre/calibre/ebooks/unihandecode/unidecoder.py
> lib/calibre/calibre/ebooks/unihandecode/vncodepoints.py
> @@ -2085,6 +2157,8 @@ lib/calibre/calibre/gui2/${MODPY_PYCACHE}bars.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOE
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}bars.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}book_details.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}book_details.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}central.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}central.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}changes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}changes.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}comments_editor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2107,12 +2181,16 @@ lib/calibre/calibre/gui2/${MODPY_PYCACHE}ebook_download.${MODPY_PYC_MAGIC_TAG}${
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}ebook_download.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}email.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}email.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}extra_files_watcher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}extra_files_watcher.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}filename_pattern_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}filename_pattern_ui.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}flow_toolbar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}flow_toolbar.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}font_family_chooser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}font_family_chooser.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}geometry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}geometry.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}gestures.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}gestures.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}html_transform_rules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2143,6 +2221,10 @@ lib/calibre/calibre/gui2/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOE
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}main_window.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}main_window.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}markdown_editor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}markdown_editor.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}markdown_syntax_highlighter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}markdown_syntax_highlighter.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}notify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}notify.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}open_with.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2153,6 +2235,10 @@ lib/calibre/calibre/gui2/${MODPY_PYCACHE}pin_columns.${MODPY_PYC_MAGIC_TAG}${MOD
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}pin_columns.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}proceed.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}proceed.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}publisher_mapper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}publisher_mapper.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}pyqt6_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}pyqt6_compat.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}qt_file_dialogs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}qt_file_dialogs.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}save.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2161,8 +2247,8 @@ lib/calibre/calibre/gui2/${MODPY_PYCACHE}search_box.${MODPY_PYC_MAGIC_TAG}${MODP
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}search_box.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}search_restriction_mixin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}search_restriction_mixin.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/gui2/${MODPY_PYCACHE}shortcuts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/gui2/${MODPY_PYCACHE}shortcuts.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}series_mapper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}series_mapper.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}splash_screen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}splash_screen.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}tag_mapper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2173,6 +2259,8 @@ lib/calibre/calibre/gui2/${MODPY_PYCACHE}throbber.${MODPY_PYC_MAGIC_TAG}${MODPY
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}throbber.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}trash.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/${MODPY_PYCACHE}trash.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}ui.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2194,14 +2282,20 @@ lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}add.${MODPY_PYC_MAGIC_TAG}${MOD
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}add.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}add_to_library.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}add_to_library.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}all_actions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}all_actions.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}annotate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}annotate.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}author_mapper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}author_mapper.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}auto_scroll.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}auto_scroll.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}booklist_context_menu.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}booklist_context_menu.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}browse_annots.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}browse_annots.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}browse_notes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}browse_notes.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}catalog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}catalog.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}choose_library.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2222,8 +2316,14 @@ lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}embed.${MODPY_PYC_MAGIC_TAG}${M
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}embed.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}fetch_news.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}fetch_news.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}fts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}fts.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}help.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}help.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}layout_actions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}layout_actions.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}manage_categories.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}manage_categories.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}mark_books.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}mark_books.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}match_books.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2244,6 +2344,8 @@ lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}restart.${MODPY_PYC_MAGIC_TAG}$
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}restart.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}save_to_disk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}save_to_disk.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}saved_searches.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}saved_searches.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}show_book_details.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}show_book_details.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}show_quickview.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2272,10 +2374,13 @@ lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}virtual_library.${MODPY_PYC_MAG
> lib/calibre/calibre/gui2/actions/${MODPY_PYCACHE}virtual_library.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/actions/add.py
> lib/calibre/calibre/gui2/actions/add_to_library.py
> +lib/calibre/calibre/gui2/actions/all_actions.py
> lib/calibre/calibre/gui2/actions/annotate.py
> lib/calibre/calibre/gui2/actions/author_mapper.py
> lib/calibre/calibre/gui2/actions/auto_scroll.py
> +lib/calibre/calibre/gui2/actions/booklist_context_menu.py
> lib/calibre/calibre/gui2/actions/browse_annots.py
> +lib/calibre/calibre/gui2/actions/browse_notes.py
> lib/calibre/calibre/gui2/actions/catalog.py
> lib/calibre/calibre/gui2/actions/choose_library.py
> lib/calibre/calibre/gui2/actions/convert.py
> @@ -2286,7 +2391,10 @@ lib/calibre/calibre/gui2/actions/edit_collections.py
> lib/calibre/calibre/gui2/actions/edit_metadata.py
> lib/calibre/calibre/gui2/actions/embed.py
> lib/calibre/calibre/gui2/actions/fetch_news.py
> +lib/calibre/calibre/gui2/actions/fts.py
> lib/calibre/calibre/gui2/actions/help.py
> +lib/calibre/calibre/gui2/actions/layout_actions.py
> +lib/calibre/calibre/gui2/actions/manage_categories.py
> lib/calibre/calibre/gui2/actions/mark_books.py
> lib/calibre/calibre/gui2/actions/match_books.py
> lib/calibre/calibre/gui2/actions/next_match.py
> @@ -2297,6 +2405,7 @@ lib/calibre/calibre/gui2/actions/preferences.py
> lib/calibre/calibre/gui2/actions/random.py
> lib/calibre/calibre/gui2/actions/restart.py
> lib/calibre/calibre/gui2/actions/save_to_disk.py
> +lib/calibre/calibre/gui2/actions/saved_searches.py
> lib/calibre/calibre/gui2/actions/show_book_details.py
> lib/calibre/calibre/gui2/actions/show_quickview.py
> lib/calibre/calibre/gui2/actions/show_stored_templates.py
> @@ -2339,6 +2448,7 @@ lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py
> lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py
> lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
> lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
> +lib/calibre/calibre/gui2/central.py
> lib/calibre/calibre/gui2/changes.py
> lib/calibre/calibre/gui2/comments_editor.py
> lib/calibre/calibre/gui2/complete2.py
> @@ -2393,6 +2503,10 @@ lib/calibre/calibre/gui2/convert/${MODPY_PYCACHE}htmlz_output.${MODPY_PYC_MAGIC
> lib/calibre/calibre/gui2/convert/${MODPY_PYCACHE}htmlz_output.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/convert/${MODPY_PYCACHE}htmlz_output_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/convert/${MODPY_PYCACHE}htmlz_output_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/convert/${MODPY_PYCACHE}kepub_output.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/convert/${MODPY_PYCACHE}kepub_output.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/convert/${MODPY_PYCACHE}kepub_output_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/convert/${MODPY_PYCACHE}kepub_output_ui.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/convert/${MODPY_PYCACHE}look_and_feel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/convert/${MODPY_PYCACHE}look_and_feel.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/convert/${MODPY_PYCACHE}look_and_feel_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2496,6 +2610,8 @@ lib/calibre/calibre/gui2/convert/heuristics.py
> lib/calibre/calibre/gui2/convert/heuristics_ui.py
> lib/calibre/calibre/gui2/convert/htmlz_output.py
> lib/calibre/calibre/gui2/convert/htmlz_output_ui.py
> +lib/calibre/calibre/gui2/convert/kepub_output.py
> +lib/calibre/calibre/gui2/convert/kepub_output_ui.py
> lib/calibre/calibre/gui2/convert/look_and_feel.py
> lib/calibre/calibre/gui2/convert/look_and_feel_ui.py
> lib/calibre/calibre/gui2/convert/lrf_output.py
> @@ -2598,16 +2714,18 @@ lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}confirm_delete.${MODPY_PYC_MAGI
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}confirm_delete.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}confirm_delete_location.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}confirm_delete_location.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}confirm_delete_location_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}confirm_delete_location_ui.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}confirm_merge.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}confirm_merge.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}connect_to_folder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}connect_to_folder.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}conversion_error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}conversion_error.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}conversion_error_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}conversion_error_ui.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}custom_recipes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}custom_recipes.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}data_files_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}data_files_manager.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}delete_matching_from_device.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}delete_matching_from_device.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}delete_matching_from_device_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2626,10 +2744,14 @@ lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}edit_authors_dialog.${MODPY_PYC
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}edit_authors_dialog.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}edit_authors_dialog_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}edit_authors_dialog_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}edit_category_notes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}edit_category_notes.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}enum_values_edit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}enum_values_edit.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}exim.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}exim.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}ff_doc_editor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}ff_doc_editor.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}jobs_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}jobs_ui.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}match_books.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2646,6 +2768,8 @@ lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}multisort.${MODPY_PYC_MAGIC_TAG
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}multisort.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}opml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}opml.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}palette.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}palette.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}password.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}password.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}password_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2668,6 +2792,8 @@ lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}${
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}select_formats.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}select_formats.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}show_category_note.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}show_category_note.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}smartdevice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}smartdevice.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}smartdevice_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2694,6 +2820,8 @@ lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}template_dialog_code_widget.${M
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}template_dialog_code_widget.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}template_dialog_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}template_dialog_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}template_general_info.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}template_general_info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}template_line_editor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}template_line_editor.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}trim_image.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2714,11 +2842,12 @@ lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py
> lib/calibre/calibre/gui2/dialogs/comments_dialog.py
> lib/calibre/calibre/gui2/dialogs/confirm_delete.py
> lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py
> -lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py
> lib/calibre/calibre/gui2/dialogs/confirm_merge.py
> +lib/calibre/calibre/gui2/dialogs/connect_to_folder.py
> lib/calibre/calibre/gui2/dialogs/conversion_error.py
> lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py
> lib/calibre/calibre/gui2/dialogs/custom_recipes.py
> +lib/calibre/calibre/gui2/dialogs/data_files_manager.py
> lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py
> lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py
> lib/calibre/calibre/gui2/dialogs/device_category_editor.py
> @@ -2728,8 +2857,10 @@ lib/calibre/calibre/gui2/dialogs/drm_error_ui.py
> lib/calibre/calibre/gui2/dialogs/duplicates.py
> lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
> lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py
> +lib/calibre/calibre/gui2/dialogs/edit_category_notes.py
> lib/calibre/calibre/gui2/dialogs/enum_values_edit.py
> lib/calibre/calibre/gui2/dialogs/exim.py
> +lib/calibre/calibre/gui2/dialogs/ff_doc_editor.py
> lib/calibre/calibre/gui2/dialogs/jobs_ui.py
> lib/calibre/calibre/gui2/dialogs/match_books.py
> lib/calibre/calibre/gui2/dialogs/match_books_ui.py
> @@ -2738,6 +2869,7 @@ lib/calibre/calibre/gui2/dialogs/metadata_bulk.py
> lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py
> lib/calibre/calibre/gui2/dialogs/multisort.py
> lib/calibre/calibre/gui2/dialogs/opml.py
> +lib/calibre/calibre/gui2/dialogs/palette.py
> lib/calibre/calibre/gui2/dialogs/password.py
> lib/calibre/calibre/gui2/dialogs/password_ui.py
> lib/calibre/calibre/gui2/dialogs/plugin_updater.py
> @@ -2749,6 +2881,7 @@ lib/calibre/calibre/gui2/dialogs/saved_search_editor.py
> lib/calibre/calibre/gui2/dialogs/scheduler.py
> lib/calibre/calibre/gui2/dialogs/search.py
> lib/calibre/calibre/gui2/dialogs/select_formats.py
> +lib/calibre/calibre/gui2/dialogs/show_category_note.py
> lib/calibre/calibre/gui2/dialogs/smartdevice.py
> lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py
> lib/calibre/calibre/gui2/dialogs/tag_categories.py
> @@ -2762,14 +2895,34 @@ lib/calibre/calibre/gui2/dialogs/template_dialog.py
> lib/calibre/calibre/gui2/dialogs/template_dialog_box_layout.py
> lib/calibre/calibre/gui2/dialogs/template_dialog_code_widget.py
> lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
> +lib/calibre/calibre/gui2/dialogs/template_general_info.py
> lib/calibre/calibre/gui2/dialogs/template_line_editor.py
> lib/calibre/calibre/gui2/dialogs/trim_image.py
> lib/calibre/calibre/gui2/dnd.py
> lib/calibre/calibre/gui2/ebook_download.py
> lib/calibre/calibre/gui2/email.py
> +lib/calibre/calibre/gui2/extra_files_watcher.py
> lib/calibre/calibre/gui2/filename_pattern_ui.py
> lib/calibre/calibre/gui2/flow_toolbar.py
> lib/calibre/calibre/gui2/font_family_chooser.py
> +lib/calibre/calibre/gui2/fts/
> +lib/calibre/calibre/gui2/fts/init.py
> +${MODPY_COMMENT}lib/calibre/calibre/gui2/fts/${MODPY_PYCACHE}/
> +lib/calibre/calibre/gui2/fts/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/fts/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/fts/${MODPY_PYCACHE}dialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/fts/${MODPY_PYCACHE}dialog.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/fts/${MODPY_PYCACHE}scan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/fts/${MODPY_PYCACHE}scan.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/fts/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/fts/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/fts/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/fts/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/fts/dialog.py
> +lib/calibre/calibre/gui2/fts/scan.py
> +lib/calibre/calibre/gui2/fts/search.py
> +lib/calibre/calibre/gui2/fts/utils.py
> +lib/calibre/calibre/gui2/geometry.py
> lib/calibre/calibre/gui2/gestures.py
> lib/calibre/calibre/gui2/html_transform_rules.py
> lib/calibre/calibre/gui2/icon_theme.py
> @@ -2796,6 +2949,8 @@ lib/calibre/calibre/gui2/library/${MODPY_PYCACHE}delegates.${MODPY_PYC_MAGIC_TAG
> lib/calibre/calibre/gui2/library/${MODPY_PYCACHE}delegates.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/library/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/library/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/library/${MODPY_PYCACHE}notes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/library/${MODPY_PYCACHE}notes.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/library/${MODPY_PYCACHE}views.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/library/${MODPY_PYCACHE}views.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/library/alternate_views.py
> @@ -2803,6 +2958,7 @@ lib/calibre/calibre/gui2/library/annotations.py
> lib/calibre/calibre/gui2/library/caches.py
> lib/calibre/calibre/gui2/library/delegates.py
> lib/calibre/calibre/gui2/library/models.py
> +lib/calibre/calibre/gui2/library/notes.py
> lib/calibre/calibre/gui2/library/views.py
> lib/calibre/calibre/gui2/linux_file_dialogs.py
> lib/calibre/calibre/gui2/listener.py
> @@ -2831,6 +2987,8 @@ lib/calibre/calibre/gui2/lrf_renderer/main_ui.py
> lib/calibre/calibre/gui2/lrf_renderer/text.py
> lib/calibre/calibre/gui2/main.py
> lib/calibre/calibre/gui2/main_window.py
> +lib/calibre/calibre/gui2/markdown_editor.py
> +lib/calibre/calibre/gui2/markdown_syntax_highlighter.py
> lib/calibre/calibre/gui2/metadata/
> lib/calibre/calibre/gui2/metadata/init.py
> ${MODPY_COMMENT}lib/calibre/calibre/gui2/metadata/${MODPY_PYCACHE}/
> @@ -2967,6 +3125,74 @@ lib/calibre/calibre/gui2/preferences/history.py
> lib/calibre/calibre/gui2/preferences/ignored_devices.py
> lib/calibre/calibre/gui2/preferences/keyboard.py
> lib/calibre/calibre/gui2/preferences/look_feel.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/init.py
> +${MODPY_COMMENT}lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}/
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}book_details.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}book_details.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}book_details_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}book_details_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}cover_grid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}cover_grid.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}cover_grid_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}cover_grid_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}cover_view.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}cover_view.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}cover_view_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}cover_view_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}edit_metadata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}edit_metadata.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}edit_metadata_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}edit_metadata_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}main_interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}main_interface.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}main_interface_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}main_interface_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}quickview.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}quickview.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}quickview_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}quickview_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_display.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_display.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_display_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_display_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_hierarchy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_hierarchy.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_hierarchy_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_hierarchy_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_icon_rules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_icon_rules.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_icon_rules_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_icon_rules_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_partitioning.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_partitioning.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_partitioning_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_partitioning_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_quickview_ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/${MODPY_PYCACHE}tb_quickview_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/book_details.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/book_details_ui.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/cover_grid.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/cover_grid_ui.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/cover_view.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/cover_view_ui.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/edit_metadata.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/edit_metadata_ui.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/main_interface.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/main_interface_ui.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/quickview.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/quickview_ui.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/tb_display.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/tb_display_ui.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/tb_hierarchy.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/tb_hierarchy_ui.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/tb_icon_rules.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/tb_icon_rules_ui.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/tb_partitioning.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/tb_partitioning_ui.py
> +lib/calibre/calibre/gui2/preferences/look_feel_tabs/tb_quickview_ui.py
> lib/calibre/calibre/gui2/preferences/look_feel_ui.py
> lib/calibre/calibre/gui2/preferences/main.py
> lib/calibre/calibre/gui2/preferences/metadata_sources.py
> @@ -2998,11 +3224,13 @@ lib/calibre/calibre/gui2/progress_indicator/init.py
> ${MODPY_COMMENT}lib/calibre/calibre/gui2/progress_indicator/${MODPY_PYCACHE}/
> lib/calibre/calibre/gui2/progress_indicator/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/progress_indicator/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/publisher_mapper.py
> +lib/calibre/calibre/gui2/pyqt6_compat.py
> lib/calibre/calibre/gui2/qt_file_dialogs.py
> lib/calibre/calibre/gui2/save.py
> lib/calibre/calibre/gui2/search_box.py
> lib/calibre/calibre/gui2/search_restriction_mixin.py
> -lib/calibre/calibre/gui2/shortcuts.py
> +lib/calibre/calibre/gui2/series_mapper.py
> lib/calibre/calibre/gui2/splash_screen.py
> lib/calibre/calibre/gui2/store/
> lib/calibre/calibre/gui2/store/init.py
> @@ -3124,6 +3352,8 @@ lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}amazon_in_plugin.${MODPY_P
> lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}amazon_in_plugin.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}amazon_it_plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}amazon_it_plugin.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}amazon_mx_plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}amazon_mx_plugin.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}amazon_plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}amazon_plugin.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}amazon_uk_plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -3203,6 +3433,7 @@ lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py
> lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
> lib/calibre/calibre/gui2/store/stores/amazon_in_plugin.py
> lib/calibre/calibre/gui2/store/stores/amazon_it_plugin.py
> +lib/calibre/calibre/gui2/store/stores/amazon_mx_plugin.py
> lib/calibre/calibre/gui2/store/stores/amazon_plugin.py
> lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py
> lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py
> @@ -3302,41 +3533,36 @@ lib/calibre/calibre/gui2/toc/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/toc/location.py
> lib/calibre/calibre/gui2/toc/main.py
> lib/calibre/calibre/gui2/tools.py
> +lib/calibre/calibre/gui2/trash.py
> lib/calibre/calibre/gui2/tts/
> lib/calibre/calibre/gui2/tts/init.py
> ${MODPY_COMMENT}lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}/
> lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}develop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}develop.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}implementation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}implementation.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}linux_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}linux_config.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}macos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}macos.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}macos_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}macos_config.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}windows_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}windows_config.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/gui2/tts/common.py
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}download.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}download.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}piper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}piper.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}speechd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}speechd.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/tts/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/tts/config.py
> lib/calibre/calibre/gui2/tts/develop.py
> -lib/calibre/calibre/gui2/tts/errors.py
> -lib/calibre/calibre/gui2/tts/implementation.py
> -lib/calibre/calibre/gui2/tts/linux.py
> -lib/calibre/calibre/gui2/tts/linux_config.py
> -lib/calibre/calibre/gui2/tts/macos.py
> -lib/calibre/calibre/gui2/tts/macos_config.py
> -lib/calibre/calibre/gui2/tts/windows.py
> -lib/calibre/calibre/gui2/tts/windows_config.py
> +lib/calibre/calibre/gui2/tts/download.py
> +lib/calibre/calibre/gui2/tts/manager.py
> +lib/calibre/calibre/gui2/tts/piper.py
> +lib/calibre/calibre/gui2/tts/qt.py
> +lib/calibre/calibre/gui2/tts/speechd.py
> +lib/calibre/calibre/gui2/tts/types.py
> lib/calibre/calibre/gui2/tweak_book/
> lib/calibre/calibre/gui2/tweak_book/init.py
> ${MODPY_COMMENT}lib/calibre/calibre/gui2/tweak_book/${MODPY_PYCACHE}/
> @@ -3388,6 +3614,8 @@ lib/calibre/calibre/gui2/tweak_book/${MODPY_PYCACHE}text_search.${MODPY_PYC_MAGI
> lib/calibre/calibre/gui2/tweak_book/${MODPY_PYCACHE}text_search.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/tweak_book/${MODPY_PYCACHE}toc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/tweak_book/${MODPY_PYCACHE}toc.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/tweak_book/${MODPY_PYCACHE}tts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/gui2/tweak_book/${MODPY_PYCACHE}tts.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/tweak_book/${MODPY_PYCACHE}ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/gui2/tweak_book/${MODPY_PYCACHE}ui.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/gui2/tweak_book/${MODPY_PYCACHE}undo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -3526,6 +3754,7 @@ lib/calibre/calibre/gui2/tweak_book/spell.py
> lib/calibre/calibre/gui2/tweak_book/templates.py
> lib/calibre/calibre/gui2/tweak_book/text_search.py
> lib/calibre/calibre/gui2/tweak_book/toc.py
> +lib/calibre/calibre/gui2/tweak_book/tts.py
> lib/calibre/calibre/gui2/tweak_book/ui.py
> lib/calibre/calibre/gui2/tweak_book/undo.py
> lib/calibre/calibre/gui2/tweak_book/widgets.py
> @@ -3700,6 +3929,8 @@ lib/calibre/calibre/plugins/
> @so lib/calibre/calibre/plugins/cPalmdoc.so
> @so lib/calibre/calibre/plugins/certgen.so
> @so lib/calibre/calibre/plugins/fast_css_transform.so
> +@so lib/calibre/calibre/plugins/fast_html_entities.so
> +@so lib/calibre/calibre/plugins/ffmpeg.so
> @so lib/calibre/calibre/plugins/freetype.so
> @so lib/calibre/calibre/plugins/html_as_json.so
> @so lib/calibre/calibre/plugins/html_syntax_highlighter.so
> @@ -3714,10 +3945,12 @@ lib/calibre/calibre/plugins/
> @so lib/calibre/calibre/plugins/pictureflow.so
> @so lib/calibre/calibre/plugins/podofo.so
> @so lib/calibre/calibre/plugins/progress_indicator.so
> +@so lib/calibre/calibre/plugins/r${CC}backend.so
> @so lib/calibre/calibre/plugins/speedup.so
> @so lib/calibre/calibre/plugins/sqlite_custom.so
> @so lib/calibre/calibre/plugins/sqlite_extension.so
> @so lib/calibre/calibre/plugins/tokenizer.so
> +@so lib/calibre/calibre/plugins/uchardet.so
> @so lib/calibre/calibre/plugins/unicode_names.so
> lib/calibre/calibre/prints.py
> lib/calibre/calibre/ptempfile.py
> @@ -3727,12 +3960,21 @@ lib/calibre/calibre/scraper/init.py
> ${MODPY_COMMENT}lib/calibre/calibre/scraper/${MODPY_PYCACHE}/
> lib/calibre/calibre/scraper/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/scraper/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/scraper/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/scraper/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/scraper/${MODPY_PYCACHE}qt_backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/scraper/${MODPY_PYCACHE}qt_backend.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/scraper/${MODPY_PYCACHE}simple.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/scraper/${MODPY_PYCACHE}simple.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/scraper/${MODPY_PYCACHE}simple_backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/scraper/${MODPY_PYCACHE}simple_backend.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/scraper/${MODPY_PYCACHE}test_fetch_backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/scraper/${MODPY_PYCACHE}test_fetch_backend.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/scraper/${MODPY_PYCACHE}webengine_backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/scraper/${MODPY_PYCACHE}webengine_backend.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/scraper/qt.py
> +lib/calibre/calibre/scraper/qt_backend.py
> lib/calibre/calibre/scraper/simple.py
> -lib/calibre/calibre/scraper/simple_backend.py
> +lib/calibre/calibre/scraper/test_fetch_backend.py
> +lib/calibre/calibre/scraper/webengine_backend.py
> lib/calibre/calibre/spell/
> lib/calibre/calibre/spell/init.py
> ${MODPY_COMMENT}lib/calibre/calibre/spell/${MODPY_PYCACHE}/
> @@ -3776,6 +4018,8 @@ lib/calibre/calibre/srv/${MODPY_PYCACHE}embedded.${MODPY_PYC_MAGIC_TAG}${MODPY_P
> lib/calibre/calibre/srv/${MODPY_PYCACHE}embedded.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/srv/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/srv/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/srv/${MODPY_PYCACHE}fts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/srv/${MODPY_PYCACHE}fts.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/srv/${MODPY_PYCACHE}handler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/srv/${MODPY_PYCACHE}handler.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/srv/${MODPY_PYCACHE}http_request.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -3784,6 +4028,8 @@ lib/calibre/calibre/srv/${MODPY_PYCACHE}http_response.${MODPY_PYC_MAGIC_TAG}${MO
> lib/calibre/calibre/srv/${MODPY_PYCACHE}http_response.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/srv/${MODPY_PYCACHE}jobs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/srv/${MODPY_PYCACHE}jobs.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/srv/${MODPY_PYCACHE}last_read.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/srv/${MODPY_PYCACHE}last_read.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/srv/${MODPY_PYCACHE}legacy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/srv/${MODPY_PYCACHE}legacy.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/srv/${MODPY_PYCACHE}library_broker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -3828,10 +4074,12 @@ lib/calibre/calibre/srv/content.py
> lib/calibre/calibre/srv/convert.py
> lib/calibre/calibre/srv/embedded.py
> lib/calibre/calibre/srv/errors.py
> +lib/calibre/calibre/srv/fts.py
> lib/calibre/calibre/srv/handler.py
> lib/calibre/calibre/srv/http_request.py
> lib/calibre/calibre/srv/http_response.py
> lib/calibre/calibre/srv/jobs.py
> +lib/calibre/calibre/srv/last_read.py
> lib/calibre/calibre/srv/legacy.py
> lib/calibre/calibre/srv/library_broker.py
> lib/calibre/calibre/srv/loop.py
> @@ -3915,10 +4163,16 @@ lib/calibre/calibre/utils/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_P
> lib/calibre/calibre/utils/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/${MODPY_PYCACHE}config_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/utils/${MODPY_PYCACHE}config_base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/utils/${MODPY_PYCACHE}copy_files.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/utils/${MODPY_PYCACHE}copy_files.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/utils/${MODPY_PYCACHE}copy_files_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/utils/${MODPY_PYCACHE}copy_files_test.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/${MODPY_PYCACHE}date.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/utils/${MODPY_PYCACHE}date.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/${MODPY_PYCACHE}exim.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/utils/${MODPY_PYCACHE}exim.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/utils/${MODPY_PYCACHE}ffml_processor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/utils/${MODPY_PYCACHE}ffml_processor.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/${MODPY_PYCACHE}file_type_icons.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/utils/${MODPY_PYCACHE}file_type_icons.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/${MODPY_PYCACHE}filenames.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -4025,6 +4279,8 @@ lib/calibre/calibre/utils/${MODPY_PYCACHE}unrar.${MODPY_PYC_MAGIC_TAG}${MODPY_PY
> lib/calibre/calibre/utils/${MODPY_PYCACHE}unrar.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/${MODPY_PYCACHE}unsmarten.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/utils/${MODPY_PYCACHE}unsmarten.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/utils/${MODPY_PYCACHE}webengine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/utils/${MODPY_PYCACHE}webengine.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/${MODPY_PYCACHE}wordcount.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/utils/${MODPY_PYCACHE}wordcount.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/${MODPY_PYCACHE}xml_parse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -4038,8 +4294,11 @@ lib/calibre/calibre/utils/cleantext.py
> lib/calibre/calibre/utils/complete.py
> lib/calibre/calibre/utils/config.py
> lib/calibre/calibre/utils/config_base.py
> +lib/calibre/calibre/utils/copy_files.py
> +lib/calibre/calibre/utils/copy_files_test.py
> lib/calibre/calibre/utils/date.py
> lib/calibre/calibre/utils/exim.py
> +lib/calibre/calibre/utils/ffml_processor.py
> lib/calibre/calibre/utils/file_type_icons.py
> lib/calibre/calibre/utils/filenames.py
> lib/calibre/calibre/utils/fonts/
> @@ -4053,6 +4312,8 @@ lib/calibre/calibre/utils/fonts/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}$
> lib/calibre/calibre/utils/fonts/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/fonts/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/utils/fonts/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/utils/fonts/${MODPY_PYCACHE}subset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/utils/fonts/${MODPY_PYCACHE}subset.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/fonts/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/utils/fonts/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/fonts/${MODPY_PYCACHE}win_fonts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -4121,6 +4382,7 @@ lib/calibre/calibre/utils/fonts/sfnt/maxp.py
> lib/calibre/calibre/utils/fonts/sfnt/merge.py
> lib/calibre/calibre/utils/fonts/sfnt/metrics.py
> lib/calibre/calibre/utils/fonts/sfnt/subset.py
> +lib/calibre/calibre/utils/fonts/subset.py
> lib/calibre/calibre/utils/fonts/utils.py
> lib/calibre/calibre/utils/fonts/win_fonts.py
> lib/calibre/calibre/utils/formatter.py
> @@ -4231,6 +4493,11 @@ lib/calibre/calibre/utils/podofo/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}
> lib/calibre/calibre/utils/podofo/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/random_ua.py
> lib/calibre/calibre/utils/rapydscript.py
> +lib/calibre/calibre/utils/r${CC}/
> +lib/calibre/calibre/utils/r${CC}/init.py
> +${MODPY_COMMENT}lib/calibre/calibre/utils/r${CC}/${MODPY_PYCACHE}/
> +lib/calibre/calibre/utils/r${CC}/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/utils/r${CC}/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/recycle_bin.py
> lib/calibre/calibre/utils/resources.py
> lib/calibre/calibre/utils/run_tests.py
> @@ -4260,16 +4527,14 @@ lib/calibre/calibre/utils/titlecase.py
> lib/calibre/calibre/utils/unicode_names.py
> lib/calibre/calibre/utils/unrar.py
> lib/calibre/calibre/utils/unsmarten.py
> +lib/calibre/calibre/utils/webengine.py
> lib/calibre/calibre/utils/windows/
> lib/calibre/calibre/utils/windows/init.py
> ${MODPY_COMMENT}lib/calibre/calibre/utils/windows/${MODPY_PYCACHE}/
> lib/calibre/calibre/utils/windows/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/utils/windows/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/utils/windows/${MODPY_PYCACHE}winsapi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/calibre/calibre/utils/windows/${MODPY_PYCACHE}winsapi.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/utils/windows/${MODPY_PYCACHE}wintest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/calibre/utils/windows/${MODPY_PYCACHE}wintest.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/calibre/calibre/utils/windows/winsapi.py
> lib/calibre/calibre/utils/windows/wintest.py
> lib/calibre/calibre/utils/winreg/
> lib/calibre/calibre/utils/winreg/init.py
> @@ -4337,6 +4602,17 @@ lib/calibre/calibre/web/fetch/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODP
> lib/calibre/calibre/web/fetch/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/calibre/web/fetch/simple.py
> lib/calibre/calibre/web/fetch/utils.py
> +lib/calibre/calibre/web/site_parsers/
> +lib/calibre/calibre/web/site_parsers/init.py
> +${MODPY_COMMENT}lib/calibre/calibre/web/site_parsers/${MODPY_PYCACHE}/
> +lib/calibre/calibre/web/site_parsers/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/web/site_parsers/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/web/site_parsers/${MODPY_PYCACHE}natgeo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/web/site_parsers/${MODPY_PYCACHE}natgeo.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/web/site_parsers/${MODPY_PYCACHE}nytimes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/calibre/web/site_parsers/${MODPY_PYCACHE}nytimes.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/web/site_parsers/natgeo.py
> +lib/calibre/calibre/web/site_parsers/nytimes.py
> lib/calibre/css_selectors/
> lib/calibre/css_selectors/init.py
> ${MODPY_COMMENT}lib/calibre/css_selectors/${MODPY_PYCACHE}/
> @@ -4520,6 +4796,10 @@ lib/calibre/qt/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/qt/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/qt/${MODPY_PYCACHE}core_name_map.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/qt/${MODPY_PYCACHE}core_name_map.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/qt/${MODPY_PYCACHE}dbus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/qt/${MODPY_PYCACHE}dbus.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/qt/${MODPY_PYCACHE}dbus_name_map.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/calibre/qt/${MODPY_PYCACHE}dbus_name_map.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/qt/${MODPY_PYCACHE}loader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/calibre/qt/${MODPY_PYCACHE}loader.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/qt/${MODPY_PYCACHE}webengine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -4528,6 +4808,8 @@ lib/calibre/qt/${MODPY_PYCACHE}webengine_name_map.${MODPY_PYC_MAGIC_TAG}${MODPY
> lib/calibre/qt/${MODPY_PYCACHE}webengine_name_map.${MODPY_PYC_MAGIC_TAG}pyc
> lib/calibre/qt/core.py
> lib/calibre/qt/core_name_map.py
> +lib/calibre/qt/dbus.py
> +lib/calibre/qt/dbus_name_map.py
> lib/calibre/qt/loader.py
> lib/calibre/qt/webengine.py
> lib/calibre/qt/webengine_name_map.py
> @@ -4645,8 +4927,6 @@ share/calibre/content-server/locales.zip
> share/calibre/content-server/mobile.css
> share/calibre/content-server/reset.css
> share/calibre/csscolorparser.js
> -share/calibre/csslint.js
> -share/calibre/dark_mode.css
> share/calibre/default_tweaks.py
> share/calibre/dictionaries/
> share/calibre/dictionaries/en-GB/
> @@ -4661,6 +4941,7 @@ share/calibre/dictionaries/es-ES/
> share/calibre/dictionaries/es-ES/es-ES.aff
> share/calibre/dictionaries/es-ES/es-ES.dic
> share/calibre/dictionaries/es-ES/locales
> +share/calibre/dictionaries/online-catalog.json
> share/calibre/ebook-convert-complete.calibre_msgpack
> share/calibre/editor-functions.json
> share/calibre/editor-help/
> @@ -4687,11 +4968,13 @@ share/calibre/fonts/liberation/LiberationSerif-BoldItalic.ttf
> share/calibre/fonts/liberation/LiberationSerif-Italic.ttf
> share/calibre/fonts/liberation/LiberationSerif-Regular.ttf
> share/calibre/fonts/liberation/version.txt
> +share/calibre/fts_sqlite.sql
> +share/calibre/fts_triggers.sql
> share/calibre/hyphenation/
> share/calibre/hyphenation/dictionaries.tar.xz
> share/calibre/hyphenation/locales.json
> share/calibre/hyphenation/sha1sum
> -share/calibre/icons.rcc
> +share/calibre/icons.r${CC}
> share/calibre/images/
> share/calibre/images.qrc
> share/calibre/images/add_book.png
> @@ -4711,7 +4994,8 @@ share/calibre/images/bullhorn.png
> share/calibre/images/catalog.png
> share/calibre/images/chapters.png
> share/calibre/images/character-set.png
> -share/calibre/images/clear_left.png
> +share/calibre/images/clear_left-for-dark-theme.png
> +share/calibre/images/clear_left-for-light-theme.png
> share/calibre/images/close-for-dark-theme.png
> share/calibre/images/close-for-light-theme.png
> share/calibre/images/code.png
> @@ -4720,6 +5004,7 @@ share/calibre/images/compress-image.png
> share/calibre/images/config.png
> share/calibre/images/connect_share.png
> share/calibre/images/connect_share_on.png
> +share/calibre/images/context_menu.png
> share/calibre/images/convert.png
> share/calibre/images/copy-to-library.png
> share/calibre/images/cover_flow.png
> @@ -4764,6 +5049,8 @@ share/calibre/images/edit_input.png
> share/calibre/images/eject.png
> share/calibre/images/embed-fonts.png
> share/calibre/images/exec.png
> +share/calibre/images/external-link-for-dark-theme.png
> +share/calibre/images/external-link.png
> share/calibre/images/filter.png
> share/calibre/images/folder_saved_search.png
> share/calibre/images/font.png
> @@ -4788,6 +5075,7 @@ share/calibre/images/format-text-subscript.png
> share/calibre/images/format-text-superscript.png
> share/calibre/images/format-text-underline.png
> share/calibre/images/forward.png
> +share/calibre/images/fts.png
> share/calibre/images/gear.png
> share/calibre/images/generic-library.png
> share/calibre/images/gmail_logo.png
> @@ -4806,6 +5094,7 @@ share/calibre/images/insert-link.png
> share/calibre/images/jobs.png
> share/calibre/images/keyboard-prefs.png
> share/calibre/images/languages.png
> +share/calibre/images/layout.png
> share/calibre/images/library.png
> share/calibre/images/list_remove.png
> share/calibre/images/lookfeel.png
> @@ -4830,6 +5119,7 @@ share/calibre/images/mimetypes/fb2.png
> share/calibre/images/mimetypes/gif.png
> share/calibre/images/mimetypes/html.png
> share/calibre/images/mimetypes/jpeg.png
> +share/calibre/images/mimetypes/kfx.png
> share/calibre/images/mimetypes/lit.png
> share/calibre/images/mimetypes/lrf.png
> share/calibre/images/mimetypes/lrx.png
> @@ -4850,10 +5140,13 @@ share/calibre/images/mimetypes/zero.png
> share/calibre/images/mimetypes/zip.png
> share/calibre/images/minus.png
> share/calibre/images/minusminus.png
> -share/calibre/images/modified.png
> +share/calibre/images/modified-for-dark-theme.png
> +share/calibre/images/modified-for-light-theme.png
> share/calibre/images/network-server.png
> share/calibre/images/news.png
> share/calibre/images/next.png
> +share/calibre/images/notes-for-dark-theme.png
> +share/calibre/images/notes.png
> share/calibre/images/ok.png
> share/calibre/images/page.png
> share/calibre/images/plugboard.png
> @@ -4930,6 +5223,7 @@ share/calibre/images/view-refresh.png
> share/calibre/images/view.png
> share/calibre/images/viewer.png
> share/calibre/images/vl.png
> +share/calibre/images/width.png
> share/calibre/images/window-close.png
> share/calibre/images/wizard.png
> share/calibre/jacket/
> @@ -4939,10 +5233,6 @@ share/calibre/localization/
> share/calibre/localization/iso3166.calibre_msgpack
> share/calibre/localization/iso639.calibre_msgpack
> share/calibre/localization/locales.zip
> -share/calibre/localization/pykakasi/
> -share/calibre/localization/pykakasi/itaijidict2.calibre_msgpack
> -share/calibre/localization/pykakasi/kanadict2.calibre_msgpack
> -share/calibre/localization/pykakasi/kanwadict2.calibre_msgpack
> share/calibre/localization/stats.calibre_msgpack
> share/calibre/localization/website-languages.txt
> share/calibre/lookup.js
> @@ -4989,9 +5279,11 @@ share/calibre/mathjax/startup.js
> share/calibre/metadata_sqlite.sql
> share/calibre/mime.types
> share/calibre/mozilla-ca-certs.pem
> +share/calibre/notes_sqlite.sql
> share/calibre/pdf-mathjax-loader.js
> share/calibre/pdf-preprint.js
> share/calibre/pin-template.svg
> +share/calibre/piper-voices.json
> share/calibre/quick_start/
> share/calibre/quick_start/deu.epub
> share/calibre/quick_start/eng.epub
> @@ -5002,47 +5294,28 @@ share/calibre/quick_start/tur.epub
> share/calibre/rapydscript/
> share/calibre/rapydscript/compiler.js.xz
> share/calibre/recipes/
> +share/calibre/recipes/10minutos.png
> share/calibre/recipes/10minutos.recipe
> -share/calibre/recipes/180.recipe
> share/calibre/recipes/1843.png
> share/calibre/recipes/1843.recipe
> share/calibre/recipes/20_minutos.png
> share/calibre/recipes/20_minutos.recipe
> share/calibre/recipes/20minutes.png
> share/calibre/recipes/20minutes.recipe
> -share/calibre/recipes/24sata.png
> -share/calibre/recipes/24sata.recipe
> share/calibre/recipes/3dnews.png
> share/calibre/recipes/3dnews.recipe
> -share/calibre/recipes/7seri.png
> -share/calibre/recipes/7seri.recipe
> +share/calibre/recipes/7x7.png
> share/calibre/recipes/7x7.recipe
> share/calibre/recipes/DrawAndCook.png
> share/calibre/recipes/DrawAndCook.recipe
> +share/calibre/recipes/TheMITPressReader.png
> share/calibre/recipes/TheMITPressReader.recipe
> -share/calibre/recipes/aabenraalokalavisen_dk.png
> -share/calibre/recipes/aabenraalokalavisen_dk.recipe
> -share/calibre/recipes/aachener_nachrichten.png
> -share/calibre/recipes/aachener_nachrichten.recipe
> -share/calibre/recipes/aarhuslokalavisen_dk.png
> -share/calibre/recipes/aarhuslokalavisen_dk.recipe
> -share/calibre/recipes/aarhusmidtlokalavisen_dk.png
> -share/calibre/recipes/aarhusmidtlokalavisen_dk.recipe
> -share/calibre/recipes/aarhusnordlokalavisen_dk.png
> -share/calibre/recipes/aarhusnordlokalavisen_dk.recipe
> -share/calibre/recipes/aarhussydlokalavisen_dk.png
> -share/calibre/recipes/aarhussydlokalavisen_dk.recipe
> -share/calibre/recipes/aarhusvestlokalavisen_dk.png
> -share/calibre/recipes/aarhusvestlokalavisen_dk.recipe
> share/calibre/recipes/abc.png
> share/calibre/recipes/abc.recipe
> share/calibre/recipes/abc_au.png
> share/calibre/recipes/abc_au.recipe
> share/calibre/recipes/abc_es.png
> share/calibre/recipes/abc_es.recipe
> -share/calibre/recipes/abc_py.png
> -share/calibre/recipes/abc_py.recipe
> -share/calibre/recipes/acim_bilim_dergisi.recipe
> share/calibre/recipes/acrimed.png
> share/calibre/recipes/acrimed.recipe
> share/calibre/recipes/ad.png
> @@ -5053,152 +5326,138 @@ share/calibre/recipes/adnkronos.png
> share/calibre/recipes/adnkronos.recipe
> share/calibre/recipes/adventuregamers.png
> share/calibre/recipes/adventuregamers.recipe
> -share/calibre/recipes/aftenposten.png
> -share/calibre/recipes/aftenposten.recipe
> -share/calibre/recipes/aftonbladet.recipe
> -share/calibre/recipes/agrogerila.recipe
> +share/calibre/recipes/afr.png
> +share/calibre/recipes/afr.recipe
> +share/calibre/recipes/afrique_21.recipe
> +share/calibre/recipes/agents.png
> +share/calibre/recipes/agents.recipe
> share/calibre/recipes/aif_ru.png
> share/calibre/recipes/aif_ru.recipe
> +share/calibre/recipes/ainonline.png
> share/calibre/recipes/ainonline.recipe
> -share/calibre/recipes/air_force_times.recipe
> -share/calibre/recipes/ajc.png
> -share/calibre/recipes/ajc.recipe
> -share/calibre/recipes/ajiajin.recipe
> -share/calibre/recipes/aksiyon_derigisi.recipe
> share/calibre/recipes/aktualne.cz.png
> share/calibre/recipes/aktualne.cz.recipe
> share/calibre/recipes/al_jazeera.png
> share/calibre/recipes/al_jazeera.recipe
> share/calibre/recipes/al_masry_alyoum_arabic.png
> share/calibre/recipes/al_masry_alyoum_arabic.recipe
> +share/calibre/recipes/al_monitor.png
> share/calibre/recipes/al_monitor.recipe
> share/calibre/recipes/albert_mohler.png
> share/calibre/recipes/albert_mohler.recipe
> +share/calibre/recipes/ald.png
> share/calibre/recipes/ald.recipe
> share/calibre/recipes/alejakomiksu_com.png
> share/calibre/recipes/alejakomiksu_com.recipe
> -share/calibre/recipes/alleroedlokalavisen_dk.png
> -share/calibre/recipes/alleroedlokalavisen_dk.recipe
> -share/calibre/recipes/alt_om_herning.recipe
> -share/calibre/recipes/alternet.png
> -share/calibre/recipes/alternet.recipe
> +share/calibre/recipes/alternatives_economiques.recipe
> share/calibre/recipes/altomdata_dk.png
> share/calibre/recipes/altomdata_dk.recipe
> +share/calibre/recipes/am730.png
> share/calibre/recipes/am730.recipe
> -share/calibre/recipes/amagerbladet_dk.recipe
> share/calibre/recipes/ambito.png
> share/calibre/recipes/ambito.recipe
> share/calibre/recipes/ambito_financiero.png
> -share/calibre/recipes/ambito_financiero.recipe
> share/calibre/recipes/american_thinker.png
> share/calibre/recipes/american_thinker.recipe
> share/calibre/recipes/amspec.png
> share/calibre/recipes/amspec.recipe
> -share/calibre/recipes/an_druma_mor.recipe
> share/calibre/recipes/anandtech.png
> share/calibre/recipes/anandtech.recipe
> -share/calibre/recipes/anchorage_daily.recipe
> +share/calibre/recipes/ancient_egypt.png
> +share/calibre/recipes/ancient_egypt.recipe
> +share/calibre/recipes/andhrajyothy_ap.png
> +share/calibre/recipes/andhrajyothy_ap.recipe
> +share/calibre/recipes/andhrajyothy_tel.png
> +share/calibre/recipes/andhrajyothy_tel.recipe
> share/calibre/recipes/android_com_pl.png
> share/calibre/recipes/android_com_pl.recipe
> +share/calibre/recipes/android_police.png
> +share/calibre/recipes/android_police.recipe
> +share/calibre/recipes/animal_politico.png
> share/calibre/recipes/animal_politico.recipe
> -share/calibre/recipes/anthony_muroni.recipe
> share/calibre/recipes/antyweb.png
> share/calibre/recipes/antyweb.recipe
> +share/calibre/recipes/ap.png
> share/calibre/recipes/ap.recipe
> -share/calibre/recipes/apcom.recipe
> share/calibre/recipes/apod.png
> share/calibre/recipes/apod.recipe
> -share/calibre/recipes/app_funds.png
> -share/calibre/recipes/app_funds.recipe
> -share/calibre/recipes/apple_daily.recipe
> -share/calibre/recipes/appledaily_tw.png
> -share/calibre/recipes/appledaily_tw.recipe
> share/calibre/recipes/aprospect.png
> share/calibre/recipes/aprospect.recipe
> -share/calibre/recipes/ara.recipe
> -share/calibre/recipes/ara_info.png
> -share/calibre/recipes/ara_info.recipe
> -share/calibre/recipes/arabian_business.png
> -share/calibre/recipes/arabian_business.recipe
> +share/calibre/recipes/arbetaren.png
> share/calibre/recipes/arbetaren.recipe
> -share/calibre/recipes/arcadia.recipe
> +share/calibre/recipes/arcamax.png
> share/calibre/recipes/arcamax.recipe
> -share/calibre/recipes/arizona_republic.recipe
> share/calibre/recipes/arret_sur_images.png
> share/calibre/recipes/arret_sur_images.recipe
> share/calibre/recipes/ars_technica.png
> share/calibre/recipes/ars_technica.recipe
> +share/calibre/recipes/asahi_shimbun_en.png
> share/calibre/recipes/asahi_shimbun_en.recipe
> share/calibre/recipes/asco_de_vida.png
> share/calibre/recipes/asco_de_vida.recipe
> -share/calibre/recipes/asia_one.recipe
> +share/calibre/recipes/asia_one.png
> share/calibre/recipes/asianreviewofbooks.png
> share/calibre/recipes/asianreviewofbooks.recipe
> share/calibre/recipes/astro_news_pl.png
> share/calibre/recipes/astro_news_pl.recipe
> -share/calibre/recipes/athens_news.png
> -share/calibre/recipes/athens_news.recipe
> share/calibre/recipes/atlantic.png
> share/calibre/recipes/atlantic.recipe
> +share/calibre/recipes/atlantic_com.png
> share/calibre/recipes/atlantic_com.recipe
> +share/calibre/recipes/attac_es.png
> share/calibre/recipes/attac_es.recipe
> -share/calibre/recipes/auto.recipe
> -share/calibre/recipes/auto_blog.png
> -share/calibre/recipes/auto_blog.recipe
> -share/calibre/recipes/auto_prove.recipe
> -share/calibre/recipes/autobild.png
> -share/calibre/recipes/autobild.recipe
> -share/calibre/recipes/automatiseringgids.png
> -share/calibre/recipes/automatiseringgids.recipe
> -share/calibre/recipes/autosport.png
> -share/calibre/recipes/autosport.recipe
> -share/calibre/recipes/avantaje.png
> -share/calibre/recipes/avantaje.recipe
> -share/calibre/recipes/aventurilapescuit.png
> -share/calibre/recipes/aventurilapescuit.recipe
> share/calibre/recipes/avisen_dk.png
> share/calibre/recipes/avisen_dk.recipe
> share/calibre/recipes/avto-magazin.png
> share/calibre/recipes/avto-magazin.recipe
> share/calibre/recipes/azstarnet.png
> share/calibre/recipes/azstarnet.recipe
> -share/calibre/recipes/b365realitatea.png
> -share/calibre/recipes/b365realitatea.recipe
> -share/calibre/recipes/b92.png
> -share/calibre/recipes/b92.recipe
> share/calibre/recipes/ba_herald.png
> share/calibre/recipes/ba_herald.recipe
> -share/calibre/recipes/babyonline.png
> -share/calibre/recipes/babyonline.recipe
> -share/calibre/recipes/badania_net.png
> -share/calibre/recipes/badania_net.recipe
> -share/calibre/recipes/balkaninsight.png
> -share/calibre/recipes/balkaninsight.recipe
> -share/calibre/recipes/balkanist.recipe
> +share/calibre/recipes/backyard_boss.png
> +share/calibre/recipes/backyard_boss.recipe
> +share/calibre/recipes/baikaljournal.png
> +share/calibre/recipes/baikaljournal.recipe
> share/calibre/recipes/baltimore_sun.png
> share/calibre/recipes/baltimore_sun.recipe
> -share/calibre/recipes/bangkok_biz.recipe
> +share/calibre/recipes/bangkokpost.png
> share/calibre/recipes/bangkokpost.recipe
> share/calibre/recipes/bankier_pl.png
> -share/calibre/recipes/bankier_pl.recipe
> +share/calibre/recipes/bar_and_bench.png
> +share/calibre/recipes/bar_and_bench.recipe
> share/calibre/recipes/barrons.png
> share/calibre/recipes/barrons.recipe
> -share/calibre/recipes/bay_citizen.recipe
> share/calibre/recipes/bbc.png
> share/calibre/recipes/bbc.recipe
> +share/calibre/recipes/bbc_brasil.png
> share/calibre/recipes/bbc_brasil.recipe
> +share/calibre/recipes/bbc_es.png
> share/calibre/recipes/bbc_es.recipe
> share/calibre/recipes/bbc_fast.png
> share/calibre/recipes/bbc_fast.recipe
> +share/calibre/recipes/bbc_ru.png
> +share/calibre/recipes/bbc_ru.recipe
> share/calibre/recipes/bbc_sport.png
> share/calibre/recipes/bbc_sport.recipe
> +share/calibre/recipes/bbc_uk.png
> +share/calibre/recipes/bbc_uk.recipe
> +share/calibre/recipes/bbcvietnamese.png
> share/calibre/recipes/bbcvietnamese.recipe
> +share/calibre/recipes/before_we_go.png
> +share/calibre/recipes/before_we_go.recipe
> +share/calibre/recipes/bellingcat_en.png
> +share/calibre/recipes/bellingcat_en.recipe
> +share/calibre/recipes/bellingcat_es.png
> +share/calibre/recipes/bellingcat_es.recipe
> +share/calibre/recipes/bellingcat_fr.png
> +share/calibre/recipes/bellingcat_fr.recipe
> +share/calibre/recipes/bellingcat_ru.png
> +share/calibre/recipes/bellingcat_ru.recipe
> +share/calibre/recipes/bellingcat_uk.png
> +share/calibre/recipes/bellingcat_uk.recipe
> share/calibre/recipes/benchmark_pl.png
> share/calibre/recipes/benchmark_pl.recipe
> -share/calibre/recipes/beppe_grillo.recipe
> -share/calibre/recipes/berliner_zeitung.recipe
> -share/calibre/recipes/berlingske_dk.png
> -share/calibre/recipes/berlingske_dk.recipe
> +share/calibre/recipes/berfreunde_blog.recipe
> share/calibre/recipes/berria.png
> share/calibre/recipes/biamag.png
> share/calibre/recipes/biamag.recipe
> @@ -5212,80 +5471,68 @@ share/calibre/recipes/big_picture.png
> share/calibre/recipes/big_picture.recipe
> share/calibre/recipes/biggovernment.png
> share/calibre/recipes/biggovernment.recipe
> -share/calibre/recipes/bighollywood.png
> -share/calibre/recipes/bighollywood.recipe
> share/calibre/recipes/bild_de.png
> share/calibre/recipes/bild_de.recipe
> +share/calibre/recipes/billorielly.png
> share/calibre/recipes/billorielly.recipe
> -share/calibre/recipes/birgun_gazetesi.recipe
> +share/calibre/recipes/birgun_gazetesi.png
> +share/calibre/recipes/birmingham_evening_mail.png
> share/calibre/recipes/birmingham_evening_mail.recipe
> -share/calibre/recipes/birmingham_post.png
> -share/calibre/recipes/birmingham_post.recipe
> -share/calibre/recipes/bitacora.recipe
> -share/calibre/recipes/biz_portal.recipe
> share/calibre/recipes/blesk.png
> share/calibre/recipes/blesk.recipe
> share/calibre/recipes/blic.png
> share/calibre/recipes/blic.recipe
> -share/calibre/recipes/boortz.png
> -share/calibre/recipes/boortz.recipe
> -share/calibre/recipes/borse_online.png
> -share/calibre/recipes/borse_online.recipe
> +share/calibre/recipes/bloomberg-business-week.png
> +share/calibre/recipes/bloomberg-business-week.recipe
> +share/calibre/recipes/bloomberg.png
> +share/calibre/recipes/bloomberg.recipe
> +share/calibre/recipes/bookforummagazine.png
> +share/calibre/recipes/bookforummagazine.recipe
> share/calibre/recipes/borsen_dk.png
> share/calibre/recipes/borsen_dk.recipe
> +share/calibre/recipes/boston.com.png
> share/calibre/recipes/boston.com.recipe
> -share/calibre/recipes/boxis.recipe
> -share/calibre/recipes/brand_eins.recipe
> -share/calibre/recipes/brasil_de_fato.recipe
> +share/calibre/recipes/boston_globe_print_edition.recipe
> +share/calibre/recipes/bq_prime.png
> +share/calibre/recipes/bq_prime.recipe
> share/calibre/recipes/breaking_mad.recipe
> -share/calibre/recipes/brecha.recipe
> +share/calibre/recipes/breakingmad.png
> share/calibre/recipes/brewiarz.png
> share/calibre/recipes/brewiarz.recipe
> share/calibre/recipes/brigitte_de.png
> share/calibre/recipes/brigitte_de.recipe
> -share/calibre/recipes/bsi_news.recipe
> share/calibre/recipes/bt_dk.png
> share/calibre/recipes/bt_dk.recipe
> share/calibre/recipes/bucataras.png
> share/calibre/recipes/bucataras.recipe
> -share/calibre/recipes/buchreport.recipe
> -share/calibre/recipes/buckmasters.recipe
> -share/calibre/recipes/buenosaireseconomico.png
> -share/calibre/recipes/buenosaireseconomico.recipe
> -share/calibre/recipes/buffalo_news.recipe
> share/calibre/recipes/bugun_gazetesi.recipe
> share/calibre/recipes/business_insider.png
> share/calibre/recipes/business_insider.recipe
> share/calibre/recipes/business_standard.png
> share/calibre/recipes/business_standard.recipe
> -share/calibre/recipes/business_standard_print_edition.recipe
> +share/calibre/recipes/business_standard_print.png
> +share/calibre/recipes/business_standard_print.recipe
> +share/calibre/recipes/business_today.png
> share/calibre/recipes/business_today.recipe
> -share/calibre/recipes/businessworldin.png
> -share/calibre/recipes/businessworldin.recipe
> +share/calibre/recipes/cachys_blog.recipe
> share/calibre/recipes/cacm.png
> share/calibre/recipes/cacm.recipe
> -share/calibre/recipes/cafcaf_dergisi.recipe
> +share/calibre/recipes/calcalist.png
> share/calibre/recipes/calcalist.recipe
> +share/calibre/recipes/calgary_herald.png
> share/calibre/recipes/calgary_herald.recipe
> -share/calibre/recipes/calibre_blog.recipe
> -share/calibre/recipes/camera_di_commercio_di_bari.recipe
> +share/calibre/recipes/canardpc.png
> share/calibre/recipes/canardpc.recipe
> -share/calibre/recipes/capes_n_babes.recipe
> -share/calibre/recipes/capital.png
> -share/calibre/recipes/capital.recipe
> -share/calibre/recipes/capital_de.png
> -share/calibre/recipes/capital_de.recipe
> +share/calibre/recipes/capital_gr.png
> share/calibre/recipes/capital_gr.recipe
> +share/calibre/recipes/car_buzz.png
> +share/calibre/recipes/car_buzz.recipe
> +share/calibre/recipes/caravan_magazine.png
> share/calibre/recipes/caravan_magazine.recipe
> -share/calibre/recipes/caravan_magazine_hindi.recipe
> -share/calibre/recipes/carta.png
> -share/calibre/recipes/carta.recipe
> share/calibre/recipes/catavencii.png
> share/calibre/recipes/catavencii.recipe
> share/calibre/recipes/catavencu.png
> share/calibre/recipes/catavencu.recipe
> -share/calibre/recipes/catholic_daily_readings.png
> -share/calibre/recipes/catholic_daily_readings.recipe
> share/calibre/recipes/catholic_news_agency.png
> share/calibre/recipes/catholic_news_agency.recipe
> share/calibre/recipes/cato.png
> @@ -5294,56 +5541,33 @@ share/calibre/recipes/cbc_canada.png
> share/calibre/recipes/cbc_canada.recipe
> share/calibre/recipes/cbn.png
> share/calibre/recipes/cbn.recipe
> -share/calibre/recipes/cd_action.png
> -share/calibre/recipes/cd_action.recipe
> -share/calibre/recipes/cdrinfo_pl.png
> -share/calibre/recipes/cdrinfo_pl.recipe
> -share/calibre/recipes/ceska_pozice.recipe
> +share/calibre/recipes/cedar.png
> +share/calibre/recipes/cedar.recipe
> share/calibre/recipes/ceske_noviny.png
> share/calibre/recipes/ceske_noviny.recipe
> -share/calibre/recipes/cesky_rozhlas_6.recipe
> -share/calibre/recipes/cetnixploitation.recipe
> -share/calibre/recipes/cgm_pl.png
> -share/calibre/recipes/cgm_pl.recipe
> share/calibre/recipes/champion.png
> share/calibre/recipes/champion.recipe
> -share/calibre/recipes/chicago_breaking_news.png
> -share/calibre/recipes/chicago_breaking_news.recipe
> +share/calibre/recipes/cherta.png
> +share/calibre/recipes/cherta.recipe
> share/calibre/recipes/chicago_tribune.png
> share/calibre/recipes/chicago_tribune.recipe
> -share/calibre/recipes/china_economic_net.png
> -share/calibre/recipes/china_economic_net.recipe
> share/calibre/recipes/china_post.png
> -share/calibre/recipes/china_times.png
> -share/calibre/recipes/china_times.recipe
> share/calibre/recipes/chinadaily.png
> -share/calibre/recipes/chipro.png
> -share/calibre/recipes/chipro.recipe
> -share/calibre/recipes/chosun.png
> -share/calibre/recipes/chosun.recipe
> -share/calibre/recipes/chowk.recipe
> +share/calibre/recipes/chowk.png
> share/calibre/recipes/chr_mon.png
> share/calibre/recipes/chr_mon.recipe
> +share/calibre/recipes/christian_post.png
> share/calibre/recipes/christian_post.recipe
> +share/calibre/recipes/chronicle_higher_ed.png
> share/calibre/recipes/chronicle_higher_ed.recipe
> +share/calibre/recipes/cicero.png
> share/calibre/recipes/cicero.recipe
> +share/calibre/recipes/cincinnati_enquirer.png
> share/calibre/recipes/cincinnati_enquirer.recipe
> -share/calibre/recipes/cinco_dias.recipe
> -share/calibre/recipes/cinebel_be.png
> -share/calibre/recipes/cinebel_be.recipe
> -share/calibre/recipes/cio.png
> -share/calibre/recipes/cio.recipe
> -share/calibre/recipes/cio_magazine.recipe
> share/calibre/recipes/ciperchile.png
> share/calibre/recipes/ciperchile.recipe
> -share/calibre/recipes/cityavisen_dk.recipe
> -share/calibre/recipes/cjr.recipe
> share/calibre/recipes/clarin.png
> share/calibre/recipes/clarin.recipe
> -share/calibre/recipes/clarion_ledger.recipe
> -share/calibre/recipes/clic_rbs.png
> -share/calibre/recipes/clic_rbs.recipe
> -share/calibre/recipes/climate_progress.recipe
> share/calibre/recipes/cm_journal.png
> share/calibre/recipes/cm_journal.recipe
> share/calibre/recipes/cnetjapan.png
> @@ -5356,50 +5580,34 @@ share/calibre/recipes/cnetnews.png
> share/calibre/recipes/cnetnews.recipe
> share/calibre/recipes/cnn.png
> share/calibre/recipes/cnn.recipe
> -share/calibre/recipes/coding_horror.png
> -share/calibre/recipes/coding_horror.recipe
> +share/calibre/recipes/coda.png
> +share/calibre/recipes/coda.recipe
> +share/calibre/recipes/coda_ru.png
> +share/calibre/recipes/coda_ru.recipe
> +share/calibre/recipes/collider.png
> +share/calibre/recipes/collider.recipe
> share/calibre/recipes/colta.png
> share/calibre/recipes/colta.recipe
> -share/calibre/recipes/columbusdispatch.png
> -share/calibre/recipes/columbusdispatch.recipe
> +share/calibre/recipes/comic_book_archive.png
> +share/calibre/recipes/comic_book_archive.recipe
> share/calibre/recipes/common_dreams.png
> share/calibre/recipes/common_dreams.recipe
> +share/calibre/recipes/computer_weekly.recipe
> share/calibre/recipes/computerworld_dk.png
> share/calibre/recipes/computerworld_dk.recipe
> -share/calibre/recipes/computerworld_pl.png
> -share/calibre/recipes/computerworld_pl.recipe
> -share/calibre/recipes/consortium_news.recipe
> -share/calibre/recipes/contemporary_argentine_writers.png
> -share/calibre/recipes/contemporary_argentine_writers.recipe
> +share/calibre/recipes/contretemps.recipe
> +share/calibre/recipes/contropiano.png
> share/calibre/recipes/contropiano.recipe
> -share/calibre/recipes/corriere_della_sera_en.png
> -share/calibre/recipes/corriere_della_sera_en.recipe
> share/calibre/recipes/corriere_della_sera_it.png
> share/calibre/recipes/corriere_della_sera_it.recipe
> -share/calibre/recipes/corriere_dello_sport.png
> -share/calibre/recipes/corriere_dello_sport.recipe
> -share/calibre/recipes/cosmopolitan.png
> -share/calibre/recipes/cosmopolitan.recipe
> -share/calibre/recipes/cosmopolitan_de.recipe
> -share/calibre/recipes/cosmopolitan_uk.recipe
> +share/calibre/recipes/cosmos.png
> share/calibre/recipes/cosmos.recipe
> -share/calibre/recipes/cotidianul.png
> -share/calibre/recipes/cotidianul.recipe
> -share/calibre/recipes/counterpunch.recipe
> -share/calibre/recipes/countryfile.recipe
> -share/calibre/recipes/courier_mail.png
> -share/calibre/recipes/courier_mail.recipe
> -share/calibre/recipes/courrier.recipe
> share/calibre/recipes/courrierinternational.png
> share/calibre/recipes/courrierinternational.recipe
> share/calibre/recipes/cracked_com.png
> share/calibre/recipes/cracked_com.recipe
> -share/calibre/recipes/craigslist.recipe
> -share/calibre/recipes/credit_slips.png
> -share/calibre/recipes/credit_slips.recipe
> +share/calibre/recipes/crikey.png
> share/calibre/recipes/crikey.recipe
> -share/calibre/recipes/cronica.png
> -share/calibre/recipes/cronica.recipe
> share/calibre/recipes/csid.png
> share/calibre/recipes/csid.recipe
> share/calibre/recipes/ct24.png
> @@ -5408,62 +5616,45 @@ share/calibre/recipes/cubadebate.png
> share/calibre/recipes/cubadebate.recipe
> share/calibre/recipes/cumhuriyet.png
> share/calibre/recipes/cumhuriyet.recipe
> -share/calibre/recipes/curierulnational.png
> -share/calibre/recipes/curierulnational.recipe
> +share/calibre/recipes/currenttime.png
> +share/calibre/recipes/currenttime.recipe
> share/calibre/recipes/cvecezla.png
> share/calibre/recipes/cvecezla.recipe
> -share/calibre/recipes/cyberpresse.png
> -share/calibre/recipes/cyberpresse.recipe
> -share/calibre/recipes/cynewslive.recipe
> -share/calibre/recipes/cyprus_weekly.recipe
> -share/calibre/recipes/czas_gentlemanow.png
> -share/calibre/recipes/czas_gentlemanow.recipe
> share/calibre/recipes/dachauer_nachrichten.png
> share/calibre/recipes/dachauer_nachrichten.recipe
> +share/calibre/recipes/dagens_industri.png
> share/calibre/recipes/dagens_industri.recipe
> +share/calibre/recipes/dagensmedicin_dk.png
> share/calibre/recipes/dagensmedicin_dk.recipe
> +share/calibre/recipes/dagenspharma_dk.png
> share/calibre/recipes/dagenspharma_dk.recipe
> -share/calibre/recipes/daily_express.png
> -share/calibre/recipes/daily_express.recipe
> share/calibre/recipes/daily_mail.png
> share/calibre/recipes/daily_mail.recipe
> share/calibre/recipes/daily_mirror.png
> share/calibre/recipes/daily_mirror.recipe
> -share/calibre/recipes/daily_telegraph.png
> -share/calibre/recipes/daily_telegraph.recipe
> share/calibre/recipes/daily_writing_tips.png
> share/calibre/recipes/daily_writing_tips.recipe
> share/calibre/recipes/dailyreckoning.png
> share/calibre/recipes/dailyreckoning.recipe
> -share/calibre/recipes/dailytportal.png
> -share/calibre/recipes/dailytportal.recipe
> +share/calibre/recipes/dainik_bhaskar.png
> share/calibre/recipes/dainik_bhaskar.recipe
> -share/calibre/recipes/dallas.recipe
> share/calibre/recipes/danas.png
> share/calibre/recipes/danas.recipe
> share/calibre/recipes/dark_horizons.png
> share/calibre/recipes/dark_horizons.recipe
> -share/calibre/recipes/dark_reading.png
> -share/calibre/recipes/dark_reading.recipe
> -share/calibre/recipes/darknet.png
> -share/calibre/recipes/darknet.recipe
> -share/calibre/recipes/data_news.recipe
> -share/calibre/recipes/datasport.recipe
> +share/calibre/recipes/daum_net.png
> share/calibre/recipes/daum_net.recipe
> +share/calibre/recipes/dawn.png
> share/calibre/recipes/dawn.recipe
> -share/calibre/recipes/daytona_beach.recipe
> -share/calibre/recipes/dbb.recipe
> -share/calibre/recipes/de_redactie_be.recipe
> share/calibre/recipes/de_standaard.png
> share/calibre/recipes/de_standaard.recipe
> -share/calibre/recipes/deadspin.png
> -share/calibre/recipes/deadspin.recipe
> -share/calibre/recipes/deccan_herald.png
> -share/calibre/recipes/defensenews.recipe
> +share/calibre/recipes/debunkingdenialism.png
> +share/calibre/recipes/debunkingdenialism.recipe
> +share/calibre/recipes/de${CC}an_herald.png
> +share/calibre/recipes/de${CC}an_herald.recipe
> share/calibre/recipes/degentenaar.png
> share/calibre/recipes/degentenaar.recipe
> -share/calibre/recipes/delco_times.recipe
> -share/calibre/recipes/demagog.cz.recipe
> +share/calibre/recipes/democracy_journal.png
> share/calibre/recipes/democracy_journal.recipe
> share/calibre/recipes/democracy_now.png
> share/calibre/recipes/democracy_now.recipe
> @@ -5473,23 +5664,25 @@ share/calibre/recipes/den_of_geek.png
> share/calibre/recipes/den_of_geek.recipe
> share/calibre/recipes/denik.cz.png
> share/calibre/recipes/denik.cz.recipe
> +share/calibre/recipes/denik_referendum.png
> share/calibre/recipes/denik_referendum.recipe
> share/calibre/recipes/denikn.cz.png
> share/calibre/recipes/denikn.cz.recipe
> +share/calibre/recipes/denver_post.png
> share/calibre/recipes/denver_post.recipe
> share/calibre/recipes/der_standard.png
> share/calibre/recipes/der_standard.recipe
> +share/calibre/recipes/deredactie.png
> share/calibre/recipes/deredactie.recipe
> share/calibre/recipes/derin_dusunce.png
> share/calibre/recipes/derin_dusunce.recipe
> share/calibre/recipes/descopera.png
> share/calibre/recipes/descopera.recipe
> -share/calibre/recipes/descopera_org.png
> -share/calibre/recipes/descopera_org.recipe
> +share/calibre/recipes/desiring_god.png
> share/calibre/recipes/desiring_god.recipe
> -share/calibre/recipes/detroit_news.recipe
> share/calibre/recipes/deutsche_welle_bs.png
> share/calibre/recipes/deutsche_welle_bs.recipe
> +share/calibre/recipes/deutsche_welle_de.png
> share/calibre/recipes/deutsche_welle_de.recipe
> share/calibre/recipes/deutsche_welle_en.png
> share/calibre/recipes/deutsche_welle_en.recipe
> @@ -5499,87 +5692,61 @@ share/calibre/recipes/deutsche_welle_hr.png
> share/calibre/recipes/deutsche_welle_hr.recipe
> share/calibre/recipes/deutsche_welle_pt.png
> share/calibre/recipes/deutsche_welle_pt.recipe
> +share/calibre/recipes/deutsche_welle_ru.png
> +share/calibre/recipes/deutsche_welle_ru.recipe
> share/calibre/recipes/deutsche_welle_sr.png
> share/calibre/recipes/deutsche_welle_sr.recipe
> +share/calibre/recipes/deutschland_funk.recipe
> +share/calibre/recipes/dev_ua.png
> +share/calibre/recipes/dev_ua.recipe
> share/calibre/recipes/developpez.png
> share/calibre/recipes/developpez.recipe
> share/calibre/recipes/dhnet_be.png
> share/calibre/recipes/dhnet_be.recipe
> share/calibre/recipes/di.png
> share/calibre/recipes/di.recipe
> -share/calibre/recipes/diagonal.recipe
> -share/calibre/recipes/diario_cordoba.recipe
> -share/calibre/recipes/diario_de_noticias.png
> -share/calibre/recipes/diario_de_noticias.recipe
> +share/calibre/recipes/diario_el_pueblo.png
> share/calibre/recipes/diario_el_pueblo.recipe
> -share/calibre/recipes/diario_extra.recipe
> share/calibre/recipes/diario_ibiza.png
> share/calibre/recipes/diario_ibiza.recipe
> -share/calibre/recipes/diario_la_republica.recipe
> share/calibre/recipes/diario_sport.png
> share/calibre/recipes/diario_sport.recipe
> share/calibre/recipes/diariovasco.png
> share/calibre/recipes/diariovasco.recipe
> share/calibre/recipes/diepresse.png
> share/calibre/recipes/diepresse.recipe
> -share/calibre/recipes/digit_magazine.recipe
> -share/calibre/recipes/digital_arts.png
> -share/calibre/recipes/digital_arts.recipe
> -share/calibre/recipes/digitaljournal.png
> -share/calibre/recipes/digitaljournal.recipe
> -share/calibre/recipes/digitalspy_uk.png
> -share/calibre/recipes/digitalspy_uk.recipe
> share/calibre/recipes/digizone.png
> share/calibre/recipes/digizone.recipe
> -share/calibre/recipes/dilbert.png
> -share/calibre/recipes/dilbert.recipe
> -share/calibre/recipes/dilemaveche.png
> -share/calibre/recipes/dilemaveche.recipe
> -share/calibre/recipes/dingoo_a320.recipe
> -share/calibre/recipes/discover_magazine.png
> +share/calibre/recipes/dilema.png
> +share/calibre/recipes/dilema.recipe
> +share/calibre/recipes/discover_magazine_monthly.png
> share/calibre/recipes/discover_magazine_monthly.recipe
> +share/calibre/recipes/disinformatico.png
> share/calibre/recipes/disinformatico.recipe
> -share/calibre/recipes/divahair.png
> -share/calibre/recipes/divahair.recipe
> -share/calibre/recipes/djurslandsposten_dk.recipe
> +share/calibre/recipes/distrowatch_weekly.png
> +share/calibre/recipes/distrowatch_weekly.recipe
> share/calibre/recipes/dn_se.png
> share/calibre/recipes/dn_se.recipe
> share/calibre/recipes/dna.png
> share/calibre/recipes/dna.recipe
> -share/calibre/recipes/dnevni_avaz.png
> -share/calibre/recipes/dnevnik.png
> -share/calibre/recipes/dnevnik.recipe
> share/calibre/recipes/dnevnik_cro.png
> share/calibre/recipes/dnevnik_cro.recipe
> -share/calibre/recipes/dnevnik_mk.recipe
> -share/calibre/recipes/dobanevinosti.recipe
> share/calibre/recipes/dobreprogamy.png
> share/calibre/recipes/dobreprogamy.recipe
> -share/calibre/recipes/doghousediaries.recipe
> -share/calibre/recipes/dominion.png
> -share/calibre/recipes/dominion.recipe
> +share/calibre/recipes/donga.png
> share/calibre/recipes/donga.recipe
> share/calibre/recipes/dorfener_anzeiger.png
> share/calibre/recipes/dorfener_anzeiger.recipe
> -share/calibre/recipes/dosisdiarias.png
> -share/calibre/recipes/dosisdiarias.recipe
> share/calibre/recipes/dot_net.png
> share/calibre/recipes/dot_net.recipe
> -share/calibre/recipes/dotpod.png
> -share/calibre/recipes/dotpod.recipe
> -share/calibre/recipes/down_to_earth.recipe
> +share/calibre/recipes/dovod.png
> +share/calibre/recipes/dovod.recipe
> share/calibre/recipes/dr_dk.png
> share/calibre/recipes/dr_dk.recipe
> -share/calibre/recipes/drivelry.recipe
> share/calibre/recipes/drytooling_pl.png
> share/calibre/recipes/drytooling_pl.recipe
> -share/calibre/recipes/dunya_bizim.recipe
> -share/calibre/recipes/dunya_bulteni.png
> -share/calibre/recipes/dunya_bulteni.recipe
> -share/calibre/recipes/dunyahalleri.recipe
> -share/calibre/recipes/dunyahalleri_haftaninozeti.recipe
> -share/calibre/recipes/dvhn.recipe
> -share/calibre/recipes/dw_de.recipe
> +share/calibre/recipes/dual_shockers.png
> +share/calibre/recipes/dual_shockers.recipe
> share/calibre/recipes/dwutygodnik.png
> share/calibre/recipes/dwutygodnik.recipe
> share/calibre/recipes/dzieje_pl.png
> @@ -5598,130 +5765,88 @@ share/calibre/recipes/dziennik_zachodni.png
> share/calibre/recipes/dziennik_zachodni.recipe
> share/calibre/recipes/dziennikzwiazkowy.png
> share/calibre/recipes/dziennikzwiazkowy.recipe
> -share/calibre/recipes/ebeltoftlokalavisen_dk.png
> -share/calibre/recipes/ebeltoftlokalavisen_dk.recipe
> share/calibre/recipes/ebetrsberger_zeitung.png
> share/calibre/recipes/ebetrsberger_zeitung.recipe
> -share/calibre/recipes/echo_dnia.png
> -share/calibre/recipes/echo_dnia.recipe
> share/calibre/recipes/echo_moskvy.png
> share/calibre/recipes/echo_moskvy.recipe
> share/calibre/recipes/echo_online.png
> -share/calibre/recipes/eclipseonline.recipe
> -share/calibre/recipes/ecogeek.recipe
> +share/calibre/recipes/economia.png
> share/calibre/recipes/economia.recipe
> share/calibre/recipes/economico.png
> share/calibre/recipes/economico.recipe
> share/calibre/recipes/economist.png
> share/calibre/recipes/economist.recipe
> +share/calibre/recipes/economist_espresso.png
> +share/calibre/recipes/economist_espresso.recipe
> share/calibre/recipes/economist_free.recipe
> -share/calibre/recipes/ecotrend.png
> -share/calibre/recipes/ecotrend.recipe
> -share/calibre/recipes/ecuisine.png
> -share/calibre/recipes/ecuisine.recipe
> -share/calibre/recipes/edebistan.png
> -share/calibre/recipes/edebistan.recipe
> -share/calibre/recipes/edebiyat_haber.png
> -share/calibre/recipes/edebiyat_haber.recipe
> -share/calibre/recipes/edge_conversations.recipe
> -share/calibre/recipes/editor_and_publisher.recipe
> -share/calibre/recipes/editoriali.png
> -share/calibre/recipes/editoriali.recipe
> +share/calibre/recipes/economist_news.png
> +share/calibre/recipes/economist_news.recipe
> +share/calibre/recipes/economist_search.recipe
> +share/calibre/recipes/economist_world_ahead.png
> +share/calibre/recipes/economist_world_ahead.recipe
> +share/calibre/recipes/edmonton_journal.png
> share/calibre/recipes/edmonton_journal.recipe
> +share/calibre/recipes/eenadu.png
> share/calibre/recipes/eenadu.recipe
> -share/calibre/recipes/egedallokalavisen_dk.png
> -share/calibre/recipes/egedallokalavisen_dk.recipe
> -share/calibre/recipes/egirl.png
> -share/calibre/recipes/egirl.recipe
> -share/calibre/recipes/eioba.png
> -share/calibre/recipes/eioba.recipe
> -share/calibre/recipes/ekantipur.recipe
> -share/calibre/recipes/ekathemerini.recipe
> -share/calibre/recipes/ekologia_pl.png
> -share/calibre/recipes/ekologia_pl.recipe
> +share/calibre/recipes/eenadu_ap.png
> +share/calibre/recipes/eenadu_ap.recipe
> share/calibre/recipes/ekot.png
> share/calibre/recipes/ekot.recipe
> share/calibre/recipes/el_colombiano.png
> share/calibre/recipes/el_colombiano.recipe
> +share/calibre/recipes/el_confidencial.recipe
> +share/calibre/recipes/el_correo.png
> share/calibre/recipes/el_correo.recipe
> share/calibre/recipes/el_cultural.recipe
> +share/calibre/recipes/el_diario.png
> share/calibre/recipes/el_diario.recipe
> share/calibre/recipes/el_diplo.png
> share/calibre/recipes/el_diplo.recipe
> -share/calibre/recipes/el_espectador.png
> -share/calibre/recipes/el_espectador.recipe
> +share/calibre/recipes/el_economista.recipe
> share/calibre/recipes/el_faro.png
> share/calibre/recipes/el_faro.recipe
> -share/calibre/recipes/el_malpensante.recipe
> share/calibre/recipes/el_mercurio_chile.png
> share/calibre/recipes/el_mercurio_chile.recipe
> -share/calibre/recipes/el_mostrador.recipe
> -share/calibre/recipes/el_mundo_co.png
> -share/calibre/recipes/el_mundo_co.recipe
> +share/calibre/recipes/el_mundo_today.png
> share/calibre/recipes/el_mundo_today.recipe
> +share/calibre/recipes/el_nacional.png
> share/calibre/recipes/el_nacional.recipe
> -share/calibre/recipes/el_observador.png
> -share/calibre/recipes/el_observador.recipe
> share/calibre/recipes/el_pais.png
> share/calibre/recipes/el_pais.recipe
> +share/calibre/recipes/el_pais_babelia.png
> share/calibre/recipes/el_pais_babelia.recipe
> share/calibre/recipes/el_pais_uy.png
> share/calibre/recipes/el_pais_uy.recipe
> -share/calibre/recipes/el_periodico.recipe
> -share/calibre/recipes/el_publico.recipe
> -share/calibre/recipes/el_tiempo.recipe
> -share/calibre/recipes/el_universal.png
> -share/calibre/recipes/el_universal.recipe
> -share/calibre/recipes/elclubdelebook.png
> -share/calibre/recipes/elclubdelebook.recipe
> +share/calibre/recipes/elcohetealaluna.png
> share/calibre/recipes/elcohetealaluna.recipe
> -share/calibre/recipes/elcomercio.png
> -share/calibre/recipes/elcomercio.recipe
> share/calibre/recipes/elcronista-arg.png
> share/calibre/recipes/elcronista-arg.recipe
> -share/calibre/recipes/ele.png
> -share/calibre/recipes/ele.recipe
> share/calibre/recipes/elektroda_pl.png
> share/calibre/recipes/elektroda_pl.recipe
> -share/calibre/recipes/elet_es_irodalom.png
> -share/calibre/recipes/elet_es_irodalom.recipe
> share/calibre/recipes/elmundo.png
> share/calibre/recipes/elmundo.recipe
> -share/calibre/recipes/elpais_impreso.png
> -share/calibre/recipes/elpais_impreso.recipe
> share/calibre/recipes/elpais_semanal.png
> share/calibre/recipes/elpais_semanal.recipe
> share/calibre/recipes/elperiodico_catalan.png
> share/calibre/recipes/elperiodico_spanish.png
> share/calibre/recipes/elperiodico_spanish.recipe
> -share/calibre/recipes/elsevier.png
> -share/calibre/recipes/elsevier.recipe
> -share/calibre/recipes/eltiempo_hn.png
> -share/calibre/recipes/eltiempo_hn.recipe
> -share/calibre/recipes/eluniversal_ve.png
> -share/calibre/recipes/eluniversal_ve.recipe
> -share/calibre/recipes/eluniverso_ec.png
> -share/calibre/recipes/eluniverso_ec.recipe
> -share/calibre/recipes/emg_en.png
> -share/calibre/recipes/emg_en.recipe
> -share/calibre/recipes/empire_magazine.recipe
> +share/calibre/recipes/en_globes_co_il.recipe
> share/calibre/recipes/endgadget.png
> share/calibre/recipes/endgadget.recipe
> -share/calibre/recipes/endgadget_ja.png
> -share/calibre/recipes/endgadget_ja.recipe
> share/calibre/recipes/entrepeneur.png
> share/calibre/recipes/entrepeneur.recipe
> -share/calibre/recipes/eos_wetenschap.recipe
> +share/calibre/recipes/epl_talk.png
> share/calibre/recipes/epl_talk.recipe
> +share/calibre/recipes/epoch_times.png
> share/calibre/recipes/epoch_times.recipe
> +share/calibre/recipes/epw.png
> share/calibre/recipes/epw.recipe
> +share/calibre/recipes/epw_magazine.png
> +share/calibre/recipes/epw_magazine.recipe
> +share/calibre/recipes/equestria_daily.png
> share/calibre/recipes/equestria_daily.recipe
> share/calibre/recipes/erdinger_anzeiger.png
> share/calibre/recipes/erdinger_anzeiger.recipe
> -share/calibre/recipes/erhvervs_avisen_dk.png
> -share/calibre/recipes/erhvervs_avisen_dk.recipe
> -share/calibre/recipes/esbjerglokalavisen_dk.png
> -share/calibre/recipes/esbjerglokalavisen_dk.recipe
> share/calibre/recipes/esenja.png
> share/calibre/recipes/esenja.recipe
> share/calibre/recipes/esensja(rss).png
> @@ -5732,26 +5857,12 @@ share/calibre/recipes/espn.png
> share/calibre/recipes/espn.recipe
> share/calibre/recipes/esquire.png
> share/calibre/recipes/esquire.recipe
> -share/calibre/recipes/estadao.png
> -share/calibre/recipes/estadao.recipe
> -share/calibre/recipes/eu_commission.recipe
> share/calibre/recipes/europa_press.png
> share/calibre/recipes/europa_press.recipe
> -share/calibre/recipes/europasur.recipe
> -share/calibre/recipes/evangelizo.recipe
> +share/calibre/recipes/everett_herald.png
> share/calibre/recipes/everett_herald.recipe
> -share/calibre/recipes/evz.ro.png
> -share/calibre/recipes/evz.ro.recipe
> -share/calibre/recipes/exiled.png
> -share/calibre/recipes/exiled.recipe
> share/calibre/recipes/expansion_spanish.png
> share/calibre/recipes/expansion_spanish.recipe
> -share/calibre/recipes/explosm.recipe
> -share/calibre/recipes/express_de.recipe
> -share/calibre/recipes/f1_ultra.png
> -share/calibre/recipes/f1_ultra.recipe
> -share/calibre/recipes/f_secure.png
> -share/calibre/recipes/f_secure.recipe
> share/calibre/recipes/factcheck.png
> share/calibre/recipes/factcheck.recipe
> share/calibre/recipes/fairbanks_daily.png
> @@ -5760,40 +5871,28 @@ share/calibre/recipes/fan_graphs.png
> share/calibre/recipes/fan_graphs.recipe
> share/calibre/recipes/fastcompany.png
> share/calibre/recipes/fastcompany.recipe
> -share/calibre/recipes/favrskovavisen_dk.png
> -share/calibre/recipes/favrskovavisen_dk.recipe
> -share/calibre/recipes/favrskovlokalavisen_dk.png
> -share/calibre/recipes/favrskovlokalavisen_dk.recipe
> -share/calibre/recipes/faznet.png
> -share/calibre/recipes/faznet.recipe
> -share/calibre/recipes/fc_knudde.png
> -share/calibre/recipes/fc_knudde.recipe
> -share/calibre/recipes/fdb_pl.recipe
> -share/calibre/recipes/fe_india.png
> -share/calibre/recipes/fe_india.recipe
> -share/calibre/recipes/felicia.png
> -share/calibre/recipes/felicia.recipe
> -share/calibre/recipes/fhm_uk.recipe
> -share/calibre/recipes/fhmro.png
> -share/calibre/recipes/fhmro.recipe
> +share/calibre/recipes/faz_net.recipe
> share/calibre/recipes/film_org_pl.png
> share/calibre/recipes/film_org_pl.recipe
> share/calibre/recipes/film_web.png
> share/calibre/recipes/film_web.recipe
> +share/calibre/recipes/financial_times.png
> share/calibre/recipes/financial_times.recipe
> -share/calibre/recipes/financial_times_print_edition.recipe
> share/calibre/recipes/financialsense.png
> share/calibre/recipes/financialsense.recipe
> share/calibre/recipes/financiarul.png
> share/calibre/recipes/financiarul.recipe
> +share/calibre/recipes/financieele_dagblad.png
> share/calibre/recipes/financieele_dagblad.recipe
> share/calibre/recipes/first_things.png
> share/calibre/recipes/first_things.recipe
> -share/calibre/recipes/fisco_oggi.recipe
> -share/calibre/recipes/fleshbot.png
> -share/calibre/recipes/fleshbot.recipe
> +share/calibre/recipes/firstpost.png
> +share/calibre/recipes/firstpost.recipe
> +share/calibre/recipes/flickr.png
> share/calibre/recipes/flickr.recipe
> +share/calibre/recipes/flickr_es.png
> share/calibre/recipes/flickr_es.recipe
> +share/calibre/recipes/fluter_de.png
> share/calibre/recipes/fluter_de.recipe
> share/calibre/recipes/focus_de.png
> share/calibre/recipes/focus_de.recipe
> @@ -5801,142 +5900,122 @@ share/calibre/recipes/focus_pl.png
> share/calibre/recipes/focus_pl.recipe
> share/calibre/recipes/fokkeensukke.png
> share/calibre/recipes/fokkeensukke.recipe
> +share/calibre/recipes/fokus.recipe
> share/calibre/recipes/folha.png
> share/calibre/recipes/folha.recipe
> share/calibre/recipes/folhadesaopaulo.png
> share/calibre/recipes/folhadesaopaulo.recipe
> +share/calibre/recipes/folhadesaopaulo_sub.png
> share/calibre/recipes/folhadesaopaulo_sub.recipe
> -share/calibre/recipes/folkebladet_dk.recipe
> -share/calibre/recipes/folkebladetdjursland_dk.png
> -share/calibre/recipes/folkebladetdjursland_dk.recipe
> -share/calibre/recipes/folketidende_dk.recipe
> -share/calibre/recipes/forbes.png
> -share/calibre/recipes/forbes.recipe
> -share/calibre/recipes/forbes_india.recipe
> -share/calibre/recipes/forbes_pl.png
> -share/calibre/recipes/forbes_pl.recipe
> +share/calibre/recipes/fontanka.png
> +share/calibre/recipes/fontanka.recipe
> +share/calibre/recipes/fooballua.png
> +share/calibre/recipes/football_fancast.png
> +share/calibre/recipes/football_fancast.recipe
> +share/calibre/recipes/football_league_world.png
> +share/calibre/recipes/football_league_world.recipe
> +share/calibre/recipes/footballua.recipe
> +share/calibre/recipes/foreign_policy.png
> share/calibre/recipes/foreign_policy.recipe
> share/calibre/recipes/foreignaffairs.png
> share/calibre/recipes/foreignaffairs.recipe
> -share/calibre/recipes/formulaas.png
> -share/calibre/recipes/formulaas.recipe
> -share/calibre/recipes/forsal.png
> -share/calibre/recipes/forsal.recipe
> +share/calibre/recipes/fortune_magazine.png
> share/calibre/recipes/fortune_magazine.recipe
> -share/calibre/recipes/fotoblogia_pl.png
> -share/calibre/recipes/fotoblogia_pl.recipe
> share/calibre/recipes/foxnews.png
> share/calibre/recipes/foxnews.recipe
> -share/calibre/recipes/fr_online.recipe
> share/calibre/recipes/frandroid.png
> share/calibre/recipes/frandroid.recipe
> -share/calibre/recipes/frankfurter_rundschau.recipe
> -share/calibre/recipes/freakonomics.png
> -share/calibre/recipes/freakonomics.recipe
> -share/calibre/recipes/fredensborglokalavisen_dk.png
> -share/calibre/recipes/fredensborglokalavisen_dk.recipe
> -share/calibre/recipes/fredericialokalavisen_dk.png
> -share/calibre/recipes/fredericialokalavisen_dk.recipe
> -share/calibre/recipes/frederiksbergbladet_dk.recipe
> -share/calibre/recipes/frederikssundlokalavisen_dk.png
> -share/calibre/recipes/frederikssundlokalavisen_dk.recipe
> +share/calibre/recipes/free_inquiry.png
> share/calibre/recipes/free_inquiry.recipe
> share/calibre/recipes/freenature.png
> share/calibre/recipes/freenature.recipe
> -share/calibre/recipes/freeway.recipe
> share/calibre/recipes/freisinger_tagblatt.png
> share/calibre/recipes/freisinger_tagblatt.recipe
> +share/calibre/recipes/frontline.png
> share/calibre/recipes/frontline.recipe
> share/calibre/recipes/fstream.png
> -share/calibre/recipes/fstream.recipe
> share/calibre/recipes/fudzilla.png
> share/calibre/recipes/fudzilla.recipe
> -share/calibre/recipes/furesoelokalavisen_dk.png
> -share/calibre/recipes/furesoelokalavisen_dk.recipe
> share/calibre/recipes/furstenfeldbrucker_tagblatt.png
> share/calibre/recipes/furstenfeldbrucker_tagblatt.recipe
> share/calibre/recipes/futurismic.png
> share/calibre/recipes/futurismic.recipe
> +share/calibre/recipes/gagadget_de.png
> +share/calibre/recipes/gagadget_de.recipe
> +share/calibre/recipes/gagadget_en.png
> +share/calibre/recipes/gagadget_en.recipe
> +share/calibre/recipes/gagadget_es.png
> +share/calibre/recipes/gagadget_es.recipe
> +share/calibre/recipes/gagadget_fr.png
> +share/calibre/recipes/gagadget_fr.recipe
> +share/calibre/recipes/gagadget_it.png
> +share/calibre/recipes/gagadget_it.recipe
> +share/calibre/recipes/gagadget_nb.png
> +share/calibre/recipes/gagadget_nb.recipe
> +share/calibre/recipes/gagadget_nl.png
> +share/calibre/recipes/gagadget_nl.recipe
> +share/calibre/recipes/gagadget_ru.png
> +share/calibre/recipes/gagadget_ru.recipe
> +share/calibre/recipes/gagadget_ua.png
> +share/calibre/recipes/gagadget_ua.recipe
> share/calibre/recipes/galaxys_edge.recipe
> share/calibre/recipes/galicia_confidential.png
> share/calibre/recipes/galicia_confidential.recipe
> -share/calibre/recipes/gamasutra_fa.png
> -share/calibre/recipes/gamasutra_fa.recipe
> -share/calibre/recipes/gamasutra_news.png
> -share/calibre/recipes/gamasutra_news.recipe
> +share/calibre/recipes/game_rant.png
> +share/calibre/recipes/game_rant.recipe
> share/calibre/recipes/gamekult.png
> share/calibre/recipes/gamekult.recipe
> share/calibre/recipes/gameplay_pl.png
> share/calibre/recipes/gameplay_pl.recipe
> -share/calibre/recipes/gamespot.png
> -share/calibre/recipes/gamespot.recipe
> -share/calibre/recipes/gandul.png
> -share/calibre/recipes/gandul.recipe
> share/calibre/recipes/garmischer_tagblatt.png
> share/calibre/recipes/garmischer_tagblatt.recipe
> +share/calibre/recipes/gates_notes.png
> +share/calibre/recipes/gates_notes.recipe
> share/calibre/recipes/gazeta-prawna-calibre-v1.png
> share/calibre/recipes/gazeta-prawna-calibre-v1.recipe
> share/calibre/recipes/gazeta_krakowska.png
> share/calibre/recipes/gazeta_krakowska.recipe
> -share/calibre/recipes/gazeta_lubuska.png
> -share/calibre/recipes/gazeta_lubuska.recipe
> -share/calibre/recipes/gazeta_pl_bydgoszcz.png
> -share/calibre/recipes/gazeta_pl_bydgoszcz.recipe
> share/calibre/recipes/gazeta_pl_krakow.png
> share/calibre/recipes/gazeta_pl_krakow.recipe
> -share/calibre/recipes/gazeta_pl_szczecin.png
> -share/calibre/recipes/gazeta_pl_szczecin.recipe
> share/calibre/recipes/gazeta_pl_warszawa.png
> share/calibre/recipes/gazeta_pl_warszawa.recipe
> -share/calibre/recipes/gazeta_pomorska.png
> -share/calibre/recipes/gazeta_pomorska.recipe
> -share/calibre/recipes/gazeta_wroclawska.png
> -share/calibre/recipes/gazeta_wroclawska.recipe
> -share/calibre/recipes/gazeta_wspolczesna.png
> -share/calibre/recipes/gazeta_wspolczesna.recipe
> -share/calibre/recipes/gazeta_wyborcza.png
> -share/calibre/recipes/gazeta_wyborcza.recipe
> -share/calibre/recipes/gcn.png
> -share/calibre/recipes/gcn.recipe
> -share/calibre/recipes/geek_poke.recipe
> -share/calibre/recipes/gentoftelokalavisen_dk.png
> -share/calibre/recipes/gentoftelokalavisen_dk.recipe
> +share/calibre/recipes/gazetaua_ru.png
> +share/calibre/recipes/gazetaua_ru.recipe
> +share/calibre/recipes/gazetaua_ua.png
> +share/calibre/recipes/gazetaua_ua.recipe
> +share/calibre/recipes/geekcity.png
> +share/calibre/recipes/geekcity.recipe
> share/calibre/recipes/geopolityka.png
> share/calibre/recipes/geopolityka.recipe
> share/calibre/recipes/geretsrieder_merkur.png
> share/calibre/recipes/geretsrieder_merkur.recipe
> -share/calibre/recipes/german_gov.recipe
> -share/calibre/recipes/gezgin_dergi.recipe
> -share/calibre/recipes/gildia_pl.png
> -share/calibre/recipes/gildia_pl.recipe
> -share/calibre/recipes/gizmodo.png
> -share/calibre/recipes/gizmodo.recipe
> +share/calibre/recipes/github.recipe
> +share/calibre/recipes/give_me_sports.png
> +share/calibre/recipes/give_me_sports.recipe
> +share/calibre/recipes/gkt.png
> share/calibre/recipes/gkt.recipe
> -share/calibre/recipes/glamour.recipe
> +share/calibre/recipes/glasgow_herald.png
> share/calibre/recipes/glasgow_herald.recipe
> share/calibre/recipes/glenn_greenwald.png
> share/calibre/recipes/glenn_greenwald.recipe
> -share/calibre/recipes/glennbeck.recipe
> +share/calibre/recipes/globaltimes.png
> share/calibre/recipes/globaltimes.recipe
> share/calibre/recipes/globe_and_mail.png
> share/calibre/recipes/globe_and_mail.recipe
> +share/calibre/recipes/globes_co_il.png
> share/calibre/recipes/globes_co_il.recipe
> -share/calibre/recipes/glos_wielkopolski.png
> -share/calibre/recipes/glos_wielkopolski.recipe
> -share/calibre/recipes/go4it.png
> -share/calibre/recipes/go4it.recipe
> +share/calibre/recipes/go_comics.png
> share/calibre/recipes/go_comics.recipe
> -share/calibre/recipes/goal.png
> -share/calibre/recipes/goal.recipe
> -share/calibre/recipes/gofin_pl.png
> -share/calibre/recipes/gofin_pl.recipe
> share/calibre/recipes/golem_de.png
> share/calibre/recipes/golem_de.recipe
> +share/calibre/recipes/good_e-reader.png
> +share/calibre/recipes/good_ereader.recipe
> +share/calibre/recipes/good_house_keeping.png
> share/calibre/recipes/good_house_keeping.recipe
> -share/calibre/recipes/good_to_know.png
> -share/calibre/recipes/good_to_know.recipe
> +share/calibre/recipes/google_news.png
> share/calibre/recipes/google_news.recipe
> -share/calibre/recipes/googlemobileblog.recipe
> +share/calibre/recipes/gorky.png
> +share/calibre/recipes/gorky.recipe
> share/calibre/recipes/gosc_full.png
> share/calibre/recipes/gosc_full.recipe
> share/calibre/recipes/gosc_niedzielny.png
> @@ -5944,148 +6023,131 @@ share/calibre/recipes/gosc_niedzielny.recipe
> share/calibre/recipes/gram_pl.png
> share/calibre/recipes/gram_pl.recipe
> share/calibre/recipes/grandes_corresponsales_es.recipe
> +share/calibre/recipes/grani.png
> +share/calibre/recipes/grani.recipe
> share/calibre/recipes/granma.png
> share/calibre/recipes/granma.recipe
> +share/calibre/recipes/granta.png
> share/calibre/recipes/granta.recipe
> +share/calibre/recipes/grantland.png
> share/calibre/recipes/grantland.recipe
> +share/calibre/recipes/greatist.png
> +share/calibre/recipes/greatist.recipe
> share/calibre/recipes/greensboro_news_and_record.png
> share/calibre/recipes/greensboro_news_and_record.recipe
> -share/calibre/recipes/grenaalokalavisen_dk.png
> -share/calibre/recipes/grenaalokalavisen_dk.recipe
> -share/calibre/recipes/gribskovlokalavisen_dk.png
> -share/calibre/recipes/gribskovlokalavisen_dk.recipe
> -share/calibre/recipes/grid_to.recipe
> -share/calibre/recipes/grrm.png
> -share/calibre/recipes/grrm.recipe
> share/calibre/recipes/gry_online_pl.png
> share/calibre/recipes/gry_online_pl.recipe
> -share/calibre/recipes/gs24_pl.png
> -share/calibre/recipes/gs24_pl.recipe
> share/calibre/recipes/gsp.png
> share/calibre/recipes/gsp.recipe
> share/calibre/recipes/guardian.png
> share/calibre/recipes/guardian.recipe
> -share/calibre/recipes/gulfnews.recipe
> -share/calibre/recipes/gulli.recipe
> share/calibre/recipes/gva_be.png
> share/calibre/recipes/gva_be.recipe
> +share/calibre/recipes/gwup.png
> share/calibre/recipes/gwup.recipe
> -share/calibre/recipes/h3.recipe
> share/calibre/recipes/haaretz_en.png
> share/calibre/recipes/haaretz_en.recipe
> +share/calibre/recipes/habr.png
> +share/calibre/recipes/habr.recipe
> +share/calibre/recipes/habr_ru.png
> +share/calibre/recipes/habr_ru.recipe
> +share/calibre/recipes/hackernews.png
> share/calibre/recipes/hackernews.recipe
> -share/calibre/recipes/haderslevlokalavisen_dk.png
> -share/calibre/recipes/haderslevlokalavisen_dk.recipe
> share/calibre/recipes/haksoz.png
> share/calibre/recipes/haksoz.recipe
> share/calibre/recipes/halsnaeslokalavisen_dk.png
> +share/calibre/recipes/hamilton_spectator.png
> share/calibre/recipes/hamilton_spectator.recipe
> share/calibre/recipes/handelsblatt.png
> share/calibre/recipes/handelsblatt.recipe
> -share/calibre/recipes/hankyoreh.png
> -share/calibre/recipes/hankyoreh.recipe
> share/calibre/recipes/hankyoreh21.png
> share/calibre/recipes/hankyoreh21.recipe
> share/calibre/recipes/hannoversche_zeitung.png
> share/calibre/recipes/hannoversche_zeitung.recipe
> +share/calibre/recipes/hardcore_gamer.png
> +share/calibre/recipes/hardcore_gamer.recipe
> +share/calibre/recipes/harpers.png
> share/calibre/recipes/harpers.recipe
> -share/calibre/recipes/harpers_full.recipe
> share/calibre/recipes/hatalska.png
> share/calibre/recipes/hatalska.recipe
> +share/calibre/recipes/hbr.png
> share/calibre/recipes/hbr.recipe
> -share/calibre/recipes/heavy_metal_it.recipe
> +share/calibre/recipes/healthline.png
> +share/calibre/recipes/healthline.recipe
> share/calibre/recipes/heise.png
> share/calibre/recipes/heise.recipe
> +share/calibre/recipes/heise_ct.png
> share/calibre/recipes/heise_ct.recipe
> +share/calibre/recipes/heise_ix.png
> share/calibre/recipes/heise_ix.recipe
> -share/calibre/recipes/heise_open.recipe
> -share/calibre/recipes/helsingin_sanomat.recipe
> share/calibre/recipes/high_country_news.png
> share/calibre/recipes/high_country_news.recipe
> +share/calibre/recipes/himal_southasian.png
> +share/calibre/recipes/himal_southasian.recipe
> +share/calibre/recipes/hindu.png
> share/calibre/recipes/hindu.recipe
> +share/calibre/recipes/hindu_business_line.png
> share/calibre/recipes/hindu_business_line.recipe
> -share/calibre/recipes/hindu_human_rights.recipe
> +share/calibre/recipes/hindu_post.png
> share/calibre/recipes/hindu_post.recipe
> +share/calibre/recipes/hindufeeds.png
> +share/calibre/recipes/hindufeeds.recipe
> +share/calibre/recipes/hinduism_today.png
> share/calibre/recipes/hinduism_today.recipe
> +share/calibre/recipes/hindustan.png
> share/calibre/recipes/hindustan.recipe
> +share/calibre/recipes/hindustan_times.png
> share/calibre/recipes/hindustan_times.recipe
> +share/calibre/recipes/hindustan_times_print.png
> +share/calibre/recipes/hindustan_times_print.recipe
> +share/calibre/recipes/hindutamil.png
> +share/calibre/recipes/hindutamil.recipe
> share/calibre/recipes/historia_pl.png
> share/calibre/recipes/historia_pl.recipe
> +share/calibre/recipes/history_today.png
> share/calibre/recipes/history_today.recipe
> share/calibre/recipes/hln_be.png
> share/calibre/recipes/hln_be.recipe
> share/calibre/recipes/hna.png
> share/calibre/recipes/hna.recipe
> -share/calibre/recipes/hnonline.png
> -share/calibre/recipes/hnonline.recipe
> -share/calibre/recipes/hoersholmlokalavisen_dk.png
> -share/calibre/recipes/hoersholmlokalavisen_dk.recipe
> -share/calibre/recipes/hola.png
> -share/calibre/recipes/hola.recipe
> -share/calibre/recipes/hollywood_reporter.png
> -share/calibre/recipes/hollywood_reporter.recipe
> share/calibre/recipes/holzkirchener_merkur.png
> share/calibre/recipes/holzkirchener_merkur.recipe
> -share/calibre/recipes/hornsherredavis_dk.recipe
> -share/calibre/recipes/hornsherredlokalavisen_dk.png
> -share/calibre/recipes/hornsherredlokalavisen_dk.recipe
> +share/calibre/recipes/horizons.png
> +share/calibre/recipes/horizons.recipe
> +share/calibre/recipes/hot_cars.png
> +share/calibre/recipes/hot_cars.recipe
> share/calibre/recipes/hotair.png
> share/calibre/recipes/hotair.recipe
> -share/calibre/recipes/hotcity.png
> -share/calibre/recipes/hotcity.recipe
> -share/calibre/recipes/hotnews.png
> -share/calibre/recipes/hotnews.recipe
> -share/calibre/recipes/house_news.png
> -share/calibre/recipes/house_news.recipe
> -share/calibre/recipes/houston_chronicle.png
> -share/calibre/recipes/houston_chronicle.recipe
> share/calibre/recipes/howtogeek.png
> share/calibre/recipes/howtogeek.recipe
> share/calibre/recipes/hoy.png
> share/calibre/recipes/hoy.recipe
> -share/calibre/recipes/hrt.png
> -share/calibre/recipes/hrt.recipe
> -share/calibre/recipes/huffingtonpost.recipe
> -share/calibre/recipes/huffingtonpost_uk.png
> share/calibre/recipes/hurriyet.png
> share/calibre/recipes/hurriyet.recipe
> share/calibre/recipes/hvg.png
> share/calibre/recipes/hvg.recipe
> -share/calibre/recipes/hvidovreavis_dk.png
> -share/calibre/recipes/hvidovreavis_dk.recipe
> -share/calibre/recipes/hvidovrelokalavisen_dk.png
> -share/calibre/recipes/hvidovrelokalavisen_dk.recipe
> -share/calibre/recipes/ibm_smarter_planet.recipe
> +share/calibre/recipes/id_pixel.png
> share/calibre/recipes/id_pixel.recipe
> -share/calibre/recipes/ideal_almeria.recipe
> -share/calibre/recipes/ideal_granada.recipe
> -share/calibre/recipes/ideal_jaen.recipe
> -share/calibre/recipes/idg_se.recipe
> share/calibre/recipes/idnes.png
> share/calibre/recipes/idnes.recipe
> +share/calibre/recipes/ieee_spectrum_mag.png
> share/calibre/recipes/ieee_spectrum_mag.recipe
> share/calibre/recipes/ieeespectrum.png
> share/calibre/recipes/ieeespectrum.recipe
> -share/calibre/recipes/iekspries.png
> -share/calibre/recipes/iekspries.recipe
> +share/calibre/recipes/ifzm.png
> share/calibre/recipes/ifzm.recipe
> -share/calibre/recipes/ihned.cz.recipe
> -share/calibre/recipes/ihned.recipe
> -share/calibre/recipes/iht.png
> -share/calibre/recipes/iht.recipe
> +share/calibre/recipes/iktibas.png
> share/calibre/recipes/iktibas.recipe
> share/calibre/recipes/il_cambiamento.png
> share/calibre/recipes/il_cambiamento.recipe
> share/calibre/recipes/il_fatto.png
> share/calibre/recipes/il_fatto.recipe
> -share/calibre/recipes/il_foglio.recipe
> share/calibre/recipes/il_giornale.png
> -share/calibre/recipes/il_giornale.recipe
> share/calibre/recipes/il_messaggero.png
> share/calibre/recipes/il_messaggero.recipe
> share/calibre/recipes/il_post.png
> share/calibre/recipes/il_post.recipe
> -share/calibre/recipes/iliteratura_cz.recipe
> +share/calibre/recipes/ilmanifesto.png
> share/calibre/recipes/ilmanifesto.recipe
> share/calibre/recipes/ilsole24ore.png
> share/calibre/recipes/ilsole24ore.recipe
> @@ -6097,142 +6159,114 @@ share/calibre/recipes/in4_pl.png
> share/calibre/recipes/in4_pl.recipe
> share/calibre/recipes/in_gr.png
> share/calibre/recipes/in_gr.recipe
> +share/calibre/recipes/inc.png
> share/calibre/recipes/inc.recipe
> +share/calibre/recipes/inc42.png
> +share/calibre/recipes/inc42.recipe
> share/calibre/recipes/independent.png
> share/calibre/recipes/independent.recipe
> +share/calibre/recipes/independent_australia.png
> share/calibre/recipes/independent_australia.recipe
> share/calibre/recipes/index_hu.png
> share/calibre/recipes/index_hu.recipe
> +share/calibre/recipes/india_facts.png
> share/calibre/recipes/india_facts.recipe
> +share/calibre/recipes/india_legal_magazine.png
> share/calibre/recipes/india_legal_magazine.recipe
> +share/calibre/recipes/india_speaks_reddit.png
> share/calibre/recipes/india_speaks_reddit.recipe
> +share/calibre/recipes/india_today.png
> share/calibre/recipes/india_today.recipe
> share/calibre/recipes/indian_express.png
> share/calibre/recipes/indian_express.recipe
> +share/calibre/recipes/indic_today.png
> share/calibre/recipes/indic_today.recipe
> -share/calibre/recipes/indy_star.recipe
> share/calibre/recipes/infobae.png
> share/calibre/recipes/infobae.recipe
> -share/calibre/recipes/infomotori.recipe
> share/calibre/recipes/information_dk.png
> share/calibre/recipes/information_dk.recipe
> -share/calibre/recipes/infoworld.recipe
> -share/calibre/recipes/infra_pl.png
> -share/calibre/recipes/infra_pl.recipe
> share/calibre/recipes/ing_dk.png
> share/calibre/recipes/ing_dk.recipe
> -share/calibre/recipes/inopressa.recipe
> share/calibre/recipes/inquirer_net.png
> share/calibre/recipes/inquirer_net.recipe
> +share/calibre/recipes/insan_okur.png
> share/calibre/recipes/insan_okur.recipe
> -share/calibre/recipes/insider.recipe
> share/calibre/recipes/instapaper.png
> share/calibre/recipes/instapaper.recipe
> +share/calibre/recipes/intelligencer.png
> share/calibre/recipes/intelligencer.recipe
> +share/calibre/recipes/interfax.png
> +share/calibre/recipes/interfax.recipe
> +share/calibre/recipes/interfax_ua.png
> +share/calibre/recipes/interfax_ua.recipe
> +share/calibre/recipes/interfax_uk.png
> +share/calibre/recipes/interfax_uk.recipe
> +share/calibre/recipes/internazionale.png
> +share/calibre/recipes/internazionale.recipe
> share/calibre/recipes/intrefete.png
> share/calibre/recipes/intrefete.recipe
> -share/calibre/recipes/io9.png
> -share/calibre/recipes/io9.recipe
> share/calibre/recipes/iol_za.png
> share/calibre/recipes/iol_za.recipe
> -share/calibre/recipes/ionline_pt.png
> -share/calibre/recipes/ionline_pt.recipe
> share/calibre/recipes/iprofesional.png
> share/calibre/recipes/iprofesional.recipe
> share/calibre/recipes/irish_independent.png
> share/calibre/recipes/irish_independent.recipe
> +share/calibre/recipes/irish_times.png
> share/calibre/recipes/irish_times.recipe
> +share/calibre/recipes/irish_times_free.png
> +share/calibre/recipes/irish_times_free.recipe
> share/calibre/recipes/isar-loisachbote.png
> share/calibre/recipes/isar-loisachbote.recipe
> +share/calibre/recipes/istorias.png
> share/calibre/recipes/istorias.recipe
> -share/calibre/recipes/ivanamilakovic.recipe
> +share/calibre/recipes/istories.png
> +share/calibre/recipes/istories.recipe
> share/calibre/recipes/ixbt.png
> share/calibre/recipes/ixbt.recipe
> share/calibre/recipes/izvestia.png
> share/calibre/recipes/izvestia.recipe
> +share/calibre/recipes/jacobinmag.png
> share/calibre/recipes/jacobinmag.recipe
> -share/calibre/recipes/jagran_josh.recipe
> -share/calibre/recipes/jakarta_globe.recipe
> +share/calibre/recipes/jakarta_post.png
> share/calibre/recipes/jakarta_post.recipe
> -share/calibre/recipes/jalopnik.png
> -share/calibre/recipes/jalopnik.recipe
> -share/calibre/recipes/japaa.recipe
> +share/calibre/recipes/japaa.png
> share/calibre/recipes/japan_news.png
> share/calibre/recipes/japan_news.recipe
> share/calibre/recipes/japan_times.png
> share/calibre/recipes/japan_times.recipe
> +share/calibre/recipes/javalobby.png
> share/calibre/recipes/javalobby.recipe
> -share/calibre/recipes/jb_online.png
> -share/calibre/recipes/jb_online.recipe
> -share/calibre/recipes/jbpress.png
> -share/calibre/recipes/jbpress.recipe
> share/calibre/recipes/jeuxvideo.png
> share/calibre/recipes/jeuxvideo.recipe
> -share/calibre/recipes/jezebel.png
> -share/calibre/recipes/jezebel.recipe
> share/calibre/recipes/jijinews.png
> share/calibre/recipes/jijinews.recipe
> -share/calibre/recipes/joelonsoftware.png
> -share/calibre/recipes/joelonsoftware.recipe
> +share/calibre/recipes/johm.png
> share/calibre/recipes/johm.recipe
> -share/calibre/recipes/joongang.png
> -share/calibre/recipes/joongang.recipe
> share/calibre/recipes/joop.png
> share/calibre/recipes/joop.recipe
> +share/calibre/recipes/jot_down.png
> share/calibre/recipes/jot_down.recipe
> -share/calibre/recipes/journalgazette.png
> -share/calibre/recipes/journalgazette.recipe
> -share/calibre/recipes/journalofaccountancy.png
> -share/calibre/recipes/journalofaccountancy.recipe
> -share/calibre/recipes/jp_dk.png
> -share/calibre/recipes/jp_dk.recipe
> +share/calibre/recipes/journalofa${CC}ountancy.png
> +share/calibre/recipes/journalofa${CC}ountancy.recipe
> share/calibre/recipes/jpost.png
> share/calibre/recipes/jpost.recipe
> -share/calibre/recipes/jpost_fr.png
> -share/calibre/recipes/jpost_fr.recipe
> -share/calibre/recipes/jsonline.png
> -share/calibre/recipes/jsonline.recipe
> -share/calibre/recipes/jurnalulnational.png
> -share/calibre/recipes/jurnalulnational.recipe
> -share/calibre/recipes/jutarnji.png
> -share/calibre/recipes/jutarnji.recipe
> -share/calibre/recipes/juve_la_stampa.recipe
> +share/calibre/recipes/juventudrebelde.png
> share/calibre/recipes/juventudrebelde.recipe
> -share/calibre/recipes/jv_dk.recipe
> -share/calibre/recipes/kahokushinpo.png
> -share/calibre/recipes/kahokushinpo.recipe
> -share/calibre/recipes/kaloeviglokalavisen_dk.png
> -share/calibre/recipes/kaloeviglokalavisen_dk.recipe
> -share/calibre/recipes/kamikaze.png
> -share/calibre/recipes/kamikaze.recipe
> share/calibre/recipes/karlsruhe.png
> share/calibre/recipes/karlsruhe.recipe
> -share/calibre/recipes/karsi_gazete.recipe
> +share/calibre/recipes/kath_net.png
> share/calibre/recipes/kath_net.recipe
> -share/calibre/recipes/kathemerini.png
> -share/calibre/recipes/kathemerini.recipe
> -share/calibre/recipes/kellog_insight.recipe
> -share/calibre/recipes/kerrang.recipe
> -share/calibre/recipes/kgsenghavebladet_dk.recipe
> -share/calibre/recipes/kidney.recipe
> +share/calibre/recipes/kirkusreviews.png
> +share/calibre/recipes/kirkusreviews.recipe
> share/calibre/recipes/kitekinto.png
> share/calibre/recipes/kitekinto.recipe
> -share/calibre/recipes/kitsapun.png
> -share/calibre/recipes/kitsapun.recipe
> +share/calibre/recipes/kleinezeitung.png
> share/calibre/recipes/kleinezeitung.recipe
> -share/calibre/recipes/klubknjige.recipe
> -share/calibre/recipes/km_blog.png
> -share/calibre/recipes/km_blog.recipe
> -share/calibre/recipes/knack_be.recipe
> -share/calibre/recipes/koegelokalavisen_dk.png
> -share/calibre/recipes/koegelokalavisen_dk.recipe
> -share/calibre/recipes/koldinglokalavisen_dk.png
> -share/calibre/recipes/koldinglokalavisen_dk.recipe
> -share/calibre/recipes/komchadluek.recipe
> +share/calibre/recipes/knife_media.png
> +share/calibre/recipes/knife_media.recipe
> share/calibre/recipes/kommersant.png
> share/calibre/recipes/kommersant.recipe
> share/calibre/recipes/kommunalsundhed_dk.recipe
> -share/calibre/recipes/kompas.recipe
> share/calibre/recipes/kompiutierra.png
> share/calibre/recipes/kompiutierra.recipe
> share/calibre/recipes/konflikty_zbrojne.png
> @@ -6245,94 +6279,54 @@ share/calibre/recipes/korea_herald.png
> share/calibre/recipes/korea_herald.recipe
> share/calibre/recipes/kosmonauta_pl.png
> share/calibre/recipes/kosmonauta_pl.recipe
> -share/calibre/recipes/kotaku.png
> -share/calibre/recipes/kotaku.recipe
> -share/calibre/recipes/kp.png
> -share/calibre/recipes/kp.recipe
> share/calibre/recipes/krebs_on_security.png
> share/calibre/recipes/krebs_on_security.recipe
> share/calibre/recipes/kresy_pl.png
> share/calibre/recipes/kresy_pl.recipe
> -share/calibre/recipes/kristeligt_dagblad_dk.png
> -share/calibre/recipes/kristeligt_dagblad_dk.recipe
> -share/calibre/recipes/krstarica_en.png
> -share/calibre/recipes/krstarica_en.recipe
> -share/calibre/recipes/ksiazka_pl.png
> -share/calibre/recipes/ksiazka_pl.recipe
> share/calibre/recipes/kstar.png
> share/calibre/recipes/kstar.recipe
> share/calibre/recipes/kudika.png
> share/calibre/recipes/kudika.recipe
> share/calibre/recipes/kudy_z_nudy.png
> share/calibre/recipes/kudy_z_nudy.recipe
> -share/calibre/recipes/kukuburi.png
> -share/calibre/recipes/kukuburi.recipe
> share/calibre/recipes/kurier.png
> share/calibre/recipes/kurier.recipe
> share/calibre/recipes/kurier_lubelski.png
> share/calibre/recipes/kurier_lubelski.recipe
> -share/calibre/recipes/kurier_poranny.png
> -share/calibre/recipes/kurier_poranny.recipe
> -share/calibre/recipes/kurier_szczecinski.png
> -share/calibre/recipes/kurier_szczecinski.recipe
> +share/calibre/recipes/kyivpost_en.png
> +share/calibre/recipes/kyivpost_en.recipe
> +share/calibre/recipes/kyivpost_ua.png
> +share/calibre/recipes/kyivpost_ua.recipe
> share/calibre/recipes/kyungyhang.recipe
> -share/calibre/recipes/l_espresso.recipe
> -share/calibre/recipes/l_vivs_ghazieta.recipe
> -share/calibre/recipes/la_cuarta.png
> -share/calibre/recipes/la_cuarta.recipe
> -share/calibre/recipes/la_gazetta_del_mezzogiorno.recipe
> -share/calibre/recipes/la_gazzeta_dello_sport.png
> -share/calibre/recipes/la_gazzeta_dello_sport.recipe
> share/calibre/recipes/la_jornada.png
> share/calibre/recipes/la_jornada.recipe
> share/calibre/recipes/la_nacion_cr.png
> share/calibre/recipes/la_nacion_cr.recipe
> share/calibre/recipes/la_nueva.png
> share/calibre/recipes/la_nueva.recipe
> -share/calibre/recipes/la_pausa_caffe.png
> -share/calibre/recipes/la_pausa_caffe.recipe
> -share/calibre/recipes/la_razon_bo.png
> -share/calibre/recipes/la_razon_bo.recipe
> share/calibre/recipes/la_republica.png
> share/calibre/recipes/la_republica.recipe
> -share/calibre/recipes/la_rioja.png
> -share/calibre/recipes/la_rioja.recipe
> -share/calibre/recipes/la_segunda.recipe
> share/calibre/recipes/la_stampa.png
> share/calibre/recipes/la_stampa.recipe
> -share/calibre/recipes/la_tercera.png
> -share/calibre/recipes/la_tercera.recipe
> -share/calibre/recipes/la_tribuna.recipe
> +share/calibre/recipes/la_voce.png
> share/calibre/recipes/la_voce.recipe
> share/calibre/recipes/lalibre_be.png
> share/calibre/recipes/lalibre_be.recipe
> share/calibre/recipes/lamebook.png
> share/calibre/recipes/lamebook.recipe
> -share/calibre/recipes/lameuse_be.recipe
> share/calibre/recipes/lanacion.png
> share/calibre/recipes/lanacion.recipe
> -share/calibre/recipes/lanacion_chile.png
> -share/calibre/recipes/lanacion_chile.recipe
> share/calibre/recipes/lapoliticaonline_ar.png
> share/calibre/recipes/lapoliticaonline_ar.recipe
> share/calibre/recipes/laprensa.png
> share/calibre/recipes/laprensa.recipe
> -share/calibre/recipes/laprensa_hn.png
> -share/calibre/recipes/laprensa_hn.recipe
> -share/calibre/recipes/laprensa_ni.png
> -share/calibre/recipes/laprensa_ni.recipe
> share/calibre/recipes/las_vegas_review.png
> share/calibre/recipes/las_vegas_review.recipe
> share/calibre/recipes/latimes.png
> share/calibre/recipes/latimes.recipe
> -share/calibre/recipes/latribuna.png
> -share/calibre/recipes/latribuna.recipe
> -share/calibre/recipes/lavanguardia.recipe
> -share/calibre/recipes/lavanguardia_corresponsales_es.recipe
> -share/calibre/recipes/lavenir_be.png
> -share/calibre/recipes/lavenir_be.recipe
> +share/calibre/recipes/le_canard_enchaine.recipe
> +share/calibre/recipes/le_gorafi.png
> share/calibre/recipes/le_gorafi.recipe
> -share/calibre/recipes/le_journal.recipe
> share/calibre/recipes/le_monde.png
> share/calibre/recipes/le_monde.recipe
> share/calibre/recipes/le_monde_diplomatique_fr.png
> @@ -6345,158 +6339,127 @@ share/calibre/recipes/le_monde_sub_paper.png
> share/calibre/recipes/le_monde_sub_paper.recipe
> share/calibre/recipes/le_nouvel_observateur.png
> share/calibre/recipes/le_nouvel_observateur.recipe
> +share/calibre/recipes/le_peuple_breton.png
> share/calibre/recipes/le_peuple_breton.recipe
> -share/calibre/recipes/le_temps.png
> -share/calibre/recipes/le_temps.recipe
> share/calibre/recipes/ledevoir.png
> share/calibre/recipes/ledevoir.recipe
> -share/calibre/recipes/leduc.recipe
> share/calibre/recipes/lega_nerd.png
> share/calibre/recipes/lega_nerd.recipe
> share/calibre/recipes/legeartis.png
> share/calibre/recipes/legeartis.recipe
> share/calibre/recipes/leggo_it.png
> share/calibre/recipes/leggo_it.recipe
> -share/calibre/recipes/legitymizm.png
> -share/calibre/recipes/legitymizm.recipe
> -share/calibre/recipes/leipzer_volkszeitung.recipe
> share/calibre/recipes/lemonde_dip.png
> share/calibre/recipes/lemonde_dip.recipe
> +share/calibre/recipes/lenta_ru.png
> share/calibre/recipes/lenta_ru.recipe
> share/calibre/recipes/lepoint.png
> share/calibre/recipes/lepoint.recipe
> -share/calibre/recipes/lequipe.png
> -share/calibre/recipes/lequipe.recipe
> -share/calibre/recipes/les_echos.recipe
> -share/calibre/recipes/lescienze.recipe
> -share/calibre/recipes/lesoir_be.recipe
> -share/calibre/recipes/letsgetcritical.recipe
> -share/calibre/recipes/levante.recipe
> +share/calibre/recipes/lex_fridman_podcast.png
> +share/calibre/recipes/lex_fridman_podcast.recipe
> share/calibre/recipes/lexpress.png
> share/calibre/recipes/lexpress.recipe
> share/calibre/recipes/liberation.png
> share/calibre/recipes/liberation.recipe
> +share/calibre/recipes/liberatorio_politico.png
> share/calibre/recipes/liberatorio_politico.recipe
> -share/calibre/recipes/libero.recipe
> share/calibre/recipes/libertad_digital.png
> share/calibre/recipes/libertad_digital.recipe
> share/calibre/recipes/liberty_times.png
> share/calibre/recipes/liberty_times.recipe
> -share/calibre/recipes/lidovky.png
> -share/calibre/recipes/lidovky.recipe
> share/calibre/recipes/lifehacker.png
> share/calibre/recipes/lifehacker.recipe
> -share/calibre/recipes/lifehacker_pl.png
> -share/calibre/recipes/lifehacker_pl.recipe
> +share/calibre/recipes/liganet_ru.png
> +share/calibre/recipes/liganet_ru.recipe
> +share/calibre/recipes/liganet_ua.png
> +share/calibre/recipes/liganet_ua.recipe
> +share/calibre/recipes/lightspeed_magazine.png
> share/calibre/recipes/lightspeed_magazine.recipe
> +share/calibre/recipes/limba_sarda.png
> share/calibre/recipes/limba_sarda.recipe
> -share/calibre/recipes/limes.png
> -share/calibre/recipes/limes.recipe
> share/calibre/recipes/linux_magazine.png
> share/calibre/recipes/linux_magazine.recipe
> +share/calibre/recipes/linux_news_de.png
> share/calibre/recipes/linux_news_de.recipe
> share/calibre/recipes/linuxportal_pl.png
> share/calibre/recipes/linuxportal_pl.recipe
> share/calibre/recipes/list_apart.png
> share/calibre/recipes/list_apart.recipe
> +share/calibre/recipes/live_law.png
> +share/calibre/recipes/live_law.recipe
> share/calibre/recipes/livemint.png
> share/calibre/recipes/livemint.recipe
> +share/calibre/recipes/livescience.png
> share/calibre/recipes/livescience.recipe
> -share/calibre/recipes/living_stones.recipe
> +share/calibre/recipes/living_stones.png
> share/calibre/recipes/lomza.png
> share/calibre/recipes/lomza.recipe
> -share/calibre/recipes/london_free_press.png
> -share/calibre/recipes/london_free_press.recipe
> -share/calibre/recipes/los_danieles.recipe
> -share/calibre/recipes/los_tiempos_bo.png
> -share/calibre/recipes/los_tiempos_bo.recipe
> -share/calibre/recipes/losservatoreromano_it.recipe
> share/calibre/recipes/lrb.png
> share/calibre/recipes/lrb.recipe
> share/calibre/recipes/lrb_payed.png
> +share/calibre/recipes/ludwig_mises.png
> share/calibre/recipes/ludwig_mises.recipe
> -share/calibre/recipes/luns_a_venres.recipe
> share/calibre/recipes/lupa.png
> share/calibre/recipes/lupa.recipe
> -share/calibre/recipes/lvivs_ks_ghazieta.recipe
> share/calibre/recipes/lwn.png
> share/calibre/recipes/lwn.recipe
> +share/calibre/recipes/lwn_free.png
> share/calibre/recipes/lwn_free.recipe
> share/calibre/recipes/lwn_weekly.png
> share/calibre/recipes/lwn_weekly.recipe
> -share/calibre/recipes/lyngby-taarbaeklokalavisen_dk.png
> -share/calibre/recipes/lyngby-taarbaeklokalavisen_dk.recipe
> -share/calibre/recipes/mac_world.png
> -share/calibre/recipes/mac_world.recipe
> -share/calibre/recipes/mac_world_uk.png
> -share/calibre/recipes/mac_world_uk.recipe
> -share/calibre/recipes/macity.recipe
> -share/calibre/recipes/macleans.png
> -share/calibre/recipes/macleans.recipe
> share/calibre/recipes/macrobusiness.png
> share/calibre/recipes/macrobusiness.recipe
> -share/calibre/recipes/maekyung.png
> -share/calibre/recipes/maekyung.recipe
> +share/calibre/recipes/magyar_nemzet.png
> share/calibre/recipes/magyar_nemzet.recipe
> -share/calibre/recipes/maharashtra_times.recipe
> share/calibre/recipes/mail_and_guardian.png
> share/calibre/recipes/mail_and_guardian.recipe
> share/calibre/recipes/mainichi.png
> share/calibre/recipes/mainichi.recipe
> +share/calibre/recipes/mainichi_en.png
> share/calibre/recipes/mainichi_en.recipe
> share/calibre/recipes/mainichi_science_news.png
> share/calibre/recipes/mainichi_science_news.recipe
> -share/calibre/recipes/malaya_business_insight.recipe
> -share/calibre/recipes/malaysian_mirror.recipe
> +share/calibre/recipes/make_use_of.png
> +share/calibre/recipes/make_use_of.recipe
> +share/calibre/recipes/mallorca_zeitung.png
> share/calibre/recipes/mallorca_zeitung.recipe
> -share/calibre/recipes/mandidner.recipe
> -share/calibre/recipes/manila_standard_today.recipe
> share/calibre/recipes/marca.png
> share/calibre/recipes/marca.recipe
> share/calibre/recipes/marctv.png
> share/calibre/recipes/marctv.recipe
> -share/calibre/recipes/marine_corps_times.recipe
> +share/calibre/recipes/marketing_magazine.png
> share/calibre/recipes/marketing_magazine.recipe
> -share/calibre/recipes/marketing_sensoriale.png
> -share/calibre/recipes/marketing_sensoriale.recipe
> +share/calibre/recipes/martinfowler.recipe
> share/calibre/recipes/maskinbladet_dk.png
> share/calibre/recipes/maskinbladet_dk.recipe
> share/calibre/recipes/mateusz_czytania.png
> share/calibre/recipes/mateusz_czytania.recipe
> -share/calibre/recipes/matichon.recipe
> share/calibre/recipes/max_planck.png
> share/calibre/recipes/max_planck.recipe
> -share/calibre/recipes/mayra.png
> -share/calibre/recipes/mayra.recipe
> +share/calibre/recipes/mdj.png
> share/calibre/recipes/mdj.recipe
> share/calibre/recipes/media2.png
> share/calibre/recipes/media2.recipe
> +share/calibre/recipes/media_zone.png
> share/calibre/recipes/media_zone.recipe
> share/calibre/recipes/mediafax.png
> share/calibre/recipes/mediafax.recipe
> +share/calibre/recipes/mediaindonesia.png
> share/calibre/recipes/mediaindonesia.recipe
> share/calibre/recipes/mediapart.png
> share/calibre/recipes/mediapart.recipe
> -share/calibre/recipes/mediterraneo.recipe
> share/calibre/recipes/medscape.png
> share/calibre/recipes/medscape.recipe
> -share/calibre/recipes/melbourne_herald_sun.png
> -share/calibre/recipes/melbourne_herald_sun.recipe
> -share/calibre/recipes/men24_gr.recipe
> -share/calibre/recipes/mens_day_out.recipe
> -share/calibre/recipes/mens_health.png
> -share/calibre/recipes/mens_health.recipe
> +share/calibre/recipes/meduza.png
> +share/calibre/recipes/meduza.recipe
> +share/calibre/recipes/meduza_ru.png
> +share/calibre/recipes/meduza_ru.recipe
> +share/calibre/recipes/mel.png
> +share/calibre/recipes/mel.recipe
> share/calibre/recipes/merco_press.png
> share/calibre/recipes/merco_press.recipe
> share/calibre/recipes/mesec.png
> share/calibre/recipes/mesec.recipe
> -share/calibre/recipes/metro_montreal.png
> -share/calibre/recipes/metro_montreal.recipe
> -share/calibre/recipes/metro_news_nl.png
> -share/calibre/recipes/metro_news_nl.recipe
> -share/calibre/recipes/metro_uk.png
> -share/calibre/recipes/metro_uk.recipe
> -share/calibre/recipes/metropol_tv.recipe
> share/calibre/recipes/miami_herald.png
> share/calibre/recipes/miami_herald.recipe
> share/calibre/recipes/michalkiewicz.png
> @@ -6505,41 +6468,36 @@ share/calibre/recipes/michellemalkin.png
> share/calibre/recipes/michellemalkin.recipe
> share/calibre/recipes/miesbacher_merkur.png
> share/calibre/recipes/miesbacher_merkur.recipe
> -share/calibre/recipes/military_times.recipe
> +share/calibre/recipes/military_history.png
> +share/calibre/recipes/military_history.recipe
> +share/calibre/recipes/minerva_magazine.png
> +share/calibre/recipes/minerva_magazine.recipe
> +share/calibre/recipes/mit_technology_review.png
> share/calibre/recipes/mit_technology_review.recipe
> -share/calibre/recipes/mlody_technik_pl.png
> -share/calibre/recipes/mlody_technik_pl.recipe
> share/calibre/recipes/mmc_rtv.png
> share/calibre/recipes/mmc_rtv.recipe
> -share/calibre/recipes/mobilenations.recipe
> share/calibre/recipes/modoros.png
> share/calibre/recipes/modoros.recipe
> -share/calibre/recipes/moldovaazi.png
> -share/calibre/recipes/moldovaazi.recipe
> -share/calibre/recipes/monbiot.recipe
> -share/calibre/recipes/mondedurable.recipe
> share/calibre/recipes/monden.png
> share/calibre/recipes/monden.recipe
> -share/calibre/recipes/money_pl.png
> -share/calibre/recipes/money_pl.recipe
> +share/calibre/recipes/moneycontrol.png
> share/calibre/recipes/moneycontrol.recipe
> -share/calibre/recipes/moneyro.png
> -share/calibre/recipes/moneyro.recipe
> share/calibre/recipes/montevideo_com.png
> share/calibre/recipes/montevideo_com.recipe
> +share/calibre/recipes/montreal_gazette.png
> share/calibre/recipes/montreal_gazette.recipe
> -share/calibre/recipes/more_intelligent_life.png
> -share/calibre/recipes/more_intelligent_life.recipe
> share/calibre/recipes/moscow_times.png
> share/calibre/recipes/moscow_times.recipe
> +share/calibre/recipes/moscowtimes_en.png
> +share/calibre/recipes/moscowtimes_en.recipe
> +share/calibre/recipes/moscowtimes_ru.png
> +share/calibre/recipes/moscowtimes_ru.recipe
> share/calibre/recipes/motherjones.png
> share/calibre/recipes/motherjones.recipe
> -share/calibre/recipes/msdnmag_en.png
> -share/calibre/recipes/msdnmag_en.recipe
> +share/calibre/recipes/movie_web.png
> +share/calibre/recipes/movie_web.recipe
> share/calibre/recipes/msnbc.png
> share/calibre/recipes/msnbc.recipe
> -share/calibre/recipes/msnsankei.png
> -share/calibre/recipes/msnsankei.recipe
> share/calibre/recipes/mult_kor.png
> share/calibre/recipes/mult_kor.recipe
> share/calibre/recipes/munchner_merkur_nord.png
> @@ -6552,16 +6510,22 @@ share/calibre/recipes/munchner_merkur_wurmtal.png
> share/calibre/recipes/munchner_merkur_wurmtal.recipe
> share/calibre/recipes/murnauer_tagblatt.png
> share/calibre/recipes/murnauer_tagblatt.recipe
> +share/calibre/recipes/muy_interesante_mexico.png
> +share/calibre/recipes/muy_interesante_mexico.recipe
> +share/calibre/recipes/mwjournal.png
> share/calibre/recipes/mwjournal.recipe
> +share/calibre/recipes/my_dealz_de.png
> share/calibre/recipes/my_dealz_de.recipe
> share/calibre/recipes/myapple_pl.png
> share/calibre/recipes/myapple_pl.recipe
> +share/calibre/recipes/n_kaliningrad.png
> +share/calibre/recipes/n_kaliningrad.recipe
> +share/calibre/recipes/n_plus_one.png
> +share/calibre/recipes/n_plus_one.recipe
> +share/calibre/recipes/nachdenkseiten.png
> share/calibre/recipes/nachdenkseiten.recipe
> share/calibre/recipes/nacional_cro.png
> share/calibre/recipes/nacional_cro.recipe
> -share/calibre/recipes/nacionred.recipe
> -share/calibre/recipes/nadacni_fond_proti_korupci.png
> -share/calibre/recipes/nadacni_fond_proti_korupci.recipe
> share/calibre/recipes/najwyzszy_czas.png
> share/calibre/recipes/najwyzszy_czas.recipe
> share/calibre/recipes/nakedcapitalism.png
> @@ -6574,136 +6538,140 @@ share/calibre/recipes/natemat_pl.png
> share/calibre/recipes/natemat_pl.recipe
> share/calibre/recipes/natgeo.png
> share/calibre/recipes/natgeo.recipe
> -share/calibre/recipes/nation_ke.recipe
> +share/calibre/recipes/natgeo_kids.png
> +share/calibre/recipes/natgeo_kids.recipe
> +share/calibre/recipes/natgeo_traveller.png
> +share/calibre/recipes/natgeo_traveller.recipe
> +share/calibre/recipes/natgeohis.png
> +share/calibre/recipes/natgeohis.recipe
> +share/calibre/recipes/natgeomag.png
> +share/calibre/recipes/natgeomag.recipe
> share/calibre/recipes/national_geographic_es.png
> share/calibre/recipes/national_geographic_es.recipe
> -share/calibre/recipes/national_geographic_it.png
> -share/calibre/recipes/national_geographic_it.recipe
> +share/calibre/recipes/national_post.png
> share/calibre/recipes/national_post.recipe
> -share/calibre/recipes/nationalgeoro.png
> -share/calibre/recipes/nationalgeoro.recipe
> -share/calibre/recipes/nationalreviewonline.png
> -share/calibre/recipes/nationalreviewonline.recipe
> +share/calibre/recipes/nature.png
> share/calibre/recipes/nature.recipe
> -share/calibre/recipes/nauka_w_polsce.png
> -share/calibre/recipes/nauka_w_polsce.recipe
> +share/calibre/recipes/nautilus.png
> share/calibre/recipes/nautilus.recipe
> share/calibre/recipes/navalny.png
> share/calibre/recipes/navalny.recipe
> +share/calibre/recipes/navy_times.png
> share/calibre/recipes/navy_times.recipe
> -share/calibre/recipes/nbonline.recipe
> +share/calibre/recipes/ncrnext.png
> share/calibre/recipes/ncrnext.recipe
> +share/calibre/recipes/nejm.png
> share/calibre/recipes/nejm.recipe
> share/calibre/recipes/neowin.png
> share/calibre/recipes/neowin.recipe
> +share/calibre/recipes/nepszabadsag.png
> share/calibre/recipes/nepszabadsag.recipe
> share/calibre/recipes/netzpolitik.png
> share/calibre/recipes/netzpolitik.recipe
> -share/calibre/recipes/neviditelny_pes.png
> -share/calibre/recipes/neviditelny_pes.recipe
> -share/calibre/recipes/new_london_day.recipe
> share/calibre/recipes/new_scientist.png
> share/calibre/recipes/new_scientist.recipe
> +share/calibre/recipes/new_scientist_mag.png
> +share/calibre/recipes/new_scientist_mag.recipe
> share/calibre/recipes/new_statesman.png
> share/calibre/recipes/new_statesman.recipe
> +share/calibre/recipes/new_york_review_of_books.png
> share/calibre/recipes/new_york_review_of_books.recipe
> +share/calibre/recipes/new_york_review_of_books_no_sub.png
> share/calibre/recipes/new_york_review_of_books_no_sub.recipe
> share/calibre/recipes/new_yorker.png
> share/calibre/recipes/new_yorker.recipe
> +share/calibre/recipes/newrepublicmag.png
> +share/calibre/recipes/newrepublicmag.recipe
> share/calibre/recipes/news24.png
> share/calibre/recipes/news24.recipe
> +share/calibre/recipes/news324.png
> share/calibre/recipes/news324.recipe
> +share/calibre/recipes/news_busters.png
> share/calibre/recipes/news_busters.recipe
> -share/calibre/recipes/news_times.png
> -share/calibre/recipes/news_times.recipe
> -share/calibre/recipes/newsbeast.recipe
> -share/calibre/recipes/newsmoldova.png
> -share/calibre/recipes/newsmoldova.recipe
> -share/calibre/recipes/newsobs.recipe
> +share/calibre/recipes/newslaundry.png
> +share/calibre/recipes/newslaundry.recipe
> +share/calibre/recipes/newsminute.png
> +share/calibre/recipes/newsminute.recipe
> share/calibre/recipes/newsstraitstimes.png
> share/calibre/recipes/newsstraitstimes.recipe
> share/calibre/recipes/newsweek_polska.png
> share/calibre/recipes/newsweek_polska.recipe
> +share/calibre/recipes/newtab.png
> +share/calibre/recipes/newtab.recipe
> +share/calibre/recipes/newtimes.png
> +share/calibre/recipes/newtimes.recipe
> +share/calibre/recipes/newz_dk.png
> share/calibre/recipes/newz_dk.recipe
> share/calibre/recipes/nezavisne_novine.png
> share/calibre/recipes/nezavisne_novine.recipe
> -share/calibre/recipes/ngz.png
> -share/calibre/recipes/ngz.recipe
> +share/calibre/recipes/nhk_news.recipe
> share/calibre/recipes/niebezpiecznik.png
> share/calibre/recipes/niebezpiecznik.recipe
> -share/calibre/recipes/nieuws_be.recipe
> -share/calibre/recipes/nightflier.recipe
> -share/calibre/recipes/nikkei_free.png
> -share/calibre/recipes/nikkei_free.recipe
> +share/calibre/recipes/nikkei_news.png
> share/calibre/recipes/nikkei_news.recipe
> -share/calibre/recipes/nikkei_sub.png
> -share/calibre/recipes/nikkei_sub.recipe
> -share/calibre/recipes/nin.recipe
> -share/calibre/recipes/njp.png
> -share/calibre/recipes/njp.recipe
> +share/calibre/recipes/nikkeiasia.png
> +share/calibre/recipes/nikkeiasia.recipe
> share/calibre/recipes/njuz_net.png
> share/calibre/recipes/njuz_net.recipe
> share/calibre/recipes/nme.png
> share/calibre/recipes/nme.recipe
> -share/calibre/recipes/noaa.png
> -share/calibre/recipes/noaa.recipe
> -share/calibre/recipes/noerrebronordvestbladet_dk.recipe
> +share/calibre/recipes/nol.png
> share/calibre/recipes/nol.recipe
> -share/calibre/recipes/non_leggerlo.recipe
> -share/calibre/recipes/norddjurslokalavisen_dk.png
> -share/calibre/recipes/norddjurslokalavisen_dk.recipe
> share/calibre/recipes/nordjyske_dk.png
> share/calibre/recipes/nordjyske_dk.recipe
> -share/calibre/recipes/nortecastilla.png
> -share/calibre/recipes/nortecastilla.recipe
> -share/calibre/recipes/nos_nl.recipe
> share/calibre/recipes/novaya_gazeta.png
> share/calibre/recipes/novaya_gazeta.recipe
> -share/calibre/recipes/novilist_novine_hr.png
> +share/calibre/recipes/novaya_gazeta_europe.png
> +share/calibre/recipes/novaya_gazeta_europe.recipe
> +share/calibre/recipes/novaya_gazeta_europe_en.png
> +share/calibre/recipes/novaya_gazeta_europe_en.recipe
> share/calibre/recipes/novilist_novine_hr.recipe
> share/calibre/recipes/novilist_portal_hr.png
> -share/calibre/recipes/novilist_portal_hr.recipe
> share/calibre/recipes/novinite.png
> share/calibre/recipes/novinite.recipe
> share/calibre/recipes/novinite_bg.png
> share/calibre/recipes/novinite_bg.recipe
> +share/calibre/recipes/novinky.cz.png
> share/calibre/recipes/novinky.cz.recipe
> +share/calibre/recipes/novinky.png
> share/calibre/recipes/novinky.recipe
> share/calibre/recipes/novosti.png
> share/calibre/recipes/novosti.recipe
> -share/calibre/recipes/nowiny_rybnik.png
> -share/calibre/recipes/nowiny_rybnik.recipe
> share/calibre/recipes/nowy_obywatel.png
> share/calibre/recipes/nowy_obywatel.recipe
> -share/calibre/recipes/noz.png
> -share/calibre/recipes/noz.recipe
> share/calibre/recipes/npr.png
> share/calibre/recipes/npr.recipe
> -share/calibre/recipes/npr_music_blogs.png
> -share/calibre/recipes/npr_music_blogs.recipe
> +share/calibre/recipes/nrc-nl-epub.png
> share/calibre/recipes/nrc-nl-epub.recipe
> share/calibre/recipes/nrc.nl.png
> share/calibre/recipes/nrc.nl.recipe
> -share/calibre/recipes/nrc_handelsblad.recipe
> share/calibre/recipes/nrc_next.png
> share/calibre/recipes/nrc_next.recipe
> -share/calibre/recipes/nsfw_corp.png
> -share/calibre/recipes/nsfw_corp.recipe
> share/calibre/recipes/nspm.png
> share/calibre/recipes/nspm.recipe
> share/calibre/recipes/nspm_int.png
> share/calibre/recipes/nspm_int.recipe
> -share/calibre/recipes/ntv_spor.recipe
> -share/calibre/recipes/ntv_tr.recipe
> share/calibre/recipes/nu.png
> share/calibre/recipes/nu.recipe
> -share/calibre/recipes/nursingtimes.png
> -share/calibre/recipes/nursingtimes.recipe
> +share/calibre/recipes/nv_en.png
> +share/calibre/recipes/nv_en.recipe
> +share/calibre/recipes/nv_ru.png
> +share/calibre/recipes/nv_ru.recipe
> +share/calibre/recipes/nv_ua.png
> +share/calibre/recipes/nv_ua.recipe
> +share/calibre/recipes/nymag.png
> share/calibre/recipes/nymag.recipe
> share/calibre/recipes/nypost.png
> share/calibre/recipes/nypost.recipe
> +share/calibre/recipes/nyt_magazine.png
> +share/calibre/recipes/nyt_magazine.recipe
> +share/calibre/recipes/nyt_tmag.png
> +share/calibre/recipes/nyt_tmag.recipe
> +share/calibre/recipes/nytfeeds.png
> +share/calibre/recipes/nytfeeds.recipe
> share/calibre/recipes/nytimes.png
> share/calibre/recipes/nytimes.recipe
> +share/calibre/recipes/nytimes_cooking.png
> share/calibre/recipes/nytimes_cooking.recipe
> share/calibre/recipes/nytimes_sports.png
> share/calibre/recipes/nytimes_sports.recipe
> @@ -6711,291 +6679,234 @@ share/calibre/recipes/nytimes_sub.png
> share/calibre/recipes/nytimes_sub.recipe
> share/calibre/recipes/nytimes_tech.png
> share/calibre/recipes/nytimes_tech.recipe
> +share/calibre/recipes/nytimesbook.png
> share/calibre/recipes/nytimesbook.recipe
> share/calibre/recipes/nzherald.png
> share/calibre/recipes/nzherald.recipe
> -share/calibre/recipes/nzz_folio.recipe
> share/calibre/recipes/nzz_ger.png
> share/calibre/recipes/nzz_ger.recipe
> -share/calibre/recipes/o_globo.png
> -share/calibre/recipes/o_globo.recipe
> share/calibre/recipes/oakland_north.recipe
> +share/calibre/recipes/oba.png
> share/calibre/recipes/oba.recipe
> -share/calibre/recipes/observa_digital.recipe
> share/calibre/recipes/observatorul_cultural.png
> share/calibre/recipes/observatorul_cultural.recipe
> -share/calibre/recipes/observer.png
> -share/calibre/recipes/observer.recipe
> share/calibre/recipes/observer_gb.png
> share/calibre/recipes/observer_gb.recipe
> share/calibre/recipes/oc_register.png
> share/calibre/recipes/oc_register.recipe
> -share/calibre/recipes/odenselokalavisen_dk.png
> -share/calibre/recipes/odenselokalavisen_dk.recipe
> -share/calibre/recipes/oesterbroavis_dk.recipe
> -share/calibre/recipes/office_space.png
> -share/calibre/recipes/office_space.recipe
> share/calibre/recipes/oilprice.png
> share/calibre/recipes/oilprice.recipe
> +share/calibre/recipes/old_games.png
> +share/calibre/recipes/old_games.recipe
> share/calibre/recipes/oldnewthing.png
> share/calibre/recipes/oldnewthing.recipe
> share/calibre/recipes/omgubuntu.png
> share/calibre/recipes/omgubuntu.recipe
> +share/calibre/recipes/onda_rock.png
> share/calibre/recipes/onda_rock.recipe
> share/calibre/recipes/onemagazine.png
> share/calibre/recipes/onemagazine.recipe
> -share/calibre/recipes/onionavclub.recipe
> +share/calibre/recipes/open_magazine.png
> share/calibre/recipes/open_magazine.recipe
> +share/calibre/recipes/opennet.png
> +share/calibre/recipes/opennet.recipe
> +share/calibre/recipes/opindia.png
> share/calibre/recipes/opindia.recipe
> -share/calibre/recipes/opinion_bo.recipe
> share/calibre/recipes/optyczne_pl.png
> share/calibre/recipes/optyczne_pl.recipe
> -share/calibre/recipes/oregonian.recipe
> -share/calibre/recipes/oreilly_premium.recipe
> -share/calibre/recipes/oriental_daily.png
> -share/calibre/recipes/oriental_daily.recipe
> -share/calibre/recipes/origo_hu.png
> -share/calibre/recipes/origo_hu.recipe
> -share/calibre/recipes/orlando_sentinel.png
> -share/calibre/recipes/orlando_sentinel.recipe
> -share/calibre/recipes/orsai.png
> -share/calibre/recipes/orsai.recipe
> -share/calibre/recipes/osel_cz.png
> -share/calibre/recipes/osel_cz.recipe
> +share/calibre/recipes/orfonline.png
> +share/calibre/recipes/orfonline.recipe
> +share/calibre/recipes/orient_21.recipe
> +share/calibre/recipes/osvitaua.png
> +share/calibre/recipes/osvitaua.recipe
> +share/calibre/recipes/osvitaua_ru.png
> +share/calibre/recipes/osvitaua_ru.recipe
> share/calibre/recipes/osw.png
> share/calibre/recipes/osw.recipe
> +share/calibre/recipes/ottawa_citizen.png
> share/calibre/recipes/ottawa_citizen.recipe
> share/calibre/recipes/ourdailybread.png
> share/calibre/recipes/ourdailybread.recipe
> +share/calibre/recipes/outlook_business_magazine.png
> share/calibre/recipes/outlook_business_magazine.recipe
> +share/calibre/recipes/outlook_india.png
> share/calibre/recipes/outlook_india.recipe
> share/calibre/recipes/oxford_mail.png
> share/calibre/recipes/oxford_mail.recipe
> +share/calibre/recipes/padreydecano.png
> share/calibre/recipes/padreydecano.recipe
> share/calibre/recipes/pagina12.png
> share/calibre/recipes/pagina12.recipe
> +share/calibre/recipes/pagina_12_print_ed.png
> share/calibre/recipes/pagina_12_print_ed.recipe
> share/calibre/recipes/pajama.png
> share/calibre/recipes/pajama.recipe
> share/calibre/recipes/pambianco.png
> share/calibre/recipes/pambianco.recipe
> -share/calibre/recipes/pandodaily.png
> -share/calibre/recipes/pandodaily.recipe
> -share/calibre/recipes/panorama.recipe
> -share/calibre/recipes/paperli_topic.recipe
> +share/calibre/recipes/paperpaper.png
> +share/calibre/recipes/paperpaper.recipe
> +share/calibre/recipes/parisreview.png
> share/calibre/recipes/parisreview.recipe
> share/calibre/recipes/parlamentni_listy.png
> share/calibre/recipes/parlamentni_listy.recipe
> -share/calibre/recipes/patente_de_corso.png
> -share/calibre/recipes/patente_de_corso.recipe
> +share/calibre/recipes/parool.png
> +share/calibre/recipes/parool.recipe
> share/calibre/recipes/pc_advisor.png
> share/calibre/recipes/pc_advisor.recipe
> share/calibre/recipes/pc_foster.png
> share/calibre/recipes/pc_foster.recipe
> -share/calibre/recipes/pc_lab.png
> -share/calibre/recipes/pc_lab.recipe
> -share/calibre/recipes/pc_mag.png
> share/calibre/recipes/pc_world.png
> share/calibre/recipes/pc_world.recipe
> share/calibre/recipes/pcworld_hu.png
> share/calibre/recipes/pcworld_hu.recipe
> -share/calibre/recipes/pcworldro.png
> -share/calibre/recipes/pcworldro.recipe
> share/calibre/recipes/pecat.png
> share/calibre/recipes/pecat.recipe
> -share/calibre/recipes/penguin_news.recipe
> share/calibre/recipes/penzberger_merkur.png
> share/calibre/recipes/penzberger_merkur.recipe
> share/calibre/recipes/people_daily.png
> share/calibre/recipes/people_daily.recipe
> -share/calibre/recipes/people_us_mashup.png
> -share/calibre/recipes/people_us_mashup.recipe
> -share/calibre/recipes/periodismo_humano_es.png
> -share/calibre/recipes/periodismo_humano_es.recipe
> share/calibre/recipes/pescanik.png
> share/calibre/recipes/pescanik.recipe
> -share/calibre/recipes/peterschiff.png
> -share/calibre/recipes/peterschiff.recipe
> -share/calibre/recipes/phd_comics.recipe
> -share/calibre/recipes/philippino_star_ngayon.recipe
> +share/calibre/recipes/phillosophy_now.png
> share/calibre/recipes/phillosophy_now.recipe
> -share/calibre/recipes/philly.png
> -share/calibre/recipes/philly.recipe
> share/calibre/recipes/phoronix.png
> share/calibre/recipes/phoronix.recipe
> share/calibre/recipes/phys_org.png
> share/calibre/recipes/phys_org.recipe
> -share/calibre/recipes/physics_today.png
> -share/calibre/recipes/physics_today.recipe
> -share/calibre/recipes/physics_world.png
> -share/calibre/recipes/physics_world.recipe
> -share/calibre/recipes/pilot.recipe
> -share/calibre/recipes/piratska_strana.recipe
> -share/calibre/recipes/piratske_noviny.recipe
> share/calibre/recipes/planet_kde.png
> share/calibre/recipes/planet_kde.recipe
> share/calibre/recipes/planet_python.recipe
> -share/calibre/recipes/plus_info.recipe
> -share/calibre/recipes/pnn.png
> -share/calibre/recipes/pnn.recipe
> -share/calibre/recipes/pobjeda.png
> -share/calibre/recipes/pobjeda.recipe
> -share/calibre/recipes/poche.recipe
> +share/calibre/recipes/pocket_lint.png
> +share/calibre/recipes/pocket_lint.recipe
> share/calibre/recipes/podnikatel.png
> share/calibre/recipes/podnikatel.recipe
> +share/calibre/recipes/poligon.png
> +share/calibre/recipes/poligon.recipe
> +share/calibre/recipes/poliitico_eu.recipe
> share/calibre/recipes/politico.png
> share/calibre/recipes/politico.recipe
> -share/calibre/recipes/politifact.recipe
> -share/calibre/recipes/politika.png
> -share/calibre/recipes/politika.recipe
> +share/calibre/recipes/politico_eu.png
> share/calibre/recipes/politiken_dk.png
> share/calibre/recipes/politiken_dk.recipe
> share/calibre/recipes/politiko_dk.png
> share/calibre/recipes/politiko_dk.recipe
> -share/calibre/recipes/polityka.png
> -share/calibre/recipes/polityka.recipe
> share/calibre/recipes/polizeipress_de.png
> share/calibre/recipes/polizeipress_de.recipe
> share/calibre/recipes/polter_pl.png
> share/calibre/recipes/polter_pl.recipe
> share/calibre/recipes/popscience.png
> share/calibre/recipes/popscience.recipe
> +share/calibre/recipes/portafolio.png
> share/calibre/recipes/portafolio.recipe
> -share/calibre/recipes/portfolio.png
> -share/calibre/recipes/portfolio.recipe
> -share/calibre/recipes/portfolio_hu.recipe
> -share/calibre/recipes/portfolio_hu_hu.png
> -share/calibre/recipes/portfolio_hu_hu.recipe
> -share/calibre/recipes/post_today.png
> -share/calibre/recipes/post_today.recipe
> -share/calibre/recipes/poughkeepsie_journal.recipe
> share/calibre/recipes/ppe_pl.png
> share/calibre/recipes/ppe_pl.recipe
> -share/calibre/recipes/praguemonitor.png
> -share/calibre/recipes/praguemonitor.recipe
> +share/calibre/recipes/pragyata.png
> share/calibre/recipes/pragyata.recipe
> +share/calibre/recipes/pravda.png
> share/calibre/recipes/pravda.recipe
> -share/calibre/recipes/pravda_it.png
> -share/calibre/recipes/pravda_it.recipe
> share/calibre/recipes/pravda_por.png
> share/calibre/recipes/pravda_por.recipe
> -share/calibre/recipes/pravda_rs.png
> -share/calibre/recipes/pravda_rs.recipe
> share/calibre/recipes/pravda_ru.png
> share/calibre/recipes/pravda_ru.recipe
> -share/calibre/recipes/pravo.recipe
> +share/calibre/recipes/pravda_uk.png
> +share/calibre/recipes/pravda_uk.recipe
> +share/calibre/recipes/pravda_ukraine.png
> +share/calibre/recipes/pravda_ukraine.recipe
> +share/calibre/recipes/pravda_ukraine_ru.png
> +share/calibre/recipes/pravda_ukraine_ru.recipe
> +share/calibre/recipes/prekshaa.png
> share/calibre/recipes/prekshaa.recipe
> +share/calibre/recipes/press_information_bureau.png
> +share/calibre/recipes/press_information_bureau.recipe
> share/calibre/recipes/presse_portal.png
> share/calibre/recipes/presse_portal.recipe
> -share/calibre/recipes/pressonline.png
> -share/calibre/recipes/pressonline.recipe
> -share/calibre/recipes/pressthink.png
> -share/calibre/recipes/pressthink.recipe
> share/calibre/recipes/private_eye.png
> share/calibre/recipes/private_eye.recipe
> -share/calibre/recipes/pro_linux_de.png
> -share/calibre/recipes/pro_linux_de.recipe
> +share/calibre/recipes/pro_physik.png
> share/calibre/recipes/pro_physik.recipe
> -share/calibre/recipes/projo.recipe
> -share/calibre/recipes/promotor.png
> -share/calibre/recipes/promotor.recipe
> +share/calibre/recipes/project.png
> +share/calibre/recipes/project.recipe
> +share/calibre/recipes/project_syndicate.png
> +share/calibre/recipes/project_syndicate.recipe
> share/calibre/recipes/propublica.png
> share/calibre/recipes/propublica.recipe
> -share/calibre/recipes/prospectmaguk.recipe
> -share/calibre/recipes/prosport.png
> -share/calibre/recipes/prosport.recipe
> -share/calibre/recipes/prostamerika.png
> -share/calibre/recipes/prostamerika.recipe
> +share/calibre/recipes/prosleduet.png
> +share/calibre/recipes/prosleduet.recipe
> +share/calibre/recipes/prospectmaguk.png
> +share/calibre/recipes/prospectmaguk_free.png
> +share/calibre/recipes/prospectmaguk_free.recipe
> +share/calibre/recipes/protagon.png
> share/calibre/recipes/protagon.recipe
> -share/calibre/recipes/protvmagazin.png
> -share/calibre/recipes/protvmagazin.recipe
> +share/calibre/recipes/psych.png
> share/calibre/recipes/psych.recipe
> -share/calibre/recipes/psychologies.png
> -share/calibre/recipes/psychologies.recipe
> -share/calibre/recipes/pubblico_giornale.recipe
> +share/calibre/recipes/publicdomainreview_org.png
> share/calibre/recipes/publicdomainreview_org.recipe
> share/calibre/recipes/publico.recipe
> -share/calibre/recipes/publika.png
> -share/calibre/recipes/publika.recipe
> share/calibre/recipes/punto_informatico.png
> share/calibre/recipes/punto_informatico.recipe
> share/calibre/recipes/pure_pc.png
> share/calibre/recipes/pure_pc.recipe
> -share/calibre/recipes/pvp_online.png
> -share/calibre/recipes/pvp_online.recipe
> +share/calibre/recipes/quanta_magazine.png
> share/calibre/recipes/quanta_magazine.recipe
> +share/calibre/recipes/queleer.png
> share/calibre/recipes/queleer.recipe
> share/calibre/recipes/queueacmorg.png
> share/calibre/recipes/queueacmorg.recipe
> -share/calibre/recipes/quotidiano.png
> -share/calibre/recipes/quotidiano.recipe
> -share/calibre/recipes/rabble_ca.recipe
> -share/calibre/recipes/radikal_tr.png
> -share/calibre/recipes/radikal_tr.recipe
> +share/calibre/recipes/radio_canada.recipe
> +share/calibre/recipes/radio_prague.png
> share/calibre/recipes/radio_prague.recipe
> -share/calibre/recipes/radio_praha.recipe
> -share/calibre/recipes/randerslokalavisen_dk.png
> -share/calibre/recipes/randerslokalavisen_dk.recipe
> +share/calibre/recipes/radiosvoboda_ua.png
> +share/calibre/recipes/radiosvoboda_ua.recipe
> share/calibre/recipes/rbc_ru.png
> share/calibre/recipes/rbc_ru.recipe
> +share/calibre/recipes/rbcua_ru.png
> +share/calibre/recipes/rbcua_ru.recipe
> +share/calibre/recipes/rbcua_ua.png
> +share/calibre/recipes/rbcua_ua.recipe
> share/calibre/recipes/rds.png
> share/calibre/recipes/rds.recipe
> +share/calibre/recipes/readers_digest.png
> share/calibre/recipes/readers_digest.recipe
> +share/calibre/recipes/readersdigest_thehealthy.png
> share/calibre/recipes/readersdigest_thehealthy.recipe
> share/calibre/recipes/readitlater.png
> share/calibre/recipes/readitlater.recipe
> +share/calibre/recipes/real_clear.png
> share/calibre/recipes/real_clear.recipe
> share/calibre/recipes/real_world_economics_review.png
> share/calibre/recipes/real_world_economics_review.recipe
> -share/calibre/recipes/realitatea.png
> -share/calibre/recipes/realitatea.recipe
> +share/calibre/recipes/reason_magazine.png
> share/calibre/recipes/reason_magazine.recipe
> -share/calibre/recipes/rebelion.png
> -share/calibre/recipes/rebelion.recipe
> -share/calibre/recipes/red_aragon.png
> -share/calibre/recipes/red_aragon.recipe
> +share/calibre/recipes/red_voltaire.png
> share/calibre/recipes/red_voltaire.recipe
> +share/calibre/recipes/reflex_cz.png
> +share/calibre/recipes/reflex_cz.recipe
> +share/calibre/recipes/regina_leader_post.png
> share/calibre/recipes/regina_leader_post.recipe
> -share/calibre/recipes/replicavedetelor.png
> -share/calibre/recipes/replicavedetelor.recipe
> -share/calibre/recipes/republica.recipe
> -share/calibre/recipes/republika.recipe
> +share/calibre/recipes/respekt_magazine.png
> share/calibre/recipes/respekt_magazine.recipe
> +share/calibre/recipes/reuters.png
> share/calibre/recipes/reuters.recipe
> -share/calibre/recipes/reuters_ja.png
> -share/calibre/recipes/reuters_ja.recipe
> -share/calibre/recipes/revista_bla.png
> -share/calibre/recipes/revista_bla.recipe
> -share/calibre/recipes/revista_cromos.recipe
> +share/calibre/recipes/revista22.png
> +share/calibre/recipes/revista22.recipe
> +share/calibre/recipes/revista_muy.png
> share/calibre/recipes/revista_muy.recipe
> -share/calibre/recipes/revista_piaui.recipe
> -share/calibre/recipes/revista_semana.recipe
> -share/calibre/recipes/revista_summa.recipe
> share/calibre/recipes/revista_veintitres.png
> share/calibre/recipes/revista_veintitres.recipe
> -share/calibre/recipes/rga.recipe
> -share/calibre/recipes/rheinische_post.png
> -share/calibre/recipes/rheinische_post.recipe
> share/calibre/recipes/ria_ru.png
> share/calibre/recipes/ria_ru.recipe
> -share/calibre/recipes/rian_eng.recipe
> -share/calibre/recipes/rian_spa.recipe
> share/calibre/recipes/rmf24_ESKN.png
> share/calibre/recipes/rmf24_ESKN.recipe
> share/calibre/recipes/rmf24_fakty.png
> share/calibre/recipes/rmf24_fakty.recipe
> share/calibre/recipes/rmf24_opinie.png
> share/calibre/recipes/rmf24_opinie.recipe
> -share/calibre/recipes/roger_ebert.recipe
> -share/calibre/recipes/roger_ebert_blog.recipe
> -share/calibre/recipes/rollingstone.png
> -share/calibre/recipes/rollingstone.recipe
> -share/calibre/recipes/romanialibera.png
> -share/calibre/recipes/romanialibera.recipe
> +share/calibre/recipes/rnd.recipe
> share/calibre/recipes/root.png
> share/calibre/recipes/root.recipe
> -share/calibre/recipes/roskildelokalavisen_dk.png
> -share/calibre/recipes/roskildelokalavisen_dk.recipe
> +share/calibre/recipes/rosbalt.png
> +share/calibre/recipes/rosbalt.recipe
> +share/calibre/recipes/rt.png
> share/calibre/recipes/rt.recipe
> share/calibre/recipes/rte.png
> share/calibre/recipes/rte.recipe
> @@ -7003,136 +6914,112 @@ share/calibre/recipes/rtnews.png
> share/calibre/recipes/rtnews.recipe
> share/calibre/recipes/rts.png
> share/calibre/recipes/rts.recipe
> -share/calibre/recipes/rubikon_de.recipe
> -share/calibre/recipes/rudersdallokalavisen_dk.png
> -share/calibre/recipes/rudersdallokalavisen_dk.recipe
> -share/calibre/recipes/rue89.png
> -share/calibre/recipes/rue89.recipe
> share/calibre/recipes/rushisaband.png
> share/calibre/recipes/rushisaband.recipe
> -share/calibre/recipes/rusiahoy.png
> -share/calibre/recipes/rusiahoy.recipe
> share/calibre/recipes/russiafeed.png
> share/calibre/recipes/russiafeed.recipe
> -share/calibre/recipes/rynek_infrastruktury.png
> -share/calibre/recipes/rynek_infrastruktury.recipe
> -share/calibre/recipes/rynek_zdrowia.png
> -share/calibre/recipes/rynek_zdrowia.recipe
> share/calibre/recipes/rzeczpospolita.png
> share/calibre/recipes/rzeczpospolita.recipe
> -share/calibre/recipes/sa_gazeta.recipe
> share/calibre/recipes/sabah.png
> share/calibre/recipes/sabah.recipe
> -share/calibre/recipes/sabit_fikir.recipe
> +share/calibre/recipes/saechsische.png
> share/calibre/recipes/saechsische.recipe
> -share/calibre/recipes/sage_news.png
> -share/calibre/recipes/sage_news.recipe
> -share/calibre/recipes/sage_news_opinion.recipe
> share/calibre/recipes/salon.png
> share/calibre/recipes/salon.recipe
> -share/calibre/recipes/salonica_press_news.recipe
> -share/calibre/recipes/samanyolu_haber.png
> -share/calibre/recipes/samanyolu_haber.recipe
> -share/calibre/recipes/samanyolu_teknoloji.recipe
> +share/calibre/recipes/salzburger_nachrichten.recipe
> share/calibre/recipes/san_fran_chronicle.png
> share/calibre/recipes/san_fran_chronicle.recipe
> share/calibre/recipes/sanjosemercurynews.png
> share/calibre/recipes/sanjosemercurynews.recipe
> -share/calibre/recipes/sarajevo_x.png
> -share/calibre/recipes/sarajevo_x.recipe
> -share/calibre/recipes/sardinia_post.recipe
> +share/calibre/recipes/saskatoon_star_phoenix.png
> share/calibre/recipes/saskatoon_star_phoenix.recipe
> -share/calibre/recipes/satira.png
> -share/calibre/recipes/satira.recipe
> share/calibre/recipes/satkurier.png
> share/calibre/recipes/satkurier.recipe
> +share/calibre/recipes/satmagazine.png
> share/calibre/recipes/satmagazine.recipe
> -share/calibre/recipes/sb_nation.png
> -share/calibre/recipes/sb_nation.recipe
> -share/calibre/recipes/schattenblick.png
> -share/calibre/recipes/schattenblick.recipe
> share/calibre/recipes/schongauer_nachrichten.png
> share/calibre/recipes/schongauer_nachrichten.recipe
> -share/calibre/recipes/schwarzerpfeil.recipe
> +share/calibre/recipes/science_advances.png
> share/calibre/recipes/science_advances.recipe
> share/calibre/recipes/science_based_medicine.png
> share/calibre/recipes/science_based_medicine.recipe
> +share/calibre/recipes/science_journal.png
> +share/calibre/recipes/science_journal.recipe
> +share/calibre/recipes/science_news.png
> share/calibre/recipes/science_news.recipe
> -share/calibre/recipes/science_news_recent_issues.png
> -share/calibre/recipes/sciencedaily.png
> -share/calibre/recipes/sciencedaily.recipe
> +share/calibre/recipes/science_x.png
> +share/calibre/recipes/science_x.recipe
> +share/calibre/recipes/scientific_american.png
> share/calibre/recipes/scientific_american.recipe
> +share/calibre/recipes/sciimmunol.png
> +share/calibre/recipes/sciimmunol.recipe
> share/calibre/recipes/scinexx.png
> share/calibre/recipes/scinexx.recipe
> +share/calibre/recipes/scirobotics.png
> +share/calibre/recipes/scirobotics.recipe
> +share/calibre/recipes/scisignaling.png
> +share/calibre/recipes/scisignaling.recipe
> +share/calibre/recipes/scistm.png
> +share/calibre/recipes/scistm.recipe
> share/calibre/recipes/scmp.png
> share/calibre/recipes/scmp.recipe
> share/calibre/recipes/scott_hanselman.png
> share/calibre/recipes/scott_hanselman.recipe
> +share/calibre/recipes/scprint.png
> share/calibre/recipes/scprint.recipe
> -share/calibre/recipes/seanhannity.recipe
> +share/calibre/recipes/screen_rant.png
> +share/calibre/recipes/screen_rant.recipe
> +share/calibre/recipes/scroll.png
> +share/calibre/recipes/scroll.recipe
> share/calibre/recipes/seattle_times.png
> share/calibre/recipes/seattle_times.recipe
> -share/calibre/recipes/security_watch.png
> -share/calibre/recipes/security_watch.recipe
> share/calibre/recipes/sekurak_pl.png
> share/calibre/recipes/sekurak_pl.recipe
> +share/calibre/recipes/seminar_magazine.png
> share/calibre/recipes/seminar_magazine.recipe
> -share/calibre/recipes/serverside.recipe
> +share/calibre/recipes/sfbg.png
> share/calibre/recipes/sfbg.recipe
> share/calibre/recipes/sfin.png
> share/calibre/recipes/sfin.recipe
> -share/calibre/recipes/sg_hu.png
> -share/calibre/recipes/sg_hu.recipe
> -share/calibre/recipes/shacknews.recipe
> -share/calibre/recipes/shortlist.recipe
> -share/calibre/recipes/sigma_live.recipe
> share/calibre/recipes/sign_of_the_times.png
> share/calibre/recipes/sign_of_the_times.recipe
> -share/calibre/recipes/sign_on_sd.recipe
> -share/calibre/recipes/silicon_republic.png
> -share/calibre/recipes/silicon_republic.recipe
> -share/calibre/recipes/singtao_daily.recipe
> +share/calibre/recipes/simple_flying.png
> +share/calibre/recipes/simple_flying.recipe
> +share/calibre/recipes/singtaohk.png
> share/calibre/recipes/singtaohk.recipe
> -share/calibre/recipes/siol.png
> -share/calibre/recipes/siol.recipe
> -share/calibre/recipes/sisainlive.recipe
> -share/calibre/recipes/sizinti_derigisi.recipe
> share/calibre/recipes/skai.png
> share/calibre/recipes/skai.recipe
> -share/calibre/recipes/skanderborglokalavisen_dk.png
> -share/calibre/recipes/skanderborglokalavisen_dk.recipe
> +share/calibre/recipes/skeptic.png
> share/calibre/recipes/skeptic.recipe
> +share/calibre/recipes/skeptical_enquirer.png
> share/calibre/recipes/skeptical_enquirer.recipe
> -share/calibre/recipes/skylife.png
> -share/calibre/recipes/skylife.recipe
> share/calibre/recipes/slashdot.png
> share/calibre/recipes/slashdot.recipe
> +share/calibre/recipes/slate.png
> share/calibre/recipes/slate.recipe
> -share/calibre/recipes/slate_star_codex.recipe
> -share/calibre/recipes/slovo.recipe
> share/calibre/recipes/smashing.png
> share/calibre/recipes/smashing.recipe
> -share/calibre/recipes/sme.recipe
> share/calibre/recipes/smh.png
> share/calibre/recipes/smh.recipe
> -share/calibre/recipes/smilezilla.recipe
> +share/calibre/recipes/smith.png
> share/calibre/recipes/smith.recipe
> -share/calibre/recipes/sn_dk.recipe
> -share/calibre/recipes/snopes.recipe
> -share/calibre/recipes/socialdiva.png
> -share/calibre/recipes/socialdiva.recipe
> -share/calibre/recipes/soenderborglokalavisen_dk.png
> -share/calibre/recipes/soenderborglokalavisen_dk.recipe
> +share/calibre/recipes/snob.png
> +share/calibre/recipes/snob.recipe
> +share/calibre/recipes/sobaka.png
> +share/calibre/recipes/sobaka.recipe
> +share/calibre/recipes/sobesednik.png
> +share/calibre/recipes/sobesednik.recipe
> +share/calibre/recipes/sol_haber.png
> share/calibre/recipes/sol_haber.recipe
> -share/calibre/recipes/soldiers.png
> -share/calibre/recipes/soldiers.recipe
> -share/calibre/recipes/something_awful.png
> -share/calibre/recipes/something_awful.recipe
> -share/calibre/recipes/sondagsavisen_dk.png
> -share/calibre/recipes/sondagsavisen_dk.recipe
> -share/calibre/recipes/southernstar.recipe
> +share/calibre/recipes/sonar21.png
> +share/calibre/recipes/sonar21.recipe
> +share/calibre/recipes/sotavision.png
> +share/calibre/recipes/sotavision.recipe
> +share/calibre/recipes/sova.png
> +share/calibre/recipes/sova.recipe
> share/calibre/recipes/spectator-au.png
> share/calibre/recipes/spectator-au.recipe
> +share/calibre/recipes/spectator_magazine.png
> share/calibre/recipes/spectator_magazine.recipe
> share/calibre/recipes/spektrum.png
> share/calibre/recipes/spektrum.recipe
> @@ -7140,59 +7027,55 @@ share/calibre/recipes/spiegel_int.png
> share/calibre/recipes/spiegel_int.recipe
> share/calibre/recipes/spiegelde.png
> share/calibre/recipes/spiegelde.recipe
> -share/calibre/recipes/spin_magazine.recipe
> -share/calibre/recipes/sportowefakty.png
> -share/calibre/recipes/sportowefakty.recipe
> +share/calibre/recipes/sports_illustrated.png
> share/calibre/recipes/sports_illustrated.recipe
> +share/calibre/recipes/sportstar.png
> share/calibre/recipes/sportstar.recipe
> -share/calibre/recipes/sporza_be.recipe
> +share/calibre/recipes/sputnik.png
> +share/calibre/recipes/sputnik.recipe
> share/calibre/recipes/st_louis_post_dispatch.png
> share/calibre/recipes/st_louis_post_dispatch.recipe
> share/calibre/recipes/stackoverflow.png
> share/calibre/recipes/stackoverflow.recipe
> -share/calibre/recipes/stamgasten.png
> -share/calibre/recipes/stamgasten.recipe
> share/calibre/recipes/standardmedia_ke.png
> share/calibre/recipes/standardmedia_ke.recipe
> -share/calibre/recipes/standardmoney.png
> -share/calibre/recipes/standardmoney.recipe
> +share/calibre/recipes/star_gazetesi.png
> share/calibre/recipes/star_gazetesi.recipe
> share/calibre/recipes/staradvertiser.png
> share/calibre/recipes/staradvertiser.recipe
> share/calibre/recipes/starnberger_merkur.png
> share/calibre/recipes/starnberger_merkur.recipe
> -share/calibre/recipes/stars_and_stripes.recipe
> -share/calibre/recipes/starwars.png
> -share/calibre/recipes/starwars.recipe
> share/calibre/recipes/stiintasitehnica.png
> share/calibre/recipes/stiintasitehnica.recipe
> -share/calibre/recipes/stnn.recipe
> +share/calibre/recipes/stopgame.png
> +share/calibre/recipes/stopgame.recipe
> share/calibre/recipes/straitstimes.png
> share/calibre/recipes/straitstimes.recipe
> +share/calibre/recipes/strange_horizons.png
> share/calibre/recipes/strange_horizons.recipe
> -share/calibre/recipes/strategic_culture.png
> -share/calibre/recipes/strategic_culture.recipe
> -share/calibre/recipes/strategy-business.recipe
> +share/calibre/recipes/substack.png
> share/calibre/recipes/substack.recipe
> share/calibre/recipes/sueddeutsche.png
> share/calibre/recipes/sueddeutsche.recipe
> -share/calibre/recipes/sueddeutsche_mobil.recipe
> -share/calibre/recipes/sueddeutschezeitung.png
> -share/calibre/recipes/sueddeutschezeitung.recipe
> -share/calibre/recipes/sunday_times_magazine.recipe
> -share/calibre/recipes/superbebe.png
> -share/calibre/recipes/superbebe.recipe
> -share/calibre/recipes/superesportes.recipe
> -share/calibre/recipes/svd_se.png
> +share/calibre/recipes/svt_nyheter.png
> share/calibre/recipes/svt_nyheter.recipe
> +share/calibre/recipes/swarajya.png
> share/calibre/recipes/swarajya.recipe
> share/calibre/recipes/swiat_obrazu.png
> share/calibre/recipes/swiat_obrazu.recipe
> share/calibre/recipes/swiatkindle.png
> share/calibre/recipes/swiatkindle.recipe
> -share/calibre/recipes/syddjurslokalavisen_dk.png
> -share/calibre/recipes/syddjurslokalavisen_dk.recipe
> +share/calibre/recipes/sz_magazin.png
> +share/calibre/recipes/sz_magazin.recipe
> +share/calibre/recipes/t3n_de.png
> share/calibre/recipes/t3n_de.recipe
> +share/calibre/recipes/t_invariant_en.png
> +share/calibre/recipes/t_invariant_en.recipe
> +share/calibre/recipes/t_invariant_ru.png
> +share/calibre/recipes/t_invariant_ru.recipe
> +share/calibre/recipes/t_invariant_ua.png
> +share/calibre/recipes/t_invariant_ua.recipe
> +share/calibre/recipes/t_online.png
> share/calibre/recipes/t_online.recipe
> share/calibre/recipes/tablety_pl.png
> share/calibre/recipes/tablety_pl.recipe
> @@ -7206,285 +7089,249 @@ share/calibre/recipes/tagesspiegel.png
> share/calibre/recipes/tagesspiegel.recipe
> share/calibre/recipes/taggeschau_de.png
> share/calibre/recipes/taggeschau_de.recipe
> -share/calibre/recipes/taipei.recipe
> -share/calibre/recipes/tanea.recipe
> -share/calibre/recipes/tanuki.png
> -share/calibre/recipes/tanuki.recipe
> -share/calibre/recipes/taz.recipe
> +share/calibre/recipes/takiedela.png
> +share/calibre/recipes/takiedela.recipe
> +share/calibre/recipes/tayga.png
> +share/calibre/recipes/tayga.recipe
> share/calibre/recipes/taz_rss.png
> share/calibre/recipes/taz_rss.recipe
> -share/calibre/recipes/tech_economy.png
> -share/calibre/recipes/tech_economy.recipe
> -share/calibre/recipes/tech_world.png
> -share/calibre/recipes/tech_world.recipe
> share/calibre/recipes/techcrunch.png
> share/calibre/recipes/techcrunch.recipe
> share/calibre/recipes/techdirt.png
> share/calibre/recipes/techdirt.recipe
> -share/calibre/recipes/technology_review.png
> -share/calibre/recipes/technology_review.recipe
> -share/calibre/recipes/technology_review_de.recipe
> -share/calibre/recipes/techtarget.recipe
> -share/calibre/recipes/tedneward.recipe
> share/calibre/recipes/tegernseer_zeitung.png
> share/calibre/recipes/tegernseer_zeitung.recipe
> -share/calibre/recipes/telam.png
> -share/calibre/recipes/telam.recipe
> -share/calibre/recipes/telegraph_in.png
> -share/calibre/recipes/telegraph_uk.png
> -share/calibre/recipes/telegraph_uk.recipe
> +share/calibre/recipes/tehelka.recipe
> share/calibre/recipes/telepolis.png
> share/calibre/recipes/telepolis.recipe
> -share/calibre/recipes/telepolis_artikel.png
> -share/calibre/recipes/telepolis_artikel.recipe
> share/calibre/recipes/teleread.png
> share/calibre/recipes/teleread.recipe
> -share/calibre/recipes/thai_post_daily.recipe
> +share/calibre/recipes/thairath.png
> share/calibre/recipes/thairath.recipe
> share/calibre/recipes/the_age.png
> share/calibre/recipes/the_age.recipe
> +share/calibre/recipes/the_baffler.png
> share/calibre/recipes/the_baffler.recipe
> +share/calibre/recipes/the_budget_fashionista.png
> share/calibre/recipes/the_budget_fashionista.recipe
> +share/calibre/recipes/the_clinic_online.png
> share/calibre/recipes/the_clinic_online.recipe
> +share/calibre/recipes/the_conversation.png
> share/calibre/recipes/the_conversation.recipe
> -share/calibre/recipes/the_daily_news_egypt.recipe
> +share/calibre/recipes/the_diplomat.png
> share/calibre/recipes/the_diplomat.recipe
> -share/calibre/recipes/the_escapist.png
> -share/calibre/recipes/the_escapist.recipe
> -share/calibre/recipes/the_feature.recipe
> +share/calibre/recipes/the_ebook_reader.png
> +share/calibre/recipes/the_ebook_reader.recipe
> +share/calibre/recipes/the_federalist.png
> share/calibre/recipes/the_federalist.recipe
> -share/calibre/recipes/the_freeman.recipe
> +share/calibre/recipes/the_friday_times.png
> share/calibre/recipes/the_friday_times.recipe
> +share/calibre/recipes/the_gamer.png
> +share/calibre/recipes/the_gamer.recipe
> +share/calibre/recipes/the_insider.png
> share/calibre/recipes/the_insider.recipe
> +share/calibre/recipes/the_journal.png
> share/calibre/recipes/the_journal.recipe
> -share/calibre/recipes/the_manila_bulletin.recipe
> -share/calibre/recipes/the_manila_times.recipe
> +share/calibre/recipes/the_marker.png
> share/calibre/recipes/the_marker.recipe
> +share/calibre/recipes/the_monthly.recipe
> share/calibre/recipes/the_nation.png
> share/calibre/recipes/the_nation.recipe
> -share/calibre/recipes/the_new_age_za.png
> -share/calibre/recipes/the_new_age_za.recipe
> -share/calibre/recipes/the_new_republic.recipe
> share/calibre/recipes/the_oz.png
> share/calibre/recipes/the_oz.recipe
> +share/calibre/recipes/the_philippine_daily_inquirer.png
> share/calibre/recipes/the_philippine_daily_inquirer.recipe
> -share/calibre/recipes/the_philippine_star.recipe
> +share/calibre/recipes/the_press_project.recipe
> +share/calibre/recipes/the_register.png
> share/calibre/recipes/the_register.recipe
> +share/calibre/recipes/the_richest.png
> +share/calibre/recipes/the_richest.recipe
> +share/calibre/recipes/the_saturday_paper.png
> share/calibre/recipes/the_saturday_paper.recipe
> -share/calibre/recipes/the_scotsman.png
> -share/calibre/recipes/the_scotsman.recipe
> +share/calibre/recipes/the_sportster.png
> +share/calibre/recipes/the_sportster.recipe
> +share/calibre/recipes/the_sun.png
> share/calibre/recipes/the_sun.recipe
> +share/calibre/recipes/the_things.png
> +share/calibre/recipes/the_things.recipe
> +share/calibre/recipes/the_travel.png
> +share/calibre/recipes/the_travel.recipe
> +share/calibre/recipes/the_verge.png
> share/calibre/recipes/the_verge.recipe
> +share/calibre/recipes/the_week.png
> share/calibre/recipes/the_week.recipe
> share/calibre/recipes/the_week_magazine_free.png
> share/calibre/recipes/the_week_magazine_free.recipe
> -share/calibre/recipes/the_workingham_times.png
> -share/calibre/recipes/the_workingham_times.recipe
> -share/calibre/recipes/thecodelesscode.recipe
> +share/calibre/recipes/the_week_uk.png
> +share/calibre/recipes/the_week_uk.recipe
> +share/calibre/recipes/the_wire.png
> +share/calibre/recipes/the_wire.recipe
> +share/calibre/recipes/thebell.png
> +share/calibre/recipes/thebell.recipe
> +share/calibre/recipes/thecultofghoul.png
> share/calibre/recipes/thecultofghoul.recipe
> share/calibre/recipes/thedailywtf.png
> share/calibre/recipes/thedailywtf.recipe
> -share/calibre/recipes/thedgesingapore.recipe
> share/calibre/recipes/theecocolapse.png
> share/calibre/recipes/theecocolapse.recipe
> share/calibre/recipes/theeconomictimes_india.png
> share/calibre/recipes/theeconomictimes_india.recipe
> +share/calibre/recipes/theeconomictimes_india_print_edition.png
> share/calibre/recipes/theeconomictimes_india_print_edition.recipe
> -share/calibre/recipes/theluminouslandscape.png
> -share/calibre/recipes/theluminouslandscape.recipe
> -share/calibre/recipes/themarketticker.png
> -share/calibre/recipes/themarketticker.recipe
> -share/calibre/recipes/themorningpaper.recipe
> +share/calibre/recipes/theindiaforum.png
> +share/calibre/recipes/theindiaforum.recipe
> share/calibre/recipes/thenewcriterion.png
> share/calibre/recipes/thenewcriterion.recipe
> -share/calibre/recipes/thenews.recipe
> -share/calibre/recipes/theoldfoodie.png
> -share/calibre/recipes/theoldfoodie.recipe
> -share/calibre/recipes/theonion.png
> -share/calibre/recipes/theonion.recipe
> +share/calibre/recipes/theoldie.recipe
> share/calibre/recipes/theonlinephotographer.recipe
> +share/calibre/recipes/theprint.png
> share/calibre/recipes/theprint.recipe
> share/calibre/recipes/thestar.png
> share/calibre/recipes/thestar.recipe
> -share/calibre/recipes/thewest_au.png
> -share/calibre/recipes/thewest_au.recipe
> -share/calibre/recipes/think_progress.png
> -share/calibre/recipes/think_progress.recipe
> -share/calibre/recipes/thn.recipe
> -share/calibre/recipes/tidbits.png
> -share/calibre/recipes/tidbits.recipe
> share/calibre/recipes/tijd.png
> share/calibre/recipes/tijd.recipe
> -share/calibre/recipes/tijolaco.recipe
> +share/calibre/recipes/tillsonburg.png
> share/calibre/recipes/tillsonburg.recipe
> share/calibre/recipes/time_magazine.png
> share/calibre/recipes/time_magazine.recipe
> -share/calibre/recipes/time_turk.png
> -share/calibre/recipes/time_turk.recipe
> share/calibre/recipes/times_of_malta.png
> share/calibre/recipes/times_of_malta.recipe
> share/calibre/recipes/times_online.png
> share/calibre/recipes/times_online.recipe
> -share/calibre/recipes/timesnewroman.png
> -share/calibre/recipes/timesnewroman.recipe
> share/calibre/recipes/titanic_de.png
> share/calibre/recipes/titanic_de.recipe
> share/calibre/recipes/tjournal.png
> share/calibre/recipes/tjournal.recipe
> +share/calibre/recipes/tls_mag.png
> +share/calibre/recipes/tls_mag.recipe
> share/calibre/recipes/tmz.png
> share/calibre/recipes/tmz.recipe
> -share/calibre/recipes/tnxm.png
> -share/calibre/recipes/tnxm.recipe
> -share/calibre/recipes/today_online.recipe
> -share/calibre/recipes/todays_zaman.recipe
> share/calibre/recipes/toi.png
> share/calibre/recipes/toi.recipe
> +share/calibre/recipes/toiprint.png
> +share/calibre/recipes/toiprint.recipe
> share/calibre/recipes/tolzer_kurier.png
> share/calibre/recipes/tolzer_kurier.recipe
> -share/calibre/recipes/tomshardware.png
> -share/calibre/recipes/tomshardware.recipe
> -share/calibre/recipes/tomshardware_de.png
> -share/calibre/recipes/tomshardware_de.recipe
> -share/calibre/recipes/tomshardware_it.recipe
> -share/calibre/recipes/toronto_sun.png
> -share/calibre/recipes/toronto_sun.recipe
> +share/calibre/recipes/top_speed.png
> +share/calibre/recipes/top_speed.recipe
> share/calibre/recipes/tovima.png
> share/calibre/recipes/tovima.recipe
> -share/calibre/recipes/toyokeizai.recipe
> -share/calibre/recipes/tpm_uk.png
> -share/calibre/recipes/tpm_uk.recipe
> -share/calibre/recipes/tri_city_herald.recipe
> -share/calibre/recipes/trojmiasto_pl.png
> -share/calibre/recipes/trojmiasto_pl.recipe
> -share/calibre/recipes/trombon.png
> -share/calibre/recipes/trombon.recipe
> share/calibre/recipes/trouw.png
> share/calibre/recipes/trouw.recipe
> share/calibre/recipes/trv.png
> share/calibre/recipes/trv.recipe
> -share/calibre/recipes/trystero.recipe
> -share/calibre/recipes/tsn.png
> -share/calibre/recipes/tsn.recipe
> +share/calibre/recipes/tst.png
> +share/calibre/recipes/tst.recipe
> share/calibre/recipes/tulsaworld.png
> share/calibre/recipes/tulsaworld.recipe
> -share/calibre/recipes/tuttojove.png
> -share/calibre/recipes/tuttojove.recipe
> -share/calibre/recipes/tuttosport.png
> -share/calibre/recipes/tuttosport.recipe
> share/calibre/recipes/tv2lorry_dk.png
> share/calibre/recipes/tv2lorry_dk.recipe
> share/calibre/recipes/tv2nord_dk.png
> share/calibre/recipes/tv2nord_dk.recipe
> share/calibre/recipes/tv2oj_dk.png
> share/calibre/recipes/tv2oj_dk.recipe
> -share/calibre/recipes/tveast_dk.png
> -share/calibre/recipes/tveast_dk.recipe
> share/calibre/recipes/tvmania.png
> share/calibre/recipes/tvmania.recipe
> share/calibre/recipes/tvmidtvest_dk.png
> share/calibre/recipes/tvmidtvest_dk.recipe
> -share/calibre/recipes/tvn24.png
> -share/calibre/recipes/tvn24.recipe
> share/calibre/recipes/tvsyd_dk.png
> share/calibre/recipes/tvsyd_dk.recipe
> -share/calibre/recipes/tvxs.png
> -share/calibre/recipes/tvxs.recipe
> -share/calibre/recipes/tweakers.png
> -share/calibre/recipes/tweakers.recipe
> share/calibre/recipes/tweakers_net.png
> share/calibre/recipes/tweakers_net.recipe
> -share/calibre/recipes/twitchfilms.png
> -share/calibre/recipes/twitchfilms.recipe
> -share/calibre/recipes/twtfb.png
> -share/calibre/recipes/twtfb.recipe
> share/calibre/recipes/tyden.cz.png
> share/calibre/recipes/tyden.cz.recipe
> +share/calibre/recipes/tyzden.png
> share/calibre/recipes/tyzden.recipe
> -share/calibre/recipes/ubuntu_pl.png
> -share/calibre/recipes/ubuntu_pl.recipe
> -share/calibre/recipes/ukraiyns_kii_tizhdien.recipe
> -share/calibre/recipes/ukraiyns_tizhdien.recipe
> -share/calibre/recipes/ultimahora.png
> -share/calibre/recipes/ultimahora.recipe
> +share/calibre/recipes/ua_fooball.png
> +share/calibre/recipes/ua_fooball.recipe
> +share/calibre/recipes/ugeskriftet.recipe
> +share/calibre/recipes/ukrinform_de.png
> +share/calibre/recipes/ukrinform_de.recipe
> +share/calibre/recipes/ukrinform_en.png
> +share/calibre/recipes/ukrinform_en.recipe
> +share/calibre/recipes/ukrinform_es.png
> +share/calibre/recipes/ukrinform_es.recipe
> +share/calibre/recipes/ukrinform_fr.png
> +share/calibre/recipes/ukrinform_fr.recipe
> +share/calibre/recipes/ukrinform_ja.png
> +share/calibre/recipes/ukrinform_ja.recipe
> +share/calibre/recipes/ukrinform_pl.png
> +share/calibre/recipes/ukrinform_pl.recipe
> +share/calibre/recipes/ukrinform_ru.png
> +share/calibre/recipes/ukrinform_ru.recipe
> +share/calibre/recipes/ukrinform_uk.png
> +share/calibre/recipes/ukrinform_uk.recipe
> share/calibre/recipes/uncrate.png
> share/calibre/recipes/uncrate.recipe
> -share/calibre/recipes/unica.png
> -share/calibre/recipes/unica.recipe
> +share/calibre/recipes/unian_net.png
> +share/calibre/recipes/unian_net.recipe
> +share/calibre/recipes/unian_net_en.png
> +share/calibre/recipes/unian_net_en.recipe
> +share/calibre/recipes/unian_net_ua.png
> +share/calibre/recipes/unian_net_ua.recipe
> share/calibre/recipes/uninohimitu.png
> share/calibre/recipes/uninohimitu.recipe
> -share/calibre/recipes/united_daily.png
> -share/calibre/recipes/united_daily.recipe
> +share/calibre/recipes/united_nations.png
> +share/calibre/recipes/united_nations.recipe
> share/calibre/recipes/universe_today.png
> share/calibre/recipes/universe_today.recipe
> -share/calibre/recipes/unperiodico.recipe
> +share/calibre/recipes/unn_ru.png
> +share/calibre/recipes/unn_ru.recipe
> +share/calibre/recipes/unn_ua.png
> +share/calibre/recipes/unn_ua.recipe
> +share/calibre/recipes/unz.png
> +share/calibre/recipes/unz.recipe
> +share/calibre/recipes/upi.png
> share/calibre/recipes/upi.recipe
> +share/calibre/recipes/usatoday.png
> share/calibre/recipes/usatoday.recipe
> share/calibre/recipes/usnews.png
> share/calibre/recipes/usnews.recipe
> -share/calibre/recipes/utrinski.recipe
> -share/calibre/recipes/valbybladet_dk.recipe
> +share/calibre/recipes/vancouver_province.png
> share/calibre/recipes/vancouver_province.recipe
> +share/calibre/recipes/vancouver_sun.png
> share/calibre/recipes/vancouver_sun.recipe
> -share/calibre/recipes/vanloesebladet_dk.recipe
> -share/calibre/recipes/vardelokalavisen_dk.png
> -share/calibre/recipes/vardelokalavisen_dk.recipe
> share/calibre/recipes/variety.png
> share/calibre/recipes/variety.recipe
> share/calibre/recipes/vecernji_list.png
> share/calibre/recipes/vecernji_list.recipe
> -share/calibre/recipes/veintitres.recipe
> -share/calibre/recipes/vejlelokalavisen_dk.png
> -share/calibre/recipes/vejlelokalavisen_dk.recipe
> +share/calibre/recipes/vedomosti.png
> +share/calibre/recipes/vedomosti.recipe
> share/calibre/recipes/version2.png
> share/calibre/recipes/version2.recipe
> -share/calibre/recipes/vesterbrobladet_dk.recipe
> -share/calibre/recipes/vfr_magazine.png
> -share/calibre/recipes/vfr_magazine.recipe
> +share/calibre/recipes/verstka.png
> +share/calibre/recipes/verstka.recipe
> +share/calibre/recipes/vic_times.png
> share/calibre/recipes/vic_times.recipe
> -share/calibre/recipes/vice.png
> -share/calibre/recipes/vice.recipe
> -share/calibre/recipes/vice_magazine.png
> -share/calibre/recipes/vice_magazine.recipe
> -share/calibre/recipes/vice_magazine_de.png
> -share/calibre/recipes/vice_magazine_de.recipe
> share/calibre/recipes/vignette.png
> share/calibre/recipes/vignette.recipe
> -share/calibre/recipes/vijesti.png
> -share/calibre/recipes/vijesti.recipe
> +share/calibre/recipes/vikna_ru.png
> +share/calibre/recipes/vikna_ru.recipe
> +share/calibre/recipes/vikna_ua.png
> +share/calibre/recipes/vikna_ua.recipe
> +share/calibre/recipes/villagevoice.png
> share/calibre/recipes/villagevoice.recipe
> share/calibre/recipes/vio_mundo.png
> share/calibre/recipes/vio_mundo.recipe
> -share/calibre/recipes/virtualshackles.png
> -share/calibre/recipes/virtualshackles.recipe
> share/calibre/recipes/vitalia.png
> share/calibre/recipes/vitalia.recipe
> -share/calibre/recipes/viva.png
> -share/calibre/recipes/viva.recipe
> -share/calibre/recipes/vnexpress.recipe
> -share/calibre/recipes/voetbal_belgie.recipe
> -share/calibre/recipes/voice_of_america.png
> -share/calibre/recipes/voice_of_america.recipe
> share/calibre/recipes/volksrant.png
> share/calibre/recipes/volksrant.recipe
> +share/calibre/recipes/vox.png
> +share/calibre/recipes/vox.recipe
> share/calibre/recipes/vreme.png
> share/calibre/recipes/vreme.recipe
> -share/calibre/recipes/vrijnederland.png
> -share/calibre/recipes/vrijnederland.recipe
> -share/calibre/recipes/waco_tribune.recipe
> share/calibre/recipes/walla.png
> share/calibre/recipes/walla.recipe
> -share/calibre/recipes/wallstreetro.png
> -share/calibre/recipes/wallstreetro.recipe
> share/calibre/recipes/walrusmag.png
> share/calibre/recipes/walrusmag.recipe
> -share/calibre/recipes/wapo_cartoons.png
> -share/calibre/recipes/wapo_cartoons.recipe
> share/calibre/recipes/warentest.png
> share/calibre/recipes/warentest.recipe
> share/calibre/recipes/wash_post.png
> share/calibre/recipes/wash_post.recipe
> +share/calibre/recipes/wash_post_print.png
> +share/calibre/recipes/wash_post_print.recipe
> share/calibre/recipes/wash_times.recipe
> -share/calibre/recipes/watchingamerica.recipe
> share/calibre/recipes/weblogs_sl.recipe
> share/calibre/recipes/weilheimer_tagblatt.png
> share/calibre/recipes/weilheimer_tagblatt.recipe
> @@ -7493,89 +7340,83 @@ share/calibre/recipes/welt.recipe
> share/calibre/recipes/welt_der_physik.png
> share/calibre/recipes/welt_der_physik.recipe
> share/calibre/recipes/wenxuecity-znjy.recipe
> -share/calibre/recipes/what_if.recipe
> -share/calibre/recipes/wichita_eagle.recipe
> -share/calibre/recipes/wikinews_en.png
> -share/calibre/recipes/wikinews_en.recipe
> +share/calibre/recipes/wicomix.png
> +share/calibre/recipes/wicomix.recipe
> share/calibre/recipes/windows_star.recipe
> share/calibre/recipes/windsor_star.recipe
> share/calibre/recipes/winnipeg_free_press.recipe
> -share/calibre/recipes/winnipeg_sun.recipe
> -share/calibre/recipes/winsupersite.png
> -share/calibre/recipes/winsupersite.recipe
> share/calibre/recipes/wired.png
> share/calibre/recipes/wired.recipe
> share/calibre/recipes/wired_daily.png
> share/calibre/recipes/wired_daily.recipe
> -share/calibre/recipes/wired_it.recipe
> -share/calibre/recipes/wirtscafts_woche.png
> -share/calibre/recipes/wirtscafts_woche.recipe
> share/calibre/recipes/wirtualnemedia_pl.png
> share/calibre/recipes/wirtualnemedia_pl.recipe
> share/calibre/recipes/wnp.png
> share/calibre/recipes/wnp.recipe
> -share/calibre/recipes/wolne_media.png
> -share/calibre/recipes/wolne_media.recipe
> +share/calibre/recipes/wonderzine.png
> +share/calibre/recipes/wonderzine.recipe
> share/calibre/recipes/words_without_borders.recipe
> -share/calibre/recipes/workers_world.png
> -share/calibre/recipes/workers_world.recipe
> +share/calibre/recipes/world_archeology.png
> +share/calibre/recipes/world_archeology.recipe
> share/calibre/recipes/worldcrunch.recipe
> -share/calibre/recipes/wow.recipe
> share/calibre/recipes/woz_die.recipe
> share/calibre/recipes/wsj.png
> share/calibre/recipes/wsj.recipe
> +share/calibre/recipes/wsj_free.png
> share/calibre/recipes/wsj_free.recipe
> -share/calibre/recipes/wvhooligan.png
> -share/calibre/recipes/wvhooligan.recipe
> +share/calibre/recipes/wsj_mag.png
> +share/calibre/recipes/wsj_mag.recipe
> +share/calibre/recipes/wsj_news.png
> +share/calibre/recipes/wsj_news.recipe
> +share/calibre/recipes/xda.png
> +share/calibre/recipes/xda.recipe
> +share/calibre/recipes/xkcd.png
> share/calibre/recipes/xkcd.recipe
> -share/calibre/recipes/xpatloop.recipe
> -share/calibre/recipes/yagmur_dergisi.recipe
> share/calibre/recipes/yahoo_news.png
> share/calibre/recipes/yahoo_news.recipe
> -share/calibre/recipes/yakima_herald.recipe
> share/calibre/recipes/yalansavar.png
> share/calibre/recipes/yalansavar.recipe
> -share/calibre/recipes/yazihane.png
> -share/calibre/recipes/yazihane.recipe
> -share/calibre/recipes/yementimes.recipe
> -share/calibre/recipes/yeni_umit_dergisi.recipe
> share/calibre/recipes/yenisafak_gazetesi.png
> share/calibre/recipes/yenisafak_gazetesi.recipe
> +share/calibre/recipes/ynet.png
> share/calibre/recipes/ynet.recipe
> -share/calibre/recipes/yomiuri.png
> -share/calibre/recipes/yomiuri.recipe
> +share/calibre/recipes/yomiuri_world.png
> share/calibre/recipes/yomiuri_world.recipe
> +share/calibre/recipes/zackzack.png
> share/calibre/recipes/zackzack.recipe
> share/calibre/recipes/zadolba_li.png
> share/calibre/recipes/zadolba_li.recipe
> -share/calibre/recipes/zaman.png
> -share/calibre/recipes/zaman.recipe
> +share/calibre/recipes/zaobao.png
> share/calibre/recipes/zaobao.recipe
> -share/calibre/recipes/zaufana_trzecia_strona.png
> -share/calibre/recipes/zaufana_trzecia_strona.recipe
> -share/calibre/recipes/zaxid_net.png
> -share/calibre/recipes/zaxid_net.recipe
> share/calibre/recipes/zdnet.fr.png
> share/calibre/recipes/zdnet.fr.recipe
> -share/calibre/recipes/zdnet.png
> -share/calibre/recipes/zdnet.recipe
> share/calibre/recipes/zeitde.png
> share/calibre/recipes/zeitde.recipe
> +share/calibre/recipes/zeitde_sub.png
> share/calibre/recipes/zeitde_sub.recipe
> -share/calibre/recipes/zerocalcare.recipe
> +share/calibre/recipes/zerkalo.png
> +share/calibre/recipes/zerkalo.recipe
> +share/calibre/recipes/zerodeux.recipe
> share/calibre/recipes/zerohedge.png
> share/calibre/recipes/zerohedge.recipe
> share/calibre/recipes/ziarulfinanciar.png
> share/calibre/recipes/ziarulfinanciar.recipe
> -share/calibre/recipes/zita_be.recipe
> share/calibre/recipes/ziuaveche.png
> share/calibre/recipes/ziuaveche.recipe
> +share/calibre/recipes/zn_ru.png
> +share/calibre/recipes/zn_ru.recipe
> +share/calibre/recipes/zn_ua.png
> +share/calibre/recipes/zn_ua.recipe
> +share/calibre/recipes/znadplanszy_pl.png
> share/calibre/recipes/znadplanszy_pl.recipe
> -share/calibre/recipes/zougla.recipe
> +share/calibre/recipes/znetwork.png
> +share/calibre/recipes/znetwork.recipe
> share/calibre/recipes/zycie_warszawy.png
> share/calibre/recipes/zycie_warszawy.recipe
> share/calibre/scraper.js
> share/calibre/scripts.calibre_msgpack
> +share/calibre/stylelint-bundle.min.js
> +share/calibre/stylelint.js
> share/calibre/template-functions.json
> share/calibre/templates/
> share/calibre/templates/book_details.css
> @@ -7585,6 +7426,7 @@ share/calibre/templates/html_export_default.css
> share/calibre/templates/html_export_default.tmpl
> share/calibre/templates/html_export_default_index.tmpl
> share/calibre/templates/inline_toc_styles.css
> +share/calibre/templates/kobo.js
> share/calibre/templates/lrf.xsl
> share/calibre/templates/new_book.html
> share/calibre/templates/new_nav.html
> @@ -7649,7 +7491,6 @@ share/icons/hicolor/64x64/mimetypes/application-x-mobi8-ebook-64.png
> share/icons/hicolor/64x64/mimetypes/application-x-mobipocket-ebook-64.png
> share/icons/hicolor/64x64/mimetypes/application-x-topaz-ebook-64.png
> share/icons/hicolor/64x64/mimetypes/text-lrs-64.png
> -share/metainfo/
> share/metainfo/calibre-ebook-edit.metainfo.xml
> share/metainfo/calibre-ebook-viewer.metainfo.xml
> share/metainfo/calibre-gui.metainfo.xml