Wed Apr 16 17:22:30 2014 UTC ()
Update to 1.31, provided by Rhialto in PR 48723 and wip.

Changes: too many to mention; 1.5 years of very active development.


(wiz)
diff -r1.68 -r1.69 pkgsrc/misc/calibre/Makefile
diff -r1.15 -r1.16 pkgsrc/misc/calibre/PLIST
diff -r1.14 -r1.15 pkgsrc/misc/calibre/distinfo
diff -r1.3 -r1.4 pkgsrc/misc/calibre/patches/patch-setup_extensions.py
diff -r0 -r1.3 pkgsrc/misc/calibre/patches/patch-src_calibre_linux.py
diff -r1.4 -r0 pkgsrc/misc/calibre/patches/patch-src_calibre_linux_py
cvs diff -r1.68 -r1.69 pkgsrc/misc/calibre/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/calibre/Makefile 2014/04/10 06:21:29 1.68
+++ pkgsrc/misc/calibre/Makefile 2014/04/16 17:22:30 1.69
@@ -1,154 +1,186 @@ @@ -1,154 +1,186 @@
1# $NetBSD: Makefile,v 1.68 2014/04/10 06:21:29 obache Exp $ 1# $NetBSD: Makefile,v 1.69 2014/04/16 17:22:30 wiz Exp $
2 2
3DISTNAME= calibre-0.9.7 3DISTNAME= calibre-1.31.0
4PKGREVISION= 18 
5CATEGORIES= misc 4CATEGORIES= misc
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
 7DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.calibre-ebook.com/ 10HOMEPAGE= http://www.calibre-ebook.com/
11COMMENT= E-book library management application 11COMMENT= E-book library management application
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14DEPENDS+= help2man>=1.36.4:../../converters/help2man 14DEPENDS+= help2man>=1.36.4:../../converters/help2man
15DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 15DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
16DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils 16DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils
17DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils 17DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils
18DEPENDS+= ${PYPKGPREFIX}-lxml>=2.2.1:../../textproc/py-lxml 18DEPENDS+= ${PYPKGPREFIX}-lxml>=2.2.1:../../textproc/py-lxml
19DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup 19DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
20DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize 20DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
21DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect 21DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
22DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils 22DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
23# Let's depend on the ones we have in pkgsrc instead of the bundled ones. 23# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
24DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf 24DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
25DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy 25DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
26DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib 26DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
27DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet 27DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
28DEPENDS+= ${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces 28DEPENDS+= ${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces
 29DEPENDS+= ${PYPKGPREFIX}-apsw-[0-9]*:../../databases/py-apsw
29 30
30PYTHON_VERSIONED_DEPENDENCIES= dateutil dns 31PYTHON_VERSIONED_DEPENDENCIES= dateutil dns
31 32
 33# We also need the distfile for qt4-libs to extract some private header files
 34# If QTVERSION changes, the distinfo file needs to be updated too.
 35QTVERSION= 4.8.5 # from ../../x11/qt4/Makefile.common
 36# Including that file to avoid hardcoding the version number won't work,
 37# since it will occur in the distinfo anyway.
 38QTNAME= qt-everywhere-opensource-src-${QTVERSION}
 39DISTFILES+= ${QTNAME}.tar.gz
 40MASTER_SITES+= http://releases.qt-project.org/qt4/source/
 41EXTRACT_USING= bsdtar
 42
32USE_LANGUAGES= c c++ 43USE_LANGUAGES= c c++
33USE_TOOLS+= pkg-config pax 44USE_TOOLS+= pkg-config pax
34PYTHON_VERSIONS_ACCEPTED= 27 45PYTHON_VERSIONS_ACCEPTED= 27
35PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mechanize, py-beautifulsoup, py-imaging, py-netifaces 46PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mechanize, py-beautifulsoup, py-imaging, py-netifaces
36PYDISTUTILSPKG= yes 47PYDISTUTILSPKG= yes
37PYSETUPOPTARGS= # empty 48PYSETUPOPTARGS= # empty
38PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX} 49PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
39WRKSRC= ${WRKDIR}/calibre 50WRKSRC= ${WRKDIR}/calibre
40 51
41INSTALLATION_DIRS= share/applications 52INSTALLATION_DIRS= share/applications
42INSTALLATION_DIRS= share/icons 53INSTALLATION_DIRS= share/icons
43INSTALLATION_DIRS= share/calibre/recipes 54INSTALLATION_DIRS= share/calibre/recipes
44 55
 56FIX_PYTHON_PATHS+= *.py
45FIX_PYTHON_PATHS+= recipes/*.recipe 57FIX_PYTHON_PATHS+= recipes/*.recipe
46FIX_PYTHON_PATHS+= resources/catalog/*.py 
47FIX_PYTHON_PATHS+= resources/*.py 58FIX_PYTHON_PATHS+= resources/*.py
48FIX_PYTHON_PATHS+= *.py 59FIX_PYTHON_PATHS+= resources/catalog/*.py
49FIX_PYTHON_PATHS+= setup/*.py 60FIX_PYTHON_PATHS+= setup/*.py
50FIX_PYTHON_PATHS+= setup/installer/*.py 61FIX_PYTHON_PATHS+= setup/installer/*.py
51FIX_PYTHON_PATHS+= setup/installer/linux/*.py 62FIX_PYTHON_PATHS+= setup/installer/linux/*.py
52FIX_PYTHON_PATHS+= setup/installer/osx/*.py 63FIX_PYTHON_PATHS+= setup/installer/osx/*.py
53FIX_PYTHON_PATHS+= setup/installer/osx/app/*.py 64FIX_PYTHON_PATHS+= setup/installer/osx/app/*.py
54FIX_PYTHON_PATHS+= setup/installer/windows/*.py 65FIX_PYTHON_PATHS+= setup/installer/windows/*.py
55FIX_PYTHON_PATHS+= src/calibre/*.py 66FIX_PYTHON_PATHS+= src/calibre/*.py
56FIX_PYTHON_PATHS+= src/calibre/customize/*.py 67FIX_PYTHON_PATHS+= src/calibre/customize/*.py
57FIX_PYTHON_PATHS+= src/calibre/db/*.py 68FIX_PYTHON_PATHS+= src/calibre/db/*.py
58FIX_PYTHON_PATHS+= src/calibre/db/tests/*.py 69FIX_PYTHON_PATHS+= src/calibre/db/tests/*.py
59FIX_PYTHON_PATHS+= src/calibre/devices/*.py 70FIX_PYTHON_PATHS+= src/calibre/devices/*.py
60FIX_PYTHON_PATHS+= src/calibre/devices/android/*.py 71FIX_PYTHON_PATHS+= src/calibre/devices/android/*.py
61FIX_PYTHON_PATHS+= src/calibre/devices/eslick/*.py 72FIX_PYTHON_PATHS+= src/calibre/devices/eslick/*.py
62FIX_PYTHON_PATHS+= src/calibre/devices/folder_device/*.py 73FIX_PYTHON_PATHS+= src/calibre/devices/folder_device/*.py
 74FIX_PYTHON_PATHS+= src/calibre/devices/idevice/*.py
63FIX_PYTHON_PATHS+= src/calibre/devices/iriver/*.py 75FIX_PYTHON_PATHS+= src/calibre/devices/iriver/*.py
64FIX_PYTHON_PATHS+= src/calibre/devices/kobo/*.py 76FIX_PYTHON_PATHS+= src/calibre/devices/kobo/*.py
 77FIX_PYTHON_PATHS+= src/calibre/devices/mtp/*.py
 78FIX_PYTHON_PATHS+= src/calibre/devices/mtp/unix/*.py
 79FIX_PYTHON_PATHS+= src/calibre/devices/mtp/unix/upstream/*.py
 80FIX_PYTHON_PATHS+= src/calibre/devices/mtp/windows/*.py
65FIX_PYTHON_PATHS+= src/calibre/devices/prs505/*.py 81FIX_PYTHON_PATHS+= src/calibre/devices/prs505/*.py
66FIX_PYTHON_PATHS+= src/calibre/devices/prst1/*.py 82FIX_PYTHON_PATHS+= src/calibre/devices/prst1/*.py
 83FIX_PYTHON_PATHS+= src/calibre/devices/smart_device_app/*.py
67FIX_PYTHON_PATHS+= src/calibre/devices/teclast/*.py 84FIX_PYTHON_PATHS+= src/calibre/devices/teclast/*.py
68FIX_PYTHON_PATHS+= src/calibre/ebooks/*.py 85FIX_PYTHON_PATHS+= src/calibre/ebooks/*.py
69FIX_PYTHON_PATHS+= src/calibre/ebooks/chm/*.py 86FIX_PYTHON_PATHS+= src/calibre/ebooks/chm/*.py
70FIX_PYTHON_PATHS+= src/calibre/ebooks/comic/*.py 87FIX_PYTHON_PATHS+= src/calibre/ebooks/comic/*.py
71FIX_PYTHON_PATHS+= src/calibre/ebooks/compression/*.py 88FIX_PYTHON_PATHS+= src/calibre/ebooks/compression/*.py
72FIX_PYTHON_PATHS+= src/calibre/ebooks/conversion/*.py 89FIX_PYTHON_PATHS+= src/calibre/ebooks/conversion/*.py
73FIX_PYTHON_PATHS+= src/calibre/ebooks/conversion/plugins/*.py 90FIX_PYTHON_PATHS+= src/calibre/ebooks/conversion/plugins/*.py
74FIX_PYTHON_PATHS+= src/calibre/ebooks/djvu/*.py 91FIX_PYTHON_PATHS+= src/calibre/ebooks/djvu/*.py
75FIX_PYTHON_PATHS+= src/calibre/ebooks/epub/fix/*.py 92FIX_PYTHON_PATHS+= src/calibre/ebooks/docx/*.py
 93FIX_PYTHON_PATHS+= src/calibre/ebooks/docx/writer/*.py
76FIX_PYTHON_PATHS+= src/calibre/ebooks/epub/*.py 94FIX_PYTHON_PATHS+= src/calibre/ebooks/epub/*.py
77FIX_PYTHON_PATHS+= src/calibre/ebooks/fb2/__init__.py 95FIX_PYTHON_PATHS+= src/calibre/ebooks/fb2/__init__.py
78FIX_PYTHON_PATHS+= src/calibre/ebooks/html/*.py 96FIX_PYTHON_PATHS+= src/calibre/ebooks/html/*.py
79FIX_PYTHON_PATHS+= src/calibre/ebooks/iterator/*.py 97FIX_PYTHON_PATHS+= src/calibre/ebooks/iterator/*.py
80FIX_PYTHON_PATHS+= src/calibre/ebooks/lit/*.py 98FIX_PYTHON_PATHS+= src/calibre/ebooks/lit/*.py
81FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/html/*.py 
82FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/*.py 99FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/*.py
 100FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/html/*.py
83FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/pylrs/*.py 101FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/pylrs/*.py
84FIX_PYTHON_PATHS+= src/calibre/ebooks/markdown/extensions/*.py 102FIX_PYTHON_PATHS+= src/calibre/ebooks/markdown/extensions/*.py
85FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/*.py 103FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/*.py
86FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/book/*.py 104FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/book/*.py
87FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/book/*.py 
88FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/sources/*.py 105FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/sources/*.py
89FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/*.py 106FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/*.py
90FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/debug/*.py 107FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/debug/*.py
91FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/reader/*.py 108FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/reader/*.py
92FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/writer2/*.py 109FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/writer2/*.py
93FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/writer8/*.py 110FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/writer8/*.py
94FIX_PYTHON_PATHS+= src/calibre/ebooks/odt/__init__.py 111FIX_PYTHON_PATHS+= src/calibre/ebooks/odt/__init__.py
95FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/*.py 112FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/*.py
96FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/display/*.py 113FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/display/*.py
97FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/display/test-cfi/*.py 114FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/display/test-cfi/*.py
 115FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/iterator/*.py
 116FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/polish/*.py
 117FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/polish/check/*.py
 118FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/polish/tests/*.py
98FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/transforms/*.py 119FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/transforms/*.py
99FIX_PYTHON_PATHS+= src/calibre/ebooks/pdb/haodoo/__init__.py 120FIX_PYTHON_PATHS+= src/calibre/ebooks/pdb/haodoo/__init__.py
 121FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/*.py
100FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/__init__.py 122FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/__init__.py
101FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/reflow.py 123FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/reflow.py
 124FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/render/*.py
102FIX_PYTHON_PATHS+= src/calibre/ebooks/readability/*.py 125FIX_PYTHON_PATHS+= src/calibre/ebooks/readability/*.py
103FIX_PYTHON_PATHS+= src/calibre/ebooks/rtf/*.py 126FIX_PYTHON_PATHS+= src/calibre/ebooks/rtf/*.py
104FIX_PYTHON_PATHS+= src/calibre/ebooks/rtf2xml/*.py 127FIX_PYTHON_PATHS+= src/calibre/ebooks/rtf2xml/*.py
105FIX_PYTHON_PATHS+= src/calibre/ebooks/snb/*.py 128FIX_PYTHON_PATHS+= src/calibre/ebooks/snb/*.py
106FIX_PYTHON_PATHS+= src/calibre/ebooks/textile/*.py 129FIX_PYTHON_PATHS+= src/calibre/ebooks/textile/*.py
107FIX_PYTHON_PATHS+= src/calibre/ebooks/txt/*.py 130FIX_PYTHON_PATHS+= src/calibre/ebooks/txt/*.py
108FIX_PYTHON_PATHS+= src/calibre/gui2/*.py 131FIX_PYTHON_PATHS+= src/calibre/gui2/*.py
109FIX_PYTHON_PATHS+= src/calibre/gui2/actions/*.py 132FIX_PYTHON_PATHS+= src/calibre/gui2/actions/*.py
110FIX_PYTHON_PATHS+= src/calibre/gui2/add_wizard/*.py 133FIX_PYTHON_PATHS+= src/calibre/gui2/add_wizard/*.py
111FIX_PYTHON_PATHS+= src/calibre/gui2/catalog/*.py 134FIX_PYTHON_PATHS+= src/calibre/gui2/catalog/*.py
112FIX_PYTHON_PATHS+= src/calibre/gui2/convert/*.py 135FIX_PYTHON_PATHS+= src/calibre/gui2/convert/*.py
 136FIX_PYTHON_PATHS+= src/calibre/gui2/device_drivers/*.py
113FIX_PYTHON_PATHS+= src/calibre/gui2/dialogs/*.py 137FIX_PYTHON_PATHS+= src/calibre/gui2/dialogs/*.py
114FIX_PYTHON_PATHS+= src/calibre/gui2/library/*.py 138FIX_PYTHON_PATHS+= src/calibre/gui2/library/*.py
115FIX_PYTHON_PATHS+= src/calibre/gui2/metadata/*.py 139FIX_PYTHON_PATHS+= src/calibre/gui2/metadata/*.py
116FIX_PYTHON_PATHS+= src/calibre/gui2/preferences/*.py 140FIX_PYTHON_PATHS+= src/calibre/gui2/preferences/*.py
117FIX_PYTHON_PATHS+= src/calibre/gui2/progress_indicator/*.py 141FIX_PYTHON_PATHS+= src/calibre/gui2/progress_indicator/*.py
 142FIX_PYTHON_PATHS+= src/calibre/gui2/store/loader.py
 143FIX_PYTHON_PATHS+= src/calibre/gui2/store/stores/*.py
118FIX_PYTHON_PATHS+= src/calibre/gui2/tag_browser/*.py 144FIX_PYTHON_PATHS+= src/calibre/gui2/tag_browser/*.py
 145FIX_PYTHON_PATHS+= src/calibre/gui2/toc/*.py
 146FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/*.py
 147FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/diff/*.py
 148FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/editor/*.py
 149FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/editor/smart/*.py
 150FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/editor/syntax/*.py
119FIX_PYTHON_PATHS+= src/calibre/gui2/viewer/*.py 151FIX_PYTHON_PATHS+= src/calibre/gui2/viewer/*.py
120FIX_PYTHON_PATHS+= src/calibre/gui2/wizard/*.py 152FIX_PYTHON_PATHS+= src/calibre/gui2/wizard/*.py
121FIX_PYTHON_PATHS+= src/calibre/library/*.py 153FIX_PYTHON_PATHS+= src/calibre/library/*.py
122FIX_PYTHON_PATHS+= src/calibre/library/catalogs/*.py 154FIX_PYTHON_PATHS+= src/calibre/library/catalogs/*.py
123FIX_PYTHON_PATHS+= src/calibre/library/server/*.py 155FIX_PYTHON_PATHS+= src/calibre/library/server/*.py
124FIX_PYTHON_PATHS+= src/calibre/manual/*.py 
125FIX_PYTHON_PATHS+= src/calibre/manual/plugin_examples/helloworld/*.py 
126FIX_PYTHON_PATHS+= src/calibre/manual/plugin_examples/interface_demo/*.py 
127FIX_PYTHON_PATHS+= src/calibre/trac/*.py 
128FIX_PYTHON_PATHS+= src/calibre/translations/*.py 156FIX_PYTHON_PATHS+= src/calibre/translations/*.py
129FIX_PYTHON_PATHS+= src/calibre/utils/*.py 157FIX_PYTHON_PATHS+= src/calibre/utils/*.py
130FIX_PYTHON_PATHS+= src/calibre/utils/fonts/*.py 158FIX_PYTHON_PATHS+= src/calibre/utils/fonts/*.py
 159FIX_PYTHON_PATHS+= src/calibre/utils/fonts/sfnt/*.py
 160FIX_PYTHON_PATHS+= src/calibre/utils/fonts/sfnt/cff/*.py
 161FIX_PYTHON_PATHS+= src/calibre/utils/fonts/woff/__init__.py
131FIX_PYTHON_PATHS+= src/calibre/utils/ipc/*.py 162FIX_PYTHON_PATHS+= src/calibre/utils/ipc/*.py
132FIX_PYTHON_PATHS+= src/calibre/utils/magick/*.py 163FIX_PYTHON_PATHS+= src/calibre/utils/magick/*.py
133FIX_PYTHON_PATHS+= src/calibre/utils/podofo/*.py 164FIX_PYTHON_PATHS+= src/calibre/utils/podofo/*.py
134FIX_PYTHON_PATHS+= src/calibre/utils/pyconsole/*.py 165FIX_PYTHON_PATHS+= src/calibre/utils/pyconsole/*.py
 166FIX_PYTHON_PATHS+= src/calibre/utils/spell/__init__.py
135FIX_PYTHON_PATHS+= src/calibre/utils/wmf/*.py 167FIX_PYTHON_PATHS+= src/calibre/utils/wmf/*.py
136FIX_PYTHON_PATHS+= src/calibre/web/feeds/*.py 168FIX_PYTHON_PATHS+= src/calibre/web/feeds/*.py
137FIX_PYTHON_PATHS+= src/calibre/web/feeds/recipes/*.py 169FIX_PYTHON_PATHS+= src/calibre/web/feeds/recipes/*.py
138FIX_PYTHON_PATHS+= src/calibre/web/fetch/*.py 170FIX_PYTHON_PATHS+= src/calibre/web/fetch/*.py
139FIX_PYTHON_PATHS+= src/calibre/web/jsbrowser/*.py 171FIX_PYTHON_PATHS+= src/calibre/web/jsbrowser/*.py
 172FIX_PYTHON_PATHS+= src/qtcurve/test_rendering.py
140FIX_PYTHON_PATHS+= src/templite/*.py 173FIX_PYTHON_PATHS+= src/templite/*.py
141 
142SUBST_CLASSES+= prefix 174SUBST_CLASSES+= prefix
143SUBST_SED.prefix= -e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake'," 175SUBST_SED.prefix= -e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake',"
144SUBST_MESSAGE.prefix= Fixing path to QMAKE 176SUBST_MESSAGE.prefix= Fixing path to QMAKE
145SUBST_STAGE.prefix= post-patch 177SUBST_STAGE.prefix= post-patch
146SUBST_FILES.prefix= setup/build_environment.py 178SUBST_FILES.prefix= setup/build_environment.py
147 179
148# This one is for /usr/bin/env python (or even /usr/bin/env Python or /usr/bin/python2) 180# This one is for /usr/bin/env python (or even /usr/bin/env Python or /usr/bin/python2)
149SUBST_CLASSES+= path 181SUBST_CLASSES+= path
150SUBST_SED.path= -e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN}," 182SUBST_SED.path= -e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN},"
151SUBST_MESSAGE.path= Fixing path to python. 183SUBST_MESSAGE.path= Fixing path to python.
152SUBST_STAGE.path= post-patch 184SUBST_STAGE.path= post-patch
153SUBST_FILES.path= ${FIX_PYTHON_PATHS} 185SUBST_FILES.path= ${FIX_PYTHON_PATHS}
154 186
@@ -161,30 +193,44 @@ REPLACE_PYTHON+= src/calibre/ebooks/meta @@ -161,30 +193,44 @@ REPLACE_PYTHON+= src/calibre/ebooks/meta
161REPLACE_PYTHON+= src/calibre/utils/*.py 193REPLACE_PYTHON+= src/calibre/utils/*.py
162REPLACE_PYTHON+= src/odf/*.py 194REPLACE_PYTHON+= src/odf/*.py
163 195
164MAKE_ENV+= FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig 196MAKE_ENV+= FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig
165MAKE_ENV+= FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib 197MAKE_ENV+= FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib
166MAKE_ENV+= PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo 198MAKE_ENV+= PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo
167MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib 199MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
168#MAKE_ENV+= WITH_USB=no 200#MAKE_ENV+= WITH_USB=no
169 201
170# Let's depend on the ones we have in pkgsrc instead of the bundled ones. 202# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
171pre-configure: 203pre-configure:
172 cd ${WRKSRC} && rm -rf src/cherrypy src/pyPdf src/html5lib src/chardet 204 cd ${WRKSRC} && rm -rf src/cherrypy src/pyPdf src/html5lib src/chardet
173 205
 206# Turn off x bits on non-executable files.
 207post-extract:
 208 find ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \;
 209 find ${WRKSRC}/resources/images/mimetypes -name '*.png' -exec chmod a-x \{} \;
 210 chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
 211 chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
 212
 213# Get access to (some of) the Qt4 private header files (for qt_hack).
 214post-wrapper:
 215 cd ${WRKDIR}/.buildlink/qt4/include/QtGui && \
 216 ln -s ../../../../${QTNAME}/include/QtGui/private .
 217 cd ${WRKDIR}/.buildlink/qt4/include/QtCore && \
 218 ln -s ../../../../${QTNAME}/include/QtCore/private .
 219
174post-install: 220post-install:
175 cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \ 221 cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
176 ${DESTDIR}${PREFIX}/share/calibre/recipes 222 ${DESTDIR}${PREFIX}/share/calibre/recipes
177 cd ${WRKSRC} && pax -wr -pma Changelog* README \ 223 cd ${WRKSRC} && pax -wr -pma Changelog* README.md \
178 COPYRIGHT INSTALL LICENSE.* \ 224 COPYRIGHT INSTALL LICENSE.* \
179 ${DESTDIR}${PREFIX}/share/doc/calibre 225 ${DESTDIR}${PREFIX}/share/doc/calibre
180 226
181.include "../../lang/python/application.mk" 227.include "../../lang/python/application.mk"
182.include "../../lang/python/versioned_dependencies.mk" 228.include "../../lang/python/versioned_dependencies.mk"
183.include "../../databases/sqlite3/buildlink3.mk" 229.include "../../databases/sqlite3/buildlink3.mk"
184.include "../../devel/chmlib/buildlink3.mk" 230.include "../../devel/chmlib/buildlink3.mk"
185BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12 231BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12
186.include "../../devel/libusb/buildlink3.mk" 232.include "../../devel/libusb/buildlink3.mk"
187.include "../../fonts/fontconfig/buildlink3.mk" 233.include "../../fonts/fontconfig/buildlink3.mk"
188BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=6.5.9 234BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=6.5.9
189.include "../../graphics/ImageMagick/buildlink3.mk" 235.include "../../graphics/ImageMagick/buildlink3.mk"
190BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.6 236BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.6
@@ -205,16 +251,16 @@ BUILDLINK_API_DEPENDS.poppler-qt4+= popp @@ -205,16 +251,16 @@ BUILDLINK_API_DEPENDS.poppler-qt4+= popp
205.include "../../print/poppler-qt4/buildlink3.mk" 251.include "../../print/poppler-qt4/buildlink3.mk"
206.include "../../sysutils/desktop-file-utils/desktopdb.mk" 252.include "../../sysutils/desktop-file-utils/desktopdb.mk"
207.include "../../sysutils/hal/buildlink3.mk" 253.include "../../sysutils/hal/buildlink3.mk"
208BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.82.2 254BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.82.2
209.include "../../sysutils/py-dbus/buildlink3.mk" 255.include "../../sysutils/py-dbus/buildlink3.mk"
210.include "../../textproc/icu/buildlink3.mk" 256.include "../../textproc/icu/buildlink3.mk"
211.include "../../databases/shared-mime-info/mimedb.mk" 257.include "../../databases/shared-mime-info/mimedb.mk"
212.include "../../textproc/py-elementtree/buildlink3.mk" 258.include "../../textproc/py-elementtree/buildlink3.mk"
213.include "../../x11/py-sip/buildlink3.mk" 259.include "../../x11/py-sip/buildlink3.mk"
214BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.7.0 260BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.7.0
215.include "../../x11/py-qt4/buildlink3.mk" 261.include "../../x11/py-qt4/buildlink3.mk"
216BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.7.0 262BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.7.0
217.include "../../x11/qt4-tools/buildlink3.mk" 263.include "../../x11/qt4-tools/buildlink3.mk"
218BUILDLINK_API_DEPENDS.qt4-qdbus+= qt4-tools>=4.7.0 264BUILDLINK_API_DEPENDS.qt4-qdbus+= qt4-qdbus>=4.7.0
219.include "../../x11/qt4-qdbus/buildlink3.mk" 265.include "../../x11/qt4-qdbus/buildlink3.mk"
220.include "../../mk/bsd.pkg.mk" 266.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/misc/calibre/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/calibre/PLIST 2012/11/26 14:02:49 1.15
+++ pkgsrc/misc/calibre/PLIST 2014/04/16 17:22:30 1.16
@@ -1,88 +1,109 @@ @@ -1,88 +1,109 @@
1@comment $NetBSD: PLIST,v 1.15 2012/11/26 14:02:49 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.16 2014/04/16 17:22:30 wiz Exp $
2bin/calibre 2bin/calibre
3bin/calibre-complete 3bin/calibre-complete
4bin/calibre-customize 4bin/calibre-customize
5bin/calibre-debug 5bin/calibre-debug
6bin/calibre-mount-helper 
7bin/calibre-parallel 6bin/calibre-parallel
8bin/calibre-server 7bin/calibre-server
9bin/calibre-smtp 8bin/calibre-smtp
10bin/calibredb 9bin/calibredb
11bin/ebook-convert 10bin/ebook-convert
12bin/ebook-device 11bin/ebook-device
 12bin/ebook-edit
13bin/ebook-meta 13bin/ebook-meta
 14bin/ebook-polish
14bin/ebook-viewer 15bin/ebook-viewer
15bin/epub-fix 
16bin/fetch-ebook-metadata 16bin/fetch-ebook-metadata
17bin/lrf2lrs 17bin/lrf2lrs
18bin/lrfviewer 18bin/lrfviewer
19bin/lrs2lrf 19bin/lrs2lrf
20bin/markdown-calibre 20bin/markdown-calibre
21bin/web2disk 21bin/web2disk
22lib/calibre/calibre/__init__.py 22lib/calibre/calibre/__init__.py
23lib/calibre/calibre/constants.py 23lib/calibre/calibre/constants.py
24lib/calibre/calibre/customize/__init__.py 24lib/calibre/calibre/customize/__init__.py
25lib/calibre/calibre/customize/builtins.py 25lib/calibre/calibre/customize/builtins.py
26lib/calibre/calibre/customize/conversion.py 26lib/calibre/calibre/customize/conversion.py
27lib/calibre/calibre/customize/profiles.py 27lib/calibre/calibre/customize/profiles.py
28lib/calibre/calibre/customize/ui.py 28lib/calibre/calibre/customize/ui.py
29lib/calibre/calibre/customize/zipplugin.py 29lib/calibre/calibre/customize/zipplugin.py
30lib/calibre/calibre/db/__init__.py 30lib/calibre/calibre/db/__init__.py
 31lib/calibre/calibre/db/adding.py
31lib/calibre/calibre/db/backend.py 32lib/calibre/calibre/db/backend.py
 33lib/calibre/calibre/db/backup.py
32lib/calibre/calibre/db/cache.py 34lib/calibre/calibre/db/cache.py
 35lib/calibre/calibre/db/categories.py
 36lib/calibre/calibre/db/delete_service.py
33lib/calibre/calibre/db/errors.py 37lib/calibre/calibre/db/errors.py
34lib/calibre/calibre/db/fields.py 38lib/calibre/calibre/db/fields.py
35lib/calibre/calibre/db/lazy.py 39lib/calibre/calibre/db/lazy.py
 40lib/calibre/calibre/db/legacy.py
36lib/calibre/calibre/db/locking.py 41lib/calibre/calibre/db/locking.py
 42lib/calibre/calibre/db/restore.py
37lib/calibre/calibre/db/schema_upgrades.py 43lib/calibre/calibre/db/schema_upgrades.py
 44lib/calibre/calibre/db/search.py
38lib/calibre/calibre/db/tables.py 45lib/calibre/calibre/db/tables.py
39lib/calibre/calibre/db/tests/__init__.py 46lib/calibre/calibre/db/tests/__init__.py
 47lib/calibre/calibre/db/tests/add_remove.py
40lib/calibre/calibre/db/tests/base.py 48lib/calibre/calibre/db/tests/base.py
 49lib/calibre/calibre/db/tests/filesystem.py
 50lib/calibre/calibre/db/tests/legacy.py
 51lib/calibre/calibre/db/tests/locking.py
 52lib/calibre/calibre/db/tests/main.py
 53lib/calibre/calibre/db/tests/profiling.py
41lib/calibre/calibre/db/tests/reading.py 54lib/calibre/calibre/db/tests/reading.py
 55lib/calibre/calibre/db/tests/utils.py
 56lib/calibre/calibre/db/tests/writing.py
 57lib/calibre/calibre/db/utils.py
42lib/calibre/calibre/db/view.py 58lib/calibre/calibre/db/view.py
 59lib/calibre/calibre/db/write.py
43lib/calibre/calibre/debug.py 60lib/calibre/calibre/debug.py
44lib/calibre/calibre/devices/__init__.py 61lib/calibre/calibre/devices/__init__.py
45lib/calibre/calibre/devices/android/__init__.py 62lib/calibre/calibre/devices/android/__init__.py
46lib/calibre/calibre/devices/android/driver.py 63lib/calibre/calibre/devices/android/driver.py
47lib/calibre/calibre/devices/apple/__init__.py 64lib/calibre/calibre/devices/apple/__init__.py
48lib/calibre/calibre/devices/apple/driver.py 65lib/calibre/calibre/devices/apple/driver.py
49lib/calibre/calibre/devices/apple/itunes.py 66lib/calibre/calibre/devices/apple/itunes.py
50lib/calibre/calibre/devices/bambook/__init__.py 67lib/calibre/calibre/devices/bambook/__init__.py
51lib/calibre/calibre/devices/bambook/driver.py 68lib/calibre/calibre/devices/bambook/driver.py
52lib/calibre/calibre/devices/bambook/libbambookcore.py 69lib/calibre/calibre/devices/bambook/libbambookcore.py
53lib/calibre/calibre/devices/binatone/__init__.py 70lib/calibre/calibre/devices/binatone/__init__.py
54lib/calibre/calibre/devices/binatone/driver.py 71lib/calibre/calibre/devices/binatone/driver.py
55lib/calibre/calibre/devices/blackberry/__init__.py 72lib/calibre/calibre/devices/blackberry/__init__.py
56lib/calibre/calibre/devices/blackberry/driver.py 73lib/calibre/calibre/devices/blackberry/driver.py
57lib/calibre/calibre/devices/boeye/__init__.py 74lib/calibre/calibre/devices/boeye/__init__.py
58lib/calibre/calibre/devices/boeye/driver.py 75lib/calibre/calibre/devices/boeye/driver.py
59lib/calibre/calibre/devices/cli.py 76lib/calibre/calibre/devices/cli.py
60lib/calibre/calibre/devices/cybook/__init__.py 77lib/calibre/calibre/devices/cybook/__init__.py
61lib/calibre/calibre/devices/cybook/driver.py 78lib/calibre/calibre/devices/cybook/driver.py
62lib/calibre/calibre/devices/cybook/t2b.py 79lib/calibre/calibre/devices/cybook/t2b.py
 80lib/calibre/calibre/devices/cybook/t4b.py
63lib/calibre/calibre/devices/eb600/__init__.py 81lib/calibre/calibre/devices/eb600/__init__.py
64lib/calibre/calibre/devices/eb600/driver.py 82lib/calibre/calibre/devices/eb600/driver.py
65lib/calibre/calibre/devices/edge/__init__.py 83lib/calibre/calibre/devices/edge/__init__.py
66lib/calibre/calibre/devices/edge/driver.py 84lib/calibre/calibre/devices/edge/driver.py
67lib/calibre/calibre/devices/errors.py 85lib/calibre/calibre/devices/errors.py
68lib/calibre/calibre/devices/eslick/__init__.py 86lib/calibre/calibre/devices/eslick/__init__.py
69lib/calibre/calibre/devices/eslick/driver.py 87lib/calibre/calibre/devices/eslick/driver.py
70lib/calibre/calibre/devices/folder_device/__init__.py 88lib/calibre/calibre/devices/folder_device/__init__.py
71lib/calibre/calibre/devices/folder_device/driver.py 89lib/calibre/calibre/devices/folder_device/driver.py
72lib/calibre/calibre/devices/hanlin/__init__.py 90lib/calibre/calibre/devices/hanlin/__init__.py
73lib/calibre/calibre/devices/hanlin/driver.py 91lib/calibre/calibre/devices/hanlin/driver.py
74lib/calibre/calibre/devices/hanvon/__init__.py 92lib/calibre/calibre/devices/hanvon/__init__.py
75lib/calibre/calibre/devices/hanvon/driver.py 93lib/calibre/calibre/devices/hanvon/driver.py
 94lib/calibre/calibre/devices/idevice/__init__.py
 95lib/calibre/calibre/devices/idevice/libimobiledevice.py
 96lib/calibre/calibre/devices/idevice/parse_xml.py
76lib/calibre/calibre/devices/iliad/__init__.py 97lib/calibre/calibre/devices/iliad/__init__.py
77lib/calibre/calibre/devices/iliad/driver.py 98lib/calibre/calibre/devices/iliad/driver.py
78lib/calibre/calibre/devices/interface.py 99lib/calibre/calibre/devices/interface.py
79lib/calibre/calibre/devices/irexdr/__init__.py 100lib/calibre/calibre/devices/irexdr/__init__.py
80lib/calibre/calibre/devices/irexdr/driver.py 101lib/calibre/calibre/devices/irexdr/driver.py
81lib/calibre/calibre/devices/iriver/__init__.py 102lib/calibre/calibre/devices/iriver/__init__.py
82lib/calibre/calibre/devices/iriver/driver.py 103lib/calibre/calibre/devices/iriver/driver.py
83lib/calibre/calibre/devices/jetbook/__init__.py 104lib/calibre/calibre/devices/jetbook/__init__.py
84lib/calibre/calibre/devices/jetbook/driver.py 105lib/calibre/calibre/devices/jetbook/driver.py
85lib/calibre/calibre/devices/kindle/__init__.py 106lib/calibre/calibre/devices/kindle/__init__.py
86lib/calibre/calibre/devices/kindle/apnx.py 107lib/calibre/calibre/devices/kindle/apnx.py
87lib/calibre/calibre/devices/kindle/bookmark.py 108lib/calibre/calibre/devices/kindle/bookmark.py
88lib/calibre/calibre/devices/kindle/driver.py 109lib/calibre/calibre/devices/kindle/driver.py
@@ -92,26 +113,27 @@ lib/calibre/calibre/devices/kobo/books.p @@ -92,26 +113,27 @@ lib/calibre/calibre/devices/kobo/books.p
92lib/calibre/calibre/devices/kobo/driver.py 113lib/calibre/calibre/devices/kobo/driver.py
93lib/calibre/calibre/devices/manager.py 114lib/calibre/calibre/devices/manager.py
94lib/calibre/calibre/devices/mime.py 115lib/calibre/calibre/devices/mime.py
95lib/calibre/calibre/devices/misc.py 116lib/calibre/calibre/devices/misc.py
96lib/calibre/calibre/devices/mtp/__init__.py 117lib/calibre/calibre/devices/mtp/__init__.py
97lib/calibre/calibre/devices/mtp/base.py 118lib/calibre/calibre/devices/mtp/base.py
98lib/calibre/calibre/devices/mtp/books.py 119lib/calibre/calibre/devices/mtp/books.py
99lib/calibre/calibre/devices/mtp/defaults.py 120lib/calibre/calibre/devices/mtp/defaults.py
100lib/calibre/calibre/devices/mtp/driver.py 121lib/calibre/calibre/devices/mtp/driver.py
101lib/calibre/calibre/devices/mtp/filesystem_cache.py 122lib/calibre/calibre/devices/mtp/filesystem_cache.py
102lib/calibre/calibre/devices/mtp/test.py 123lib/calibre/calibre/devices/mtp/test.py
103lib/calibre/calibre/devices/mtp/unix/__init__.py 124lib/calibre/calibre/devices/mtp/unix/__init__.py
104lib/calibre/calibre/devices/mtp/unix/driver.py 125lib/calibre/calibre/devices/mtp/unix/driver.py
 126lib/calibre/calibre/devices/mtp/unix/sysfs.py
105lib/calibre/calibre/devices/mtp/unix/upstream/update.py 127lib/calibre/calibre/devices/mtp/unix/upstream/update.py
106lib/calibre/calibre/devices/mtp/windows/__init__.py 128lib/calibre/calibre/devices/mtp/windows/__init__.py
107lib/calibre/calibre/devices/mtp/windows/driver.py 129lib/calibre/calibre/devices/mtp/windows/driver.py
108lib/calibre/calibre/devices/mtp/windows/remote.py 130lib/calibre/calibre/devices/mtp/windows/remote.py
109lib/calibre/calibre/devices/nokia/__init__.py 131lib/calibre/calibre/devices/nokia/__init__.py
110lib/calibre/calibre/devices/nokia/driver.py 132lib/calibre/calibre/devices/nokia/driver.py
111lib/calibre/calibre/devices/nook/__init__.py 133lib/calibre/calibre/devices/nook/__init__.py
112lib/calibre/calibre/devices/nook/driver.py 134lib/calibre/calibre/devices/nook/driver.py
113lib/calibre/calibre/devices/nuut2/__init__.py 135lib/calibre/calibre/devices/nuut2/__init__.py
114lib/calibre/calibre/devices/nuut2/driver.py 136lib/calibre/calibre/devices/nuut2/driver.py
115lib/calibre/calibre/devices/prs505/__init__.py 137lib/calibre/calibre/devices/prs505/__init__.py
116lib/calibre/calibre/devices/prs505/driver.py 138lib/calibre/calibre/devices/prs505/driver.py
117lib/calibre/calibre/devices/prs505/sony_cache.py 139lib/calibre/calibre/devices/prs505/sony_cache.py
@@ -138,34 +160,36 @@ lib/calibre/calibre/devices/utils.py @@ -138,34 +160,36 @@ lib/calibre/calibre/devices/utils.py
138lib/calibre/calibre/ebooks/BeautifulSoup.py 160lib/calibre/calibre/ebooks/BeautifulSoup.py
139lib/calibre/calibre/ebooks/__init__.py 161lib/calibre/calibre/ebooks/__init__.py
140lib/calibre/calibre/ebooks/azw4/__init__.py 162lib/calibre/calibre/ebooks/azw4/__init__.py
141lib/calibre/calibre/ebooks/azw4/reader.py 163lib/calibre/calibre/ebooks/azw4/reader.py
142lib/calibre/calibre/ebooks/chardet.py 164lib/calibre/calibre/ebooks/chardet.py
143lib/calibre/calibre/ebooks/chm/__init__.py 165lib/calibre/calibre/ebooks/chm/__init__.py
144lib/calibre/calibre/ebooks/chm/metadata.py 166lib/calibre/calibre/ebooks/chm/metadata.py
145lib/calibre/calibre/ebooks/chm/reader.py 167lib/calibre/calibre/ebooks/chm/reader.py
146lib/calibre/calibre/ebooks/comic/__init__.py 168lib/calibre/calibre/ebooks/comic/__init__.py
147lib/calibre/calibre/ebooks/comic/input.py 169lib/calibre/calibre/ebooks/comic/input.py
148lib/calibre/calibre/ebooks/compression/__init__.py 170lib/calibre/calibre/ebooks/compression/__init__.py
149lib/calibre/calibre/ebooks/compression/palmdoc.py 171lib/calibre/calibre/ebooks/compression/palmdoc.py
150lib/calibre/calibre/ebooks/compression/tcr.py 172lib/calibre/calibre/ebooks/compression/tcr.py
 173lib/calibre/calibre/ebooks/constants.py
151lib/calibre/calibre/ebooks/conversion/__init__.py 174lib/calibre/calibre/ebooks/conversion/__init__.py
152lib/calibre/calibre/ebooks/conversion/cli.py 175lib/calibre/calibre/ebooks/conversion/cli.py
153lib/calibre/calibre/ebooks/conversion/config.py 176lib/calibre/calibre/ebooks/conversion/config.py
154lib/calibre/calibre/ebooks/conversion/plugins/__init__.py 177lib/calibre/calibre/ebooks/conversion/plugins/__init__.py
155lib/calibre/calibre/ebooks/conversion/plugins/azw4_input.py 178lib/calibre/calibre/ebooks/conversion/plugins/azw4_input.py
156lib/calibre/calibre/ebooks/conversion/plugins/chm_input.py 179lib/calibre/calibre/ebooks/conversion/plugins/chm_input.py
157lib/calibre/calibre/ebooks/conversion/plugins/comic_input.py 180lib/calibre/calibre/ebooks/conversion/plugins/comic_input.py
158lib/calibre/calibre/ebooks/conversion/plugins/djvu_input.py 181lib/calibre/calibre/ebooks/conversion/plugins/djvu_input.py
 182lib/calibre/calibre/ebooks/conversion/plugins/docx_input.py
159lib/calibre/calibre/ebooks/conversion/plugins/epub_input.py 183lib/calibre/calibre/ebooks/conversion/plugins/epub_input.py
160lib/calibre/calibre/ebooks/conversion/plugins/epub_output.py 184lib/calibre/calibre/ebooks/conversion/plugins/epub_output.py
161lib/calibre/calibre/ebooks/conversion/plugins/fb2_input.py 185lib/calibre/calibre/ebooks/conversion/plugins/fb2_input.py
162lib/calibre/calibre/ebooks/conversion/plugins/fb2_output.py 186lib/calibre/calibre/ebooks/conversion/plugins/fb2_output.py
163lib/calibre/calibre/ebooks/conversion/plugins/html_input.py 187lib/calibre/calibre/ebooks/conversion/plugins/html_input.py
164lib/calibre/calibre/ebooks/conversion/plugins/html_output.py 188lib/calibre/calibre/ebooks/conversion/plugins/html_output.py
165lib/calibre/calibre/ebooks/conversion/plugins/htmlz_input.py 189lib/calibre/calibre/ebooks/conversion/plugins/htmlz_input.py
166lib/calibre/calibre/ebooks/conversion/plugins/htmlz_output.py 190lib/calibre/calibre/ebooks/conversion/plugins/htmlz_output.py
167lib/calibre/calibre/ebooks/conversion/plugins/lit_input.py 191lib/calibre/calibre/ebooks/conversion/plugins/lit_input.py
168lib/calibre/calibre/ebooks/conversion/plugins/lit_output.py 192lib/calibre/calibre/ebooks/conversion/plugins/lit_output.py
169lib/calibre/calibre/ebooks/conversion/plugins/lrf_input.py 193lib/calibre/calibre/ebooks/conversion/plugins/lrf_input.py
170lib/calibre/calibre/ebooks/conversion/plugins/lrf_output.py 194lib/calibre/calibre/ebooks/conversion/plugins/lrf_output.py
171lib/calibre/calibre/ebooks/conversion/plugins/mobi_input.py 195lib/calibre/calibre/ebooks/conversion/plugins/mobi_input.py
@@ -185,103 +209,127 @@ lib/calibre/calibre/ebooks/conversion/pl @@ -185,103 +209,127 @@ lib/calibre/calibre/ebooks/conversion/pl
185lib/calibre/calibre/ebooks/conversion/plugins/rtf_output.py 209lib/calibre/calibre/ebooks/conversion/plugins/rtf_output.py
186lib/calibre/calibre/ebooks/conversion/plugins/snb_input.py 210lib/calibre/calibre/ebooks/conversion/plugins/snb_input.py
187lib/calibre/calibre/ebooks/conversion/plugins/snb_output.py 211lib/calibre/calibre/ebooks/conversion/plugins/snb_output.py
188lib/calibre/calibre/ebooks/conversion/plugins/tcr_input.py 212lib/calibre/calibre/ebooks/conversion/plugins/tcr_input.py
189lib/calibre/calibre/ebooks/conversion/plugins/tcr_output.py 213lib/calibre/calibre/ebooks/conversion/plugins/tcr_output.py
190lib/calibre/calibre/ebooks/conversion/plugins/txt_input.py 214lib/calibre/calibre/ebooks/conversion/plugins/txt_input.py
191lib/calibre/calibre/ebooks/conversion/plugins/txt_output.py 215lib/calibre/calibre/ebooks/conversion/plugins/txt_output.py
192lib/calibre/calibre/ebooks/conversion/plumber.py 216lib/calibre/calibre/ebooks/conversion/plumber.py
193lib/calibre/calibre/ebooks/conversion/preprocess.py 217lib/calibre/calibre/ebooks/conversion/preprocess.py
194lib/calibre/calibre/ebooks/conversion/utils.py 218lib/calibre/calibre/ebooks/conversion/utils.py
195lib/calibre/calibre/ebooks/djvu/__init__.py 219lib/calibre/calibre/ebooks/djvu/__init__.py
196lib/calibre/calibre/ebooks/djvu/djvu.py 220lib/calibre/calibre/ebooks/djvu/djvu.py
197lib/calibre/calibre/ebooks/djvu/djvubzzdec.py 221lib/calibre/calibre/ebooks/djvu/djvubzzdec.py
 222lib/calibre/calibre/ebooks/docx/__init__.py
 223lib/calibre/calibre/ebooks/docx/block_styles.py
 224lib/calibre/calibre/ebooks/docx/char_styles.py
 225lib/calibre/calibre/ebooks/docx/cleanup.py
 226lib/calibre/calibre/ebooks/docx/container.py
 227lib/calibre/calibre/ebooks/docx/dump.py
 228lib/calibre/calibre/ebooks/docx/fields.py
 229lib/calibre/calibre/ebooks/docx/fonts.py
 230lib/calibre/calibre/ebooks/docx/footnotes.py
 231lib/calibre/calibre/ebooks/docx/images.py
 232lib/calibre/calibre/ebooks/docx/index.py
 233lib/calibre/calibre/ebooks/docx/lcid.py
 234lib/calibre/calibre/ebooks/docx/names.py
 235lib/calibre/calibre/ebooks/docx/numbering.py
 236lib/calibre/calibre/ebooks/docx/settings.py
 237lib/calibre/calibre/ebooks/docx/styles.py
 238lib/calibre/calibre/ebooks/docx/tables.py
 239lib/calibre/calibre/ebooks/docx/theme.py
 240lib/calibre/calibre/ebooks/docx/to_html.py
 241lib/calibre/calibre/ebooks/docx/toc.py
 242lib/calibre/calibre/ebooks/docx/writer/__init__.py
 243lib/calibre/calibre/ebooks/docx/writer/container.py
198lib/calibre/calibre/ebooks/epub/__init__.py 244lib/calibre/calibre/ebooks/epub/__init__.py
199lib/calibre/calibre/ebooks/epub/fix/__init__.py 
200lib/calibre/calibre/ebooks/epub/fix/container.py 
201lib/calibre/calibre/ebooks/epub/fix/epubcheck.py 
202lib/calibre/calibre/ebooks/epub/fix/main.py 
203lib/calibre/calibre/ebooks/epub/fix/unmanifested.py 
204lib/calibre/calibre/ebooks/epub/pages.py 245lib/calibre/calibre/ebooks/epub/pages.py
205lib/calibre/calibre/ebooks/epub/periodical.py 246lib/calibre/calibre/ebooks/epub/periodical.py
206lib/calibre/calibre/ebooks/fb2/__init__.py 247lib/calibre/calibre/ebooks/fb2/__init__.py
207lib/calibre/calibre/ebooks/fb2/fb2ml.py 248lib/calibre/calibre/ebooks/fb2/fb2ml.py
208lib/calibre/calibre/ebooks/html/__init__.py 249lib/calibre/calibre/ebooks/html/__init__.py
209lib/calibre/calibre/ebooks/html/input.py 250lib/calibre/calibre/ebooks/html/input.py
210lib/calibre/calibre/ebooks/html/meta.py 251lib/calibre/calibre/ebooks/html/meta.py
211lib/calibre/calibre/ebooks/html/to_zip.py 252lib/calibre/calibre/ebooks/html/to_zip.py
 253lib/calibre/calibre/ebooks/html_entities.py
212lib/calibre/calibre/ebooks/htmlz/__init__.py 254lib/calibre/calibre/ebooks/htmlz/__init__.py
213lib/calibre/calibre/ebooks/htmlz/oeb2html.py 255lib/calibre/calibre/ebooks/htmlz/oeb2html.py
214lib/calibre/calibre/ebooks/hyphenate.py 256lib/calibre/calibre/ebooks/hyphenate.py
215lib/calibre/calibre/ebooks/iterator/__init__.py 257lib/calibre/calibre/ebooks/iterator/__init__.py
216lib/calibre/calibre/ebooks/lit/__init__.py 258lib/calibre/calibre/ebooks/lit/__init__.py
217lib/calibre/calibre/ebooks/lit/from_any.py 259lib/calibre/calibre/ebooks/lit/from_any.py
218lib/calibre/calibre/ebooks/lit/lzx.py 260lib/calibre/calibre/ebooks/lit/lzx.py
219lib/calibre/calibre/ebooks/lit/maps/__init__.py 261lib/calibre/calibre/ebooks/lit/maps/__init__.py
220lib/calibre/calibre/ebooks/lit/maps/html.py 262lib/calibre/calibre/ebooks/lit/maps/html.py
221lib/calibre/calibre/ebooks/lit/maps/opf.py 263lib/calibre/calibre/ebooks/lit/maps/opf.py
222lib/calibre/calibre/ebooks/lit/mssha1.py 264lib/calibre/calibre/ebooks/lit/mssha1.py
223lib/calibre/calibre/ebooks/lit/reader.py 265lib/calibre/calibre/ebooks/lit/reader.py
224lib/calibre/calibre/ebooks/lit/writer.py 266lib/calibre/calibre/ebooks/lit/writer.py
225lib/calibre/calibre/ebooks/lrf/__init__.py 267lib/calibre/calibre/ebooks/lrf/__init__.py
226lib/calibre/calibre/ebooks/lrf/fonts/__init__.py 268lib/calibre/calibre/ebooks/lrf/fonts.py
227lib/calibre/calibre/ebooks/lrf/html/__init__.py 269lib/calibre/calibre/ebooks/lrf/html/__init__.py
228lib/calibre/calibre/ebooks/lrf/html/color_map.py 270lib/calibre/calibre/ebooks/lrf/html/color_map.py
229lib/calibre/calibre/ebooks/lrf/html/convert_from.py 271lib/calibre/calibre/ebooks/lrf/html/convert_from.py
230lib/calibre/calibre/ebooks/lrf/html/convert_to.py 272lib/calibre/calibre/ebooks/lrf/html/convert_to.py
231lib/calibre/calibre/ebooks/lrf/html/table.py 273lib/calibre/calibre/ebooks/lrf/html/table.py
232lib/calibre/calibre/ebooks/lrf/html/table_as_image.py 274lib/calibre/calibre/ebooks/lrf/html/table_as_image.py
233lib/calibre/calibre/ebooks/lrf/input.py 275lib/calibre/calibre/ebooks/lrf/input.py
234lib/calibre/calibre/ebooks/lrf/lrfparser.py 276lib/calibre/calibre/ebooks/lrf/lrfparser.py
235lib/calibre/calibre/ebooks/lrf/lrs/__init__.py 277lib/calibre/calibre/ebooks/lrf/lrs/__init__.py
236lib/calibre/calibre/ebooks/lrf/lrs/convert_from.py 278lib/calibre/calibre/ebooks/lrf/lrs/convert_from.py
237lib/calibre/calibre/ebooks/lrf/meta.py 279lib/calibre/calibre/ebooks/lrf/meta.py
238lib/calibre/calibre/ebooks/lrf/objects.py 280lib/calibre/calibre/ebooks/lrf/objects.py
239lib/calibre/calibre/ebooks/lrf/pylrs/__init__.py 281lib/calibre/calibre/ebooks/lrf/pylrs/__init__.py
240lib/calibre/calibre/ebooks/lrf/pylrs/elements.py 282lib/calibre/calibre/ebooks/lrf/pylrs/elements.py
241lib/calibre/calibre/ebooks/lrf/pylrs/pylrf.py 283lib/calibre/calibre/ebooks/lrf/pylrs/pylrf.py
242lib/calibre/calibre/ebooks/lrf/pylrs/pylrfopt.py 284lib/calibre/calibre/ebooks/lrf/pylrs/pylrfopt.py
243lib/calibre/calibre/ebooks/lrf/pylrs/pylrs.py 285lib/calibre/calibre/ebooks/lrf/pylrs/pylrs.py
244lib/calibre/calibre/ebooks/lrf/tags.py 286lib/calibre/calibre/ebooks/lrf/tags.py
245lib/calibre/calibre/ebooks/markdown/__init__.py 287lib/calibre/calibre/ebooks/markdown/__init__.py
 288lib/calibre/calibre/ebooks/markdown/__main__.py
 289lib/calibre/calibre/ebooks/markdown/__version__.py
246lib/calibre/calibre/ebooks/markdown/blockparser.py 290lib/calibre/calibre/ebooks/markdown/blockparser.py
247lib/calibre/calibre/ebooks/markdown/blockprocessors.py 291lib/calibre/calibre/ebooks/markdown/blockprocessors.py
248lib/calibre/calibre/ebooks/markdown/commandline.py 
249lib/calibre/calibre/ebooks/markdown/etree_loader.py 
250lib/calibre/calibre/ebooks/markdown/extensions/__init__.py 292lib/calibre/calibre/ebooks/markdown/extensions/__init__.py
251lib/calibre/calibre/ebooks/markdown/extensions/abbr.py 293lib/calibre/calibre/ebooks/markdown/extensions/abbr.py
 294lib/calibre/calibre/ebooks/markdown/extensions/admonition.py
 295lib/calibre/calibre/ebooks/markdown/extensions/attr_list.py
252lib/calibre/calibre/ebooks/markdown/extensions/codehilite.py 296lib/calibre/calibre/ebooks/markdown/extensions/codehilite.py
253lib/calibre/calibre/ebooks/markdown/extensions/def_list.py 297lib/calibre/calibre/ebooks/markdown/extensions/def_list.py
254lib/calibre/calibre/ebooks/markdown/extensions/extra.py 298lib/calibre/calibre/ebooks/markdown/extensions/extra.py
255lib/calibre/calibre/ebooks/markdown/extensions/fenced_code.py 299lib/calibre/calibre/ebooks/markdown/extensions/fenced_code.py
256lib/calibre/calibre/ebooks/markdown/extensions/footnotes.py 300lib/calibre/calibre/ebooks/markdown/extensions/footnotes.py
257lib/calibre/calibre/ebooks/markdown/extensions/headerid.py 301lib/calibre/calibre/ebooks/markdown/extensions/headerid.py
258lib/calibre/calibre/ebooks/markdown/extensions/meta.py 302lib/calibre/calibre/ebooks/markdown/extensions/meta.py
259lib/calibre/calibre/ebooks/markdown/extensions/rss.py 303lib/calibre/calibre/ebooks/markdown/extensions/nl2br.py
 304lib/calibre/calibre/ebooks/markdown/extensions/sane_lists.py
 305lib/calibre/calibre/ebooks/markdown/extensions/smart_strong.py
260lib/calibre/calibre/ebooks/markdown/extensions/tables.py 306lib/calibre/calibre/ebooks/markdown/extensions/tables.py
261lib/calibre/calibre/ebooks/markdown/extensions/toc.py 307lib/calibre/calibre/ebooks/markdown/extensions/toc.py
262lib/calibre/calibre/ebooks/markdown/extensions/wikilinks.py 308lib/calibre/calibre/ebooks/markdown/extensions/wikilinks.py
263lib/calibre/calibre/ebooks/markdown/html4.py 
264lib/calibre/calibre/ebooks/markdown/inlinepatterns.py 309lib/calibre/calibre/ebooks/markdown/inlinepatterns.py
265lib/calibre/calibre/ebooks/markdown/markdown.py 
266lib/calibre/calibre/ebooks/markdown/odict.py 310lib/calibre/calibre/ebooks/markdown/odict.py
267lib/calibre/calibre/ebooks/markdown/postprocessors.py 311lib/calibre/calibre/ebooks/markdown/postprocessors.py
268lib/calibre/calibre/ebooks/markdown/preprocessors.py 312lib/calibre/calibre/ebooks/markdown/preprocessors.py
 313lib/calibre/calibre/ebooks/markdown/serializers.py
269lib/calibre/calibre/ebooks/markdown/treeprocessors.py 314lib/calibre/calibre/ebooks/markdown/treeprocessors.py
 315lib/calibre/calibre/ebooks/markdown/util.py
270lib/calibre/calibre/ebooks/metadata/__init__.py 316lib/calibre/calibre/ebooks/metadata/__init__.py
271lib/calibre/calibre/ebooks/metadata/archive.py 317lib/calibre/calibre/ebooks/metadata/archive.py
272lib/calibre/calibre/ebooks/metadata/book/__init__.py 318lib/calibre/calibre/ebooks/metadata/book/__init__.py
273lib/calibre/calibre/ebooks/metadata/book/base.py 319lib/calibre/calibre/ebooks/metadata/book/base.py
 320lib/calibre/calibre/ebooks/metadata/book/formatter.py
274lib/calibre/calibre/ebooks/metadata/book/json_codec.py 321lib/calibre/calibre/ebooks/metadata/book/json_codec.py
 322lib/calibre/calibre/ebooks/metadata/book/render.py
275lib/calibre/calibre/ebooks/metadata/cli.py 323lib/calibre/calibre/ebooks/metadata/cli.py
276lib/calibre/calibre/ebooks/metadata/docx.py 324lib/calibre/calibre/ebooks/metadata/docx.py
277lib/calibre/calibre/ebooks/metadata/epub.py 325lib/calibre/calibre/ebooks/metadata/epub.py
278lib/calibre/calibre/ebooks/metadata/ereader.py 326lib/calibre/calibre/ebooks/metadata/ereader.py
279lib/calibre/calibre/ebooks/metadata/extz.py 327lib/calibre/calibre/ebooks/metadata/extz.py
280lib/calibre/calibre/ebooks/metadata/fb2.py 328lib/calibre/calibre/ebooks/metadata/fb2.py
281lib/calibre/calibre/ebooks/metadata/haodoo.py 329lib/calibre/calibre/ebooks/metadata/haodoo.py
282lib/calibre/calibre/ebooks/metadata/html.py 330lib/calibre/calibre/ebooks/metadata/html.py
283lib/calibre/calibre/ebooks/metadata/imp.py 331lib/calibre/calibre/ebooks/metadata/imp.py
284lib/calibre/calibre/ebooks/metadata/kdl.py 332lib/calibre/calibre/ebooks/metadata/kdl.py
285lib/calibre/calibre/ebooks/metadata/library_thing.py 333lib/calibre/calibre/ebooks/metadata/library_thing.py
286lib/calibre/calibre/ebooks/metadata/lit.py 334lib/calibre/calibre/ebooks/metadata/lit.py
287lib/calibre/calibre/ebooks/metadata/lrx.py 335lib/calibre/calibre/ebooks/metadata/lrx.py
@@ -290,42 +338,47 @@ lib/calibre/calibre/ebooks/metadata/mobi @@ -290,42 +338,47 @@ lib/calibre/calibre/ebooks/metadata/mobi
290lib/calibre/calibre/ebooks/metadata/odt.py 338lib/calibre/calibre/ebooks/metadata/odt.py
291lib/calibre/calibre/ebooks/metadata/opf2.py 339lib/calibre/calibre/ebooks/metadata/opf2.py
292lib/calibre/calibre/ebooks/metadata/pdb.py 340lib/calibre/calibre/ebooks/metadata/pdb.py
293lib/calibre/calibre/ebooks/metadata/pdf.py 341lib/calibre/calibre/ebooks/metadata/pdf.py
294lib/calibre/calibre/ebooks/metadata/plucker.py 342lib/calibre/calibre/ebooks/metadata/plucker.py
295lib/calibre/calibre/ebooks/metadata/pml.py 343lib/calibre/calibre/ebooks/metadata/pml.py
296lib/calibre/calibre/ebooks/metadata/rar.py 344lib/calibre/calibre/ebooks/metadata/rar.py
297lib/calibre/calibre/ebooks/metadata/rb.py 345lib/calibre/calibre/ebooks/metadata/rb.py
298lib/calibre/calibre/ebooks/metadata/rtf.py 346lib/calibre/calibre/ebooks/metadata/rtf.py
299lib/calibre/calibre/ebooks/metadata/snb.py 347lib/calibre/calibre/ebooks/metadata/snb.py
300lib/calibre/calibre/ebooks/metadata/sources/__init__.py 348lib/calibre/calibre/ebooks/metadata/sources/__init__.py
301lib/calibre/calibre/ebooks/metadata/sources/amazon.py 349lib/calibre/calibre/ebooks/metadata/sources/amazon.py
302lib/calibre/calibre/ebooks/metadata/sources/base.py 350lib/calibre/calibre/ebooks/metadata/sources/base.py
 351lib/calibre/calibre/ebooks/metadata/sources/big_book_search.py
303lib/calibre/calibre/ebooks/metadata/sources/cli.py 352lib/calibre/calibre/ebooks/metadata/sources/cli.py
304lib/calibre/calibre/ebooks/metadata/sources/covers.py 353lib/calibre/calibre/ebooks/metadata/sources/covers.py
305lib/calibre/calibre/ebooks/metadata/sources/douban.py 354lib/calibre/calibre/ebooks/metadata/sources/douban.py
 355lib/calibre/calibre/ebooks/metadata/sources/edelweiss.py
306lib/calibre/calibre/ebooks/metadata/sources/google.py 356lib/calibre/calibre/ebooks/metadata/sources/google.py
 357lib/calibre/calibre/ebooks/metadata/sources/google_images.py
307lib/calibre/calibre/ebooks/metadata/sources/identify.py 358lib/calibre/calibre/ebooks/metadata/sources/identify.py
308lib/calibre/calibre/ebooks/metadata/sources/isbndb.py 359lib/calibre/calibre/ebooks/metadata/sources/isbndb.py
309lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py 360lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py
310lib/calibre/calibre/ebooks/metadata/sources/overdrive.py 361lib/calibre/calibre/ebooks/metadata/sources/overdrive.py
311lib/calibre/calibre/ebooks/metadata/sources/ozon.py 362lib/calibre/calibre/ebooks/metadata/sources/ozon.py
 363lib/calibre/calibre/ebooks/metadata/sources/prefs.py
312lib/calibre/calibre/ebooks/metadata/sources/test.py 364lib/calibre/calibre/ebooks/metadata/sources/test.py
313lib/calibre/calibre/ebooks/metadata/sources/worker.py 365lib/calibre/calibre/ebooks/metadata/sources/worker.py
314lib/calibre/calibre/ebooks/metadata/toc.py 366lib/calibre/calibre/ebooks/metadata/toc.py
315lib/calibre/calibre/ebooks/metadata/topaz.py 367lib/calibre/calibre/ebooks/metadata/topaz.py
316lib/calibre/calibre/ebooks/metadata/txt.py 368lib/calibre/calibre/ebooks/metadata/txt.py
317lib/calibre/calibre/ebooks/metadata/worker.py 369lib/calibre/calibre/ebooks/metadata/worker.py
318lib/calibre/calibre/ebooks/metadata/xisbn.py 370lib/calibre/calibre/ebooks/metadata/xisbn.py
 371lib/calibre/calibre/ebooks/metadata/xmp.py
319lib/calibre/calibre/ebooks/metadata/zip.py 372lib/calibre/calibre/ebooks/metadata/zip.py
320lib/calibre/calibre/ebooks/mobi/__init__.py 373lib/calibre/calibre/ebooks/mobi/__init__.py
321lib/calibre/calibre/ebooks/mobi/debug/__init__.py 374lib/calibre/calibre/ebooks/mobi/debug/__init__.py
322lib/calibre/calibre/ebooks/mobi/debug/headers.py 375lib/calibre/calibre/ebooks/mobi/debug/headers.py
323lib/calibre/calibre/ebooks/mobi/debug/index.py 376lib/calibre/calibre/ebooks/mobi/debug/index.py
324lib/calibre/calibre/ebooks/mobi/debug/main.py 377lib/calibre/calibre/ebooks/mobi/debug/main.py
325lib/calibre/calibre/ebooks/mobi/debug/mobi6.py 378lib/calibre/calibre/ebooks/mobi/debug/mobi6.py
326lib/calibre/calibre/ebooks/mobi/debug/mobi8.py 379lib/calibre/calibre/ebooks/mobi/debug/mobi8.py
327lib/calibre/calibre/ebooks/mobi/huffcdic.py 380lib/calibre/calibre/ebooks/mobi/huffcdic.py
328lib/calibre/calibre/ebooks/mobi/langcodes.py 381lib/calibre/calibre/ebooks/mobi/langcodes.py
329lib/calibre/calibre/ebooks/mobi/mobiml.py 382lib/calibre/calibre/ebooks/mobi/mobiml.py
330lib/calibre/calibre/ebooks/mobi/reader/__init__.py 383lib/calibre/calibre/ebooks/mobi/reader/__init__.py
331lib/calibre/calibre/ebooks/mobi/reader/headers.py 384lib/calibre/calibre/ebooks/mobi/reader/headers.py
@@ -353,31 +406,65 @@ lib/calibre/calibre/ebooks/mobi/writer8/ @@ -353,31 +406,65 @@ lib/calibre/calibre/ebooks/mobi/writer8/
353lib/calibre/calibre/ebooks/mobi/writer8/toc.py 406lib/calibre/calibre/ebooks/mobi/writer8/toc.py
354lib/calibre/calibre/ebooks/odt/__init__.py 407lib/calibre/calibre/ebooks/odt/__init__.py
355lib/calibre/calibre/ebooks/odt/input.py 408lib/calibre/calibre/ebooks/odt/input.py
356lib/calibre/calibre/ebooks/oeb/__init__.py 409lib/calibre/calibre/ebooks/oeb/__init__.py
357lib/calibre/calibre/ebooks/oeb/base.py 410lib/calibre/calibre/ebooks/oeb/base.py
358lib/calibre/calibre/ebooks/oeb/display/__init__.py 411lib/calibre/calibre/ebooks/oeb/display/__init__.py
359lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py 412lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py
360lib/calibre/calibre/ebooks/oeb/display/webview.py 413lib/calibre/calibre/ebooks/oeb/display/webview.py
361lib/calibre/calibre/ebooks/oeb/iterator/__init__.py 414lib/calibre/calibre/ebooks/oeb/iterator/__init__.py
362lib/calibre/calibre/ebooks/oeb/iterator/book.py 415lib/calibre/calibre/ebooks/oeb/iterator/book.py
363lib/calibre/calibre/ebooks/oeb/iterator/bookmarks.py 416lib/calibre/calibre/ebooks/oeb/iterator/bookmarks.py
364lib/calibre/calibre/ebooks/oeb/iterator/extract_fonts.py 417lib/calibre/calibre/ebooks/oeb/iterator/extract_fonts.py
365lib/calibre/calibre/ebooks/oeb/iterator/spine.py 418lib/calibre/calibre/ebooks/oeb/iterator/spine.py
 419lib/calibre/calibre/ebooks/oeb/normalize_css.py
366lib/calibre/calibre/ebooks/oeb/parse_utils.py 420lib/calibre/calibre/ebooks/oeb/parse_utils.py
 421lib/calibre/calibre/ebooks/oeb/polish/__init__.py
 422lib/calibre/calibre/ebooks/oeb/polish/check/__init__.py
 423lib/calibre/calibre/ebooks/oeb/polish/check/base.py
 424lib/calibre/calibre/ebooks/oeb/polish/check/fonts.py
 425lib/calibre/calibre/ebooks/oeb/polish/check/images.py
 426lib/calibre/calibre/ebooks/oeb/polish/check/links.py
 427lib/calibre/calibre/ebooks/oeb/polish/check/main.py
 428lib/calibre/calibre/ebooks/oeb/polish/check/opf.py
 429lib/calibre/calibre/ebooks/oeb/polish/check/parsing.py
 430lib/calibre/calibre/ebooks/oeb/polish/container.py
 431lib/calibre/calibre/ebooks/oeb/polish/cover.py
 432lib/calibre/calibre/ebooks/oeb/polish/create.py
 433lib/calibre/calibre/ebooks/oeb/polish/css.py
 434lib/calibre/calibre/ebooks/oeb/polish/embed.py
 435lib/calibre/calibre/ebooks/oeb/polish/errors.py
 436lib/calibre/calibre/ebooks/oeb/polish/import_book.py
 437lib/calibre/calibre/ebooks/oeb/polish/jacket.py
 438lib/calibre/calibre/ebooks/oeb/polish/main.py
 439lib/calibre/calibre/ebooks/oeb/polish/opf.py
 440lib/calibre/calibre/ebooks/oeb/polish/parsing.py
 441lib/calibre/calibre/ebooks/oeb/polish/pretty.py
 442lib/calibre/calibre/ebooks/oeb/polish/replace.py
 443lib/calibre/calibre/ebooks/oeb/polish/split.py
 444lib/calibre/calibre/ebooks/oeb/polish/stats.py
 445lib/calibre/calibre/ebooks/oeb/polish/subset.py
 446lib/calibre/calibre/ebooks/oeb/polish/tests/__init__.py
 447lib/calibre/calibre/ebooks/oeb/polish/tests/base.py
 448lib/calibre/calibre/ebooks/oeb/polish/tests/container.py
 449lib/calibre/calibre/ebooks/oeb/polish/tests/main.py
 450lib/calibre/calibre/ebooks/oeb/polish/tests/parsing.py
 451lib/calibre/calibre/ebooks/oeb/polish/toc.py
 452lib/calibre/calibre/ebooks/oeb/polish/utils.py
367lib/calibre/calibre/ebooks/oeb/reader.py 453lib/calibre/calibre/ebooks/oeb/reader.py
368lib/calibre/calibre/ebooks/oeb/stylizer.py 454lib/calibre/calibre/ebooks/oeb/stylizer.py
369lib/calibre/calibre/ebooks/oeb/transforms/__init__.py 455lib/calibre/calibre/ebooks/oeb/transforms/__init__.py
370lib/calibre/calibre/ebooks/oeb/transforms/cover.py 456lib/calibre/calibre/ebooks/oeb/transforms/cover.py
 457lib/calibre/calibre/ebooks/oeb/transforms/embed_fonts.py
371lib/calibre/calibre/ebooks/oeb/transforms/filenames.py 458lib/calibre/calibre/ebooks/oeb/transforms/filenames.py
372lib/calibre/calibre/ebooks/oeb/transforms/flatcss.py 459lib/calibre/calibre/ebooks/oeb/transforms/flatcss.py
373lib/calibre/calibre/ebooks/oeb/transforms/guide.py 460lib/calibre/calibre/ebooks/oeb/transforms/guide.py
374lib/calibre/calibre/ebooks/oeb/transforms/htmltoc.py 461lib/calibre/calibre/ebooks/oeb/transforms/htmltoc.py
375lib/calibre/calibre/ebooks/oeb/transforms/jacket.py 462lib/calibre/calibre/ebooks/oeb/transforms/jacket.py
376lib/calibre/calibre/ebooks/oeb/transforms/linearize_tables.py 463lib/calibre/calibre/ebooks/oeb/transforms/linearize_tables.py
377lib/calibre/calibre/ebooks/oeb/transforms/manglecase.py 464lib/calibre/calibre/ebooks/oeb/transforms/manglecase.py
378lib/calibre/calibre/ebooks/oeb/transforms/metadata.py 465lib/calibre/calibre/ebooks/oeb/transforms/metadata.py
379lib/calibre/calibre/ebooks/oeb/transforms/page_margin.py 466lib/calibre/calibre/ebooks/oeb/transforms/page_margin.py
380lib/calibre/calibre/ebooks/oeb/transforms/rasterize.py 467lib/calibre/calibre/ebooks/oeb/transforms/rasterize.py
381lib/calibre/calibre/ebooks/oeb/transforms/rescale.py 468lib/calibre/calibre/ebooks/oeb/transforms/rescale.py
382lib/calibre/calibre/ebooks/oeb/transforms/split.py 469lib/calibre/calibre/ebooks/oeb/transforms/split.py
383lib/calibre/calibre/ebooks/oeb/transforms/structure.py 470lib/calibre/calibre/ebooks/oeb/transforms/structure.py
@@ -403,26 +490,37 @@ lib/calibre/calibre/ebooks/pdb/palmdoc/w @@ -403,26 +490,37 @@ lib/calibre/calibre/ebooks/pdb/palmdoc/w
403lib/calibre/calibre/ebooks/pdb/pdf/__init__.py 490lib/calibre/calibre/ebooks/pdb/pdf/__init__.py
404lib/calibre/calibre/ebooks/pdb/pdf/reader.py 491lib/calibre/calibre/ebooks/pdb/pdf/reader.py
405lib/calibre/calibre/ebooks/pdb/plucker/__init__.py 492lib/calibre/calibre/ebooks/pdb/plucker/__init__.py
406lib/calibre/calibre/ebooks/pdb/plucker/reader.py 493lib/calibre/calibre/ebooks/pdb/plucker/reader.py
407lib/calibre/calibre/ebooks/pdb/ztxt/__init__.py 494lib/calibre/calibre/ebooks/pdb/ztxt/__init__.py
408lib/calibre/calibre/ebooks/pdb/ztxt/reader.py 495lib/calibre/calibre/ebooks/pdb/ztxt/reader.py
409lib/calibre/calibre/ebooks/pdb/ztxt/writer.py 496lib/calibre/calibre/ebooks/pdb/ztxt/writer.py
410lib/calibre/calibre/ebooks/pdf/__init__.py 497lib/calibre/calibre/ebooks/pdf/__init__.py
411lib/calibre/calibre/ebooks/pdf/from_comic.py 498lib/calibre/calibre/ebooks/pdf/from_comic.py
412lib/calibre/calibre/ebooks/pdf/outline_writer.py 499lib/calibre/calibre/ebooks/pdf/outline_writer.py
413lib/calibre/calibre/ebooks/pdf/pageoptions.py 500lib/calibre/calibre/ebooks/pdf/pageoptions.py
414lib/calibre/calibre/ebooks/pdf/pdftohtml.py 501lib/calibre/calibre/ebooks/pdf/pdftohtml.py
415lib/calibre/calibre/ebooks/pdf/reflow.py 502lib/calibre/calibre/ebooks/pdf/reflow.py
 503lib/calibre/calibre/ebooks/pdf/render/__init__.py
 504lib/calibre/calibre/ebooks/pdf/render/common.py
 505lib/calibre/calibre/ebooks/pdf/render/engine.py
 506lib/calibre/calibre/ebooks/pdf/render/fonts.py
 507lib/calibre/calibre/ebooks/pdf/render/from_html.py
 508lib/calibre/calibre/ebooks/pdf/render/gradients.py
 509lib/calibre/calibre/ebooks/pdf/render/graphics.py
 510lib/calibre/calibre/ebooks/pdf/render/links.py
 511lib/calibre/calibre/ebooks/pdf/render/serialize.py
 512lib/calibre/calibre/ebooks/pdf/render/test.py
 513lib/calibre/calibre/ebooks/pdf/render/toc.py
416lib/calibre/calibre/ebooks/pdf/writer.py 514lib/calibre/calibre/ebooks/pdf/writer.py
417lib/calibre/calibre/ebooks/pml/__init__.py 515lib/calibre/calibre/ebooks/pml/__init__.py
418lib/calibre/calibre/ebooks/pml/pmlconverter.py 516lib/calibre/calibre/ebooks/pml/pmlconverter.py
419lib/calibre/calibre/ebooks/pml/pmlml.py 517lib/calibre/calibre/ebooks/pml/pmlml.py
420lib/calibre/calibre/ebooks/rb/__init__.py 518lib/calibre/calibre/ebooks/rb/__init__.py
421lib/calibre/calibre/ebooks/rb/rbml.py 519lib/calibre/calibre/ebooks/rb/rbml.py
422lib/calibre/calibre/ebooks/rb/reader.py 520lib/calibre/calibre/ebooks/rb/reader.py
423lib/calibre/calibre/ebooks/rb/writer.py 521lib/calibre/calibre/ebooks/rb/writer.py
424lib/calibre/calibre/ebooks/readability/__init__.py 522lib/calibre/calibre/ebooks/readability/__init__.py
425lib/calibre/calibre/ebooks/readability/cleaners.py 523lib/calibre/calibre/ebooks/readability/cleaners.py
426lib/calibre/calibre/ebooks/readability/debug.py 524lib/calibre/calibre/ebooks/readability/debug.py
427lib/calibre/calibre/ebooks/readability/htmls.py 525lib/calibre/calibre/ebooks/readability/htmls.py
428lib/calibre/calibre/ebooks/readability/readability.py 526lib/calibre/calibre/ebooks/readability/readability.py
@@ -515,38 +613,44 @@ lib/calibre/calibre/gui2/actions/__init_ @@ -515,38 +613,44 @@ lib/calibre/calibre/gui2/actions/__init_
515lib/calibre/calibre/gui2/actions/add.py 613lib/calibre/calibre/gui2/actions/add.py
516lib/calibre/calibre/gui2/actions/add_to_library.py 614lib/calibre/calibre/gui2/actions/add_to_library.py
517lib/calibre/calibre/gui2/actions/annotate.py 615lib/calibre/calibre/gui2/actions/annotate.py
518lib/calibre/calibre/gui2/actions/catalog.py 616lib/calibre/calibre/gui2/actions/catalog.py
519lib/calibre/calibre/gui2/actions/choose_library.py 617lib/calibre/calibre/gui2/actions/choose_library.py
520lib/calibre/calibre/gui2/actions/convert.py 618lib/calibre/calibre/gui2/actions/convert.py
521lib/calibre/calibre/gui2/actions/copy_to_library.py 619lib/calibre/calibre/gui2/actions/copy_to_library.py
522lib/calibre/calibre/gui2/actions/delete.py 620lib/calibre/calibre/gui2/actions/delete.py
523lib/calibre/calibre/gui2/actions/device.py 621lib/calibre/calibre/gui2/actions/device.py
524lib/calibre/calibre/gui2/actions/edit_collections.py 622lib/calibre/calibre/gui2/actions/edit_collections.py
525lib/calibre/calibre/gui2/actions/edit_metadata.py 623lib/calibre/calibre/gui2/actions/edit_metadata.py
526lib/calibre/calibre/gui2/actions/fetch_news.py 624lib/calibre/calibre/gui2/actions/fetch_news.py
527lib/calibre/calibre/gui2/actions/help.py 625lib/calibre/calibre/gui2/actions/help.py
 626lib/calibre/calibre/gui2/actions/mark_books.py
 627lib/calibre/calibre/gui2/actions/match_books.py
528lib/calibre/calibre/gui2/actions/next_match.py 628lib/calibre/calibre/gui2/actions/next_match.py
529lib/calibre/calibre/gui2/actions/open.py 629lib/calibre/calibre/gui2/actions/open.py
530lib/calibre/calibre/gui2/actions/plugin_updates.py 630lib/calibre/calibre/gui2/actions/plugin_updates.py
 631lib/calibre/calibre/gui2/actions/polish.py
531lib/calibre/calibre/gui2/actions/preferences.py 632lib/calibre/calibre/gui2/actions/preferences.py
532lib/calibre/calibre/gui2/actions/random.py 633lib/calibre/calibre/gui2/actions/random.py
533lib/calibre/calibre/gui2/actions/restart.py 634lib/calibre/calibre/gui2/actions/restart.py
534lib/calibre/calibre/gui2/actions/save_to_disk.py 635lib/calibre/calibre/gui2/actions/save_to_disk.py
535lib/calibre/calibre/gui2/actions/show_book_details.py 636lib/calibre/calibre/gui2/actions/show_book_details.py
536lib/calibre/calibre/gui2/actions/show_quickview.py 637lib/calibre/calibre/gui2/actions/show_quickview.py
537lib/calibre/calibre/gui2/actions/similar_books.py 638lib/calibre/calibre/gui2/actions/similar_books.py
 639lib/calibre/calibre/gui2/actions/sort.py
538lib/calibre/calibre/gui2/actions/store.py 640lib/calibre/calibre/gui2/actions/store.py
 641lib/calibre/calibre/gui2/actions/toc_edit.py
539lib/calibre/calibre/gui2/actions/tweak_epub.py 642lib/calibre/calibre/gui2/actions/tweak_epub.py
 643lib/calibre/calibre/gui2/actions/unpack_book.py
540lib/calibre/calibre/gui2/actions/view.py 644lib/calibre/calibre/gui2/actions/view.py
541lib/calibre/calibre/gui2/add.py 645lib/calibre/calibre/gui2/add.py
542lib/calibre/calibre/gui2/add_wizard/__init__.py 646lib/calibre/calibre/gui2/add_wizard/__init__.py
543lib/calibre/calibre/gui2/add_wizard/scan_ui.py 647lib/calibre/calibre/gui2/add_wizard/scan_ui.py
544lib/calibre/calibre/gui2/add_wizard/welcome_ui.py 648lib/calibre/calibre/gui2/add_wizard/welcome_ui.py
545lib/calibre/calibre/gui2/auto_add.py 649lib/calibre/calibre/gui2/auto_add.py
546lib/calibre/calibre/gui2/bars.py 650lib/calibre/calibre/gui2/bars.py
547lib/calibre/calibre/gui2/book_details.py 651lib/calibre/calibre/gui2/book_details.py
548lib/calibre/calibre/gui2/catalog/__init__.py 652lib/calibre/calibre/gui2/catalog/__init__.py
549lib/calibre/calibre/gui2/catalog/catalog_bibtex.py 653lib/calibre/calibre/gui2/catalog/catalog_bibtex.py
550lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py 654lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py
551lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py 655lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py
552lib/calibre/calibre/gui2/catalog/catalog_csv_xml_ui.py 656lib/calibre/calibre/gui2/catalog/catalog_csv_xml_ui.py
@@ -554,28 +658,29 @@ lib/calibre/calibre/gui2/catalog/catalog @@ -554,28 +658,29 @@ lib/calibre/calibre/gui2/catalog/catalog
554lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py 658lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
555lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py 659lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
556lib/calibre/calibre/gui2/comments_editor.py 660lib/calibre/calibre/gui2/comments_editor.py
557lib/calibre/calibre/gui2/complete.py 661lib/calibre/calibre/gui2/complete.py
558lib/calibre/calibre/gui2/complete2.py 662lib/calibre/calibre/gui2/complete2.py
559lib/calibre/calibre/gui2/convert/__init__.py 663lib/calibre/calibre/gui2/convert/__init__.py
560lib/calibre/calibre/gui2/convert/azw3_output.py 664lib/calibre/calibre/gui2/convert/azw3_output.py
561lib/calibre/calibre/gui2/convert/azw3_output_ui.py 665lib/calibre/calibre/gui2/convert/azw3_output_ui.py
562lib/calibre/calibre/gui2/convert/bulk.py 666lib/calibre/calibre/gui2/convert/bulk.py
563lib/calibre/calibre/gui2/convert/comic_input.py 667lib/calibre/calibre/gui2/convert/comic_input.py
564lib/calibre/calibre/gui2/convert/comic_input_ui.py 668lib/calibre/calibre/gui2/convert/comic_input_ui.py
565lib/calibre/calibre/gui2/convert/debug.py 669lib/calibre/calibre/gui2/convert/debug.py
566lib/calibre/calibre/gui2/convert/debug_ui.py 670lib/calibre/calibre/gui2/convert/debug_ui.py
567lib/calibre/calibre/gui2/convert/djvu_input.py 
568lib/calibre/calibre/gui2/convert/djvu_input_ui.py 671lib/calibre/calibre/gui2/convert/djvu_input_ui.py
 672lib/calibre/calibre/gui2/convert/docx_input.py
 673lib/calibre/calibre/gui2/convert/docx_input_ui.py
569lib/calibre/calibre/gui2/convert/epub_output.py 674lib/calibre/calibre/gui2/convert/epub_output.py
570lib/calibre/calibre/gui2/convert/epub_output_ui.py 675lib/calibre/calibre/gui2/convert/epub_output_ui.py
571lib/calibre/calibre/gui2/convert/fb2_input.py 676lib/calibre/calibre/gui2/convert/fb2_input.py
572lib/calibre/calibre/gui2/convert/fb2_input_ui.py 677lib/calibre/calibre/gui2/convert/fb2_input_ui.py
573lib/calibre/calibre/gui2/convert/fb2_output.py 678lib/calibre/calibre/gui2/convert/fb2_output.py
574lib/calibre/calibre/gui2/convert/fb2_output_ui.py 679lib/calibre/calibre/gui2/convert/fb2_output_ui.py
575lib/calibre/calibre/gui2/convert/font_key.py 680lib/calibre/calibre/gui2/convert/font_key.py
576lib/calibre/calibre/gui2/convert/font_key_ui.py 681lib/calibre/calibre/gui2/convert/font_key_ui.py
577lib/calibre/calibre/gui2/convert/gui_conversion.py 682lib/calibre/calibre/gui2/convert/gui_conversion.py
578lib/calibre/calibre/gui2/convert/heuristics.py 683lib/calibre/calibre/gui2/convert/heuristics.py
579lib/calibre/calibre/gui2/convert/heuristics_ui.py 684lib/calibre/calibre/gui2/convert/heuristics_ui.py
580lib/calibre/calibre/gui2/convert/htmlz_output.py 685lib/calibre/calibre/gui2/convert/htmlz_output.py
581lib/calibre/calibre/gui2/convert/htmlz_output_ui.py 686lib/calibre/calibre/gui2/convert/htmlz_output_ui.py
@@ -591,26 +696,28 @@ lib/calibre/calibre/gui2/convert/page_se @@ -591,26 +696,28 @@ lib/calibre/calibre/gui2/convert/page_se
591lib/calibre/calibre/gui2/convert/page_setup_ui.py 696lib/calibre/calibre/gui2/convert/page_setup_ui.py
592lib/calibre/calibre/gui2/convert/pdb_output.py 697lib/calibre/calibre/gui2/convert/pdb_output.py
593lib/calibre/calibre/gui2/convert/pdb_output_ui.py 698lib/calibre/calibre/gui2/convert/pdb_output_ui.py
594lib/calibre/calibre/gui2/convert/pdf_input.py 699lib/calibre/calibre/gui2/convert/pdf_input.py
595lib/calibre/calibre/gui2/convert/pdf_input_ui.py 700lib/calibre/calibre/gui2/convert/pdf_input_ui.py
596lib/calibre/calibre/gui2/convert/pdf_output.py 701lib/calibre/calibre/gui2/convert/pdf_output.py
597lib/calibre/calibre/gui2/convert/pdf_output_ui.py 702lib/calibre/calibre/gui2/convert/pdf_output_ui.py
598lib/calibre/calibre/gui2/convert/pml_output.py 703lib/calibre/calibre/gui2/convert/pml_output.py
599lib/calibre/calibre/gui2/convert/pmlz_output_ui.py 704lib/calibre/calibre/gui2/convert/pmlz_output_ui.py
600lib/calibre/calibre/gui2/convert/rb_output.py 705lib/calibre/calibre/gui2/convert/rb_output.py
601lib/calibre/calibre/gui2/convert/rb_output_ui.py 706lib/calibre/calibre/gui2/convert/rb_output_ui.py
602lib/calibre/calibre/gui2/convert/regex_builder.py 707lib/calibre/calibre/gui2/convert/regex_builder.py
603lib/calibre/calibre/gui2/convert/regex_builder_ui.py 708lib/calibre/calibre/gui2/convert/regex_builder_ui.py
 709lib/calibre/calibre/gui2/convert/rtf_input.py
 710lib/calibre/calibre/gui2/convert/rtf_input_ui.py
604lib/calibre/calibre/gui2/convert/search_and_replace.py 711lib/calibre/calibre/gui2/convert/search_and_replace.py
605lib/calibre/calibre/gui2/convert/search_and_replace_ui.py 712lib/calibre/calibre/gui2/convert/search_and_replace_ui.py
606lib/calibre/calibre/gui2/convert/single.py 713lib/calibre/calibre/gui2/convert/single.py
607lib/calibre/calibre/gui2/convert/single_ui.py 714lib/calibre/calibre/gui2/convert/single_ui.py
608lib/calibre/calibre/gui2/convert/snb_output.py 715lib/calibre/calibre/gui2/convert/snb_output.py
609lib/calibre/calibre/gui2/convert/snb_output_ui.py 716lib/calibre/calibre/gui2/convert/snb_output_ui.py
610lib/calibre/calibre/gui2/convert/structure_detection.py 717lib/calibre/calibre/gui2/convert/structure_detection.py
611lib/calibre/calibre/gui2/convert/structure_detection_ui.py 718lib/calibre/calibre/gui2/convert/structure_detection_ui.py
612lib/calibre/calibre/gui2/convert/toc.py 719lib/calibre/calibre/gui2/convert/toc.py
613lib/calibre/calibre/gui2/convert/toc_ui.py 720lib/calibre/calibre/gui2/convert/toc_ui.py
614lib/calibre/calibre/gui2/convert/txt_input.py 721lib/calibre/calibre/gui2/convert/txt_input.py
615lib/calibre/calibre/gui2/convert/txt_input_ui.py 722lib/calibre/calibre/gui2/convert/txt_input_ui.py
616lib/calibre/calibre/gui2/convert/txt_output.py 723lib/calibre/calibre/gui2/convert/txt_output.py
@@ -621,58 +728,61 @@ lib/calibre/calibre/gui2/convert/xpath_w @@ -621,58 +728,61 @@ lib/calibre/calibre/gui2/convert/xpath_w
621lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py 728lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py
622lib/calibre/calibre/gui2/cover_flow.py 729lib/calibre/calibre/gui2/cover_flow.py
623lib/calibre/calibre/gui2/custom_column_widgets.py 730lib/calibre/calibre/gui2/custom_column_widgets.py
624lib/calibre/calibre/gui2/device.py 731lib/calibre/calibre/gui2/device.py
625lib/calibre/calibre/gui2/device_drivers/__init__.py 732lib/calibre/calibre/gui2/device_drivers/__init__.py
626lib/calibre/calibre/gui2/device_drivers/configwidget.py 733lib/calibre/calibre/gui2/device_drivers/configwidget.py
627lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py 734lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py
628lib/calibre/calibre/gui2/device_drivers/mtp_config.py 735lib/calibre/calibre/gui2/device_drivers/mtp_config.py
629lib/calibre/calibre/gui2/device_drivers/mtp_folder_browser.py 736lib/calibre/calibre/gui2/device_drivers/mtp_folder_browser.py
630lib/calibre/calibre/gui2/dialogs/__init__.py 737lib/calibre/calibre/gui2/dialogs/__init__.py
631lib/calibre/calibre/gui2/dialogs/add_empty_book.py 738lib/calibre/calibre/gui2/dialogs/add_empty_book.py
632lib/calibre/calibre/gui2/dialogs/add_from_isbn.py 739lib/calibre/calibre/gui2/dialogs/add_from_isbn.py
633lib/calibre/calibre/gui2/dialogs/add_from_isbn_ui.py 740lib/calibre/calibre/gui2/dialogs/add_from_isbn_ui.py
 741lib/calibre/calibre/gui2/dialogs/authors_edit.py
634lib/calibre/calibre/gui2/dialogs/book_info.py 742lib/calibre/calibre/gui2/dialogs/book_info.py
635lib/calibre/calibre/gui2/dialogs/book_info_ui.py 
636lib/calibre/calibre/gui2/dialogs/catalog.py 743lib/calibre/calibre/gui2/dialogs/catalog.py
637lib/calibre/calibre/gui2/dialogs/catalog_ui.py 744lib/calibre/calibre/gui2/dialogs/catalog_ui.py
638lib/calibre/calibre/gui2/dialogs/check_library.py 745lib/calibre/calibre/gui2/dialogs/check_library.py
639lib/calibre/calibre/gui2/dialogs/choose_format.py 746lib/calibre/calibre/gui2/dialogs/choose_format.py
640lib/calibre/calibre/gui2/dialogs/choose_format_device.py 747lib/calibre/calibre/gui2/dialogs/choose_format_device.py
641lib/calibre/calibre/gui2/dialogs/choose_format_device_ui.py 748lib/calibre/calibre/gui2/dialogs/choose_format_device_ui.py
642lib/calibre/calibre/gui2/dialogs/choose_format_ui.py 749lib/calibre/calibre/gui2/dialogs/choose_format_ui.py
643lib/calibre/calibre/gui2/dialogs/choose_library.py 750lib/calibre/calibre/gui2/dialogs/choose_library.py
644lib/calibre/calibre/gui2/dialogs/choose_library_ui.py 751lib/calibre/calibre/gui2/dialogs/choose_library_ui.py
645lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py 752lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py
646lib/calibre/calibre/gui2/dialogs/comicconf.py 753lib/calibre/calibre/gui2/dialogs/comicconf.py
647lib/calibre/calibre/gui2/dialogs/comicconf_ui.py 754lib/calibre/calibre/gui2/dialogs/comicconf_ui.py
648lib/calibre/calibre/gui2/dialogs/comments_dialog.py 755lib/calibre/calibre/gui2/dialogs/comments_dialog.py
649lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py 756lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py
650lib/calibre/calibre/gui2/dialogs/confirm_delete.py 757lib/calibre/calibre/gui2/dialogs/confirm_delete.py
651lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py 758lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py
652lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py 759lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py
653lib/calibre/calibre/gui2/dialogs/confirm_delete_ui.py 760lib/calibre/calibre/gui2/dialogs/confirm_delete_ui.py
654lib/calibre/calibre/gui2/dialogs/conversion_error.py 761lib/calibre/calibre/gui2/dialogs/conversion_error.py
655lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py 762lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py
656lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py 763lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py
657lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py 764lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py
658lib/calibre/calibre/gui2/dialogs/device_category_editor.py 765lib/calibre/calibre/gui2/dialogs/device_category_editor.py
659lib/calibre/calibre/gui2/dialogs/device_category_editor_ui.py 766lib/calibre/calibre/gui2/dialogs/device_category_editor_ui.py
660lib/calibre/calibre/gui2/dialogs/drm_error.py 767lib/calibre/calibre/gui2/dialogs/drm_error.py
661lib/calibre/calibre/gui2/dialogs/drm_error_ui.py 768lib/calibre/calibre/gui2/dialogs/drm_error_ui.py
 769lib/calibre/calibre/gui2/dialogs/duplicates.py
662lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py 770lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
663lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py 771lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py
664lib/calibre/calibre/gui2/dialogs/job_view_ui.py 772lib/calibre/calibre/gui2/dialogs/job_view_ui.py
665lib/calibre/calibre/gui2/dialogs/jobs_ui.py 773lib/calibre/calibre/gui2/dialogs/jobs_ui.py
 774lib/calibre/calibre/gui2/dialogs/match_books.py
 775lib/calibre/calibre/gui2/dialogs/match_books_ui.py
666lib/calibre/calibre/gui2/dialogs/message_box.py 776lib/calibre/calibre/gui2/dialogs/message_box.py
667lib/calibre/calibre/gui2/dialogs/message_box_ui.py 777lib/calibre/calibre/gui2/dialogs/message_box_ui.py
668lib/calibre/calibre/gui2/dialogs/metadata_bulk.py 778lib/calibre/calibre/gui2/dialogs/metadata_bulk.py
669lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py 779lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py
670lib/calibre/calibre/gui2/dialogs/password.py 780lib/calibre/calibre/gui2/dialogs/password.py
671lib/calibre/calibre/gui2/dialogs/password_ui.py 781lib/calibre/calibre/gui2/dialogs/password_ui.py
672lib/calibre/calibre/gui2/dialogs/plugin_updater.py 782lib/calibre/calibre/gui2/dialogs/plugin_updater.py
673lib/calibre/calibre/gui2/dialogs/progress.py 783lib/calibre/calibre/gui2/dialogs/progress.py
674lib/calibre/calibre/gui2/dialogs/progress_ui.py 784lib/calibre/calibre/gui2/dialogs/progress_ui.py
675lib/calibre/calibre/gui2/dialogs/quickview.py 785lib/calibre/calibre/gui2/dialogs/quickview.py
676lib/calibre/calibre/gui2/dialogs/quickview_ui.py 786lib/calibre/calibre/gui2/dialogs/quickview_ui.py
677lib/calibre/calibre/gui2/dialogs/restore_library.py 787lib/calibre/calibre/gui2/dialogs/restore_library.py
678lib/calibre/calibre/gui2/dialogs/saved_search_editor.py 788lib/calibre/calibre/gui2/dialogs/saved_search_editor.py
@@ -685,56 +795,61 @@ lib/calibre/calibre/gui2/dialogs/search_ @@ -685,56 +795,61 @@ lib/calibre/calibre/gui2/dialogs/search_
685lib/calibre/calibre/gui2/dialogs/select_formats.py 795lib/calibre/calibre/gui2/dialogs/select_formats.py
686lib/calibre/calibre/gui2/dialogs/smartdevice.py 796lib/calibre/calibre/gui2/dialogs/smartdevice.py
687lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py 797lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py
688lib/calibre/calibre/gui2/dialogs/tag_categories.py 798lib/calibre/calibre/gui2/dialogs/tag_categories.py
689lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py 799lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py
690lib/calibre/calibre/gui2/dialogs/tag_editor.py 800lib/calibre/calibre/gui2/dialogs/tag_editor.py
691lib/calibre/calibre/gui2/dialogs/tag_editor_ui.py 801lib/calibre/calibre/gui2/dialogs/tag_editor_ui.py
692lib/calibre/calibre/gui2/dialogs/tag_list_editor.py 802lib/calibre/calibre/gui2/dialogs/tag_list_editor.py
693lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py 803lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
694lib/calibre/calibre/gui2/dialogs/template_dialog.py 804lib/calibre/calibre/gui2/dialogs/template_dialog.py
695lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py 805lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
696lib/calibre/calibre/gui2/dialogs/template_line_editor.py 806lib/calibre/calibre/gui2/dialogs/template_line_editor.py
697lib/calibre/calibre/gui2/dialogs/test_email_ui.py 807lib/calibre/calibre/gui2/dialogs/test_email_ui.py
 808lib/calibre/calibre/gui2/dialogs/trim_image.py
698lib/calibre/calibre/gui2/dialogs/user_profiles.py 809lib/calibre/calibre/gui2/dialogs/user_profiles.py
699lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py 810lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py
700lib/calibre/calibre/gui2/dnd.py 811lib/calibre/calibre/gui2/dnd.py
701lib/calibre/calibre/gui2/duplicates.py 
702lib/calibre/calibre/gui2/ebook_download.py 812lib/calibre/calibre/gui2/ebook_download.py
703lib/calibre/calibre/gui2/email.py 813lib/calibre/calibre/gui2/email.py
704lib/calibre/calibre/gui2/filename_pattern_ui.py 814lib/calibre/calibre/gui2/filename_pattern_ui.py
705lib/calibre/calibre/gui2/font_family_chooser.py 815lib/calibre/calibre/gui2/font_family_chooser.py
706lib/calibre/calibre/gui2/init.py 816lib/calibre/calibre/gui2/init.py
 817lib/calibre/calibre/gui2/job_indicator.py
707lib/calibre/calibre/gui2/jobs.py 818lib/calibre/calibre/gui2/jobs.py
708lib/calibre/calibre/gui2/keyboard.py 819lib/calibre/calibre/gui2/keyboard.py
709lib/calibre/calibre/gui2/languages.py 820lib/calibre/calibre/gui2/languages.py
710lib/calibre/calibre/gui2/layout.py 821lib/calibre/calibre/gui2/layout.py
711lib/calibre/calibre/gui2/library/__init__.py 822lib/calibre/calibre/gui2/library/__init__.py
 823lib/calibre/calibre/gui2/library/alternate_views.py
 824lib/calibre/calibre/gui2/library/caches.py
712lib/calibre/calibre/gui2/library/delegates.py 825lib/calibre/calibre/gui2/library/delegates.py
713lib/calibre/calibre/gui2/library/models.py 826lib/calibre/calibre/gui2/library/models.py
714lib/calibre/calibre/gui2/library/views.py 827lib/calibre/calibre/gui2/library/views.py
715lib/calibre/calibre/gui2/lrf_renderer/__init__.py 828lib/calibre/calibre/gui2/lrf_renderer/__init__.py
716lib/calibre/calibre/gui2/lrf_renderer/bookview.py 829lib/calibre/calibre/gui2/lrf_renderer/bookview.py
717lib/calibre/calibre/gui2/lrf_renderer/config_ui.py 830lib/calibre/calibre/gui2/lrf_renderer/config_ui.py
718lib/calibre/calibre/gui2/lrf_renderer/document.py 831lib/calibre/calibre/gui2/lrf_renderer/document.py
719lib/calibre/calibre/gui2/lrf_renderer/main.py 832lib/calibre/calibre/gui2/lrf_renderer/main.py
720lib/calibre/calibre/gui2/lrf_renderer/main_ui.py 833lib/calibre/calibre/gui2/lrf_renderer/main_ui.py
721lib/calibre/calibre/gui2/lrf_renderer/text.py 834lib/calibre/calibre/gui2/lrf_renderer/text.py
722lib/calibre/calibre/gui2/main.py 835lib/calibre/calibre/gui2/main.py
723lib/calibre/calibre/gui2/main_window.py 836lib/calibre/calibre/gui2/main_window.py
724lib/calibre/calibre/gui2/metadata/__init__.py 837lib/calibre/calibre/gui2/metadata/__init__.py
725lib/calibre/calibre/gui2/metadata/basic_widgets.py 838lib/calibre/calibre/gui2/metadata/basic_widgets.py
726lib/calibre/calibre/gui2/metadata/bulk_download.py 839lib/calibre/calibre/gui2/metadata/bulk_download.py
727lib/calibre/calibre/gui2/metadata/config.py 840lib/calibre/calibre/gui2/metadata/config.py
 841lib/calibre/calibre/gui2/metadata/diff.py
 842lib/calibre/calibre/gui2/metadata/pdf_covers.py
728lib/calibre/calibre/gui2/metadata/single.py 843lib/calibre/calibre/gui2/metadata/single.py
729lib/calibre/calibre/gui2/metadata/single_download.py 844lib/calibre/calibre/gui2/metadata/single_download.py
730lib/calibre/calibre/gui2/notify.py 845lib/calibre/calibre/gui2/notify.py
731lib/calibre/calibre/gui2/preferences/__init__.py 846lib/calibre/calibre/gui2/preferences/__init__.py
732lib/calibre/calibre/gui2/preferences/adding.py 847lib/calibre/calibre/gui2/preferences/adding.py
733lib/calibre/calibre/gui2/preferences/adding_ui.py 848lib/calibre/calibre/gui2/preferences/adding_ui.py
734lib/calibre/calibre/gui2/preferences/behavior.py 849lib/calibre/calibre/gui2/preferences/behavior.py
735lib/calibre/calibre/gui2/preferences/behavior_ui.py 850lib/calibre/calibre/gui2/preferences/behavior_ui.py
736lib/calibre/calibre/gui2/preferences/coloring.py 851lib/calibre/calibre/gui2/preferences/coloring.py
737lib/calibre/calibre/gui2/preferences/columns.py 852lib/calibre/calibre/gui2/preferences/columns.py
738lib/calibre/calibre/gui2/preferences/columns_ui.py 853lib/calibre/calibre/gui2/preferences/columns_ui.py
739lib/calibre/calibre/gui2/preferences/conversion.py 854lib/calibre/calibre/gui2/preferences/conversion.py
740lib/calibre/calibre/gui2/preferences/conversion_ui.py 855lib/calibre/calibre/gui2/preferences/conversion_ui.py
@@ -760,151 +875,193 @@ lib/calibre/calibre/gui2/preferences/plu @@ -760,151 +875,193 @@ lib/calibre/calibre/gui2/preferences/plu
760lib/calibre/calibre/gui2/preferences/plugins_ui.py 875lib/calibre/calibre/gui2/preferences/plugins_ui.py
761lib/calibre/calibre/gui2/preferences/save_template.py 876lib/calibre/calibre/gui2/preferences/save_template.py
762lib/calibre/calibre/gui2/preferences/save_template_ui.py 877lib/calibre/calibre/gui2/preferences/save_template_ui.py
763lib/calibre/calibre/gui2/preferences/saving.py 878lib/calibre/calibre/gui2/preferences/saving.py
764lib/calibre/calibre/gui2/preferences/saving_ui.py 879lib/calibre/calibre/gui2/preferences/saving_ui.py
765lib/calibre/calibre/gui2/preferences/search.py 880lib/calibre/calibre/gui2/preferences/search.py
766lib/calibre/calibre/gui2/preferences/search_ui.py 881lib/calibre/calibre/gui2/preferences/search_ui.py
767lib/calibre/calibre/gui2/preferences/sending.py 882lib/calibre/calibre/gui2/preferences/sending.py
768lib/calibre/calibre/gui2/preferences/sending_ui.py 883lib/calibre/calibre/gui2/preferences/sending_ui.py
769lib/calibre/calibre/gui2/preferences/server.py 884lib/calibre/calibre/gui2/preferences/server.py
770lib/calibre/calibre/gui2/preferences/server_ui.py 885lib/calibre/calibre/gui2/preferences/server_ui.py
771lib/calibre/calibre/gui2/preferences/template_functions.py 886lib/calibre/calibre/gui2/preferences/template_functions.py
772lib/calibre/calibre/gui2/preferences/template_functions_ui.py 887lib/calibre/calibre/gui2/preferences/template_functions_ui.py
 888lib/calibre/calibre/gui2/preferences/texture_chooser.py
773lib/calibre/calibre/gui2/preferences/toolbar.py 889lib/calibre/calibre/gui2/preferences/toolbar.py
774lib/calibre/calibre/gui2/preferences/toolbar_ui.py 890lib/calibre/calibre/gui2/preferences/toolbar_ui.py
775lib/calibre/calibre/gui2/preferences/tweaks.py 891lib/calibre/calibre/gui2/preferences/tweaks.py
776lib/calibre/calibre/gui2/preferences/tweaks_ui.py 892lib/calibre/calibre/gui2/preferences/tweaks_ui.py
777lib/calibre/calibre/gui2/proceed.py 893lib/calibre/calibre/gui2/proceed.py
778lib/calibre/calibre/gui2/progress_indicator/__init__.py 894lib/calibre/calibre/gui2/progress_indicator/__init__.py
779lib/calibre/calibre/gui2/search_box.py 895lib/calibre/calibre/gui2/search_box.py
780lib/calibre/calibre/gui2/search_restriction_mixin.py 896lib/calibre/calibre/gui2/search_restriction_mixin.py
781lib/calibre/calibre/gui2/shortcuts.py 897lib/calibre/calibre/gui2/shortcuts.py
782lib/calibre/calibre/gui2/shortcuts_ui.py 898lib/calibre/calibre/gui2/shortcuts_ui.py
783lib/calibre/calibre/gui2/store/__init__.py 899lib/calibre/calibre/gui2/store/__init__.py
784lib/calibre/calibre/gui2/store/basic_config.py 900lib/calibre/calibre/gui2/store/basic_config.py
785lib/calibre/calibre/gui2/store/basic_config_widget_ui.py 901lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
786lib/calibre/calibre/gui2/store/config/__init__.py 902lib/calibre/calibre/gui2/store/config/__init__.py
787lib/calibre/calibre/gui2/store/config/chooser/__init__.py 903lib/calibre/calibre/gui2/store/config/chooser/__init__.py
788lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py 904lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py
789lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py 905lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py
790lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py 906lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py
791lib/calibre/calibre/gui2/store/config/chooser/chooser_widget.py 907lib/calibre/calibre/gui2/store/config/chooser/chooser_widget.py
792lib/calibre/calibre/gui2/store/config/chooser/chooser_widget_ui.py 908lib/calibre/calibre/gui2/store/config/chooser/chooser_widget_ui.py
793lib/calibre/calibre/gui2/store/config/chooser/models.py 909lib/calibre/calibre/gui2/store/config/chooser/models.py
794lib/calibre/calibre/gui2/store/config/chooser/results_view.py 910lib/calibre/calibre/gui2/store/config/chooser/results_view.py
795lib/calibre/calibre/gui2/store/config/search/__init__.py 911lib/calibre/calibre/gui2/store/config/search/__init__.py
796lib/calibre/calibre/gui2/store/config/search/search_widget.py 912lib/calibre/calibre/gui2/store/config/search/search_widget.py
797lib/calibre/calibre/gui2/store/config/search/search_widget_ui.py 913lib/calibre/calibre/gui2/store/config/search/search_widget_ui.py
798lib/calibre/calibre/gui2/store/config/store.py 914lib/calibre/calibre/gui2/store/config/store.py
 915lib/calibre/calibre/gui2/store/loader.py
799lib/calibre/calibre/gui2/store/opensearch_store.py 916lib/calibre/calibre/gui2/store/opensearch_store.py
800lib/calibre/calibre/gui2/store/search/__init__.py 917lib/calibre/calibre/gui2/store/search/__init__.py
801lib/calibre/calibre/gui2/store/search/adv_search_builder.py 918lib/calibre/calibre/gui2/store/search/adv_search_builder.py
802lib/calibre/calibre/gui2/store/search/adv_search_builder_ui.py 919lib/calibre/calibre/gui2/store/search/adv_search_builder_ui.py
803lib/calibre/calibre/gui2/store/search/download_thread.py 920lib/calibre/calibre/gui2/store/search/download_thread.py
804lib/calibre/calibre/gui2/store/search/models.py 921lib/calibre/calibre/gui2/store/search/models.py
805lib/calibre/calibre/gui2/store/search/results_view.py 922lib/calibre/calibre/gui2/store/search/results_view.py
806lib/calibre/calibre/gui2/store/search/search.py 923lib/calibre/calibre/gui2/store/search/search.py
807lib/calibre/calibre/gui2/store/search/search_ui.py 924lib/calibre/calibre/gui2/store/search/search_ui.py
808lib/calibre/calibre/gui2/store/search_result.py 925lib/calibre/calibre/gui2/store/search_result.py
809lib/calibre/calibre/gui2/store/stores/__init__.py 926lib/calibre/calibre/gui2/store/stores/__init__.py
 927lib/calibre/calibre/gui2/store/stores/allegro_plugin.py
 928lib/calibre/calibre/gui2/store/stores/amazon_ca_plugin.py
810lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py 929lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py
811lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py 930lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py
812lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py 931lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
813lib/calibre/calibre/gui2/store/stores/amazon_it_plugin.py 932lib/calibre/calibre/gui2/store/stores/amazon_it_plugin.py
814lib/calibre/calibre/gui2/store/stores/amazon_plugin.py 933lib/calibre/calibre/gui2/store/stores/amazon_plugin.py
815lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py 934lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py
816lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py 935lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py
817lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py 936lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py
818lib/calibre/calibre/gui2/store/stores/bewrite_plugin.py 937lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
819lib/calibre/calibre/gui2/store/stores/biblio_plugin.py 938lib/calibre/calibre/gui2/store/stores/biblio_plugin.py
820lib/calibre/calibre/gui2/store/stores/bn_plugin.py 939lib/calibre/calibre/gui2/store/stores/bn_plugin.py
821lib/calibre/calibre/gui2/store/stores/bookoteka_plugin.py 940lib/calibre/calibre/gui2/store/stores/cdp_plugin.py
822lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py 941lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py
823lib/calibre/calibre/gui2/store/stores/diesel_ebooks_plugin.py 
824lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py 942lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py
825lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py 943lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
826lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py 944lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py
827lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py 945lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py
828lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py 946lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py
829lib/calibre/calibre/gui2/store/stores/eharlequin_plugin.py 
830lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py 947lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py
831lib/calibre/calibre/gui2/store/stores/empik_plugin.py 948lib/calibre/calibre/gui2/store/stores/empik_plugin.py
832lib/calibre/calibre/gui2/store/stores/escapemagazine_plugin.py 
833lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py 949lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
834lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py 
835lib/calibre/calibre/gui2/store/stores/google_books_plugin.py 950lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
836lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py 951lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py
837lib/calibre/calibre/gui2/store/stores/kobo_plugin.py 952lib/calibre/calibre/gui2/store/stores/kobo_plugin.py
 953lib/calibre/calibre/gui2/store/stores/koobe_plugin.py
838lib/calibre/calibre/gui2/store/stores/legimi_plugin.py 954lib/calibre/calibre/gui2/store/stores/legimi_plugin.py
839lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py 955lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py
840lib/calibre/calibre/gui2/store/stores/litres_plugin.py 956lib/calibre/calibre/gui2/store/stores/litres_plugin.py
841lib/calibre/calibre/gui2/store/stores/manybooks_plugin.py 957lib/calibre/calibre/gui2/store/stores/manybooks_plugin.py
842lib/calibre/calibre/gui2/store/stores/mills_boon_uk_plugin.py 958lib/calibre/calibre/gui2/store/stores/mills_boon_uk_plugin.py
843lib/calibre/calibre/gui2/store/stores/mobileread/__init__.py 959lib/calibre/calibre/gui2/store/stores/mobileread/__init__.py
844lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder.py 960lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder.py
845lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder_ui.py 961lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder_ui.py
846lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog.py 962lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog.py
847lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog_ui.py 963lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog_ui.py
848lib/calibre/calibre/gui2/store/stores/mobileread/cache_update_thread.py 964lib/calibre/calibre/gui2/store/stores/mobileread/cache_update_thread.py
849lib/calibre/calibre/gui2/store/stores/mobileread/mobileread_plugin.py 965lib/calibre/calibre/gui2/store/stores/mobileread/mobileread_plugin.py
850lib/calibre/calibre/gui2/store/stores/mobileread/models.py 966lib/calibre/calibre/gui2/store/stores/mobileread/models.py
851lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py 967lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py
852lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py 968lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py
853lib/calibre/calibre/gui2/store/stores/nexto_plugin.py 969lib/calibre/calibre/gui2/store/stores/nexto_plugin.py
 970lib/calibre/calibre/gui2/store/stores/nook_uk_plugin.py
854lib/calibre/calibre/gui2/store/stores/open_books_plugin.py 971lib/calibre/calibre/gui2/store/stores/open_books_plugin.py
855lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py 972lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py
856lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py 973lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py
857lib/calibre/calibre/gui2/store/stores/publio_plugin.py 974lib/calibre/calibre/gui2/store/stores/publio_plugin.py
858lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py 975lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
859lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py 976lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
 977lib/calibre/calibre/gui2/store/stores/sony_au_plugin.py
860lib/calibre/calibre/gui2/store/stores/sony_plugin.py 978lib/calibre/calibre/gui2/store/stores/sony_plugin.py
861lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py 979lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
862lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py 980lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
863lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py 981lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
864lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py 982lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py
865lib/calibre/calibre/gui2/store/stores/woblink_plugin.py 983lib/calibre/calibre/gui2/store/stores/woblink_plugin.py
 984lib/calibre/calibre/gui2/store/stores/wolnelektury_plugin.py
866lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py 985lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py
867lib/calibre/calibre/gui2/store/stores/zixo_plugin.py 
868lib/calibre/calibre/gui2/store/web_control.py 986lib/calibre/calibre/gui2/store/web_control.py
869lib/calibre/calibre/gui2/store/web_store_dialog.py 987lib/calibre/calibre/gui2/store/web_store_dialog.py
870lib/calibre/calibre/gui2/store/web_store_dialog_ui.py 988lib/calibre/calibre/gui2/store/web_store_dialog_ui.py
871lib/calibre/calibre/gui2/tag_browser/__init__.py 989lib/calibre/calibre/gui2/tag_browser/__init__.py
872lib/calibre/calibre/gui2/tag_browser/model.py 990lib/calibre/calibre/gui2/tag_browser/model.py
873lib/calibre/calibre/gui2/tag_browser/ui.py 991lib/calibre/calibre/gui2/tag_browser/ui.py
874lib/calibre/calibre/gui2/tag_browser/view.py 992lib/calibre/calibre/gui2/tag_browser/view.py
875lib/calibre/calibre/gui2/threaded_jobs.py 993lib/calibre/calibre/gui2/threaded_jobs.py
876lib/calibre/calibre/gui2/throbber.py 994lib/calibre/calibre/gui2/throbber.py
 995lib/calibre/calibre/gui2/toc/__init__.py
 996lib/calibre/calibre/gui2/toc/location.py
 997lib/calibre/calibre/gui2/toc/main.py
877lib/calibre/calibre/gui2/tools.py 998lib/calibre/calibre/gui2/tools.py
 999lib/calibre/calibre/gui2/tweak_book/__init__.py
 1000lib/calibre/calibre/gui2/tweak_book/boss.py
 1001lib/calibre/calibre/gui2/tweak_book/char_select.py
 1002lib/calibre/calibre/gui2/tweak_book/check.py
 1003lib/calibre/calibre/gui2/tweak_book/diff/__init__.py
 1004lib/calibre/calibre/gui2/tweak_book/diff/highlight.py
 1005lib/calibre/calibre/gui2/tweak_book/diff/main.py
 1006lib/calibre/calibre/gui2/tweak_book/diff/view.py
 1007lib/calibre/calibre/gui2/tweak_book/editor/__init__.py
 1008lib/calibre/calibre/gui2/tweak_book/editor/canvas.py
 1009lib/calibre/calibre/gui2/tweak_book/editor/image.py
 1010lib/calibre/calibre/gui2/tweak_book/editor/insert_resource.py
 1011lib/calibre/calibre/gui2/tweak_book/editor/smart/__init__.py
 1012lib/calibre/calibre/gui2/tweak_book/editor/smart/html.py
 1013lib/calibre/calibre/gui2/tweak_book/editor/syntax/__init__.py
 1014lib/calibre/calibre/gui2/tweak_book/editor/syntax/base.py
 1015lib/calibre/calibre/gui2/tweak_book/editor/syntax/css.py
 1016lib/calibre/calibre/gui2/tweak_book/editor/syntax/html.py
 1017lib/calibre/calibre/gui2/tweak_book/editor/text.py
 1018lib/calibre/calibre/gui2/tweak_book/editor/themes.py
 1019lib/calibre/calibre/gui2/tweak_book/editor/widget.py
 1020lib/calibre/calibre/gui2/tweak_book/file_list.py
 1021lib/calibre/calibre/gui2/tweak_book/job.py
 1022lib/calibre/calibre/gui2/tweak_book/main.py
 1023lib/calibre/calibre/gui2/tweak_book/preferences.py
 1024lib/calibre/calibre/gui2/tweak_book/preview.py
 1025lib/calibre/calibre/gui2/tweak_book/save.py
 1026lib/calibre/calibre/gui2/tweak_book/search.py
 1027lib/calibre/calibre/gui2/tweak_book/templates.py
 1028lib/calibre/calibre/gui2/tweak_book/toc.py
 1029lib/calibre/calibre/gui2/tweak_book/ui.py
 1030lib/calibre/calibre/gui2/tweak_book/undo.py
 1031lib/calibre/calibre/gui2/tweak_book/widgets.py
878lib/calibre/calibre/gui2/ui.py 1032lib/calibre/calibre/gui2/ui.py
879lib/calibre/calibre/gui2/update.py 1033lib/calibre/calibre/gui2/update.py
880lib/calibre/calibre/gui2/viewer/__init__.py 1034lib/calibre/calibre/gui2/viewer/__init__.py
881lib/calibre/calibre/gui2/viewer/bookmarkmanager.py 1035lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
882lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py 1036lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py
883lib/calibre/calibre/gui2/viewer/config.py 1037lib/calibre/calibre/gui2/viewer/config.py
884lib/calibre/calibre/gui2/viewer/config_ui.py 1038lib/calibre/calibre/gui2/viewer/config_ui.py
885lib/calibre/calibre/gui2/viewer/dictionary.py 1039lib/calibre/calibre/gui2/viewer/dictionary.py
886lib/calibre/calibre/gui2/viewer/documentview.py 1040lib/calibre/calibre/gui2/viewer/documentview.py
887lib/calibre/calibre/gui2/viewer/flip.py 1041lib/calibre/calibre/gui2/viewer/flip.py
 1042lib/calibre/calibre/gui2/viewer/gestures.py
888lib/calibre/calibre/gui2/viewer/image_popup.py 1043lib/calibre/calibre/gui2/viewer/image_popup.py
 1044lib/calibre/calibre/gui2/viewer/inspector.py
889lib/calibre/calibre/gui2/viewer/javascript.py 1045lib/calibre/calibre/gui2/viewer/javascript.py
890lib/calibre/calibre/gui2/viewer/keys.py 1046lib/calibre/calibre/gui2/viewer/keys.py
891lib/calibre/calibre/gui2/viewer/main.py 1047lib/calibre/calibre/gui2/viewer/main.py
892lib/calibre/calibre/gui2/viewer/main_ui.py 1048lib/calibre/calibre/gui2/viewer/main_ui.py
893lib/calibre/calibre/gui2/viewer/position.py 1049lib/calibre/calibre/gui2/viewer/position.py
894lib/calibre/calibre/gui2/viewer/printing.py 1050lib/calibre/calibre/gui2/viewer/printing.py
895lib/calibre/calibre/gui2/viewer/table_popup.py 1051lib/calibre/calibre/gui2/viewer/table_popup.py
896lib/calibre/calibre/gui2/viewer/toc.py 1052lib/calibre/calibre/gui2/viewer/toc.py
897lib/calibre/calibre/gui2/widgets.py 1053lib/calibre/calibre/gui2/widgets.py
 1054lib/calibre/calibre/gui2/widgets2.py
898lib/calibre/calibre/gui2/wizard/__init__.py 1055lib/calibre/calibre/gui2/wizard/__init__.py
899lib/calibre/calibre/gui2/wizard/device_ui.py 1056lib/calibre/calibre/gui2/wizard/device_ui.py
900lib/calibre/calibre/gui2/wizard/finish_ui.py 1057lib/calibre/calibre/gui2/wizard/finish_ui.py
901lib/calibre/calibre/gui2/wizard/kindle_ui.py 1058lib/calibre/calibre/gui2/wizard/kindle_ui.py
902lib/calibre/calibre/gui2/wizard/library_ui.py 1059lib/calibre/calibre/gui2/wizard/library_ui.py
903lib/calibre/calibre/gui2/wizard/send_email.py 1060lib/calibre/calibre/gui2/wizard/send_email.py
904lib/calibre/calibre/gui2/wizard/send_email_ui.py 1061lib/calibre/calibre/gui2/wizard/send_email_ui.py
905lib/calibre/calibre/gui2/wizard/stanza_ui.py 1062lib/calibre/calibre/gui2/wizard/stanza_ui.py
906lib/calibre/calibre/library/__init__.py 1063lib/calibre/calibre/library/__init__.py
907lib/calibre/calibre/library/add_to_library.py 1064lib/calibre/calibre/library/add_to_library.py
908lib/calibre/calibre/library/caches.py 1065lib/calibre/calibre/library/caches.py
909lib/calibre/calibre/library/catalogs/__init__.py 1066lib/calibre/calibre/library/catalogs/__init__.py
910lib/calibre/calibre/library/catalogs/bibtex.py 1067lib/calibre/calibre/library/catalogs/bibtex.py
@@ -928,162 +1085,178 @@ lib/calibre/calibre/library/schema_upgra @@ -928,162 +1085,178 @@ lib/calibre/calibre/library/schema_upgra
928lib/calibre/calibre/library/server/__init__.py 1085lib/calibre/calibre/library/server/__init__.py
929lib/calibre/calibre/library/server/ajax.py 1086lib/calibre/calibre/library/server/ajax.py
930lib/calibre/calibre/library/server/base.py 1087lib/calibre/calibre/library/server/base.py
931lib/calibre/calibre/library/server/browse.py 1088lib/calibre/calibre/library/server/browse.py
932lib/calibre/calibre/library/server/cache.py 1089lib/calibre/calibre/library/server/cache.py
933lib/calibre/calibre/library/server/content.py 1090lib/calibre/calibre/library/server/content.py
934lib/calibre/calibre/library/server/main.py 1091lib/calibre/calibre/library/server/main.py
935lib/calibre/calibre/library/server/mobile.py 1092lib/calibre/calibre/library/server/mobile.py
936lib/calibre/calibre/library/server/opds.py 1093lib/calibre/calibre/library/server/opds.py
937lib/calibre/calibre/library/server/utils.py 1094lib/calibre/calibre/library/server/utils.py
938lib/calibre/calibre/library/server/xml.py 1095lib/calibre/calibre/library/server/xml.py
939lib/calibre/calibre/library/sqlite.py 1096lib/calibre/calibre/library/sqlite.py
940lib/calibre/calibre/library/test.py 1097lib/calibre/calibre/library/test.py
941lib/calibre/calibre/libunrar.py 
942lib/calibre/calibre/libunzip.py 1098lib/calibre/calibre/libunzip.py
943lib/calibre/calibre/libwand.py 1099lib/calibre/calibre/libwand.py
944lib/calibre/calibre/linux.py 1100lib/calibre/calibre/linux.py
 1101lib/calibre/calibre/plugins/_patiencediff_c.so
 1102lib/calibre/calibre/plugins/_regex.so
 1103lib/calibre/calibre/plugins/bzzdec.so
945lib/calibre/calibre/plugins/cPalmdoc.so 1104lib/calibre/calibre/plugins/cPalmdoc.so
946lib/calibre/calibre/plugins/calibre_style.so 1105lib/calibre/calibre/plugins/calibre_style.so
947lib/calibre/calibre/plugins/chm_extra.so 1106lib/calibre/calibre/plugins/chm_extra.so
948lib/calibre/calibre/plugins/chmlib.so 1107lib/calibre/calibre/plugins/chmlib.so
949lib/calibre/calibre/plugins/freetype.so 1108lib/calibre/calibre/plugins/freetype.so
 1109lib/calibre/calibre/plugins/hunspell.so
950lib/calibre/calibre/plugins/icu.so 1110lib/calibre/calibre/plugins/icu.so
951lib/calibre/calibre/plugins/lzx.so 1111lib/calibre/calibre/plugins/lzx.so
952lib/calibre/calibre/plugins/magick.so 1112lib/calibre/calibre/plugins/magick.so
 1113lib/calibre/calibre/plugins/matcher.so
953lib/calibre/calibre/plugins/msdes.so 1114lib/calibre/calibre/plugins/msdes.so
954lib/calibre/calibre/plugins/pictureflow.so 1115lib/calibre/calibre/plugins/pictureflow.so
955lib/calibre/calibre/plugins/podofo.so 1116lib/calibre/calibre/plugins/podofo.so
956lib/calibre/calibre/plugins/progress_indicator.so 1117lib/calibre/calibre/plugins/progress_indicator.so
 1118lib/calibre/calibre/plugins/qt_hack.so
957lib/calibre/calibre/plugins/speedup.so 1119lib/calibre/calibre/plugins/speedup.so
958lib/calibre/calibre/plugins/sqlite_custom.so 1120lib/calibre/calibre/plugins/sqlite_custom.so
 1121lib/calibre/calibre/plugins/unrar.so
959lib/calibre/calibre/plugins/woff.so 1122lib/calibre/calibre/plugins/woff.so
960lib/calibre/calibre/ptempfile.py 1123lib/calibre/calibre/ptempfile.py
 1124lib/calibre/calibre/rpdb.py
961lib/calibre/calibre/startup.py 1125lib/calibre/calibre/startup.py
962lib/calibre/calibre/test_build.py 1126lib/calibre/calibre/test_build.py
963lib/calibre/calibre/trac/__init__.py 
964lib/calibre/calibre/trac/bzr_commit_plugin.py 
965lib/calibre/calibre/translations/__init__.py 1127lib/calibre/calibre/translations/__init__.py
966lib/calibre/calibre/translations/dynamic.py 1128lib/calibre/calibre/translations/dynamic.py
967lib/calibre/calibre/translations/msgfmt.py 1129lib/calibre/calibre/translations/msgfmt.py
968lib/calibre/calibre/utils/Zeroconf.py 1130lib/calibre/calibre/utils/Zeroconf.py
969lib/calibre/calibre/utils/__init__.py 1131lib/calibre/calibre/utils/__init__.py
 1132lib/calibre/calibre/utils/apsw_shell.py
970lib/calibre/calibre/utils/bibtex.py 1133lib/calibre/calibre/utils/bibtex.py
971lib/calibre/calibre/utils/browser.py 1134lib/calibre/calibre/utils/browser.py
972lib/calibre/calibre/utils/chm/__init__.py 1135lib/calibre/calibre/utils/chm/__init__.py
973lib/calibre/calibre/utils/chm/chm.py 1136lib/calibre/calibre/utils/chm/chm.py
974lib/calibre/calibre/utils/chm/chmlib.py 1137lib/calibre/calibre/utils/chm/chmlib.py
975lib/calibre/calibre/utils/cleantext.py 1138lib/calibre/calibre/utils/cleantext.py
976lib/calibre/calibre/utils/complete.py 1139lib/calibre/calibre/utils/complete.py
977lib/calibre/calibre/utils/config.py 1140lib/calibre/calibre/utils/config.py
978lib/calibre/calibre/utils/config_base.py 1141lib/calibre/calibre/utils/config_base.py
979lib/calibre/calibre/utils/date.py 1142lib/calibre/calibre/utils/date.py
980lib/calibre/calibre/utils/dictclient.py 1143lib/calibre/calibre/utils/dictclient.py
 1144lib/calibre/calibre/utils/file_associations.py
981lib/calibre/calibre/utils/filenames.py 1145lib/calibre/calibre/utils/filenames.py
982lib/calibre/calibre/utils/fonts/__init__.py 1146lib/calibre/calibre/utils/fonts/__init__.py
983lib/calibre/calibre/utils/fonts/free_type.py 1147lib/calibre/calibre/utils/fonts/free_type.py
984lib/calibre/calibre/utils/fonts/metadata.py 1148lib/calibre/calibre/utils/fonts/metadata.py
985lib/calibre/calibre/utils/fonts/scanner.py 1149lib/calibre/calibre/utils/fonts/scanner.py
986lib/calibre/calibre/utils/fonts/sfnt/__init__.py 1150lib/calibre/calibre/utils/fonts/sfnt/__init__.py
987lib/calibre/calibre/utils/fonts/sfnt/cff/__init__.py 1151lib/calibre/calibre/utils/fonts/sfnt/cff/__init__.py
988lib/calibre/calibre/utils/fonts/sfnt/cff/constants.py 1152lib/calibre/calibre/utils/fonts/sfnt/cff/constants.py
989lib/calibre/calibre/utils/fonts/sfnt/cff/dict_data.py 1153lib/calibre/calibre/utils/fonts/sfnt/cff/dict_data.py
990lib/calibre/calibre/utils/fonts/sfnt/cff/table.py 1154lib/calibre/calibre/utils/fonts/sfnt/cff/table.py
991lib/calibre/calibre/utils/fonts/sfnt/cff/writer.py 1155lib/calibre/calibre/utils/fonts/sfnt/cff/writer.py
992lib/calibre/calibre/utils/fonts/sfnt/cmap.py 1156lib/calibre/calibre/utils/fonts/sfnt/cmap.py
993lib/calibre/calibre/utils/fonts/sfnt/common.py 1157lib/calibre/calibre/utils/fonts/sfnt/common.py
994lib/calibre/calibre/utils/fonts/sfnt/container.py 1158lib/calibre/calibre/utils/fonts/sfnt/container.py
995lib/calibre/calibre/utils/fonts/sfnt/errors.py 1159lib/calibre/calibre/utils/fonts/sfnt/errors.py
996lib/calibre/calibre/utils/fonts/sfnt/glyf.py 1160lib/calibre/calibre/utils/fonts/sfnt/glyf.py
997lib/calibre/calibre/utils/fonts/sfnt/gsub.py 1161lib/calibre/calibre/utils/fonts/sfnt/gsub.py
998lib/calibre/calibre/utils/fonts/sfnt/head.py 1162lib/calibre/calibre/utils/fonts/sfnt/head.py
999lib/calibre/calibre/utils/fonts/sfnt/kern.py 1163lib/calibre/calibre/utils/fonts/sfnt/kern.py
1000lib/calibre/calibre/utils/fonts/sfnt/loca.py 1164lib/calibre/calibre/utils/fonts/sfnt/loca.py
1001lib/calibre/calibre/utils/fonts/sfnt/maxp.py 1165lib/calibre/calibre/utils/fonts/sfnt/maxp.py
 1166lib/calibre/calibre/utils/fonts/sfnt/metrics.py
1002lib/calibre/calibre/utils/fonts/sfnt/subset.py 1167lib/calibre/calibre/utils/fonts/sfnt/subset.py
1003lib/calibre/calibre/utils/fonts/utils.py 1168lib/calibre/calibre/utils/fonts/utils.py
1004lib/calibre/calibre/utils/fonts/win_fonts.py 1169lib/calibre/calibre/utils/fonts/win_fonts.py
1005lib/calibre/calibre/utils/fonts/woff/__init__.py 1170lib/calibre/calibre/utils/fonts/woff/__init__.py
1006lib/calibre/calibre/utils/formatter.py 1171lib/calibre/calibre/utils/formatter.py
1007lib/calibre/calibre/utils/formatter_functions.py 1172lib/calibre/calibre/utils/formatter_functions.py
1008lib/calibre/calibre/utils/html2text.py 1173lib/calibre/calibre/utils/html2text.py
1009lib/calibre/calibre/utils/html5_entities.py 1174lib/calibre/calibre/utils/https.py
1010lib/calibre/calibre/utils/icu.py 1175lib/calibre/calibre/utils/icu.py
 1176lib/calibre/calibre/utils/icu_test.py
 1177lib/calibre/calibre/utils/imghdr.py
1011lib/calibre/calibre/utils/ipc/__init__.py 1178lib/calibre/calibre/utils/ipc/__init__.py
1012lib/calibre/calibre/utils/ipc/job.py 1179lib/calibre/calibre/utils/ipc/job.py
1013lib/calibre/calibre/utils/ipc/launch.py 1180lib/calibre/calibre/utils/ipc/launch.py
1014lib/calibre/calibre/utils/ipc/proxy.py 1181lib/calibre/calibre/utils/ipc/proxy.py
1015lib/calibre/calibre/utils/ipc/server.py 1182lib/calibre/calibre/utils/ipc/server.py
1016lib/calibre/calibre/utils/ipc/simple_worker.py 1183lib/calibre/calibre/utils/ipc/simple_worker.py
1017lib/calibre/calibre/utils/ipc/worker.py 1184lib/calibre/calibre/utils/ipc/worker.py
1018lib/calibre/calibre/utils/ipython.py 1185lib/calibre/calibre/utils/ipython.py
1019lib/calibre/calibre/utils/linux_trash.py 1186lib/calibre/calibre/utils/linux_trash.py
1020lib/calibre/calibre/utils/localization.py 1187lib/calibre/calibre/utils/localization.py
1021lib/calibre/calibre/utils/localunzip.py 1188lib/calibre/calibre/utils/localunzip.py
1022lib/calibre/calibre/utils/lock.py 1189lib/calibre/calibre/utils/lock.py
1023lib/calibre/calibre/utils/logging.py 1190lib/calibre/calibre/utils/logging.py
1024lib/calibre/calibre/utils/magick/__init__.py 1191lib/calibre/calibre/utils/magick/__init__.py
1025lib/calibre/calibre/utils/magick/draw.py 1192lib/calibre/calibre/utils/magick/draw.py
1026lib/calibre/calibre/utils/magick/generate.py 1193lib/calibre/calibre/utils/magick/generate.py
 1194lib/calibre/calibre/utils/matcher.py
1027lib/calibre/calibre/utils/mdns.py 1195lib/calibre/calibre/utils/mdns.py
1028lib/calibre/calibre/utils/mem.py 1196lib/calibre/calibre/utils/mem.py
 1197lib/calibre/calibre/utils/monotonic.py
1029lib/calibre/calibre/utils/mreplace.py 1198lib/calibre/calibre/utils/mreplace.py
1030lib/calibre/calibre/utils/network.py 1199lib/calibre/calibre/utils/network.py
1031lib/calibre/calibre/utils/opensearch/__init__.py 1200lib/calibre/calibre/utils/opensearch/__init__.py
1032lib/calibre/calibre/utils/opensearch/description.py 1201lib/calibre/calibre/utils/opensearch/description.py
1033lib/calibre/calibre/utils/opensearch/query.py 1202lib/calibre/calibre/utils/opensearch/query.py
1034lib/calibre/calibre/utils/opensearch/url.py 1203lib/calibre/calibre/utils/opensearch/url.py
1035lib/calibre/calibre/utils/ordered_dict.py 1204lib/calibre/calibre/utils/ordered_dict.py
1036lib/calibre/calibre/utils/osx_symlinks.py 1205lib/calibre/calibre/utils/osx_symlinks.py
1037lib/calibre/calibre/utils/pdftk.py 1206lib/calibre/calibre/utils/pdftk.py
1038lib/calibre/calibre/utils/podofo/__init__.py 1207lib/calibre/calibre/utils/podofo/__init__.py
1039lib/calibre/calibre/utils/pyconsole/__init__.py 1208lib/calibre/calibre/utils/pyconsole/__init__.py
1040lib/calibre/calibre/utils/pyconsole/console.py 1209lib/calibre/calibre/utils/pyconsole/console.py
1041lib/calibre/calibre/utils/pyconsole/controller.py 1210lib/calibre/calibre/utils/pyconsole/controller.py
1042lib/calibre/calibre/utils/pyconsole/formatter.py 1211lib/calibre/calibre/utils/pyconsole/formatter.py
1043lib/calibre/calibre/utils/pyconsole/history.py 1212lib/calibre/calibre/utils/pyconsole/history.py
1044lib/calibre/calibre/utils/pyconsole/interpreter.py 1213lib/calibre/calibre/utils/pyconsole/interpreter.py
1045lib/calibre/calibre/utils/pyconsole/main.py 1214lib/calibre/calibre/utils/pyconsole/main.py
1046lib/calibre/calibre/utils/pyparsing.py 1215lib/calibre/calibre/utils/pyparsing.py
1047lib/calibre/calibre/utils/recycle_bin.py 1216lib/calibre/calibre/utils/recycle_bin.py
1048lib/calibre/calibre/utils/resources.py 1217lib/calibre/calibre/utils/resources.py
1049lib/calibre/calibre/utils/rss_gen.py 1218lib/calibre/calibre/utils/rss_gen.py
1050lib/calibre/calibre/utils/search_query_parser.py 1219lib/calibre/calibre/utils/search_query_parser.py
1051lib/calibre/calibre/utils/serve_coffee.py 1220lib/calibre/calibre/utils/serve_coffee.py
1052lib/calibre/calibre/utils/sftp.py 1221lib/calibre/calibre/utils/sftp.py
1053lib/calibre/calibre/utils/sigil.py 
1054lib/calibre/calibre/utils/smartypants.py 1222lib/calibre/calibre/utils/smartypants.py
1055lib/calibre/calibre/utils/smtp.py 1223lib/calibre/calibre/utils/smtp.py
1056lib/calibre/calibre/utils/smtplib.py 1224lib/calibre/calibre/utils/smtplib.py
 1225lib/calibre/calibre/utils/socket_inheritance.py
1057lib/calibre/calibre/utils/soupparser.py 1226lib/calibre/calibre/utils/soupparser.py
 1227lib/calibre/calibre/utils/spell/__init__.py
1058lib/calibre/calibre/utils/terminal.py 1228lib/calibre/calibre/utils/terminal.py
1059lib/calibre/calibre/utils/text2int.py 1229lib/calibre/calibre/utils/text2int.py
1060lib/calibre/calibre/utils/threadpool.py 1230lib/calibre/calibre/utils/threadpool.py
1061lib/calibre/calibre/utils/titlecase.py 1231lib/calibre/calibre/utils/titlecase.py
 1232lib/calibre/calibre/utils/unrar.py
1062lib/calibre/calibre/utils/unsmarten.py 1233lib/calibre/calibre/utils/unsmarten.py
1063lib/calibre/calibre/utils/winshell.py 
1064lib/calibre/calibre/utils/wmf/__init__.py 1234lib/calibre/calibre/utils/wmf/__init__.py
 1235lib/calibre/calibre/utils/wmf/emf.py
1065lib/calibre/calibre/utils/wmf/parse.py 1236lib/calibre/calibre/utils/wmf/parse.py
1066lib/calibre/calibre/utils/wordcount.py 1237lib/calibre/calibre/utils/wordcount.py
1067lib/calibre/calibre/utils/zipfile.py 1238lib/calibre/calibre/utils/zipfile.py
1068lib/calibre/calibre/web/__init__.py 1239lib/calibre/calibre/web/__init__.py
1069lib/calibre/calibre/web/feeds/__init__.py 1240lib/calibre/calibre/web/feeds/__init__.py
1070lib/calibre/calibre/web/feeds/feedparser.py 1241lib/calibre/calibre/web/feeds/feedparser.py
 1242lib/calibre/calibre/web/feeds/jsnews.py
1071lib/calibre/calibre/web/feeds/news.py 1243lib/calibre/calibre/web/feeds/news.py
1072lib/calibre/calibre/web/feeds/recipes/__init__.py 1244lib/calibre/calibre/web/feeds/recipes/__init__.py
1073lib/calibre/calibre/web/feeds/recipes/collection.py 1245lib/calibre/calibre/web/feeds/recipes/collection.py
1074lib/calibre/calibre/web/feeds/recipes/model.py 1246lib/calibre/calibre/web/feeds/recipes/model.py
1075lib/calibre/calibre/web/feeds/templates.py 1247lib/calibre/calibre/web/feeds/templates.py
1076lib/calibre/calibre/web/fetch/__init__.py 1248lib/calibre/calibre/web/fetch/__init__.py
 1249lib/calibre/calibre/web/fetch/javascript.py
1077lib/calibre/calibre/web/fetch/simple.py 1250lib/calibre/calibre/web/fetch/simple.py
1078lib/calibre/calibre/web/jsbrowser/__init__.py 1251lib/calibre/calibre/web/jsbrowser/__init__.py
1079lib/calibre/calibre/web/jsbrowser/browser.py 1252lib/calibre/calibre/web/jsbrowser/browser.py
1080lib/calibre/calibre/web/jsbrowser/forms.py 1253lib/calibre/calibre/web/jsbrowser/forms.py
1081lib/calibre/calibre/web/jsbrowser/login.py 1254lib/calibre/calibre/web/jsbrowser/login.py
1082lib/calibre/calibre/web/jsbrowser/test.py 1255lib/calibre/calibre/web/jsbrowser/test.py
1083lib/calibre/odf/__init__.py 1256lib/calibre/odf/__init__.py
1084lib/calibre/odf/anim.py 1257lib/calibre/odf/anim.py
1085lib/calibre/odf/attrconverters.py 1258lib/calibre/odf/attrconverters.py
1086lib/calibre/odf/chart.py 1259lib/calibre/odf/chart.py
1087lib/calibre/odf/config.py 1260lib/calibre/odf/config.py
1088lib/calibre/odf/dc.py 1261lib/calibre/odf/dc.py
1089lib/calibre/odf/dr3d.py 1262lib/calibre/odf/dr3d.py
@@ -1105,41 +1278,47 @@ lib/calibre/odf/odfmanifest.py @@ -1105,41 +1278,47 @@ lib/calibre/odf/odfmanifest.py
1105lib/calibre/odf/office.py 1278lib/calibre/odf/office.py
1106lib/calibre/odf/opendocument.py 1279lib/calibre/odf/opendocument.py
1107lib/calibre/odf/presentation.py 1280lib/calibre/odf/presentation.py
1108lib/calibre/odf/script.py 1281lib/calibre/odf/script.py
1109lib/calibre/odf/style.py 1282lib/calibre/odf/style.py
1110lib/calibre/odf/svg.py 1283lib/calibre/odf/svg.py
1111lib/calibre/odf/table.py 1284lib/calibre/odf/table.py
1112lib/calibre/odf/teletype.py 1285lib/calibre/odf/teletype.py
1113lib/calibre/odf/text.py 1286lib/calibre/odf/text.py
1114lib/calibre/odf/thumbnail.py 1287lib/calibre/odf/thumbnail.py
1115lib/calibre/odf/userfield.py 1288lib/calibre/odf/userfield.py
1116lib/calibre/odf/xforms.py 1289lib/calibre/odf/xforms.py
1117lib/calibre/qtcurve/test_rendering.py 1290lib/calibre/qtcurve/test_rendering.py
 1291lib/calibre/regex/__init__.py
 1292lib/calibre/regex/_regex_core.py
1118lib/calibre/routes/__init__.py 1293lib/calibre/routes/__init__.py
1119lib/calibre/routes/base.py 1294lib/calibre/routes/base.py
1120lib/calibre/routes/lru.py 1295lib/calibre/routes/lru.py
1121lib/calibre/routes/mapper.py 1296lib/calibre/routes/mapper.py
1122lib/calibre/routes/middleware.py 1297lib/calibre/routes/middleware.py
1123lib/calibre/routes/route.py 1298lib/calibre/routes/route.py
1124lib/calibre/routes/util.py 1299lib/calibre/routes/util.py
 1300lib/calibre/six.py
1125lib/calibre/templite/__init__.py 1301lib/calibre/templite/__init__.py
1126${PYSITELIB}/init_calibre.py 1302${PYSITELIB}/init_calibre.py
 1303share/applications/calibre-ebook-edit.desktop
1127share/applications/calibre-ebook-viewer.desktop 1304share/applications/calibre-ebook-viewer.desktop
1128share/applications/calibre-gui.desktop 1305share/applications/calibre-gui.desktop
1129share/applications/calibre-lrfviewer.desktop 1306share/applications/calibre-lrfviewer.desktop
1130share/bash_completion.d/calibre 1307share/bash_completion.d/calibre
1131share/calibre/builtin_recipes.xml 1308share/calibre/builtin_recipes.xml
1132share/calibre/builtin_recipes.zip 1309share/calibre/builtin_recipes.zip
 1310share/calibre/calibre-ebook-root-CA.crt
 1311share/calibre/calibre-mimetypes.xml
1133share/calibre/calibre-portable.bat 1312share/calibre/calibre-portable.bat
1134share/calibre/calibre-portable.sh 1313share/calibre/calibre-portable.sh
1135share/calibre/catalog/DefaultCover.jpg 1314share/calibre/catalog/DefaultCover.jpg
1136share/calibre/catalog/mastheadImage.gif 1315share/calibre/catalog/mastheadImage.gif
1137share/calibre/catalog/section_list_templates.py 1316share/calibre/catalog/section_list_templates.py
1138share/calibre/catalog/stylesheet.css 1317share/calibre/catalog/stylesheet.css
1139share/calibre/catalog/template.xhtml 1318share/calibre/catalog/template.xhtml
1140share/calibre/compiled_coffeescript.zip 1319share/calibre/compiled_coffeescript.zip
1141share/calibre/content_server/av.jpg 1320share/calibre/content_server/av.jpg
1142share/calibre/content_server/bg_search_box.png 1321share/calibre/content_server/bg_search_box.png
1143share/calibre/content_server/browse/browse.css 1322share/calibre/content_server/browse/browse.css
1144share/calibre/content_server/browse/browse.html 1323share/calibre/content_server/browse/browse.html
1145share/calibre/content_server/browse/browse.js 1324share/calibre/content_server/browse/browse.js
@@ -1191,126 +1370,138 @@ share/calibre/ebook-convert-complete.pic @@ -1191,126 +1370,138 @@ share/calibre/ebook-convert-complete.pic
1191share/calibre/fonts/calibreSymbols.otf 1370share/calibre/fonts/calibreSymbols.otf
1192share/calibre/fonts/liberation/LiberationMono-Bold.ttf 1371share/calibre/fonts/liberation/LiberationMono-Bold.ttf
1193share/calibre/fonts/liberation/LiberationMono-BoldItalic.ttf 1372share/calibre/fonts/liberation/LiberationMono-BoldItalic.ttf
1194share/calibre/fonts/liberation/LiberationMono-Italic.ttf 1373share/calibre/fonts/liberation/LiberationMono-Italic.ttf
1195share/calibre/fonts/liberation/LiberationMono-Regular.ttf 1374share/calibre/fonts/liberation/LiberationMono-Regular.ttf
1196share/calibre/fonts/liberation/LiberationSans-Bold.ttf 1375share/calibre/fonts/liberation/LiberationSans-Bold.ttf
1197share/calibre/fonts/liberation/LiberationSans-BoldItalic.ttf 1376share/calibre/fonts/liberation/LiberationSans-BoldItalic.ttf
1198share/calibre/fonts/liberation/LiberationSans-Italic.ttf 1377share/calibre/fonts/liberation/LiberationSans-Italic.ttf
1199share/calibre/fonts/liberation/LiberationSans-Regular.ttf 1378share/calibre/fonts/liberation/LiberationSans-Regular.ttf
1200share/calibre/fonts/liberation/LiberationSerif-Bold.ttf 1379share/calibre/fonts/liberation/LiberationSerif-Bold.ttf
1201share/calibre/fonts/liberation/LiberationSerif-BoldItalic.ttf 1380share/calibre/fonts/liberation/LiberationSerif-BoldItalic.ttf
1202share/calibre/fonts/liberation/LiberationSerif-Italic.ttf 1381share/calibre/fonts/liberation/LiberationSerif-Italic.ttf
1203share/calibre/fonts/liberation/LiberationSerif-Regular.ttf 1382share/calibre/fonts/liberation/LiberationSerif-Regular.ttf
1204share/calibre/fonts/prs500/tt0003m_.ttf 
1205share/calibre/fonts/prs500/tt0011m_.ttf 
1206share/calibre/fonts/prs500/tt0419m_.ttf 
1207share/calibre/images.qrc 1383share/calibre/images.qrc
1208share/calibre/images/add_book.png 1384share/calibre/images/add_book.png
1209share/calibre/images/arrow-down.png 1385share/calibre/images/arrow-down.png
1210share/calibre/images/arrow-up.png 1386share/calibre/images/arrow-up.png
 1387share/calibre/images/auto-reload.png
1211share/calibre/images/auto_author_sort.png 1388share/calibre/images/auto_author_sort.png
1212share/calibre/images/back.png 1389share/calibre/images/back.png
 1390share/calibre/images/beautify.png
1213share/calibre/images/blank.png 1391share/calibre/images/blank.png
1214share/calibre/images/book.png 1392share/calibre/images/book.png
1215share/calibre/images/bookmarks.png 1393share/calibre/images/bookmarks.png
1216share/calibre/images/books_in_series.png 1394share/calibre/images/books_in_series.png
1217share/calibre/images/catalog.png 1395share/calibre/images/catalog.png
1218share/calibre/images/chapters.png 1396share/calibre/images/chapters.png
 1397share/calibre/images/character-set.png
1219share/calibre/images/clear_left.png 1398share/calibre/images/clear_left.png
 1399share/calibre/images/code.png
1220share/calibre/images/column.png 1400share/calibre/images/column.png
1221share/calibre/images/config.png 1401share/calibre/images/config.png
1222share/calibre/images/connect_share.png 1402share/calibre/images/connect_share.png
1223share/calibre/images/connect_share_on.png 1403share/calibre/images/connect_share_on.png
1224share/calibre/images/console.png 1404share/calibre/images/console.png
1225share/calibre/images/convert.png 1405share/calibre/images/convert.png
1226share/calibre/images/cover_flow.png 1406share/calibre/images/cover_flow.png
1227share/calibre/images/cover_texture.png 1407share/calibre/images/cover_texture.png
1228share/calibre/images/debug.png 1408share/calibre/images/debug.png
1229share/calibre/images/default_cover.png 1409share/calibre/images/default_cover.png
1230share/calibre/images/devices/bambook.png 1410share/calibre/images/devices/bambook.png
1231share/calibre/images/devices/boox.jpg 1411share/calibre/images/devices/boox.jpg
1232share/calibre/images/devices/folder.png 1412share/calibre/images/devices/folder.png
1233share/calibre/images/devices/ipad.png 1413share/calibre/images/devices/ipad.png
1234share/calibre/images/devices/italica.png 1414share/calibre/images/devices/italica.png
1235share/calibre/images/devices/itunes.png 1415share/calibre/images/devices/itunes.png
1236share/calibre/images/devices/kindle.jpg 1416share/calibre/images/devices/kindle.jpg
1237share/calibre/images/devices/nook.jpg 1417share/calibre/images/devices/nook.jpg
1238share/calibre/images/devices/tablet.png 1418share/calibre/images/devices/tablet.png
1239share/calibre/images/dialog_error.png 1419share/calibre/images/dialog_error.png
1240share/calibre/images/dialog_information.png 1420share/calibre/images/dialog_information.png
1241share/calibre/images/dialog_question.png 1421share/calibre/images/dialog_question.png
1242share/calibre/images/dialog_warning.png 1422share/calibre/images/dialog_warning.png
1243share/calibre/images/dictionary.png 1423share/calibre/images/dictionary.png
 1424share/calibre/images/diff.png
1244share/calibre/images/document-encrypt.png 1425share/calibre/images/document-encrypt.png
 1426share/calibre/images/document-new.png
1245share/calibre/images/document_open.png 1427share/calibre/images/document_open.png
1246share/calibre/images/donate.png 1428share/calibre/images/donate.png
1247share/calibre/images/dot_green.png 1429share/calibre/images/dot_green.png
1248share/calibre/images/dot_red.png 1430share/calibre/images/dot_red.png
1249share/calibre/images/drawer.png 1431share/calibre/images/drawer.png
1250share/calibre/images/drm-locked.png 1432share/calibre/images/drm-locked.png
1251share/calibre/images/drm-unlocked.png 1433share/calibre/images/drm-unlocked.png
1252share/calibre/images/edit-clear.png 1434share/calibre/images/edit-clear.png
1253share/calibre/images/edit-copy.png 1435share/calibre/images/edit-copy.png
1254share/calibre/images/edit-cut.png 1436share/calibre/images/edit-cut.png
1255share/calibre/images/edit-paste.png 1437share/calibre/images/edit-paste.png
1256share/calibre/images/edit-redo.png 1438share/calibre/images/edit-redo.png
1257share/calibre/images/edit-select-all.png 1439share/calibre/images/edit-select-all.png
1258share/calibre/images/edit-undo.png 1440share/calibre/images/edit-undo.png
1259share/calibre/images/edit_input.png 1441share/calibre/images/edit_input.png
1260share/calibre/images/eject.png 1442share/calibre/images/eject.png
 1443share/calibre/images/embed-fonts.png
1261share/calibre/images/exec.png 1444share/calibre/images/exec.png
 1445share/calibre/images/filter.png
1262share/calibre/images/font.png 1446share/calibre/images/font.png
1263share/calibre/images/font_size_larger.png 1447share/calibre/images/font_size_larger.png
1264share/calibre/images/font_size_smaller.png 1448share/calibre/images/font_size_smaller.png
1265share/calibre/images/format-fill-color.png 1449share/calibre/images/format-fill-color.png
1266share/calibre/images/format-indent-less.png 1450share/calibre/images/format-indent-less.png
1267share/calibre/images/format-indent-more.png 1451share/calibre/images/format-indent-more.png
1268share/calibre/images/format-justify-center.png 1452share/calibre/images/format-justify-center.png
1269share/calibre/images/format-justify-fill.png 1453share/calibre/images/format-justify-fill.png
1270share/calibre/images/format-justify-left.png 1454share/calibre/images/format-justify-left.png
1271share/calibre/images/format-justify-right.png 1455share/calibre/images/format-justify-right.png
1272share/calibre/images/format-list-ordered.png 1456share/calibre/images/format-list-ordered.png
1273share/calibre/images/format-list-unordered.png 1457share/calibre/images/format-list-unordered.png
1274share/calibre/images/format-text-bold.png 1458share/calibre/images/format-text-bold.png
1275share/calibre/images/format-text-color.png 1459share/calibre/images/format-text-color.png
1276share/calibre/images/format-text-heading.png 1460share/calibre/images/format-text-heading.png
1277share/calibre/images/format-text-italic.png 1461share/calibre/images/format-text-italic.png
1278share/calibre/images/format-text-strikethrough.png 1462share/calibre/images/format-text-strikethrough.png
1279share/calibre/images/format-text-subscript.png 1463share/calibre/images/format-text-subscript.png
1280share/calibre/images/format-text-superscript.png 1464share/calibre/images/format-text-superscript.png
1281share/calibre/images/format-text-underline.png 1465share/calibre/images/format-text-underline.png
1282share/calibre/images/forward.png 1466share/calibre/images/forward.png
1283share/calibre/images/gmail_logo.png 1467share/calibre/images/gmail_logo.png
 1468share/calibre/images/grid.png
1284share/calibre/images/help.png 1469share/calibre/images/help.png
1285share/calibre/images/heuristics.png 1470share/calibre/images/heuristics.png
1286share/calibre/images/highlight_only_off.png 1471share/calibre/images/highlight_only_off.png
1287share/calibre/images/highlight_only_on.png 1472share/calibre/images/highlight_only_on.png
1288share/calibre/images/hotmail.png 1473share/calibre/images/hotmail.png
 1474share/calibre/images/html-fix.png
 1475share/calibre/images/icon_choose.png
1289share/calibre/images/identifiers.png 1476share/calibre/images/identifiers.png
1290share/calibre/images/insert-link.png 1477share/calibre/images/insert-link.png
1291share/calibre/images/jobs.png 1478share/calibre/images/jobs.png
1292share/calibre/images/keyboard-prefs.png 1479share/calibre/images/keyboard-prefs.png
1293share/calibre/images/languages.png 1480share/calibre/images/languages.png
1294share/calibre/images/library.png 1481share/calibre/images/library.png
1295share/calibre/images/list_remove.png 1482share/calibre/images/list_remove.png
1296share/calibre/images/lookfeel.png 1483share/calibre/images/lookfeel.png
1297share/calibre/images/lt.png 1484share/calibre/images/lt.png
1298share/calibre/images/mail.png 1485share/calibre/images/mail.png
 1486share/calibre/images/marked.png
 1487share/calibre/images/merge.png
1299share/calibre/images/merge_books.png 1488share/calibre/images/merge_books.png
1300share/calibre/images/metadata.png 1489share/calibre/images/metadata.png
1301share/calibre/images/mimetypes/azw2.png 1490share/calibre/images/mimetypes/azw2.png
1302share/calibre/images/mimetypes/azw3.png 1491share/calibre/images/mimetypes/azw3.png
1303share/calibre/images/mimetypes/bmp.png 1492share/calibre/images/mimetypes/bmp.png
 1493share/calibre/images/mimetypes/cbr.png
 1494share/calibre/images/mimetypes/cbz.png
1304share/calibre/images/mimetypes/computer.png 1495share/calibre/images/mimetypes/computer.png
1305share/calibre/images/mimetypes/dir.png 1496share/calibre/images/mimetypes/dir.png
1306share/calibre/images/mimetypes/djvu.png 1497share/calibre/images/mimetypes/djvu.png
1307share/calibre/images/mimetypes/docx.png 1498share/calibre/images/mimetypes/docx.png
1308share/calibre/images/mimetypes/epub.png 1499share/calibre/images/mimetypes/epub.png
1309share/calibre/images/mimetypes/fb2.png 1500share/calibre/images/mimetypes/fb2.png
1310share/calibre/images/mimetypes/gif.png 1501share/calibre/images/mimetypes/gif.png
1311share/calibre/images/mimetypes/html.png 1502share/calibre/images/mimetypes/html.png
1312share/calibre/images/mimetypes/jpeg.png 1503share/calibre/images/mimetypes/jpeg.png
1313share/calibre/images/mimetypes/lit.png 1504share/calibre/images/mimetypes/lit.png
1314share/calibre/images/mimetypes/lrf.png 1505share/calibre/images/mimetypes/lrf.png
1315share/calibre/images/mimetypes/lrx.png 1506share/calibre/images/mimetypes/lrx.png
1316share/calibre/images/mimetypes/mobi.png 1507share/calibre/images/mimetypes/mobi.png
@@ -1319,181 +1510,209 @@ share/calibre/images/mimetypes/pdf.png @@ -1319,181 +1510,209 @@ share/calibre/images/mimetypes/pdf.png
1319share/calibre/images/mimetypes/png.png 1510share/calibre/images/mimetypes/png.png
1320share/calibre/images/mimetypes/rar.png 1511share/calibre/images/mimetypes/rar.png
1321share/calibre/images/mimetypes/rtf.png 1512share/calibre/images/mimetypes/rtf.png
1322share/calibre/images/mimetypes/snb.png 1513share/calibre/images/mimetypes/snb.png
1323share/calibre/images/mimetypes/svg.png 1514share/calibre/images/mimetypes/svg.png
1324share/calibre/images/mimetypes/tpz.png 1515share/calibre/images/mimetypes/tpz.png
1325share/calibre/images/mimetypes/txt.png 1516share/calibre/images/mimetypes/txt.png
1326share/calibre/images/mimetypes/unknown.png 1517share/calibre/images/mimetypes/unknown.png
1327share/calibre/images/mimetypes/xps.png 1518share/calibre/images/mimetypes/xps.png
1328share/calibre/images/mimetypes/zero.png 1519share/calibre/images/mimetypes/zero.png
1329share/calibre/images/mimetypes/zip.png 1520share/calibre/images/mimetypes/zip.png
1330share/calibre/images/minus.png 1521share/calibre/images/minus.png
1331share/calibre/images/minusminus.png 1522share/calibre/images/minusminus.png
 1523share/calibre/images/modified.png
1332share/calibre/images/network-server.png 1524share/calibre/images/network-server.png
1333share/calibre/images/news.png 1525share/calibre/images/news.png
1334share/calibre/images/next.png 1526share/calibre/images/next.png
1335share/calibre/images/notify.png 1527share/calibre/images/notify.png
1336share/calibre/images/ok.png 1528share/calibre/images/ok.png
1337share/calibre/images/page.png 1529share/calibre/images/page.png
1338share/calibre/images/plugboard.png 1530share/calibre/images/plugboard.png
1339share/calibre/images/plugins.png 1531share/calibre/images/plugins.png
1340share/calibre/images/plugins/mobileread.png 1532share/calibre/images/plugins/mobileread.png
1341share/calibre/images/plugins/plugin_deprecated.png 1533share/calibre/images/plugins/plugin_deprecated.png
1342share/calibre/images/plugins/plugin_disabled_invalid.png 1534share/calibre/images/plugins/plugin_disabled_invalid.png
1343share/calibre/images/plugins/plugin_disabled_ok.png 1535share/calibre/images/plugins/plugin_disabled_ok.png
1344share/calibre/images/plugins/plugin_disabled_valid.png 1536share/calibre/images/plugins/plugin_disabled_valid.png
1345share/calibre/images/plugins/plugin_new.png 1537share/calibre/images/plugins/plugin_new.png
1346share/calibre/images/plugins/plugin_new_invalid.png 1538share/calibre/images/plugins/plugin_new_invalid.png
1347share/calibre/images/plugins/plugin_new_valid.png 1539share/calibre/images/plugins/plugin_new_valid.png
1348share/calibre/images/plugins/plugin_updater.png 1540share/calibre/images/plugins/plugin_updater.png
1349share/calibre/images/plugins/plugin_updater_updates.png 1541share/calibre/images/plugins/plugin_updater_updates.png
1350share/calibre/images/plugins/plugin_upgrade_invalid.png 1542share/calibre/images/plugins/plugin_upgrade_invalid.png
1351share/calibre/images/plugins/plugin_upgrade_ok.png 1543share/calibre/images/plugins/plugin_upgrade_ok.png
1352share/calibre/images/plugins/plugin_upgrade_valid.png 1544share/calibre/images/plugins/plugin_upgrade_valid.png
1353share/calibre/images/plus.png 1545share/calibre/images/plus.png
1354share/calibre/images/plusplus.png 1546share/calibre/images/plusplus.png
 1547share/calibre/images/polish.png
1355share/calibre/images/previous.png 1548share/calibre/images/previous.png
1356share/calibre/images/print-preview.png 1549share/calibre/images/print-preview.png
1357share/calibre/images/print.png 1550share/calibre/images/print.png
1358share/calibre/images/publisher.png 1551share/calibre/images/publisher.png
1359share/calibre/images/random.png 1552share/calibre/images/random.png
1360share/calibre/images/rating.png 1553share/calibre/images/rating.png
1361share/calibre/images/reader.png 1554share/calibre/images/reader.png
 1555share/calibre/images/resize.png
1362share/calibre/images/rotate-right.png 1556share/calibre/images/rotate-right.png
1363share/calibre/images/save.png 1557share/calibre/images/save.png
1364share/calibre/images/scheduler.png 1558share/calibre/images/scheduler.png
1365share/calibre/images/scroll.png 1559share/calibre/images/scroll.png
1366share/calibre/images/sd.png 1560share/calibre/images/sd.png
1367share/calibre/images/search.png 1561share/calibre/images/search.png
1368share/calibre/images/search_add_saved.png 1562share/calibre/images/search_add_saved.png
1369share/calibre/images/search_copy_saved.png 1563share/calibre/images/search_copy_saved.png
1370share/calibre/images/search_delete_saved.png 1564share/calibre/images/search_delete_saved.png
1371share/calibre/images/series.png 1565share/calibre/images/series.png
 1566share/calibre/images/smarten-punctuation.png
1372share/calibre/images/store.png 1567share/calibre/images/store.png
 1568share/calibre/images/subset-fonts.png
1373share/calibre/images/swap.png 1569share/calibre/images/swap.png
 1570share/calibre/images/sync-right.png
1374share/calibre/images/sync.png 1571share/calibre/images/sync.png
1375share/calibre/images/tags.png 1572share/calibre/images/tags.png
1376share/calibre/images/tb_folder.png 1573share/calibre/images/tb_folder.png
1377share/calibre/images/template_funcs.png 1574share/calibre/images/template_funcs.png
 1575share/calibre/images/textures/dark_cloth.png
 1576share/calibre/images/textures/dark_wood.png
 1577share/calibre/images/textures/grey_wash_wall.png
 1578share/calibre/images/textures/light_wood.png
 1579share/calibre/images/textures/subtle_wood.png
 1580share/calibre/images/toc.png
1378share/calibre/images/trash.png 1581share/calibre/images/trash.png
1379share/calibre/images/trim.png 1582share/calibre/images/trim.png
 1583share/calibre/images/tweak.png
 1584share/calibre/images/unpack-book.png
1380share/calibre/images/user_profile.png 1585share/calibre/images/user_profile.png
1381share/calibre/images/view-image.png 1586share/calibre/images/view-image.png
 1587share/calibre/images/view-refresh.png
1382share/calibre/images/view.png 1588share/calibre/images/view.png
1383share/calibre/images/viewer.png 1589share/calibre/images/viewer.png
1384share/calibre/images/welcome_wizard.png 1590share/calibre/images/welcome_wizard.png
1385share/calibre/images/window-close.png 1591share/calibre/images/window-close.png
1386share/calibre/images/wizard.png 1592share/calibre/images/wizard.png
1387share/calibre/jacket/stylesheet.css 1593share/calibre/jacket/stylesheet.css
1388share/calibre/jacket/template.xhtml 1594share/calibre/jacket/template.xhtml
1389share/calibre/jquery.simulate.js 1595share/calibre/jquery.simulate.js
 1596share/calibre/localization/iso3166.pickle
1390share/calibre/localization/iso639.pickle 1597share/calibre/localization/iso639.pickle
1391share/calibre/localization/locales.zip 1598share/calibre/localization/locales.zip
1392share/calibre/localization/pykakasi/itaijidict2.pickle 1599share/calibre/localization/pykakasi/itaijidict2.pickle
1393share/calibre/localization/pykakasi/kanadict2.pickle 1600share/calibre/localization/pykakasi/kanadict2.pickle
1394share/calibre/localization/pykakasi/kanwadict2.pickle 1601share/calibre/localization/pykakasi/kanwadict2.pickle
1395share/calibre/localization/stats.pickle 1602share/calibre/localization/stats.pickle
1396share/calibre/metadata_sqlite.sql 1603share/calibre/metadata_sqlite.sql
1397share/calibre/mime.types 1604share/calibre/mime.types
1398share/calibre/quick_start.epub 1605share/calibre/quick_start.epub
 1606share/calibre/recipes/10minutos.recipe
1399share/calibre/recipes/180.recipe 1607share/calibre/recipes/180.recipe
1400share/calibre/recipes/20_minutos.recipe 1608share/calibre/recipes/20_minutos.recipe
1401share/calibre/recipes/20minutes.recipe 1609share/calibre/recipes/20minutes.recipe
1402share/calibre/recipes/20minutos.recipe 1610share/calibre/recipes/20minutos.recipe
1403share/calibre/recipes/24sata.recipe 1611share/calibre/recipes/24sata.recipe
1404share/calibre/recipes/24sata_rs.recipe 1612share/calibre/recipes/24sata_rs.recipe
1405share/calibre/recipes/7dias.recipe 1613share/calibre/recipes/7dias.recipe
1406share/calibre/recipes/7seri.recipe 1614share/calibre/recipes/7seri.recipe
1407share/calibre/recipes/Ansa.recipe 1615share/calibre/recipes/Ansa.recipe
1408share/calibre/recipes/DrawAndCook.recipe 1616share/calibre/recipes/DrawAndCook.recipe
1409share/calibre/recipes/ZIVE.sk.recipe 1617share/calibre/recipes/ZIVE.sk.recipe
1410share/calibre/recipes/aachener_nachrichten.recipe 1618share/calibre/recipes/aachener_nachrichten.recipe
1411share/calibre/recipes/abc.recipe 1619share/calibre/recipes/abc.recipe
1412share/calibre/recipes/abc_au.recipe 1620share/calibre/recipes/abc_au.recipe
1413share/calibre/recipes/abc_es.recipe 1621share/calibre/recipes/abc_es.recipe
1414share/calibre/recipes/abc_py.recipe 1622share/calibre/recipes/abc_py.recipe
1415share/calibre/recipes/accountancyage.recipe 1623share/calibre/recipes/accountancyage.recipe
1416share/calibre/recipes/acim_bilim_dergisi.recipe 1624share/calibre/recipes/acim_bilim_dergisi.recipe
 1625share/calibre/recipes/acrimed.recipe
1417share/calibre/recipes/ad.recipe 1626share/calibre/recipes/ad.recipe
1418share/calibre/recipes/adevarul.recipe 1627share/calibre/recipes/adevarul.recipe
1419share/calibre/recipes/adnkronos.recipe 1628share/calibre/recipes/adnkronos.recipe
1420share/calibre/recipes/ads_of_the_world.recipe 1629share/calibre/recipes/ads_of_the_world.recipe
1421share/calibre/recipes/adventure_zone_pl.recipe 1630share/calibre/recipes/adventure_zone_pl.recipe
1422share/calibre/recipes/adventuregamers.recipe 1631share/calibre/recipes/adventuregamers.recipe
1423share/calibre/recipes/aftenposten.recipe 1632share/calibre/recipes/aftenposten.recipe
1424share/calibre/recipes/agrogerila.recipe 1633share/calibre/recipes/agrogerila.recipe
1425share/calibre/recipes/aif_ru.recipe 1634share/calibre/recipes/aif_ru.recipe
1426share/calibre/recipes/air_force_times.recipe 1635share/calibre/recipes/air_force_times.recipe
1427share/calibre/recipes/ajc.recipe 1636share/calibre/recipes/ajc.recipe
1428share/calibre/recipes/ajiajin.recipe 1637share/calibre/recipes/ajiajin.recipe
1429share/calibre/recipes/aksiyon_derigisi.recipe 1638share/calibre/recipes/aksiyon_derigisi.recipe
1430share/calibre/recipes/akter.recipe 1639share/calibre/recipes/akter.recipe
1431share/calibre/recipes/akter_dnevnik.recipe 1640share/calibre/recipes/akter_dnevnik.recipe
1432share/calibre/recipes/aktualne.cz.recipe 1641share/calibre/recipes/aktualne.cz.recipe
1433share/calibre/recipes/al_ahram.recipe 1642share/calibre/recipes/al_ahram.recipe
1434share/calibre/recipes/al_jazeera.recipe 1643share/calibre/recipes/al_jazeera.recipe
1435share/calibre/recipes/al_masry_al_youm.recipe 1644share/calibre/recipes/al_masry_al_youm.recipe
1436share/calibre/recipes/albert_mohler.recipe 1645share/calibre/recipes/albert_mohler.recipe
 1646share/calibre/recipes/alejakomiksu_com.recipe
1437share/calibre/recipes/alo_novine.recipe 1647share/calibre/recipes/alo_novine.recipe
1438share/calibre/recipes/alt_om_herning.recipe 1648share/calibre/recipes/alt_om_herning.recipe
1439share/calibre/recipes/alternet.recipe 1649share/calibre/recipes/alternet.recipe
 1650share/calibre/recipes/am730.recipe
1440share/calibre/recipes/ambito.recipe 1651share/calibre/recipes/ambito.recipe
1441share/calibre/recipes/ambito_financiero.recipe 1652share/calibre/recipes/ambito_financiero.recipe
1442share/calibre/recipes/american_thinker.recipe 1653share/calibre/recipes/american_thinker.recipe
1443share/calibre/recipes/amspec.recipe 1654share/calibre/recipes/amspec.recipe
1444share/calibre/recipes/an_druma_mor.recipe 1655share/calibre/recipes/an_druma_mor.recipe
1445share/calibre/recipes/anandtech.recipe 1656share/calibre/recipes/anandtech.recipe
1446share/calibre/recipes/anchorage_daily.recipe 1657share/calibre/recipes/anchorage_daily.recipe
1447share/calibre/recipes/android_com_pl.recipe 1658share/calibre/recipes/android_com_pl.recipe
1448share/calibre/recipes/animal_politico.recipe 1659share/calibre/recipes/animal_politico.recipe
1449share/calibre/recipes/antyweb.recipe 1660share/calibre/recipes/antyweb.recipe
1450share/calibre/recipes/ap.recipe 1661share/calibre/recipes/ap.recipe
1451share/calibre/recipes/apcom.recipe 1662share/calibre/recipes/apcom.recipe
1452share/calibre/recipes/apod.recipe 1663share/calibre/recipes/apod.recipe
 1664share/calibre/recipes/app_funds.recipe
1453share/calibre/recipes/apple_daily.recipe 1665share/calibre/recipes/apple_daily.recipe
 1666share/calibre/recipes/applefobia.recipe
1454share/calibre/recipes/aprospect.recipe 1667share/calibre/recipes/aprospect.recipe
1455share/calibre/recipes/ara_info.recipe 1668share/calibre/recipes/ara_info.recipe
1456share/calibre/recipes/arabian_business.recipe 1669share/calibre/recipes/arabian_business.recipe
1457share/calibre/recipes/arbetaren.recipe 1670share/calibre/recipes/arbetaren.recipe
1458share/calibre/recipes/arcadia.recipe 1671share/calibre/recipes/arcadia.recipe
1459share/calibre/recipes/arcamax.recipe 1672share/calibre/recipes/arcamax.recipe
1460share/calibre/recipes/archeowiesci.recipe 1673share/calibre/recipes/archeowiesci.recipe
 1674share/calibre/recipes/argnoticias.recipe
1461share/calibre/recipes/arizona_republic.recipe 1675share/calibre/recipes/arizona_republic.recipe
1462share/calibre/recipes/army_times.recipe 1676share/calibre/recipes/army_times.recipe
 1677share/calibre/recipes/arret_sur_images.recipe
1463share/calibre/recipes/ars_technica.recipe 1678share/calibre/recipes/ars_technica.recipe
 1679share/calibre/recipes/asco_de_vida.recipe
1464share/calibre/recipes/asia_one.recipe 1680share/calibre/recipes/asia_one.recipe
1465share/calibre/recipes/asianreviewofbooks.recipe 1681share/calibre/recipes/asianreviewofbooks.recipe
1466share/calibre/recipes/astro_news_pl.recipe 1682share/calibre/recipes/astro_news_pl.recipe
 1683share/calibre/recipes/astroflesz.recipe
1467share/calibre/recipes/astronomia_pl.recipe 1684share/calibre/recipes/astronomia_pl.recipe
1468share/calibre/recipes/athens_news.recipe 1685share/calibre/recipes/athens_news.recipe
1469share/calibre/recipes/atlantic.recipe 1686share/calibre/recipes/atlantic.recipe
1470share/calibre/recipes/attac_es.recipe 1687share/calibre/recipes/attac_es.recipe
1471share/calibre/recipes/auto.recipe 1688share/calibre/recipes/auto.recipe
1472share/calibre/recipes/auto_blog.recipe 1689share/calibre/recipes/auto_blog.recipe
1473share/calibre/recipes/auto_prove.recipe 1690share/calibre/recipes/auto_prove.recipe
1474share/calibre/recipes/autobild.recipe 1691share/calibre/recipes/autobild.recipe
1475share/calibre/recipes/automatiseringgids.recipe 1692share/calibre/recipes/automatiseringgids.recipe
1476share/calibre/recipes/autosport.recipe 1693share/calibre/recipes/autosport.recipe
1477share/calibre/recipes/avantaje.recipe 1694share/calibre/recipes/avantaje.recipe
1478share/calibre/recipes/aventurilapescuit.recipe 1695share/calibre/recipes/aventurilapescuit.recipe
1479share/calibre/recipes/avto-magazin.recipe 1696share/calibre/recipes/avto-magazin.recipe
1480share/calibre/recipes/axxon_magazine.recipe 1697share/calibre/recipes/axxon_magazine.recipe
1481share/calibre/recipes/axxon_news.recipe 1698share/calibre/recipes/axxon_news.recipe
1482share/calibre/recipes/azstarnet.recipe 1699share/calibre/recipes/azstarnet.recipe
1483share/calibre/recipes/b365realitatea.recipe 1700share/calibre/recipes/b365realitatea.recipe
1484share/calibre/recipes/b92.recipe 1701share/calibre/recipes/b92.recipe
1485share/calibre/recipes/ba_herald.recipe 1702share/calibre/recipes/ba_herald.recipe
1486share/calibre/recipes/babyonline.recipe 1703share/calibre/recipes/babyonline.recipe
 1704share/calibre/recipes/bachormagazyn.recipe
 1705share/calibre/recipes/badania_net.recipe
1487share/calibre/recipes/balkaninsight.recipe 1706share/calibre/recipes/balkaninsight.recipe
1488share/calibre/recipes/baltimore_sun.recipe 1707share/calibre/recipes/baltimore_sun.recipe
1489share/calibre/recipes/banat_news.recipe 1708share/calibre/recipes/banat_news.recipe
1490share/calibre/recipes/bangkok_biz.recipe 1709share/calibre/recipes/bangkok_biz.recipe
1491share/calibre/recipes/bangkokpost.recipe 1710share/calibre/recipes/bangkokpost.recipe
1492share/calibre/recipes/bankier_pl.recipe 1711share/calibre/recipes/bankier_pl.recipe
1493share/calibre/recipes/barrons.recipe 1712share/calibre/recipes/barrons.recipe
1494share/calibre/recipes/bash_org_pl.recipe 1713share/calibre/recipes/bash_org_pl.recipe
1495share/calibre/recipes/bay_citizen.recipe 1714share/calibre/recipes/bay_citizen.recipe
1496share/calibre/recipes/bbc.recipe 1715share/calibre/recipes/bbc.recipe
1497share/calibre/recipes/bbc_brasil.recipe 1716share/calibre/recipes/bbc_brasil.recipe
1498share/calibre/recipes/bbc_chinese.recipe 1717share/calibre/recipes/bbc_chinese.recipe
1499share/calibre/recipes/bbc_es.recipe 1718share/calibre/recipes/bbc_es.recipe
@@ -1508,76 +1727,83 @@ share/calibre/recipes/berria.recipe @@ -1508,76 +1727,83 @@ share/calibre/recipes/berria.recipe
1508share/calibre/recipes/beta.recipe 1727share/calibre/recipes/beta.recipe
1509share/calibre/recipes/beta_en.recipe 1728share/calibre/recipes/beta_en.recipe
1510share/calibre/recipes/biamag.recipe 1729share/calibre/recipes/biamag.recipe
1511share/calibre/recipes/biamag_en.recipe 1730share/calibre/recipes/biamag_en.recipe
1512share/calibre/recipes/bianet.recipe 1731share/calibre/recipes/bianet.recipe
1513share/calibre/recipes/big_oven.recipe 1732share/calibre/recipes/big_oven.recipe
1514share/calibre/recipes/big_picture.recipe 1733share/calibre/recipes/big_picture.recipe
1515share/calibre/recipes/biggovernment.recipe 1734share/calibre/recipes/biggovernment.recipe
1516share/calibre/recipes/bighollywood.recipe 1735share/calibre/recipes/bighollywood.recipe
1517share/calibre/recipes/bild_de.recipe 1736share/calibre/recipes/bild_de.recipe
1518share/calibre/recipes/billorielly.recipe 1737share/calibre/recipes/billorielly.recipe
1519share/calibre/recipes/biolog_pl.recipe 1738share/calibre/recipes/biolog_pl.recipe
1520share/calibre/recipes/birgun_gazetesi.recipe 1739share/calibre/recipes/birgun_gazetesi.recipe
 1740share/calibre/recipes/birmingham_evening_mail.recipe
1521share/calibre/recipes/birmingham_post.recipe 1741share/calibre/recipes/birmingham_post.recipe
1522share/calibre/recipes/bitacora.recipe 1742share/calibre/recipes/bitacora.recipe
 1743share/calibre/recipes/biweekly.recipe
1523share/calibre/recipes/biz_portal.recipe 1744share/calibre/recipes/biz_portal.recipe
1524share/calibre/recipes/blesk.recipe 1745share/calibre/recipes/blesk.recipe
1525share/calibre/recipes/blic.recipe 1746share/calibre/recipes/blic.recipe
 1747share/calibre/recipes/blind_buch_de.recipe
 1748share/calibre/recipes/blog_biszopa.recipe
1526share/calibre/recipes/blog_da_cidadania.recipe 1749share/calibre/recipes/blog_da_cidadania.recipe
1527share/calibre/recipes/blognexto.recipe 1750share/calibre/recipes/blognexto.recipe
1528share/calibre/recipes/blues.recipe 1751share/calibre/recipes/blues.recipe
1529share/calibre/recipes/boortz.recipe 1752share/calibre/recipes/boortz.recipe
1530share/calibre/recipes/borse_online.recipe 1753share/calibre/recipes/borse_online.recipe
1531share/calibre/recipes/boston.com.recipe 1754share/calibre/recipes/boston.com.recipe
1532share/calibre/recipes/brand_eins.recipe 1755share/calibre/recipes/brand_eins.recipe
1533share/calibre/recipes/brasil_de_fato.recipe 1756share/calibre/recipes/brasil_de_fato.recipe
1534share/calibre/recipes/brecha.recipe 1757share/calibre/recipes/brecha.recipe
1535share/calibre/recipes/brewiarz.recipe 1758share/calibre/recipes/brewiarz.recipe
1536share/calibre/recipes/brigitte_de.recipe 1759share/calibre/recipes/brigitte_de.recipe
1537share/calibre/recipes/bucataras.recipe 1760share/calibre/recipes/bucataras.recipe
1538share/calibre/recipes/buchreport.recipe 1761share/calibre/recipes/buchreport.recipe
1539share/calibre/recipes/buckmasters.recipe 1762share/calibre/recipes/buckmasters.recipe
1540share/calibre/recipes/buenosaireseconomico.recipe 1763share/calibre/recipes/buenosaireseconomico.recipe
1541share/calibre/recipes/buffalo_news.recipe 1764share/calibre/recipes/buffalo_news.recipe
1542share/calibre/recipes/bugun_gazetesi.recipe 1765share/calibre/recipes/bugun_gazetesi.recipe
1543share/calibre/recipes/business_insider.recipe 1766share/calibre/recipes/business_insider.recipe
1544share/calibre/recipes/business_spectator.recipe 1767share/calibre/recipes/business_spectator.recipe
1545share/calibre/recipes/business_standard.recipe 1768share/calibre/recipes/business_standard.recipe
1546share/calibre/recipes/businessworldin.recipe 1769share/calibre/recipes/businessworldin.recipe
1547share/calibre/recipes/bwmagazine.recipe 1770share/calibre/recipes/bwmagazine.recipe
1548share/calibre/recipes/bwmagazine2.recipe 1771share/calibre/recipes/bwmagazine2.recipe
1549share/calibre/recipes/cacm.recipe 1772share/calibre/recipes/cacm.recipe
 1773share/calibre/recipes/cafcaf_dergisi.recipe
1550share/calibre/recipes/caijing.recipe 1774share/calibre/recipes/caijing.recipe
1551share/calibre/recipes/calcalist.recipe 1775share/calibre/recipes/calcalist.recipe
1552share/calibre/recipes/calgary_herald.recipe 1776share/calibre/recipes/calgary_herald.recipe
1553share/calibre/recipes/calibre_blog.recipe 1777share/calibre/recipes/calibre_blog.recipe
1554share/calibre/recipes/camera_di_commercio_di_bari.recipe 1778share/calibre/recipes/camera_di_commercio_di_bari.recipe
1555share/calibre/recipes/canardpc.recipe 1779share/calibre/recipes/canardpc.recipe
1556share/calibre/recipes/capes_n_babes.recipe 1780share/calibre/recipes/capes_n_babes.recipe
1557share/calibre/recipes/capital.recipe 1781share/calibre/recipes/capital.recipe
1558share/calibre/recipes/capital_de.recipe 1782share/calibre/recipes/capital_de.recipe
1559share/calibre/recipes/capital_gr.recipe 1783share/calibre/recipes/capital_gr.recipe
 1784share/calibre/recipes/caravan_magazine.recipe
1560share/calibre/recipes/caros_amigos.recipe 1785share/calibre/recipes/caros_amigos.recipe
1561share/calibre/recipes/carta.recipe 1786share/calibre/recipes/carta.recipe
1562share/calibre/recipes/carta_capital.recipe 1787share/calibre/recipes/carta_capital.recipe
1563share/calibre/recipes/catavencii.recipe 1788share/calibre/recipes/catavencii.recipe
1564share/calibre/recipes/catavencu.recipe 1789share/calibre/recipes/catavencu.recipe
1565share/calibre/recipes/catholic_daily_readings.recipe 1790share/calibre/recipes/catholic_daily_readings.recipe
1566share/calibre/recipes/catholic_news_agency.recipe 1791share/calibre/recipes/catholic_news_agency.recipe
1567share/calibre/recipes/cato.recipe 1792share/calibre/recipes/cato.recipe
1568share/calibre/recipes/cbc_canada.recipe 1793share/calibre/recipes/cbc_canada.recipe
1569share/calibre/recipes/cbn.recipe 1794share/calibre/recipes/cbn.recipe
1570share/calibre/recipes/cd_action.recipe 1795share/calibre/recipes/cd_action.recipe
 1796share/calibre/recipes/cdrinfo_pl.recipe
1571share/calibre/recipes/ceska_pozice.recipe 1797share/calibre/recipes/ceska_pozice.recipe
1572share/calibre/recipes/ceske_noviny.recipe 1798share/calibre/recipes/ceske_noviny.recipe
1573share/calibre/recipes/cesky_rozhlas_6.recipe 1799share/calibre/recipes/cesky_rozhlas_6.recipe
1574share/calibre/recipes/cetnixploitation.recipe 1800share/calibre/recipes/cetnixploitation.recipe
1575share/calibre/recipes/cgm_pl.recipe 1801share/calibre/recipes/cgm_pl.recipe
1576share/calibre/recipes/chicago_breaking_news.recipe 1802share/calibre/recipes/chicago_breaking_news.recipe
1577share/calibre/recipes/chicago_tribune.recipe 1803share/calibre/recipes/chicago_tribune.recipe
1578share/calibre/recipes/china_economic_net.recipe 1804share/calibre/recipes/china_economic_net.recipe
1579share/calibre/recipes/china_post.recipe 1805share/calibre/recipes/china_post.recipe
1580share/calibre/recipes/china_press.recipe 1806share/calibre/recipes/china_press.recipe
1581share/calibre/recipes/china_times.recipe 1807share/calibre/recipes/china_times.recipe
1582share/calibre/recipes/chinadaily.recipe 1808share/calibre/recipes/chinadaily.recipe
1583share/calibre/recipes/chipro.recipe 1809share/calibre/recipes/chipro.recipe
@@ -1598,311 +1824,360 @@ share/calibre/recipes/cjr.recipe @@ -1598,311 +1824,360 @@ share/calibre/recipes/cjr.recipe
1598share/calibre/recipes/clarin.recipe 1824share/calibre/recipes/clarin.recipe
1599share/calibre/recipes/clarion_ledger.recipe 1825share/calibre/recipes/clarion_ledger.recipe
1600share/calibre/recipes/clic_rbs.recipe 1826share/calibre/recipes/clic_rbs.recipe
1601share/calibre/recipes/climate_progress.recipe 1827share/calibre/recipes/climate_progress.recipe
1602share/calibre/recipes/cm_journal.recipe 1828share/calibre/recipes/cm_journal.recipe
1603share/calibre/recipes/cnd.recipe 1829share/calibre/recipes/cnd.recipe
1604share/calibre/recipes/cnd_weekly.recipe 1830share/calibre/recipes/cnd_weekly.recipe
1605share/calibre/recipes/cnetjapan.recipe 1831share/calibre/recipes/cnetjapan.recipe
1606share/calibre/recipes/cnetjapan_digital.recipe 1832share/calibre/recipes/cnetjapan_digital.recipe
1607share/calibre/recipes/cnetjapan_release.recipe 1833share/calibre/recipes/cnetjapan_release.recipe
1608share/calibre/recipes/cnetnews.recipe 1834share/calibre/recipes/cnetnews.recipe
1609share/calibre/recipes/cnn.recipe 1835share/calibre/recipes/cnn.recipe
1610share/calibre/recipes/coding_horror.recipe 1836share/calibre/recipes/coding_horror.recipe
 1837share/calibre/recipes/colta.recipe
1611share/calibre/recipes/columbusdispatch.recipe 1838share/calibre/recipes/columbusdispatch.recipe
1612share/calibre/recipes/comics_com.recipe 
1613share/calibre/recipes/common_dreams.recipe 1839share/calibre/recipes/common_dreams.recipe
1614share/calibre/recipes/computer_active.recipe 1840share/calibre/recipes/computer_active.recipe
 1841share/calibre/recipes/computer_woche.recipe
1615share/calibre/recipes/computerworld_pl.recipe 1842share/calibre/recipes/computerworld_pl.recipe
1616share/calibre/recipes/conowego_pl.recipe 1843share/calibre/recipes/conowego_pl.recipe
1617share/calibre/recipes/consortium_news.recipe 1844share/calibre/recipes/consortium_news.recipe
1618share/calibre/recipes/consumerist.recipe 1845share/calibre/recipes/consumerist.recipe
 1846share/calibre/recipes/contemporary_argentine_writers.recipe
1619share/calibre/recipes/corren2.recipe 1847share/calibre/recipes/corren2.recipe
1620share/calibre/recipes/corriere_della_sera_en.recipe 1848share/calibre/recipes/corriere_della_sera_en.recipe
1621share/calibre/recipes/corriere_della_sera_it.recipe 1849share/calibre/recipes/corriere_della_sera_it.recipe
1622share/calibre/recipes/corriere_dello_sport.recipe 1850share/calibre/recipes/corriere_dello_sport.recipe
1623share/calibre/recipes/cosmopolitan.recipe 1851share/calibre/recipes/cosmopolitan.recipe
1624share/calibre/recipes/cosmopolitan_de.recipe 1852share/calibre/recipes/cosmopolitan_de.recipe
1625share/calibre/recipes/cosmopolitan_uk.recipe 1853share/calibre/recipes/cosmopolitan_uk.recipe
1626share/calibre/recipes/cotidianul.recipe 1854share/calibre/recipes/cotidianul.recipe
1627share/calibre/recipes/counterpunch.recipe 1855share/calibre/recipes/counterpunch.recipe
1628share/calibre/recipes/countryfile.recipe 1856share/calibre/recipes/countryfile.recipe
1629share/calibre/recipes/courrier.recipe 1857share/calibre/recipes/courrier.recipe
1630share/calibre/recipes/courrierinternational.recipe 1858share/calibre/recipes/courrierinternational.recipe
1631share/calibre/recipes/cracked_com.recipe 1859share/calibre/recipes/cracked_com.recipe
1632share/calibre/recipes/craigslist.recipe 1860share/calibre/recipes/craigslist.recipe
1633share/calibre/recipes/credit_slips.recipe 1861share/calibre/recipes/credit_slips.recipe
1634share/calibre/recipes/csid.recipe 1862share/calibre/recipes/csid.recipe
1635share/calibre/recipes/ct24.recipe 1863share/calibre/recipes/ct24.recipe
1636share/calibre/recipes/cubadebate.recipe 1864share/calibre/recipes/cubadebate.recipe
1637share/calibre/recipes/cumhuriyet.recipe 1865share/calibre/recipes/cumhuriyet.recipe
1638share/calibre/recipes/curierulnational.recipe 1866share/calibre/recipes/curierulnational.recipe
1639share/calibre/recipes/cvecezla.recipe 1867share/calibre/recipes/cvecezla.recipe
1640share/calibre/recipes/cyberpresse.recipe 1868share/calibre/recipes/cyberpresse.recipe
1641share/calibre/recipes/cynewslive.recipe 1869share/calibre/recipes/cynewslive.recipe
1642share/calibre/recipes/cyprus_weekly.recipe 1870share/calibre/recipes/cyprus_weekly.recipe
 1871share/calibre/recipes/czas_gentlemanow.recipe
1643share/calibre/recipes/dagens_industri.recipe 1872share/calibre/recipes/dagens_industri.recipe
 1873share/calibre/recipes/daily_express.recipe
1644share/calibre/recipes/daily_mail.recipe 1874share/calibre/recipes/daily_mail.recipe
1645share/calibre/recipes/daily_mirror.recipe 1875share/calibre/recipes/daily_mirror.recipe
1646share/calibre/recipes/daily_telegraph.recipe 1876share/calibre/recipes/daily_telegraph.recipe
1647share/calibre/recipes/daily_writing_tips.recipe 1877share/calibre/recipes/daily_writing_tips.recipe
1648share/calibre/recipes/dailyreckoning.recipe 1878share/calibre/recipes/dailyreckoning.recipe
1649share/calibre/recipes/dailytportal.recipe 1879share/calibre/recipes/dailytportal.recipe
1650share/calibre/recipes/dallas.recipe 1880share/calibre/recipes/dallas.recipe
1651share/calibre/recipes/danas.recipe 1881share/calibre/recipes/danas.recipe
1652share/calibre/recipes/dani.recipe 1882share/calibre/recipes/dani.recipe
1653share/calibre/recipes/dark_horizons.recipe 1883share/calibre/recipes/dark_horizons.recipe
1654share/calibre/recipes/darknet.recipe 1884share/calibre/recipes/darknet.recipe
1655share/calibre/recipes/datasport.recipe 1885share/calibre/recipes/datasport.recipe
1656share/calibre/recipes/daum_net.recipe 1886share/calibre/recipes/daum_net.recipe
1657share/calibre/recipes/dawn.recipe 1887share/calibre/recipes/dawn.recipe
1658share/calibre/recipes/daytona_beach.recipe 1888share/calibre/recipes/daytona_beach.recipe
1659share/calibre/recipes/dbb.recipe 1889share/calibre/recipes/dbb.recipe
1660share/calibre/recipes/de_standaard.recipe 1890share/calibre/recipes/de_standaard.recipe
1661share/calibre/recipes/deadspin.recipe 1891share/calibre/recipes/deadspin.recipe
 1892share/calibre/recipes/deccan_herald.recipe
1662share/calibre/recipes/defensenews.recipe 1893share/calibre/recipes/defensenews.recipe
1663share/calibre/recipes/degentenaar.recipe 1894share/calibre/recipes/degentenaar.recipe
1664share/calibre/recipes/deia.recipe 1895share/calibre/recipes/deia.recipe
1665share/calibre/recipes/delco_times.recipe 1896share/calibre/recipes/delco_times.recipe
1666share/calibre/recipes/demagog.cz.recipe 1897share/calibre/recipes/demagog.cz.recipe
 1898share/calibre/recipes/democracy_journal.recipe
 1899share/calibre/recipes/democracy_now.recipe
1667share/calibre/recipes/demorgen_be.recipe 1900share/calibre/recipes/demorgen_be.recipe
1668share/calibre/recipes/den_of_geek.recipe 1901share/calibre/recipes/den_of_geek.recipe
1669share/calibre/recipes/denik.cz.recipe 1902share/calibre/recipes/denik.cz.recipe
1670share/calibre/recipes/denik_referendum.recipe 1903share/calibre/recipes/denik_referendum.recipe
1671share/calibre/recipes/denver_post.recipe 1904share/calibre/recipes/denver_post.recipe
1672share/calibre/recipes/der_spiegel.recipe 1905share/calibre/recipes/der_spiegel.recipe
1673share/calibre/recipes/der_standard.recipe 1906share/calibre/recipes/der_standard.recipe
1674share/calibre/recipes/deredactie.recipe 1907share/calibre/recipes/deredactie.recipe
1675share/calibre/recipes/derin_dusunce.recipe 1908share/calibre/recipes/derin_dusunce.recipe
1676share/calibre/recipes/descopera.recipe 1909share/calibre/recipes/descopera.recipe
1677share/calibre/recipes/descopera_org.recipe 1910share/calibre/recipes/descopera_org.recipe
1678share/calibre/recipes/desiring_god.recipe 1911share/calibre/recipes/desiring_god.recipe
1679share/calibre/recipes/detroit_news.recipe 1912share/calibre/recipes/detroit_news.recipe
1680share/calibre/recipes/deutsche_welle_bs.recipe 1913share/calibre/recipes/deutsche_welle_bs.recipe
1681share/calibre/recipes/deutsche_welle_en.recipe 1914share/calibre/recipes/deutsche_welle_en.recipe
1682share/calibre/recipes/deutsche_welle_es.recipe 1915share/calibre/recipes/deutsche_welle_es.recipe
1683share/calibre/recipes/deutsche_welle_hr.recipe 1916share/calibre/recipes/deutsche_welle_hr.recipe
1684share/calibre/recipes/deutsche_welle_pt.recipe 1917share/calibre/recipes/deutsche_welle_pt.recipe
1685share/calibre/recipes/deutsche_welle_sr.recipe 1918share/calibre/recipes/deutsche_welle_sr.recipe
1686share/calibre/recipes/developpez.recipe 1919share/calibre/recipes/developpez.recipe
1687share/calibre/recipes/dhnet_be.recipe 1920share/calibre/recipes/dhnet_be.recipe
1688share/calibre/recipes/di.recipe 1921share/calibre/recipes/di.recipe
1689share/calibre/recipes/diagonal.recipe 1922share/calibre/recipes/diagonal.recipe
1690share/calibre/recipes/diagonales.recipe 1923share/calibre/recipes/diagonales.recipe
1691share/calibre/recipes/diario_cordoba.recipe 1924share/calibre/recipes/diario_cordoba.recipe
 1925share/calibre/recipes/diario_de_noticias.recipe
 1926share/calibre/recipes/diario_el_pueblo.recipe
 1927share/calibre/recipes/diario_extra.recipe
1692share/calibre/recipes/diario_ibiza.recipe 1928share/calibre/recipes/diario_ibiza.recipe
1693share/calibre/recipes/diario_la_republica.recipe 1929share/calibre/recipes/diario_la_republica.recipe
 1930share/calibre/recipes/diario_salto.recipe
1694share/calibre/recipes/diario_sport.recipe 1931share/calibre/recipes/diario_sport.recipe
1695share/calibre/recipes/diariovasco.recipe 1932share/calibre/recipes/diariovasco.recipe
1696share/calibre/recipes/diepresse.recipe 1933share/calibre/recipes/diepresse.recipe
1697share/calibre/recipes/digital_arts.recipe 1934share/calibre/recipes/digital_arts.recipe
1698share/calibre/recipes/digitaljournal.recipe 1935share/calibre/recipes/digitaljournal.recipe
1699share/calibre/recipes/digitalspy_uk.recipe 1936share/calibre/recipes/digitalspy_uk.recipe
1700share/calibre/recipes/digizone.recipe 1937share/calibre/recipes/digizone.recipe
1701share/calibre/recipes/dilbert.recipe 1938share/calibre/recipes/dilbert.recipe
1702share/calibre/recipes/dilemaveche.recipe 1939share/calibre/recipes/dilemaveche.recipe
 1940share/calibre/recipes/dingoo_a320.recipe
1703share/calibre/recipes/discover_magazine.recipe 1941share/calibre/recipes/discover_magazine.recipe
 1942share/calibre/recipes/disinformatico.recipe
1704share/calibre/recipes/divahair.recipe 1943share/calibre/recipes/divahair.recipe
1705share/calibre/recipes/dn_se.recipe 1944share/calibre/recipes/dn_se.recipe
1706share/calibre/recipes/dna.recipe 1945share/calibre/recipes/dna.recipe
1707share/calibre/recipes/dnevni_avaz.recipe 1946share/calibre/recipes/dnevni_avaz.recipe
1708share/calibre/recipes/dnevnik.recipe 1947share/calibre/recipes/dnevnik.recipe
1709share/calibre/recipes/dnevnik_cro.recipe 1948share/calibre/recipes/dnevnik_cro.recipe
1710share/calibre/recipes/dnevnik_mk.recipe 1949share/calibre/recipes/dnevnik_mk.recipe
 1950share/calibre/recipes/dobanevinosti.recipe
1711share/calibre/recipes/dobreprogamy.recipe 1951share/calibre/recipes/dobreprogamy.recipe
1712share/calibre/recipes/doghousediaries.recipe 1952share/calibre/recipes/doghousediaries.recipe
1713share/calibre/recipes/dominion.recipe 1953share/calibre/recipes/dominion.recipe
1714share/calibre/recipes/dosisdiarias.recipe 1954share/calibre/recipes/dosisdiarias.recipe
1715share/calibre/recipes/dot_net.recipe 1955share/calibre/recipes/dot_net.recipe
1716share/calibre/recipes/dotpod.recipe 1956share/calibre/recipes/dotpod.recipe
1717share/calibre/recipes/down_to_earth.recipe 1957share/calibre/recipes/down_to_earth.recipe
1718share/calibre/recipes/dr_dk.recipe 1958share/calibre/recipes/dr_dk.recipe
1719share/calibre/recipes/drivelry.recipe 1959share/calibre/recipes/drivelry.recipe
1720share/calibre/recipes/drytooling_pl.recipe 1960share/calibre/recipes/drytooling_pl.recipe
1721share/calibre/recipes/dunya_bizim.recipe 1961share/calibre/recipes/dunya_bizim.recipe
1722share/calibre/recipes/dunya_bulteni.recipe 1962share/calibre/recipes/dunya_bulteni.recipe
1723share/calibre/recipes/dvhn.recipe 1963share/calibre/recipes/dvhn.recipe
 1964share/calibre/recipes/dwutygodnik.recipe
 1965share/calibre/recipes/dzial_zagraniczny.recipe
1724share/calibre/recipes/dzieje_pl.recipe 1966share/calibre/recipes/dzieje_pl.recipe
 1967share/calibre/recipes/dziennik_baltycki.recipe
 1968share/calibre/recipes/dziennik_lodzki.recipe
1725share/calibre/recipes/dziennik_pl.recipe 1969share/calibre/recipes/dziennik_pl.recipe
1726share/calibre/recipes/dziennik_polski.recipe 1970share/calibre/recipes/dziennik_polski.recipe
 1971share/calibre/recipes/dziennik_wschodni.recipe
 1972share/calibre/recipes/dziennik_zachodni.recipe
1727share/calibre/recipes/e_novine.recipe 1973share/calibre/recipes/e_novine.recipe
 1974share/calibre/recipes/echo_dnia.recipe
 1975share/calibre/recipes/echo_moskvy.recipe
1728share/calibre/recipes/echo_online.recipe 1976share/calibre/recipes/echo_online.recipe
1729share/calibre/recipes/eclicto.recipe 1977share/calibre/recipes/eclicto.recipe
 1978share/calibre/recipes/eclipseonline.recipe
1730share/calibre/recipes/ecogeek.recipe 1979share/calibre/recipes/ecogeek.recipe
 1980share/calibre/recipes/economia.recipe
1731share/calibre/recipes/economico.recipe 1981share/calibre/recipes/economico.recipe
1732share/calibre/recipes/economist.recipe 1982share/calibre/recipes/economist.recipe
1733share/calibre/recipes/economist_free.recipe 1983share/calibre/recipes/economist_free.recipe
1734share/calibre/recipes/ecotrend.recipe 1984share/calibre/recipes/ecotrend.recipe
1735share/calibre/recipes/ecuisine.recipe 1985share/calibre/recipes/ecuisine.recipe
 1986share/calibre/recipes/edebistan.recipe
1736share/calibre/recipes/edge_conversations.recipe 1987share/calibre/recipes/edge_conversations.recipe
1737share/calibre/recipes/editor_and_publisher.recipe 1988share/calibre/recipes/editor_and_publisher.recipe
1738share/calibre/recipes/editoriali.recipe 1989share/calibre/recipes/editoriali.recipe
1739share/calibre/recipes/edmonton_journal.recipe 1990share/calibre/recipes/edmonton_journal.recipe
1740share/calibre/recipes/egirl.recipe 1991share/calibre/recipes/egirl.recipe
1741share/calibre/recipes/eioba.recipe 1992share/calibre/recipes/eioba.recipe
1742share/calibre/recipes/ekantipur.recipe 1993share/calibre/recipes/ekantipur.recipe
1743share/calibre/recipes/ekathemerini.recipe 1994share/calibre/recipes/ekathemerini.recipe
 1995share/calibre/recipes/ekologia_pl.recipe
1744share/calibre/recipes/ekot.recipe 1996share/calibre/recipes/ekot.recipe
1745share/calibre/recipes/eksiazki.recipe 1997share/calibre/recipes/eksiazki.recipe
1746share/calibre/recipes/ekundelek_pl.recipe 1998share/calibre/recipes/ekundelek_pl.recipe
1747share/calibre/recipes/el_colombiano.recipe 1999share/calibre/recipes/el_colombiano.recipe
1748share/calibre/recipes/el_correo.recipe 2000share/calibre/recipes/el_correo.recipe
1749share/calibre/recipes/el_cultural.recipe 2001share/calibre/recipes/el_cultural.recipe
 2002share/calibre/recipes/el_diplo.recipe
1750share/calibre/recipes/el_espectador.recipe 2003share/calibre/recipes/el_espectador.recipe
1751share/calibre/recipes/el_faro.recipe 2004share/calibre/recipes/el_faro.recipe
 2005share/calibre/recipes/el_malpensante.recipe
1752share/calibre/recipes/el_mercurio_chile.recipe 2006share/calibre/recipes/el_mercurio_chile.recipe
1753share/calibre/recipes/el_mostrador.recipe 2007share/calibre/recipes/el_mostrador.recipe
1754share/calibre/recipes/el_mundo_co.recipe 2008share/calibre/recipes/el_mundo_co.recipe
1755share/calibre/recipes/el_mundo_today.recipe 2009share/calibre/recipes/el_mundo_today.recipe
1756share/calibre/recipes/el_observador.recipe 2010share/calibre/recipes/el_observador.recipe
1757share/calibre/recipes/el_pais.recipe 2011share/calibre/recipes/el_pais.recipe
1758share/calibre/recipes/el_pais_babelia.recipe 2012share/calibre/recipes/el_pais_babelia.recipe
1759share/calibre/recipes/el_pais_uy.recipe 2013share/calibre/recipes/el_pais_uy.recipe
1760share/calibre/recipes/el_periodico.recipe 2014share/calibre/recipes/el_periodico.recipe
1761share/calibre/recipes/el_publico.recipe 2015share/calibre/recipes/el_publico.recipe
1762share/calibre/recipes/el_tiempo.recipe 2016share/calibre/recipes/el_tiempo.recipe
1763share/calibre/recipes/el_universal.recipe 2017share/calibre/recipes/el_universal.recipe
1764share/calibre/recipes/elargentino.recipe 2018share/calibre/recipes/elargentino.recipe
1765share/calibre/recipes/elclubdelebook.recipe 2019share/calibre/recipes/elclubdelebook.recipe
1766share/calibre/recipes/elcomercio.recipe 2020share/calibre/recipes/elcomercio.recipe
1767share/calibre/recipes/elcronista.recipe 2021share/calibre/recipes/elcronista.recipe
1768share/calibre/recipes/ele.recipe 2022share/calibre/recipes/ele.recipe
1769share/calibre/recipes/elektroda_pl.recipe 2023share/calibre/recipes/elektroda_pl.recipe
1770share/calibre/recipes/elet_es_irodalom.recipe 2024share/calibre/recipes/elet_es_irodalom.recipe
1771share/calibre/recipes/elmundo.recipe 2025share/calibre/recipes/elmundo.recipe
1772share/calibre/recipes/elpais_impreso.recipe 2026share/calibre/recipes/elpais_impreso.recipe
1773share/calibre/recipes/elpais_semanal.recipe 2027share/calibre/recipes/elpais_semanal.recipe
1774share/calibre/recipes/elperiodico_catalan.recipe 2028share/calibre/recipes/elperiodico_catalan.recipe
1775share/calibre/recipes/elperiodico_spanish.recipe 2029share/calibre/recipes/elperiodico_spanish.recipe
1776share/calibre/recipes/elsevier.recipe 2030share/calibre/recipes/elsevier.recipe
1777share/calibre/recipes/eltiempo_hn.recipe 2031share/calibre/recipes/eltiempo_hn.recipe
 2032share/calibre/recipes/eltribuno_jujuy_impreso.recipe
 2033share/calibre/recipes/eltribuno_salta_impreso.recipe
1778share/calibre/recipes/eluniversal_ve.recipe 2034share/calibre/recipes/eluniversal_ve.recipe
1779share/calibre/recipes/eluniversalimpresa.recipe 2035share/calibre/recipes/eluniversalimpresa.recipe
1780share/calibre/recipes/eluniverso_ec.recipe 2036share/calibre/recipes/eluniverso_ec.recipe
1781share/calibre/recipes/emg_en.recipe 2037share/calibre/recipes/emg_en.recipe
1782share/calibre/recipes/emg_rs.recipe 2038share/calibre/recipes/emg_rs.recipe
1783share/calibre/recipes/empire_magazine.recipe 2039share/calibre/recipes/empire_magazine.recipe
1784share/calibre/recipes/emuzica_pl.recipe 2040share/calibre/recipes/emuzica_pl.recipe
1785share/calibre/recipes/endgadget.recipe 2041share/calibre/recipes/endgadget.recipe
1786share/calibre/recipes/endgadget_ja.recipe 2042share/calibre/recipes/endgadget_ja.recipe
1787share/calibre/recipes/entrepeneur.recipe 2043share/calibre/recipes/entrepeneur.recipe
1788share/calibre/recipes/epicurious.recipe 2044share/calibre/recipes/epicurious.recipe
1789share/calibre/recipes/epl_talk.recipe 2045share/calibre/recipes/epl_talk.recipe
 2046share/calibre/recipes/equipped.recipe
1790share/calibre/recipes/escrevinhador.recipe 2047share/calibre/recipes/escrevinhador.recipe
1791share/calibre/recipes/esenja.recipe 2048share/calibre/recipes/esenja.recipe
 2049share/calibre/recipes/esensja_(rss).recipe
 2050share/calibre/recipes/eso_pl.recipe
1792share/calibre/recipes/espn.recipe 2051share/calibre/recipes/espn.recipe
1793share/calibre/recipes/esquire.recipe 2052share/calibre/recipes/esquire.recipe
1794share/calibre/recipes/estadao.recipe 2053share/calibre/recipes/estadao.recipe
1795share/calibre/recipes/eu_commission.recipe 2054share/calibre/recipes/eu_commission.recipe
1796share/calibre/recipes/europa_press.recipe 2055share/calibre/recipes/europa_press.recipe
1797share/calibre/recipes/europasur.recipe 2056share/calibre/recipes/europasur.recipe
1798share/calibre/recipes/european_voice.recipe 2057share/calibre/recipes/european_voice.recipe
1799share/calibre/recipes/evangelizo.recipe 2058share/calibre/recipes/evangelizo.recipe
1800share/calibre/recipes/everett_herald.recipe 2059share/calibre/recipes/everett_herald.recipe
1801share/calibre/recipes/evz.ro.recipe 2060share/calibre/recipes/evz.ro.recipe
1802share/calibre/recipes/exiled.recipe 2061share/calibre/recipes/exiled.recipe
1803share/calibre/recipes/expansion_spanish.recipe 2062share/calibre/recipes/expansion_spanish.recipe
1804share/calibre/recipes/explosm.recipe 2063share/calibre/recipes/explosm.recipe
1805share/calibre/recipes/express_de.recipe 2064share/calibre/recipes/express_de.recipe
1806share/calibre/recipes/f1_ultra.recipe 2065share/calibre/recipes/f1_ultra.recipe
1807share/calibre/recipes/f_secure.recipe 2066share/calibre/recipes/f_secure.recipe
1808share/calibre/recipes/factcheck.recipe 2067share/calibre/recipes/factcheck.recipe
1809share/calibre/recipes/fairbanks_daily.recipe 2068share/calibre/recipes/fairbanks_daily.recipe
1810share/calibre/recipes/fan_graphs.recipe 2069share/calibre/recipes/fan_graphs.recipe
1811share/calibre/recipes/fastcompany.recipe 2070share/calibre/recipes/fastcompany.recipe
1812share/calibre/recipes/faznet.recipe 2071share/calibre/recipes/faznet.recipe
1813share/calibre/recipes/fc_knudde.recipe 2072share/calibre/recipes/fc_knudde.recipe
 2073share/calibre/recipes/fdb_pl.recipe
1814share/calibre/recipes/fe_india.recipe 2074share/calibre/recipes/fe_india.recipe
1815share/calibre/recipes/felicia.recipe 2075share/calibre/recipes/felicia.recipe
1816share/calibre/recipes/fhm_uk.recipe 2076share/calibre/recipes/fhm_uk.recipe
1817share/calibre/recipes/fhmro.recipe 2077share/calibre/recipes/fhmro.recipe
 2078share/calibre/recipes/film_org_pl.recipe
1818share/calibre/recipes/film_web.recipe 2079share/calibre/recipes/film_web.recipe
1819share/calibre/recipes/financial_times.recipe 2080share/calibre/recipes/financial_times.recipe
1820share/calibre/recipes/financial_times_uk.recipe 2081share/calibre/recipes/financial_times_uk.recipe
 2082share/calibre/recipes/financial_times_us.recipe
1821share/calibre/recipes/financialsense.recipe 2083share/calibre/recipes/financialsense.recipe
1822share/calibre/recipes/financiarul.recipe 2084share/calibre/recipes/financiarul.recipe
1823share/calibre/recipes/financieele_dagblad.recipe 2085share/calibre/recipes/financieele_dagblad.recipe
1824share/calibre/recipes/fisco_oggi.recipe 2086share/calibre/recipes/fisco_oggi.recipe
1825share/calibre/recipes/fleshbot.recipe 2087share/calibre/recipes/fleshbot.recipe
1826share/calibre/recipes/flickr.recipe 2088share/calibre/recipes/flickr.recipe
1827share/calibre/recipes/flickr_es.recipe 2089share/calibre/recipes/flickr_es.recipe
1828share/calibre/recipes/fluter_de.recipe 2090share/calibre/recipes/fluter_de.recipe
1829share/calibre/recipes/focus_de.recipe 2091share/calibre/recipes/focus_de.recipe
1830share/calibre/recipes/focus_pl.recipe 2092share/calibre/recipes/focus_pl.recipe
1831share/calibre/recipes/fokkeensukke.recipe 2093share/calibre/recipes/fokkeensukke.recipe
1832share/calibre/recipes/folha.recipe 2094share/calibre/recipes/folha.recipe
1833share/calibre/recipes/folhadesaopaulo.recipe 2095share/calibre/recipes/folhadesaopaulo.recipe
1834share/calibre/recipes/folhadesaopaulo_sub.recipe 2096share/calibre/recipes/folhadesaopaulo_sub.recipe
1835share/calibre/recipes/forbes.recipe 2097share/calibre/recipes/forbes.recipe
1836share/calibre/recipes/forbes_india.recipe 2098share/calibre/recipes/forbes_india.recipe
 2099share/calibre/recipes/forbes_pl.recipe
1837share/calibre/recipes/foreign_policy.recipe 2100share/calibre/recipes/foreign_policy.recipe
1838share/calibre/recipes/foreignaffairs.recipe 2101share/calibre/recipes/foreignaffairs.recipe
1839share/calibre/recipes/formulaas.recipe 2102share/calibre/recipes/formulaas.recipe
1840share/calibre/recipes/forsal.recipe 2103share/calibre/recipes/forsal.recipe
 2104share/calibre/recipes/fortune_magazine.recipe
1841share/calibre/recipes/fotoblogia_pl.recipe 2105share/calibre/recipes/fotoblogia_pl.recipe
1842share/calibre/recipes/foxnews.recipe 2106share/calibre/recipes/foxnews.recipe
1843share/calibre/recipes/fr_online.recipe 2107share/calibre/recipes/fr_online.recipe
1844share/calibre/recipes/frandroid.recipe 2108share/calibre/recipes/frandroid.recipe
1845share/calibre/recipes/frankfurter_rundschau.recipe 2109share/calibre/recipes/frankfurter_rundschau.recipe
1846share/calibre/recipes/frazpc.recipe 2110share/calibre/recipes/frazpc.recipe
1847share/calibre/recipes/freakonomics.recipe 2111share/calibre/recipes/freakonomics.recipe
1848share/calibre/recipes/freenature.recipe 2112share/calibre/recipes/freenature.recipe
1849share/calibre/recipes/freeway.recipe 2113share/calibre/recipes/freeway.recipe
1850share/calibre/recipes/fria.recipe 2114share/calibre/recipes/fria.recipe
1851share/calibre/recipes/fronda.recipe 2115share/calibre/recipes/fronda.recipe
1852share/calibre/recipes/frontlineonnet.recipe 2116share/calibre/recipes/frontlineonnet.recipe
1853share/calibre/recipes/fstream.recipe 2117share/calibre/recipes/fstream.recipe
1854share/calibre/recipes/ftd.recipe 2118share/calibre/recipes/ftd.recipe
1855share/calibre/recipes/fudzilla.recipe 2119share/calibre/recipes/fudzilla.recipe
1856share/calibre/recipes/futurismic.recipe 2120share/calibre/recipes/futurismic.recipe
 2121share/calibre/recipes/galaxys_edge.recipe
1857share/calibre/recipes/galicia_confidential.recipe 2122share/calibre/recipes/galicia_confidential.recipe
1858share/calibre/recipes/gamasutra_fa.recipe 2123share/calibre/recipes/gamasutra_fa.recipe
1859share/calibre/recipes/gamasutra_news.recipe 2124share/calibre/recipes/gamasutra_news.recipe
 2125share/calibre/recipes/gamekult.recipe
1860share/calibre/recipes/gameplay_pl.recipe 2126share/calibre/recipes/gameplay_pl.recipe
1861share/calibre/recipes/gamespot.recipe 2127share/calibre/recipes/gamespot.recipe
1862share/calibre/recipes/gandul.recipe 2128share/calibre/recipes/gandul.recipe
1863share/calibre/recipes/gawker.recipe 2129share/calibre/recipes/gawker.recipe
1864share/calibre/recipes/gazeta-prawna-calibre-v1.recipe 2130share/calibre/recipes/gazeta-prawna-calibre-v1.recipe
 2131share/calibre/recipes/gazeta_krakowska.recipe
 2132share/calibre/recipes/gazeta_lubuska.recipe
 2133share/calibre/recipes/gazeta_pl_bydgoszcz.recipe
1865share/calibre/recipes/gazeta_pl_krakow.recipe 2134share/calibre/recipes/gazeta_pl_krakow.recipe
1866share/calibre/recipes/gazeta_pl_szczecin.recipe 2135share/calibre/recipes/gazeta_pl_szczecin.recipe
1867share/calibre/recipes/gazeta_pl_warszawa.recipe 2136share/calibre/recipes/gazeta_pl_warszawa.recipe
1868share/calibre/recipes/gazeta_pomorska.recipe 2137share/calibre/recipes/gazeta_pomorska.recipe
 2138share/calibre/recipes/gazeta_wroclawska.recipe
 2139share/calibre/recipes/gazeta_wspolczesna.recipe
1869share/calibre/recipes/gazeta_wyborcza.recipe 2140share/calibre/recipes/gazeta_wyborcza.recipe
 2141share/calibre/recipes/gcn.recipe
1870share/calibre/recipes/geek_poke.recipe 2142share/calibre/recipes/geek_poke.recipe
 2143share/calibre/recipes/geopolityka.recipe
1871share/calibre/recipes/german_gov.recipe 2144share/calibre/recipes/german_gov.recipe
 2145share/calibre/recipes/gezgin_dergi.recipe
1872share/calibre/recipes/gildia_pl.recipe 2146share/calibre/recipes/gildia_pl.recipe
1873share/calibre/recipes/givemesomethingtoread.recipe 
1874share/calibre/recipes/gizmodo.recipe 2147share/calibre/recipes/gizmodo.recipe
1875share/calibre/recipes/glamour.recipe 2148share/calibre/recipes/glamour.recipe
1876share/calibre/recipes/glas_srpske.recipe 2149share/calibre/recipes/glas_srpske.recipe
1877share/calibre/recipes/glasgow_herald.recipe 2150share/calibre/recipes/glasgow_herald.recipe
1878share/calibre/recipes/glasjavnosti.recipe 2151share/calibre/recipes/glasjavnosti.recipe
 2152share/calibre/recipes/glenn_greenwald.recipe
1879share/calibre/recipes/glennbeck.recipe 2153share/calibre/recipes/glennbeck.recipe
1880share/calibre/recipes/globaltimes.recipe 2154share/calibre/recipes/globaltimes.recipe
1881share/calibre/recipes/globe_and_mail.recipe 2155share/calibre/recipes/globe_and_mail.recipe
1882share/calibre/recipes/globes_co_il.recipe 2156share/calibre/recipes/globes_co_il.recipe
 2157share/calibre/recipes/glos_wielkopolski.recipe
1883share/calibre/recipes/go4it.recipe 2158share/calibre/recipes/go4it.recipe
1884share/calibre/recipes/go_comics.recipe 2159share/calibre/recipes/go_comics.recipe
1885share/calibre/recipes/goal.recipe 2160share/calibre/recipes/goal.recipe
 2161share/calibre/recipes/gofin_pl.recipe
1886share/calibre/recipes/golem_de.recipe 2162share/calibre/recipes/golem_de.recipe
1887share/calibre/recipes/good_house_keeping.recipe 2163share/calibre/recipes/good_house_keeping.recipe
1888share/calibre/recipes/good_to_know.recipe 2164share/calibre/recipes/good_to_know.recipe
1889share/calibre/recipes/googlemobileblog.recipe 2165share/calibre/recipes/googlemobileblog.recipe
 2166share/calibre/recipes/gosc_full.recipe
1890share/calibre/recipes/gosc_niedzielny.recipe 2167share/calibre/recipes/gosc_niedzielny.recipe
1891share/calibre/recipes/gram_pl.recipe 2168share/calibre/recipes/gram_pl.recipe
1892share/calibre/recipes/granma.recipe 2169share/calibre/recipes/granma.recipe
1893share/calibre/recipes/grantland.recipe 2170share/calibre/recipes/grantland.recipe
1894share/calibre/recipes/greader.recipe 
1895share/calibre/recipes/greader_uber.recipe 
1896share/calibre/recipes/greensboro_news_and_record.recipe 2171share/calibre/recipes/greensboro_news_and_record.recipe
1897share/calibre/recipes/grid_to.recipe 2172share/calibre/recipes/grid_to.recipe
1898share/calibre/recipes/grrm.recipe 2173share/calibre/recipes/grrm.recipe
1899share/calibre/recipes/gry_online_pl.recipe 2174share/calibre/recipes/gry_online_pl.recipe
1900share/calibre/recipes/gs24_pl.recipe 2175share/calibre/recipes/gs24_pl.recipe
1901share/calibre/recipes/gsp.recipe 2176share/calibre/recipes/gsp.recipe
1902share/calibre/recipes/guardian.recipe 2177share/calibre/recipes/guardian.recipe
1903share/calibre/recipes/gulfnews.recipe 2178share/calibre/recipes/gulfnews.recipe
1904share/calibre/recipes/gulli.recipe 2179share/calibre/recipes/gulli.recipe
1905share/calibre/recipes/gva_be.recipe 2180share/calibre/recipes/gva_be.recipe
1906share/calibre/recipes/h1.recipe 2181share/calibre/recipes/h1.recipe
1907share/calibre/recipes/h2.recipe 2182share/calibre/recipes/h2.recipe
1908share/calibre/recipes/h3.recipe 2183share/calibre/recipes/h3.recipe
@@ -1910,51 +2185,52 @@ share/calibre/recipes/h7_tumspor.recipe @@ -1910,51 +2185,52 @@ share/calibre/recipes/h7_tumspor.recipe
1910share/calibre/recipes/haaretz_en.recipe 2185share/calibre/recipes/haaretz_en.recipe
1911share/calibre/recipes/haber7.recipe 2186share/calibre/recipes/haber7.recipe
1912share/calibre/recipes/hackernews.recipe 2187share/calibre/recipes/hackernews.recipe
1913share/calibre/recipes/haksoz.recipe 2188share/calibre/recipes/haksoz.recipe
1914share/calibre/recipes/hallo_assen.recipe 2189share/calibre/recipes/hallo_assen.recipe
1915share/calibre/recipes/hamilton_spectator.recipe 2190share/calibre/recipes/hamilton_spectator.recipe
1916share/calibre/recipes/handelsblatt.recipe 2191share/calibre/recipes/handelsblatt.recipe
1917share/calibre/recipes/hankyoreh.recipe 2192share/calibre/recipes/hankyoreh.recipe
1918share/calibre/recipes/hankyoreh21.recipe 2193share/calibre/recipes/hankyoreh21.recipe
1919share/calibre/recipes/hannoversche_zeitung.recipe 2194share/calibre/recipes/hannoversche_zeitung.recipe
1920share/calibre/recipes/harpers.recipe 2195share/calibre/recipes/harpers.recipe
1921share/calibre/recipes/harpers_full.recipe 2196share/calibre/recipes/harpers_full.recipe
1922share/calibre/recipes/hartford_courant.recipe 2197share/calibre/recipes/hartford_courant.recipe
 2198share/calibre/recipes/hatalska.recipe
1923share/calibre/recipes/hawaii.recipe 2199share/calibre/recipes/hawaii.recipe
1924share/calibre/recipes/hbr.recipe 2200share/calibre/recipes/hbr.recipe
1925share/calibre/recipes/hbr_blogs.recipe 2201share/calibre/recipes/hbr_blogs.recipe
1926share/calibre/recipes/heavy_metal_it.recipe 2202share/calibre/recipes/heavy_metal_it.recipe
1927share/calibre/recipes/heise.recipe 2203share/calibre/recipes/heise.recipe
1928share/calibre/recipes/heise_online.recipe 2204share/calibre/recipes/heise_online.recipe
1929share/calibre/recipes/heise_open.recipe 2205share/calibre/recipes/heise_open.recipe
1930share/calibre/recipes/helsingin_sanomat.recipe 2206share/calibre/recipes/helsingin_sanomat.recipe
1931share/calibre/recipes/heraldo.recipe 2207share/calibre/recipes/heraldo.recipe
1932share/calibre/recipes/heritage_foundation.recipe 2208share/calibre/recipes/heritage_foundation.recipe
1933share/calibre/recipes/high_country_blogs.recipe 
1934share/calibre/recipes/high_country_news.recipe 2209share/calibre/recipes/high_country_news.recipe
1935share/calibre/recipes/hindu.recipe 2210share/calibre/recipes/hindu.recipe
1936share/calibre/recipes/hindu_business_line.recipe 2211share/calibre/recipes/hindu_business_line.recipe
1937share/calibre/recipes/hindustan_times.recipe 2212share/calibre/recipes/hindustan_times.recipe
1938share/calibre/recipes/hira.recipe 2213share/calibre/recipes/hira.recipe
1939share/calibre/recipes/histmag.recipe 2214share/calibre/recipes/histmag.recipe
1940share/calibre/recipes/historia_news.recipe 2215share/calibre/recipes/historia_news.recipe
1941share/calibre/recipes/historia_pl.recipe 2216share/calibre/recipes/historia_pl.recipe
1942share/calibre/recipes/historiaro.recipe 2217share/calibre/recipes/historiaro.recipe
1943share/calibre/recipes/history_today.recipe 2218share/calibre/recipes/history_today.recipe
1944share/calibre/recipes/hitro.recipe 2219share/calibre/recipes/hitro.recipe
1945share/calibre/recipes/hln.recipe 2220share/calibre/recipes/hln.recipe
1946share/calibre/recipes/hln_be.recipe 2221share/calibre/recipes/hln_be.recipe
1947share/calibre/recipes/hna.recipe 2222share/calibre/recipes/hna.recipe
 2223share/calibre/recipes/hnonline.recipe
1948share/calibre/recipes/hola.recipe 2224share/calibre/recipes/hola.recipe
1949share/calibre/recipes/homopedia_pl.recipe 2225share/calibre/recipes/homopedia_pl.recipe
1950share/calibre/recipes/hotair.recipe 2226share/calibre/recipes/hotair.recipe
1951share/calibre/recipes/hotcity.recipe 2227share/calibre/recipes/hotcity.recipe
1952share/calibre/recipes/hotnews.recipe 2228share/calibre/recipes/hotnews.recipe
1953share/calibre/recipes/house_news.recipe 2229share/calibre/recipes/house_news.recipe
1954share/calibre/recipes/houston_chronicle.recipe 2230share/calibre/recipes/houston_chronicle.recipe
1955share/calibre/recipes/howtogeek.recipe 2231share/calibre/recipes/howtogeek.recipe
1956share/calibre/recipes/hoy.recipe 2232share/calibre/recipes/hoy.recipe
1957share/calibre/recipes/hrt.recipe 2233share/calibre/recipes/hrt.recipe
1958share/calibre/recipes/huffingtonpost.recipe 2234share/calibre/recipes/huffingtonpost.recipe
1959share/calibre/recipes/huffingtonpost_uk.recipe 2235share/calibre/recipes/huffingtonpost_uk.recipe
1960share/calibre/recipes/hvg.recipe 2236share/calibre/recipes/hvg.recipe
@@ -1962,312 +2238,352 @@ share/calibre/recipes/ibm_smarter_planet @@ -1962,312 +2238,352 @@ share/calibre/recipes/ibm_smarter_planet
1962share/calibre/recipes/ideal_almeria.recipe 2238share/calibre/recipes/ideal_almeria.recipe
1963share/calibre/recipes/ideal_granada.recipe 2239share/calibre/recipes/ideal_granada.recipe
1964share/calibre/recipes/ideal_jaen.recipe 2240share/calibre/recipes/ideal_jaen.recipe
1965share/calibre/recipes/idg_now.recipe 2241share/calibre/recipes/idg_now.recipe
1966share/calibre/recipes/idg_se.recipe 2242share/calibre/recipes/idg_se.recipe
1967share/calibre/recipes/idnes.recipe 2243share/calibre/recipes/idnes.recipe
1968share/calibre/recipes/ieco.recipe 2244share/calibre/recipes/ieco.recipe
1969share/calibre/recipes/ieeespectrum.recipe 2245share/calibre/recipes/ieeespectrum.recipe
1970share/calibre/recipes/ifzm.recipe 2246share/calibre/recipes/ifzm.recipe
1971share/calibre/recipes/ihned.cz.recipe 2247share/calibre/recipes/ihned.cz.recipe
1972share/calibre/recipes/ihned.recipe 2248share/calibre/recipes/ihned.recipe
1973share/calibre/recipes/iht.recipe 2249share/calibre/recipes/iht.recipe
1974share/calibre/recipes/iktibas.recipe 2250share/calibre/recipes/iktibas.recipe
 2251share/calibre/recipes/il_cambiamento.recipe
1975share/calibre/recipes/il_fatto.recipe 2252share/calibre/recipes/il_fatto.recipe
 2253share/calibre/recipes/il_foglio.recipe
1976share/calibre/recipes/il_giornale.recipe 2254share/calibre/recipes/il_giornale.recipe
1977share/calibre/recipes/il_messaggero.recipe 2255share/calibre/recipes/il_messaggero.recipe
1978share/calibre/recipes/iliteratura_cz.recipe 2256share/calibre/recipes/iliteratura_cz.recipe
1979share/calibre/recipes/ilmanifesto.recipe 2257share/calibre/recipes/ilmanifesto.recipe
1980share/calibre/recipes/ilsole24ore.recipe 2258share/calibre/recipes/ilsole24ore.recipe
1981share/calibre/recipes/imperatortravel.recipe 2259share/calibre/recipes/imperatortravel.recipe
1982share/calibre/recipes/impulse_de.recipe 2260share/calibre/recipes/impulse_de.recipe
1983share/calibre/recipes/in4_pl.recipe 2261share/calibre/recipes/in4_pl.recipe
1984share/calibre/recipes/in_gr.recipe 2262share/calibre/recipes/in_gr.recipe
1985share/calibre/recipes/inc.recipe 2263share/calibre/recipes/inc.recipe
1986share/calibre/recipes/independent.recipe 2264share/calibre/recipes/independent.recipe
1987share/calibre/recipes/index_hu.recipe 2265share/calibre/recipes/index_hu.recipe
1988share/calibre/recipes/india_today.recipe 2266share/calibre/recipes/india_today.recipe
1989share/calibre/recipes/indian_express.recipe 2267share/calibre/recipes/indian_express.recipe
1990share/calibre/recipes/indy_star.recipe 2268share/calibre/recipes/indy_star.recipe
1991share/calibre/recipes/infobae.recipe 2269share/calibre/recipes/infobae.recipe
1992share/calibre/recipes/infomotori.recipe 2270share/calibre/recipes/infomotori.recipe
1993share/calibre/recipes/informacje_usa.recipe 2271share/calibre/recipes/informacje_usa.recipe
1994share/calibre/recipes/information_dk.recipe 2272share/calibre/recipes/information_dk.recipe
1995share/calibre/recipes/infoworld.recipe 2273share/calibre/recipes/infoworld.recipe
1996share/calibre/recipes/infra_pl.recipe 2274share/calibre/recipes/infra_pl.recipe
 2275share/calibre/recipes/inopressa.recipe
1997share/calibre/recipes/inquirer_net.recipe 2276share/calibre/recipes/inquirer_net.recipe
 2277share/calibre/recipes/insan_okur.recipe
1998share/calibre/recipes/insider.recipe 2278share/calibre/recipes/insider.recipe
1999share/calibre/recipes/instapaper.recipe 2279share/calibre/recipes/instapaper.recipe
2000share/calibre/recipes/intelligencer.recipe 2280share/calibre/recipes/intelligencer.recipe
2001share/calibre/recipes/interia_fakty.recipe 2281share/calibre/recipes/interia_fakty.recipe
2002share/calibre/recipes/interia_sport.recipe 2282share/calibre/recipes/interia_sport.recipe
2003share/calibre/recipes/intrefete.recipe 2283share/calibre/recipes/intrefete.recipe
2004share/calibre/recipes/io9.recipe 2284share/calibre/recipes/io9.recipe
2005share/calibre/recipes/iol_za.recipe 2285share/calibre/recipes/iol_za.recipe
2006share/calibre/recipes/ionline_pt.recipe 2286share/calibre/recipes/ionline_pt.recipe
2007share/calibre/recipes/iprofesional.recipe 2287share/calibre/recipes/iprofesional.recipe
2008share/calibre/recipes/irish_independent.recipe 2288share/calibre/recipes/irish_independent.recipe
2009share/calibre/recipes/irish_times.recipe 2289share/calibre/recipes/irish_times.recipe
 2290share/calibre/recipes/ittechblog.recipe
2010share/calibre/recipes/ivanamilakovic.recipe 2291share/calibre/recipes/ivanamilakovic.recipe
2011share/calibre/recipes/izdiham.com.recipe 2292share/calibre/recipes/izdiham.com.recipe
2012share/calibre/recipes/izvestia.recipe 2293share/calibre/recipes/izvestia.recipe
2013share/calibre/recipes/jakarta_globe.recipe 2294share/calibre/recipes/jakarta_globe.recipe
2014share/calibre/recipes/jakarta_post.recipe 2295share/calibre/recipes/jakarta_post.recipe
2015share/calibre/recipes/jalopnik.recipe 2296share/calibre/recipes/jalopnik.recipe
2016share/calibre/recipes/japaa.recipe 2297share/calibre/recipes/japaa.recipe
2017share/calibre/recipes/japan_news.recipe 2298share/calibre/recipes/japan_news.recipe
2018share/calibre/recipes/japan_times.recipe 2299share/calibre/recipes/japan_times.recipe
2019share/calibre/recipes/javalobby.recipe 2300share/calibre/recipes/javalobby.recipe
 2301share/calibre/recipes/jazzpress.recipe
2020share/calibre/recipes/jb_online.recipe 2302share/calibre/recipes/jb_online.recipe
2021share/calibre/recipes/jbpress.recipe 2303share/calibre/recipes/jbpress.recipe
 2304share/calibre/recipes/jeuxvideo.recipe
2022share/calibre/recipes/jezebel.recipe 2305share/calibre/recipes/jezebel.recipe
2023share/calibre/recipes/jijinews.recipe 2306share/calibre/recipes/jijinews.recipe
2024share/calibre/recipes/joelonsoftware.recipe 2307share/calibre/recipes/joelonsoftware.recipe
2025share/calibre/recipes/johm.recipe 2308share/calibre/recipes/johm.recipe
2026share/calibre/recipes/joop.recipe 2309share/calibre/recipes/joop.recipe
 2310share/calibre/recipes/jot_down.recipe
2027share/calibre/recipes/journalgazette.recipe 2311share/calibre/recipes/journalgazette.recipe
2028share/calibre/recipes/journalofaccountancy.recipe 2312share/calibre/recipes/journalofaccountancy.recipe
2029share/calibre/recipes/jp_dk.recipe 2313share/calibre/recipes/jp_dk.recipe
2030share/calibre/recipes/jpost.recipe 2314share/calibre/recipes/jpost.recipe
2031share/calibre/recipes/jpost_fr.recipe 2315share/calibre/recipes/jpost_fr.recipe
2032share/calibre/recipes/jsonline.recipe 2316share/calibre/recipes/jsonline.recipe
2033share/calibre/recipes/jurnalulnational.recipe 2317share/calibre/recipes/jurnalulnational.recipe
2034share/calibre/recipes/jutarnji.recipe 2318share/calibre/recipes/jutarnji.recipe
2035share/calibre/recipes/juve_la_stampa.recipe 2319share/calibre/recipes/juve_la_stampa.recipe
2036share/calibre/recipes/juventudrebelde.recipe 2320share/calibre/recipes/juventudrebelde.recipe
2037share/calibre/recipes/juventudrebelde_english.recipe 2321share/calibre/recipes/juventudrebelde_english.recipe
2038share/calibre/recipes/kahokushinpo.recipe 2322share/calibre/recipes/kahokushinpo.recipe
2039share/calibre/recipes/kamerabild.recipe 2323share/calibre/recipes/kamerabild.recipe
2040share/calibre/recipes/kamikaze.recipe 2324share/calibre/recipes/kamikaze.recipe
2041share/calibre/recipes/karlsruhe.recipe 2325share/calibre/recipes/karlsruhe.recipe
2042share/calibre/recipes/kath_net.recipe 2326share/calibre/recipes/kath_net.recipe
2043share/calibre/recipes/kathemerini.recipe 2327share/calibre/recipes/kathemerini.recipe
2044share/calibre/recipes/kellog_faculty.recipe 2328share/calibre/recipes/kellog_faculty.recipe
2045share/calibre/recipes/kellog_insight.recipe 2329share/calibre/recipes/kellog_insight.recipe
2046share/calibre/recipes/kerrang.recipe 2330share/calibre/recipes/kerrang.recipe
2047share/calibre/recipes/kidney.recipe 2331share/calibre/recipes/kidney.recipe
2048share/calibre/recipes/kitsapun.recipe 2332share/calibre/recipes/kitsapun.recipe
2049share/calibre/recipes/kleinezeitung.recipe 2333share/calibre/recipes/kleinezeitung.recipe
2050share/calibre/recipes/klip_me.recipe 2334share/calibre/recipes/klip_me.recipe
2051share/calibre/recipes/klubknjige.recipe 2335share/calibre/recipes/klubknjige.recipe
 2336share/calibre/recipes/km_blog.recipe
2052share/calibre/recipes/komchadluek.recipe 2337share/calibre/recipes/komchadluek.recipe
2053share/calibre/recipes/kommersant.recipe 2338share/calibre/recipes/kommersant.recipe
2054share/calibre/recipes/kompas.recipe 2339share/calibre/recipes/kompas.recipe
2055share/calibre/recipes/kompiutierra.recipe 2340share/calibre/recipes/kompiutierra.recipe
2056share/calibre/recipes/konflikty_zbrojne.recipe 2341share/calibre/recipes/konflikty_zbrojne.recipe
2057share/calibre/recipes/kopalniawiedzy.recipe 2342share/calibre/recipes/kopalniawiedzy.recipe
2058share/calibre/recipes/korben.recipe 2343share/calibre/recipes/korben.recipe
2059share/calibre/recipes/korea_herald.recipe 2344share/calibre/recipes/korea_herald.recipe
2060share/calibre/recipes/korespondent.recipe 2345share/calibre/recipes/korespondent.recipe
2061share/calibre/recipes/kosmonauta_pl.recipe 2346share/calibre/recipes/kosmonauta_pl.recipe
2062share/calibre/recipes/kotaku.recipe 2347share/calibre/recipes/kotaku.recipe
 2348share/calibre/recipes/kp.recipe
2063share/calibre/recipes/kresy_pl.recipe 2349share/calibre/recipes/kresy_pl.recipe
2064share/calibre/recipes/krstarica.recipe 2350share/calibre/recipes/krstarica.recipe
2065share/calibre/recipes/krstarica_en.recipe 2351share/calibre/recipes/krstarica_en.recipe
2066share/calibre/recipes/ksiazka_pl.recipe 2352share/calibre/recipes/ksiazka_pl.recipe
2067share/calibre/recipes/kstar.recipe 2353share/calibre/recipes/kstar.recipe
2068share/calibre/recipes/kudika.recipe 2354share/calibre/recipes/kudika.recipe
2069share/calibre/recipes/kudy_z_nudy.recipe 2355share/calibre/recipes/kudy_z_nudy.recipe
2070share/calibre/recipes/kukuburi.recipe 2356share/calibre/recipes/kukuburi.recipe
2071share/calibre/recipes/kurier.recipe 2357share/calibre/recipes/kurier.recipe
 2358share/calibre/recipes/kurier_galicyjski.recipe
 2359share/calibre/recipes/kurier_lubelski.recipe
 2360share/calibre/recipes/kurier_poranny.recipe
 2361share/calibre/recipes/kurier_szczecinski.recipe
 2362share/calibre/recipes/kyungyhang.recipe
2072share/calibre/recipes/l_espresso.recipe 2363share/calibre/recipes/l_espresso.recipe
2073share/calibre/recipes/la_cuarta.recipe 2364share/calibre/recipes/la_cuarta.recipe
2074share/calibre/recipes/la_diaria.recipe 2365share/calibre/recipes/la_diaria.recipe
2075share/calibre/recipes/la_gazetta_del_mezzogiorno.recipe 2366share/calibre/recipes/la_gazetta_del_mezzogiorno.recipe
2076share/calibre/recipes/la_gazzeta_dello_sport.recipe 2367share/calibre/recipes/la_gazzeta_dello_sport.recipe
2077share/calibre/recipes/la_jornada.recipe 2368share/calibre/recipes/la_jornada.recipe
 2369share/calibre/recipes/la_nacion_cr.recipe
2078share/calibre/recipes/la_nueva.recipe 2370share/calibre/recipes/la_nueva.recipe
2079share/calibre/recipes/la_pausa_caffe.recipe 2371share/calibre/recipes/la_pausa_caffe.recipe
2080share/calibre/recipes/la_razon_bo.recipe 2372share/calibre/recipes/la_razon_bo.recipe
2081share/calibre/recipes/la_republica.recipe 2373share/calibre/recipes/la_republica.recipe
2082share/calibre/recipes/la_rioja.recipe 2374share/calibre/recipes/la_rioja.recipe
2083share/calibre/recipes/la_segunda.recipe 2375share/calibre/recipes/la_segunda.recipe
2084share/calibre/recipes/la_stampa.recipe 2376share/calibre/recipes/la_stampa.recipe
2085share/calibre/recipes/la_tercera.recipe 2377share/calibre/recipes/la_tercera.recipe
2086share/calibre/recipes/la_tribuna.recipe 2378share/calibre/recipes/la_tribuna.recipe
2087share/calibre/recipes/la_voce.recipe 2379share/calibre/recipes/la_voce.recipe
 2380share/calibre/recipes/lacapital.recipe
2088share/calibre/recipes/lalibre_be.recipe 2381share/calibre/recipes/lalibre_be.recipe
 2382share/calibre/recipes/lamebook.recipe
2089share/calibre/recipes/lameuse_be.recipe 2383share/calibre/recipes/lameuse_be.recipe
2090share/calibre/recipes/lamujerdemivida.recipe 2384share/calibre/recipes/lamujerdemivida.recipe
2091share/calibre/recipes/lanacion.recipe 2385share/calibre/recipes/lanacion.recipe
2092share/calibre/recipes/lanacion_chile.recipe 2386share/calibre/recipes/lanacion_chile.recipe
2093share/calibre/recipes/laprensa.recipe 2387share/calibre/recipes/laprensa.recipe
2094share/calibre/recipes/laprensa_hn.recipe 2388share/calibre/recipes/laprensa_hn.recipe
2095share/calibre/recipes/laprensa_ni.recipe 2389share/calibre/recipes/laprensa_ni.recipe
2096share/calibre/recipes/las_vegas_review.recipe 2390share/calibre/recipes/las_vegas_review.recipe
2097share/calibre/recipes/latimes.recipe 2391share/calibre/recipes/latimes.recipe
2098share/calibre/recipes/latribuna.recipe 2392share/calibre/recipes/latribuna.recipe
2099share/calibre/recipes/lavanguardia.recipe 2393share/calibre/recipes/lavanguardia.recipe
2100share/calibre/recipes/lavenir_be.recipe 2394share/calibre/recipes/lavenir_be.recipe
 2395share/calibre/recipes/le_gorafi.recipe
2101share/calibre/recipes/le_journal.recipe 2396share/calibre/recipes/le_journal.recipe
2102share/calibre/recipes/le_monde.recipe 2397share/calibre/recipes/le_monde.recipe
 2398share/calibre/recipes/le_monde_diplomatique_fr.recipe
2103share/calibre/recipes/le_monde_sub.recipe 2399share/calibre/recipes/le_monde_sub.recipe
 2400share/calibre/recipes/le_nouvel_observateur.recipe
2104share/calibre/recipes/le_temps.recipe 2401share/calibre/recipes/le_temps.recipe
2105share/calibre/recipes/ledevoir.recipe 2402share/calibre/recipes/ledevoir.recipe
2106share/calibre/recipes/leduc.recipe 2403share/calibre/recipes/leduc.recipe
2107share/calibre/recipes/lega_nerd.recipe 2404share/calibre/recipes/lega_nerd.recipe
2108share/calibre/recipes/legeartis.recipe 2405share/calibre/recipes/legeartis.recipe
2109share/calibre/recipes/leggo_it.recipe 2406share/calibre/recipes/leggo_it.recipe
2110share/calibre/recipes/legitymizm.recipe 2407share/calibre/recipes/legitymizm.recipe
2111share/calibre/recipes/leipzer_volkszeitung.recipe 2408share/calibre/recipes/leipzer_volkszeitung.recipe
2112share/calibre/recipes/lemonde_dip.recipe 2409share/calibre/recipes/lemonde_dip.recipe
2113share/calibre/recipes/lenta_ru.recipe 2410share/calibre/recipes/lenta_ru.recipe
2114share/calibre/recipes/lepoint.recipe 2411share/calibre/recipes/lepoint.recipe
2115share/calibre/recipes/lequipe.recipe 2412share/calibre/recipes/lequipe.recipe
 2413share/calibre/recipes/les_echos.recipe
2116share/calibre/recipes/lescienze.recipe 2414share/calibre/recipes/lescienze.recipe
2117share/calibre/recipes/lesoir_be.recipe 2415share/calibre/recipes/lesoir_be.recipe
2118share/calibre/recipes/letsgetcritical.recipe 2416share/calibre/recipes/letsgetcritical.recipe
2119share/calibre/recipes/levante.recipe 2417share/calibre/recipes/levante.recipe
2120share/calibre/recipes/lexpress.recipe 2418share/calibre/recipes/lexpress.recipe
 2419share/calibre/recipes/libartes.recipe
2121share/calibre/recipes/liberation.recipe 2420share/calibre/recipes/liberation.recipe
2122share/calibre/recipes/liberation_sub.recipe 
2123share/calibre/recipes/liberatorio_politico.recipe 2421share/calibre/recipes/liberatorio_politico.recipe
2124share/calibre/recipes/libero.recipe 2422share/calibre/recipes/libero.recipe
 2423share/calibre/recipes/libertad_digital.recipe
2125share/calibre/recipes/liberty_times.recipe 2424share/calibre/recipes/liberty_times.recipe
2126share/calibre/recipes/lidovky.recipe 2425share/calibre/recipes/lidovky.recipe
2127share/calibre/recipes/lifehacker.recipe 2426share/calibre/recipes/lifehacker.recipe
 2427share/calibre/recipes/lifehacker_pl.recipe
 2428share/calibre/recipes/lightspeed_magazine.recipe
2128share/calibre/recipes/limes.recipe 2429share/calibre/recipes/limes.recipe
2129share/calibre/recipes/linux_journal.recipe 2430share/calibre/recipes/linux_journal.recipe
2130share/calibre/recipes/linux_magazine.recipe 2431share/calibre/recipes/linux_magazine.recipe
2131share/calibre/recipes/linuxdevices.recipe 2432share/calibre/recipes/linuxdevices.recipe
 2433share/calibre/recipes/linuxportal_pl.recipe
2132share/calibre/recipes/list_apart.recipe 2434share/calibre/recipes/list_apart.recipe
2133share/calibre/recipes/livemint.recipe 2435share/calibre/recipes/livemint.recipe
2134share/calibre/recipes/living_digital.recipe 
2135share/calibre/recipes/living_stones.recipe 2436share/calibre/recipes/living_stones.recipe
 2437share/calibre/recipes/loksatta.recipe
2136share/calibre/recipes/lomza.recipe 2438share/calibre/recipes/lomza.recipe
2137share/calibre/recipes/london_free_press.recipe 2439share/calibre/recipes/london_free_press.recipe
2138share/calibre/recipes/los_tiempos_bo.recipe 2440share/calibre/recipes/los_tiempos_bo.recipe
2139share/calibre/recipes/losandes.recipe 2441share/calibre/recipes/losandes.recipe
2140share/calibre/recipes/losservatoreromano_it.recipe 2442share/calibre/recipes/losservatoreromano_it.recipe
2141share/calibre/recipes/lrb.recipe 2443share/calibre/recipes/lrb.recipe
2142share/calibre/recipes/lrb_payed.recipe 2444share/calibre/recipes/lrb_payed.recipe
 2445share/calibre/recipes/ludwig_mises.recipe
2143share/calibre/recipes/luns_a_venres.recipe 2446share/calibre/recipes/luns_a_venres.recipe
2144share/calibre/recipes/lupa.recipe 2447share/calibre/recipes/lupa.recipe
 2448share/calibre/recipes/lvivs_ks_ghazieta.recipe
2145share/calibre/recipes/lwn.recipe 2449share/calibre/recipes/lwn.recipe
2146share/calibre/recipes/lwn_weekly.recipe 2450share/calibre/recipes/lwn_weekly.recipe
2147share/calibre/recipes/mac_video.recipe 2451share/calibre/recipes/mac_video.recipe
2148share/calibre/recipes/mac_world.recipe 2452share/calibre/recipes/mac_world.recipe
2149share/calibre/recipes/mac_world_uk.recipe 2453share/calibre/recipes/mac_world_uk.recipe
2150share/calibre/recipes/macity.recipe 2454share/calibre/recipes/macity.recipe
2151share/calibre/recipes/macleans.recipe 2455share/calibre/recipes/macleans.recipe
 2456share/calibre/recipes/magazyn_consido.recipe
 2457share/calibre/recipes/maharashtra_times.recipe
2152share/calibre/recipes/mail_and_guardian.recipe 2458share/calibre/recipes/mail_and_guardian.recipe
2153share/calibre/recipes/mainichi.recipe 2459share/calibre/recipes/mainichi.recipe
2154share/calibre/recipes/mainichi_en.recipe 2460share/calibre/recipes/mainichi_en.recipe
2155share/calibre/recipes/mainichi_science_news.recipe 2461share/calibre/recipes/mainichi_science_news.recipe
2156share/calibre/recipes/malaya_business_insight.recipe 2462share/calibre/recipes/malaya_business_insight.recipe
2157share/calibre/recipes/malaysian_mirror.recipe 2463share/calibre/recipes/malaysian_mirror.recipe
2158share/calibre/recipes/manila_standard_today.recipe 2464share/calibre/recipes/manila_standard_today.recipe
2159share/calibre/recipes/marca.recipe 2465share/calibre/recipes/marca.recipe
2160share/calibre/recipes/marctv.recipe 2466share/calibre/recipes/marctv.recipe
2161share/calibre/recipes/marine_corps_times.recipe 2467share/calibre/recipes/marine_corps_times.recipe
2162share/calibre/recipes/marketing_magazine.recipe 2468share/calibre/recipes/marketing_magazine.recipe
2163share/calibre/recipes/marketing_sensoriale.recipe 2469share/calibre/recipes/marketing_sensoriale.recipe
2164share/calibre/recipes/mateusz_czytania.recipe 2470share/calibre/recipes/mateusz_czytania.recipe
2165share/calibre/recipes/matichon.recipe 2471share/calibre/recipes/matichon.recipe
2166share/calibre/recipes/max_planck.recipe 2472share/calibre/recipes/max_planck.recipe
2167share/calibre/recipes/maximum_pc.recipe 2473share/calibre/recipes/maximum_pc.recipe
2168share/calibre/recipes/mayra.recipe 2474share/calibre/recipes/mayra.recipe
2169share/calibre/recipes/mdj.recipe 2475share/calibre/recipes/mdj.recipe
 2476share/calibre/recipes/media2.recipe
2170share/calibre/recipes/mediafax.recipe 2477share/calibre/recipes/mediafax.recipe
2171share/calibre/recipes/mediaindonesia.recipe 2478share/calibre/recipes/mediaindonesia.recipe
2172share/calibre/recipes/mediapart.recipe 2479share/calibre/recipes/mediapart.recipe
2173share/calibre/recipes/medscape.recipe 2480share/calibre/recipes/medscape.recipe
2174share/calibre/recipes/melbourne_herald_sun.recipe 2481share/calibre/recipes/melbourne_herald_sun.recipe
2175share/calibre/recipes/men24_gr.recipe 2482share/calibre/recipes/men24_gr.recipe
2176share/calibre/recipes/menorca.recipe 2483share/calibre/recipes/menorca.recipe
2177share/calibre/recipes/mens_health.recipe 2484share/calibre/recipes/mens_health.recipe
2178share/calibre/recipes/merco_press.recipe 2485share/calibre/recipes/merco_press.recipe
2179share/calibre/recipes/mesec.recipe 2486share/calibre/recipes/mesec.recipe
2180share/calibre/recipes/metro_montreal.recipe 2487share/calibre/recipes/metro_montreal.recipe
2181share/calibre/recipes/metro_news_nl.recipe 2488share/calibre/recipes/metro_news_nl.recipe
2182share/calibre/recipes/metro_uk.recipe 2489share/calibre/recipes/metro_uk.recipe
2183share/calibre/recipes/metropol_tv.recipe 2490share/calibre/recipes/metropol_tv.recipe
2184share/calibre/recipes/miami_herald.recipe 2491share/calibre/recipes/miami_herald.recipe
2185share/calibre/recipes/michalkiewicz.recipe 2492share/calibre/recipes/michalkiewicz.recipe
2186share/calibre/recipes/michellemalkin.recipe 2493share/calibre/recipes/michellemalkin.recipe
2187share/calibre/recipes/microwave_and_rf.recipe 
2188share/calibre/recipes/midday.recipe 
2189share/calibre/recipes/milenio.recipe 2494share/calibre/recipes/milenio.recipe
2190share/calibre/recipes/military_times.recipe 2495share/calibre/recipes/military_times.recipe
2191share/calibre/recipes/ming_pao.recipe 2496share/calibre/recipes/ming_pao.recipe
2192share/calibre/recipes/ming_pao_toronto.recipe 2497share/calibre/recipes/ming_pao_toronto.recipe
2193share/calibre/recipes/ming_pao_vancouver.recipe 2498share/calibre/recipes/ming_pao_vancouver.recipe
2194share/calibre/recipes/miradasalsur.recipe 2499share/calibre/recipes/miradasalsur.recipe
2195share/calibre/recipes/mlody_technik_pl.recipe 2500share/calibre/recipes/mlody_technik_pl.recipe
2196share/calibre/recipes/mmc_rtv.recipe 2501share/calibre/recipes/mmc_rtv.recipe
 2502share/calibre/recipes/mobile_bulgaria.recipe
2197share/calibre/recipes/mobilenations.recipe 2503share/calibre/recipes/mobilenations.recipe
 2504share/calibre/recipes/mobilna.recipe
2198share/calibre/recipes/modoros.recipe 2505share/calibre/recipes/modoros.recipe
 2506share/calibre/recipes/mojegotowanie.recipe
2199share/calibre/recipes/moldovaazi.recipe 2507share/calibre/recipes/moldovaazi.recipe
2200share/calibre/recipes/monbiot.recipe 2508share/calibre/recipes/monbiot.recipe
2201share/calibre/recipes/mondedurable.recipe 2509share/calibre/recipes/mondedurable.recipe
2202share/calibre/recipes/monden.recipe 2510share/calibre/recipes/monden.recipe
2203share/calibre/recipes/money_pl.recipe 2511share/calibre/recipes/money_pl.recipe
2204share/calibre/recipes/moneycontrol.recipe 2512share/calibre/recipes/moneycontrol.recipe
2205share/calibre/recipes/moneynews.recipe 2513share/calibre/recipes/moneynews.recipe
2206share/calibre/recipes/moneyro.recipe 2514share/calibre/recipes/moneyro.recipe
2207share/calibre/recipes/monitor.recipe 2515share/calibre/recipes/monitor.recipe
2208share/calibre/recipes/montevideo_com.recipe 2516share/calibre/recipes/montevideo_com.recipe
2209share/calibre/recipes/montreal_gazette.recipe 2517share/calibre/recipes/montreal_gazette.recipe
 2518share/calibre/recipes/more_intelligent_life.recipe
2210share/calibre/recipes/moscow_times.recipe 2519share/calibre/recipes/moscow_times.recipe
2211share/calibre/recipes/motherjones.recipe 2520share/calibre/recipes/motherjones.recipe
2212share/calibre/recipes/msdnmag_en.recipe 2521share/calibre/recipes/msdnmag_en.recipe
2213share/calibre/recipes/msnbc.recipe 2522share/calibre/recipes/msnbc.recipe
2214share/calibre/recipes/msnsankei.recipe 2523share/calibre/recipes/msnsankei.recipe
2215share/calibre/recipes/mumbai_mirror.recipe 2524share/calibre/recipes/mumbai_mirror.recipe
2216share/calibre/recipes/mwjournal.recipe 2525share/calibre/recipes/mwjournal.recipe
2217share/calibre/recipes/myapple_pl.recipe 2526share/calibre/recipes/myapple_pl.recipe
2218share/calibre/recipes/nachdenkseiten.recipe 2527share/calibre/recipes/nachdenkseiten.recipe
2219share/calibre/recipes/nacional_cro.recipe 2528share/calibre/recipes/nacional_cro.recipe
2220share/calibre/recipes/nacionred.recipe 2529share/calibre/recipes/nacionred.recipe
2221share/calibre/recipes/nadacni_fond_proti_korupci.recipe 2530share/calibre/recipes/nadacni_fond_proti_korupci.recipe
 2531share/calibre/recipes/najwyzszy_czas.recipe
2222share/calibre/recipes/nakedcapitalism.recipe 2532share/calibre/recipes/nakedcapitalism.recipe
 2533share/calibre/recipes/nanfengchuang.recipe
2223share/calibre/recipes/nasa.recipe 2534share/calibre/recipes/nasa.recipe
2224share/calibre/recipes/naszdziennik.recipe 2535share/calibre/recipes/naszdziennik.recipe
2225share/calibre/recipes/natemat_pl.recipe 2536share/calibre/recipes/natemat_pl.recipe
2226share/calibre/recipes/natgeo.recipe 2537share/calibre/recipes/natgeo.recipe
2227share/calibre/recipes/nation_ke.recipe 2538share/calibre/recipes/nation_ke.recipe
2228share/calibre/recipes/national_geographic_de.recipe 2539share/calibre/recipes/national_geographic_de.recipe
2229share/calibre/recipes/national_geographic_es.recipe 2540share/calibre/recipes/national_geographic_es.recipe
2230share/calibre/recipes/national_geographic_it.recipe 2541share/calibre/recipes/national_geographic_it.recipe
2231share/calibre/recipes/national_geographic_mag.recipe 2542share/calibre/recipes/national_geographic_mag.recipe
2232share/calibre/recipes/national_geographic_pl.recipe 2543share/calibre/recipes/national_geographic_pl.recipe
2233share/calibre/recipes/national_post.recipe 2544share/calibre/recipes/national_post.recipe
2234share/calibre/recipes/nationalgeographic.recipe 2545share/calibre/recipes/nationalgeographic.recipe
2235share/calibre/recipes/nationalgeographicjp.recipe 2546share/calibre/recipes/nationalgeographicjp.recipe
2236share/calibre/recipes/nationalgeoro.recipe 2547share/calibre/recipes/nationalgeoro.recipe
2237share/calibre/recipes/nationalreviewonline.recipe 2548share/calibre/recipes/nationalreviewonline.recipe
 2549share/calibre/recipes/nauka_w_polsce.recipe
 2550share/calibre/recipes/navegalo.recipe
2238share/calibre/recipes/navy_times.recipe 2551share/calibre/recipes/navy_times.recipe
2239share/calibre/recipes/nbonline.recipe 2552share/calibre/recipes/nbonline.recipe
2240share/calibre/recipes/ncrnext.recipe 2553share/calibre/recipes/ncrnext.recipe
2241share/calibre/recipes/nejm.recipe 2554share/calibre/recipes/nejm.recipe
2242share/calibre/recipes/neowin.recipe 2555share/calibre/recipes/neowin.recipe
2243share/calibre/recipes/nepszabadsag.recipe 2556share/calibre/recipes/nepszabadsag.recipe
2244share/calibre/recipes/netzpolitik.recipe 2557share/calibre/recipes/netzpolitik.recipe
 2558share/calibre/recipes/neu_osnabrucker_zeitung.recipe
2245share/calibre/recipes/neviditelny_pes.recipe 2559share/calibre/recipes/neviditelny_pes.recipe
2246share/calibre/recipes/new_london_day.recipe 2560share/calibre/recipes/new_london_day.recipe
2247share/calibre/recipes/new_scientist.recipe 2561share/calibre/recipes/new_scientist.recipe
2248share/calibre/recipes/new_statesman.recipe 2562share/calibre/recipes/new_statesman.recipe
2249share/calibre/recipes/new_york_review_of_books.recipe 2563share/calibre/recipes/new_york_review_of_books.recipe
2250share/calibre/recipes/new_york_review_of_books_no_sub.recipe 2564share/calibre/recipes/new_york_review_of_books_no_sub.recipe
2251share/calibre/recipes/new_yorker.recipe 2565share/calibre/recipes/new_yorker.recipe
 2566share/calibre/recipes/news24.recipe
2252share/calibre/recipes/news_busters.recipe 2567share/calibre/recipes/news_busters.recipe
2253share/calibre/recipes/news_times.recipe 2568share/calibre/recipes/news_times.recipe
2254share/calibre/recipes/newsbeast.recipe 2569share/calibre/recipes/newsbeast.recipe
2255share/calibre/recipes/newsmoldova.recipe 2570share/calibre/recipes/newsmoldova.recipe
2256share/calibre/recipes/newsobs.recipe 2571share/calibre/recipes/newsobs.recipe
2257share/calibre/recipes/newsstraitstimes.recipe 2572share/calibre/recipes/newsstraitstimes.recipe
2258share/calibre/recipes/newsweek.recipe 2573share/calibre/recipes/newsweek.recipe
2259share/calibre/recipes/newsweek_argentina.recipe 2574share/calibre/recipes/newsweek_argentina.recipe
2260share/calibre/recipes/newsweek_polska.recipe 2575share/calibre/recipes/newsweek_polska.recipe
 2576share/calibre/recipes/nezavisne_novine.recipe
2261share/calibre/recipes/ngz.recipe 2577share/calibre/recipes/ngz.recipe
2262share/calibre/recipes/niebezpiecznik.recipe 2578share/calibre/recipes/niebezpiecznik.recipe
2263share/calibre/recipes/nightflier.recipe 2579share/calibre/recipes/nightflier.recipe
2264share/calibre/recipes/nikkei_free.recipe 2580share/calibre/recipes/nikkei_free.recipe
2265share/calibre/recipes/nikkei_news.recipe 2581share/calibre/recipes/nikkei_news.recipe
2266share/calibre/recipes/nikkei_sub.recipe 2582share/calibre/recipes/nikkei_sub.recipe
2267share/calibre/recipes/nikkei_sub_economy.recipe 2583share/calibre/recipes/nikkei_sub_economy.recipe
2268share/calibre/recipes/nikkei_sub_industry.recipe 2584share/calibre/recipes/nikkei_sub_industry.recipe
2269share/calibre/recipes/nikkei_sub_life.recipe 2585share/calibre/recipes/nikkei_sub_life.recipe
2270share/calibre/recipes/nikkei_sub_main.recipe 2586share/calibre/recipes/nikkei_sub_main.recipe
2271share/calibre/recipes/nikkei_sub_shakai.recipe 2587share/calibre/recipes/nikkei_sub_shakai.recipe
2272share/calibre/recipes/nikkei_sub_sports.recipe 2588share/calibre/recipes/nikkei_sub_sports.recipe
2273share/calibre/recipes/nin.recipe 2589share/calibre/recipes/nin.recipe
@@ -2281,143 +2597,164 @@ share/calibre/recipes/nortecastilla.reci @@ -2281,143 +2597,164 @@ share/calibre/recipes/nortecastilla.reci
2281share/calibre/recipes/noticias_r7.recipe 2597share/calibre/recipes/noticias_r7.recipe
2282share/calibre/recipes/noticias_unb.recipe 2598share/calibre/recipes/noticias_unb.recipe
2283share/calibre/recipes/novaya_gazeta.recipe 2599share/calibre/recipes/novaya_gazeta.recipe
2284share/calibre/recipes/novilist_novine_hr.recipe 2600share/calibre/recipes/novilist_novine_hr.recipe
2285share/calibre/recipes/novilist_portal_hr.recipe 2601share/calibre/recipes/novilist_portal_hr.recipe
2286share/calibre/recipes/novinite.recipe 2602share/calibre/recipes/novinite.recipe
2287share/calibre/recipes/novinite_bg.recipe 2603share/calibre/recipes/novinite_bg.recipe
2288share/calibre/recipes/novinky.cz.recipe 2604share/calibre/recipes/novinky.cz.recipe
2289share/calibre/recipes/novinky.recipe 2605share/calibre/recipes/novinky.recipe
2290share/calibre/recipes/novistandard.recipe 2606share/calibre/recipes/novistandard.recipe
2291share/calibre/recipes/novosti.recipe 2607share/calibre/recipes/novosti.recipe
2292share/calibre/recipes/now_toronto.recipe 2608share/calibre/recipes/now_toronto.recipe
2293share/calibre/recipes/nowa_fantastyka.recipe 2609share/calibre/recipes/nowa_fantastyka.recipe
 2610share/calibre/recipes/nowiny_rybnik.recipe
2294share/calibre/recipes/nowy_ekran.recipe 2611share/calibre/recipes/nowy_ekran.recipe
 2612share/calibre/recipes/nowy_obywatel.recipe
2295share/calibre/recipes/noz.recipe 2613share/calibre/recipes/noz.recipe
2296share/calibre/recipes/npr.recipe 2614share/calibre/recipes/npr.recipe
2297share/calibre/recipes/npr_music_blogs.recipe 2615share/calibre/recipes/npr_music_blogs.recipe
2298share/calibre/recipes/nrc-nl-epub.recipe 2616share/calibre/recipes/nrc-nl-epub.recipe
2299share/calibre/recipes/nrc.nl.recipe 2617share/calibre/recipes/nrc.nl.recipe
2300share/calibre/recipes/nrc_handelsblad.recipe 2618share/calibre/recipes/nrc_handelsblad.recipe
 2619share/calibre/recipes/nrc_next.recipe
2301share/calibre/recipes/nsfw_corp.recipe 2620share/calibre/recipes/nsfw_corp.recipe
2302share/calibre/recipes/nspm.recipe 2621share/calibre/recipes/nspm.recipe
2303share/calibre/recipes/nspm_int.recipe 2622share/calibre/recipes/nspm_int.recipe
 2623share/calibre/recipes/nto.recipe
2304share/calibre/recipes/ntv_spor.recipe 2624share/calibre/recipes/ntv_spor.recipe
2305share/calibre/recipes/ntv_tr.recipe 2625share/calibre/recipes/ntv_tr.recipe
2306share/calibre/recipes/nu.recipe 2626share/calibre/recipes/nu.recipe
2307share/calibre/recipes/nursingtimes.recipe 2627share/calibre/recipes/nursingtimes.recipe
 2628share/calibre/recipes/nuus24.recipe
2308share/calibre/recipes/nymag.recipe 2629share/calibre/recipes/nymag.recipe
2309share/calibre/recipes/nypost.recipe 2630share/calibre/recipes/nypost.recipe
2310share/calibre/recipes/nytimes.recipe 2631share/calibre/recipes/nytimes.recipe
2311share/calibre/recipes/nytimes_sports.recipe 2632share/calibre/recipes/nytimes_sports.recipe
2312share/calibre/recipes/nytimes_sub.recipe 2633share/calibre/recipes/nytimes_sub.recipe
2313share/calibre/recipes/nytimes_tech.recipe 2634share/calibre/recipes/nytimes_tech.recipe
2314share/calibre/recipes/nytimesbook.recipe 2635share/calibre/recipes/nytimesbook.recipe
2315share/calibre/recipes/nzherald.recipe 2636share/calibre/recipes/nzherald.recipe
2316share/calibre/recipes/nzz_folio.recipe 2637share/calibre/recipes/nzz_folio.recipe
2317share/calibre/recipes/nzz_ger.recipe 2638share/calibre/recipes/nzz_ger.recipe
2318share/calibre/recipes/nzz_webpaper.recipe 2639share/calibre/recipes/nzz_webpaper.recipe
2319share/calibre/recipes/o_globo.recipe 2640share/calibre/recipes/o_globo.recipe
2320share/calibre/recipes/oakland_north.recipe 2641share/calibre/recipes/oakland_north.recipe
2321share/calibre/recipes/observa_digital.recipe 2642share/calibre/recipes/observa_digital.recipe
2322share/calibre/recipes/observatorul_cultural.recipe 2643share/calibre/recipes/observatorul_cultural.recipe
2323share/calibre/recipes/observer.recipe 2644share/calibre/recipes/observer.recipe
2324share/calibre/recipes/observer_gb.recipe 2645share/calibre/recipes/observer_gb.recipe
2325share/calibre/recipes/oc_register.recipe 2646share/calibre/recipes/oc_register.recipe
2326share/calibre/recipes/oclab_pl.recipe 2647share/calibre/recipes/oclab_pl.recipe
 2648share/calibre/recipes/odkrywcy_pl.recipe
2327share/calibre/recipes/office_space.recipe 2649share/calibre/recipes/office_space.recipe
2328share/calibre/recipes/oilprice.recipe 2650share/calibre/recipes/oilprice.recipe
2329share/calibre/recipes/oldnewthing.recipe 2651share/calibre/recipes/oldnewthing.recipe
2330share/calibre/recipes/omgubuntu.recipe 2652share/calibre/recipes/omgubuntu.recipe
2331share/calibre/recipes/onda_rock.recipe 2653share/calibre/recipes/onda_rock.recipe
2332share/calibre/recipes/onemagazine.recipe 2654share/calibre/recipes/onemagazine.recipe
2333share/calibre/recipes/onionavclub.recipe 2655share/calibre/recipes/onionavclub.recipe
2334share/calibre/recipes/open_left.recipe 2656share/calibre/recipes/open_left.recipe
2335share/calibre/recipes/opinion_bo.recipe 2657share/calibre/recipes/opinion_bo.recipe
 2658share/calibre/recipes/optyczne_pl.recipe
2336share/calibre/recipes/oregonian.recipe 2659share/calibre/recipes/oregonian.recipe
2337share/calibre/recipes/oreilly_premium.recipe 2660share/calibre/recipes/oreilly_premium.recipe
2338share/calibre/recipes/oriental_daily.recipe 2661share/calibre/recipes/oriental_daily.recipe
2339share/calibre/recipes/origo_hu.recipe 2662share/calibre/recipes/origo_hu.recipe
2340share/calibre/recipes/orlando_sentinel.recipe 2663share/calibre/recipes/orlando_sentinel.recipe
2341share/calibre/recipes/orsai.recipe 2664share/calibre/recipes/orsai.recipe
2342share/calibre/recipes/osnews_pl.recipe 2665share/calibre/recipes/osnews_pl.recipe
 2666share/calibre/recipes/osw.recipe
 2667share/calibre/recipes/osworld_pl.recipe
2343share/calibre/recipes/ottawa_citizen.recipe 2668share/calibre/recipes/ottawa_citizen.recipe
2344share/calibre/recipes/ourdailybread.recipe 2669share/calibre/recipes/ourdailybread.recipe
2345share/calibre/recipes/outlook_india.recipe 2670share/calibre/recipes/outlook_india.recipe
 2671share/calibre/recipes/outside_magazine.recipe
2346share/calibre/recipes/overclock_pl.recipe 2672share/calibre/recipes/overclock_pl.recipe
 2673share/calibre/recipes/oxford_mail.recipe
 2674share/calibre/recipes/padreydecano.recipe
2347share/calibre/recipes/pagina12.recipe 2675share/calibre/recipes/pagina12.recipe
2348share/calibre/recipes/pagina_12_print_ed.recipe 2676share/calibre/recipes/pagina_12_print_ed.recipe
2349share/calibre/recipes/pajama.recipe 2677share/calibre/recipes/pajama.recipe
2350share/calibre/recipes/palmtop_pl.recipe 2678share/calibre/recipes/palmtop_pl.recipe
2351share/calibre/recipes/pambianco.recipe 2679share/calibre/recipes/pambianco.recipe
2352share/calibre/recipes/panorama.recipe 2680share/calibre/recipes/panorama.recipe
2353share/calibre/recipes/paperli_topic.recipe 2681share/calibre/recipes/paperli_topic.recipe
2354share/calibre/recipes/parlamentni_listy.recipe 2682share/calibre/recipes/parlamentni_listy.recipe
2355share/calibre/recipes/patente_de_corso.recipe 2683share/calibre/recipes/patente_de_corso.recipe
2356share/calibre/recipes/pc_advisor.recipe 2684share/calibre/recipes/pc_advisor.recipe
2357share/calibre/recipes/pc_arena.recipe 2685share/calibre/recipes/pc_arena.recipe
2358share/calibre/recipes/pc_centre_pl.recipe 2686share/calibre/recipes/pc_centre_pl.recipe
2359share/calibre/recipes/pc_foster.recipe 2687share/calibre/recipes/pc_foster.recipe
2360share/calibre/recipes/pc_lab.recipe 2688share/calibre/recipes/pc_lab.recipe
2361share/calibre/recipes/pc_mag.recipe 2689share/calibre/recipes/pc_mag.recipe
2362share/calibre/recipes/pc_quest_india.recipe 
2363share/calibre/recipes/pc_world.recipe 2690share/calibre/recipes/pc_world.recipe
2364share/calibre/recipes/pcworld_hu.recipe 2691share/calibre/recipes/pcworld_hu.recipe
2365share/calibre/recipes/pcworldro.recipe 2692share/calibre/recipes/pcworldro.recipe
2366share/calibre/recipes/pecat.recipe 2693share/calibre/recipes/pecat.recipe
2367share/calibre/recipes/penguin_news.recipe 2694share/calibre/recipes/penguin_news.recipe
2368share/calibre/recipes/people_daily.recipe 2695share/calibre/recipes/people_daily.recipe
2369share/calibre/recipes/people_us_mashup.recipe 2696share/calibre/recipes/people_us_mashup.recipe
2370share/calibre/recipes/perfil.recipe 2697share/calibre/recipes/perfil.recipe
2371share/calibre/recipes/pescanik.recipe 2698share/calibre/recipes/pescanik.recipe
2372share/calibre/recipes/peterschiff.recipe 2699share/calibre/recipes/peterschiff.recipe
2373share/calibre/recipes/phd_comics.recipe 2700share/calibre/recipes/phd_comics.recipe
2374share/calibre/recipes/philippino_star_ngayon.recipe 2701share/calibre/recipes/philippino_star_ngayon.recipe
2375share/calibre/recipes/phillosophy_now.recipe 2702share/calibre/recipes/phillosophy_now.recipe
2376share/calibre/recipes/philly.recipe 2703share/calibre/recipes/philly.recipe
2377share/calibre/recipes/phoronix.recipe 2704share/calibre/recipes/phoronix.recipe
 2705share/calibre/recipes/phys_org.recipe
2378share/calibre/recipes/physics_today.recipe 2706share/calibre/recipes/physics_today.recipe
2379share/calibre/recipes/physics_world.recipe 2707share/calibre/recipes/physics_world.recipe
 2708share/calibre/recipes/picoboard_pl.recipe
2380share/calibre/recipes/pilot.recipe 2709share/calibre/recipes/pilot.recipe
2381share/calibre/recipes/piratska_strana.recipe 2710share/calibre/recipes/piratska_strana.recipe
2382share/calibre/recipes/piratske_noviny.recipe 2711share/calibre/recipes/piratske_noviny.recipe
2383share/calibre/recipes/planet_kde.recipe 2712share/calibre/recipes/planet_kde.recipe
2384share/calibre/recipes/plus_info.recipe 2713share/calibre/recipes/plus_info.recipe
 2714share/calibre/recipes/pnn.recipe
2385share/calibre/recipes/pobjeda.recipe 2715share/calibre/recipes/pobjeda.recipe
 2716share/calibre/recipes/poche.recipe
2386share/calibre/recipes/podnikatel.recipe 2717share/calibre/recipes/podnikatel.recipe
2387share/calibre/recipes/politico.recipe 2718share/calibre/recipes/politico.recipe
2388share/calibre/recipes/politifact.recipe 2719share/calibre/recipes/politifact.recipe
2389share/calibre/recipes/politika.recipe 2720share/calibre/recipes/politika.recipe
2390share/calibre/recipes/politiken_dk.recipe 2721share/calibre/recipes/politiken_dk.recipe
2391share/calibre/recipes/polityka.recipe 2722share/calibre/recipes/polityka.recipe
2392share/calibre/recipes/polizeipress_de.recipe 2723share/calibre/recipes/polizeipress_de.recipe
2393share/calibre/recipes/polska_times.recipe 2724share/calibre/recipes/polska_times.recipe
 2725share/calibre/recipes/polter_pl.recipe
2394share/calibre/recipes/popscience.recipe 2726share/calibre/recipes/popscience.recipe
 2727share/calibre/recipes/poradnia_pwn.recipe
2395share/calibre/recipes/portafolio.recipe 2728share/calibre/recipes/portafolio.recipe
2396share/calibre/recipes/portfolio.recipe 2729share/calibre/recipes/portfolio.recipe
2397share/calibre/recipes/portfolio_hu.recipe 2730share/calibre/recipes/portfolio_hu.recipe
2398share/calibre/recipes/portfolio_hu_hu.recipe 2731share/calibre/recipes/portfolio_hu_hu.recipe
2399share/calibre/recipes/post_today.recipe 2732share/calibre/recipes/post_today.recipe
2400share/calibre/recipes/poughkeepsie_journal.recipe 2733share/calibre/recipes/poughkeepsie_journal.recipe
 2734share/calibre/recipes/ppe_pl.recipe
2401share/calibre/recipes/praguemonitor.recipe 2735share/calibre/recipes/praguemonitor.recipe
2402share/calibre/recipes/pravda.recipe 2736share/calibre/recipes/pravda.recipe
2403share/calibre/recipes/pravda_en.recipe 2737share/calibre/recipes/pravda_en.recipe
2404share/calibre/recipes/pravda_it.recipe 2738share/calibre/recipes/pravda_it.recipe
2405share/calibre/recipes/pravda_por.recipe 2739share/calibre/recipes/pravda_por.recipe
 2740share/calibre/recipes/pravda_rs.recipe
2406share/calibre/recipes/pravda_ru.recipe 2741share/calibre/recipes/pravda_ru.recipe
2407share/calibre/recipes/pravo.recipe 2742share/calibre/recipes/pravo.recipe
2408share/calibre/recipes/prawica_net.recipe 2743share/calibre/recipes/prawica_net.recipe
 2744share/calibre/recipes/presseurop.recipe
2409share/calibre/recipes/pressonline.recipe 2745share/calibre/recipes/pressonline.recipe
2410share/calibre/recipes/pressthink.recipe 2746share/calibre/recipes/pressthink.recipe
 2747share/calibre/recipes/private_eye.recipe
2411share/calibre/recipes/pro_linux_de.recipe 2748share/calibre/recipes/pro_linux_de.recipe
2412share/calibre/recipes/pro_physik.recipe 2749share/calibre/recipes/pro_physik.recipe
2413share/calibre/recipes/projo.recipe 2750share/calibre/recipes/projo.recipe
2414share/calibre/recipes/promotor.recipe 2751share/calibre/recipes/promotor.recipe
2415share/calibre/recipes/propublica.recipe 2752share/calibre/recipes/propublica.recipe
2416share/calibre/recipes/prospectmaguk.recipe 2753share/calibre/recipes/prospectmaguk.recipe
2417share/calibre/recipes/prosport.recipe 2754share/calibre/recipes/prosport.recipe
2418share/calibre/recipes/prostamerika.recipe 2755share/calibre/recipes/prostamerika.recipe
2419share/calibre/recipes/protagon.recipe 2756share/calibre/recipes/protagon.recipe
2420share/calibre/recipes/protvmagazin.recipe 2757share/calibre/recipes/protvmagazin.recipe
2421share/calibre/recipes/psych.recipe 2758share/calibre/recipes/psych.recipe
2422share/calibre/recipes/psychologies.recipe 2759share/calibre/recipes/psychologies.recipe
2423share/calibre/recipes/pubblico_giornale.recipe 2760share/calibre/recipes/pubblico_giornale.recipe
@@ -2439,89 +2776,99 @@ share/calibre/recipes/rds.recipe @@ -2439,89 +2776,99 @@ share/calibre/recipes/rds.recipe
2439share/calibre/recipes/readers_digest.recipe 2776share/calibre/recipes/readers_digest.recipe
2440share/calibre/recipes/readitlater.recipe 2777share/calibre/recipes/readitlater.recipe
2441share/calibre/recipes/real_clear.recipe 2778share/calibre/recipes/real_clear.recipe
2442share/calibre/recipes/real_world_economics_review.recipe 2779share/calibre/recipes/real_world_economics_review.recipe
2443share/calibre/recipes/realitatea.recipe 2780share/calibre/recipes/realitatea.recipe
2444share/calibre/recipes/rebelion.recipe 2781share/calibre/recipes/rebelion.recipe
2445share/calibre/recipes/red_aragon.recipe 2782share/calibre/recipes/red_aragon.recipe
2446share/calibre/recipes/red_voltaire.recipe 2783share/calibre/recipes/red_voltaire.recipe
2447share/calibre/recipes/regina_leader_post.recipe 2784share/calibre/recipes/regina_leader_post.recipe
2448share/calibre/recipes/replicavedetelor.recipe 2785share/calibre/recipes/replicavedetelor.recipe
2449share/calibre/recipes/reptantes.recipe 2786share/calibre/recipes/reptantes.recipe
2450share/calibre/recipes/republica.recipe 2787share/calibre/recipes/republica.recipe
2451share/calibre/recipes/republika.recipe 2788share/calibre/recipes/republika.recipe
 2789share/calibre/recipes/res_publica.recipe
2452share/calibre/recipes/respekt.recipe 2790share/calibre/recipes/respekt.recipe
2453share/calibre/recipes/resurgence.recipe 2791share/calibre/recipes/resurgence.recipe
2454share/calibre/recipes/reuters.recipe 2792share/calibre/recipes/reuters.recipe
2455share/calibre/recipes/reuters_ja.recipe 2793share/calibre/recipes/reuters_ja.recipe
2456share/calibre/recipes/revista_bla.recipe 2794share/calibre/recipes/revista_bla.recipe
 2795share/calibre/recipes/revista_cromos.recipe
2457share/calibre/recipes/revista_muy.recipe 2796share/calibre/recipes/revista_muy.recipe
2458share/calibre/recipes/revista_piaui.recipe 2797share/calibre/recipes/revista_piaui.recipe
2459share/calibre/recipes/revista_semana.recipe 2798share/calibre/recipes/revista_semana.recipe
2460share/calibre/recipes/revista_summa.recipe 2799share/calibre/recipes/revista_summa.recipe
2461share/calibre/recipes/rga.recipe 2800share/calibre/recipes/rga.recipe
2462share/calibre/recipes/rheinische_post.recipe 2801share/calibre/recipes/rheinische_post.recipe
2463share/calibre/recipes/ria_ru.recipe 2802share/calibre/recipes/ria_ru.recipe
2464share/calibre/recipes/rian_eng.recipe 2803share/calibre/recipes/rian_eng.recipe
2465share/calibre/recipes/rian_spa.recipe 2804share/calibre/recipes/rian_spa.recipe
2466share/calibre/recipes/richmond_times_dispatch.recipe 2805share/calibre/recipes/richmond_times_dispatch.recipe
2467share/calibre/recipes/rionegro.recipe 2806share/calibre/recipes/rionegro.recipe
2468share/calibre/recipes/rmf24_ESKN.recipe 2807share/calibre/recipes/rmf24_ESKN.recipe
2469share/calibre/recipes/rmf24_fakty.recipe 2808share/calibre/recipes/rmf24_fakty.recipe
2470share/calibre/recipes/rmf24_opinie.recipe 2809share/calibre/recipes/rmf24_opinie.recipe
2471share/calibre/recipes/roger_ebert.recipe 2810share/calibre/recipes/roger_ebert.recipe
2472share/calibre/recipes/roger_ebert_blog.recipe 2811share/calibre/recipes/roger_ebert_blog.recipe
2473share/calibre/recipes/rollingstone.recipe 2812share/calibre/recipes/rollingstone.recipe
2474share/calibre/recipes/romanialibera.recipe 2813share/calibre/recipes/romanialibera.recipe
2475share/calibre/recipes/root.recipe 2814share/calibre/recipes/root.recipe
 2815share/calibre/recipes/rossijkaja_gazeta.recipe
2476share/calibre/recipes/rstones.recipe 2816share/calibre/recipes/rstones.recipe
2477share/calibre/recipes/rte.recipe 2817share/calibre/recipes/rte.recipe
2478share/calibre/recipes/rtnews.recipe 2818share/calibre/recipes/rtnews.recipe
2479share/calibre/recipes/rts.recipe 2819share/calibre/recipes/rts.recipe
2480share/calibre/recipes/rue89.recipe 2820share/calibre/recipes/rue89.recipe
2481share/calibre/recipes/rushisaband.recipe 2821share/calibre/recipes/rushisaband.recipe
2482share/calibre/recipes/rusiahoy.recipe 2822share/calibre/recipes/rusiahoy.recipe
2483share/calibre/recipes/rybinski.recipe 2823share/calibre/recipes/rybinski.recipe
2484share/calibre/recipes/rynek_infrastruktury.recipe 2824share/calibre/recipes/rynek_infrastruktury.recipe
2485share/calibre/recipes/rynek_kolejowy.recipe 2825share/calibre/recipes/rynek_kolejowy.recipe
2486share/calibre/recipes/rynek_zdrowia.recipe 2826share/calibre/recipes/rynek_zdrowia.recipe
2487share/calibre/recipes/rzeczpospolita.recipe 2827share/calibre/recipes/rzeczpospolita.recipe
2488share/calibre/recipes/sabah.recipe 2828share/calibre/recipes/sabah.recipe
 2829share/calibre/recipes/sabit_fikir.recipe
 2830share/calibre/recipes/sage_news.recipe
 2831share/calibre/recipes/sage_news_opinion.recipe
2489share/calibre/recipes/salon.recipe 2832share/calibre/recipes/salon.recipe
2490share/calibre/recipes/salonica_press_news.recipe 2833share/calibre/recipes/salonica_press_news.recipe
2491share/calibre/recipes/samanyolu_haber.recipe 2834share/calibre/recipes/samanyolu_haber.recipe
2492share/calibre/recipes/samanyolu_teknoloji.recipe 2835share/calibre/recipes/samanyolu_teknoloji.recipe
 2836share/calibre/recipes/samcik_blox.recipe
2493share/calibre/recipes/san_fran_chronicle.recipe 2837share/calibre/recipes/san_fran_chronicle.recipe
2494share/calibre/recipes/sanjosemercurynews.recipe 2838share/calibre/recipes/sanjosemercurynews.recipe
2495share/calibre/recipes/sarajevo_x.recipe 2839share/calibre/recipes/sarajevo_x.recipe
2496share/calibre/recipes/saskatoon_star_phoenix.recipe 2840share/calibre/recipes/saskatoon_star_phoenix.recipe
2497share/calibre/recipes/satira.recipe 2841share/calibre/recipes/satira.recipe
2498share/calibre/recipes/satkurier.recipe 2842share/calibre/recipes/satkurier.recipe
2499share/calibre/recipes/satmagazine.recipe 2843share/calibre/recipes/satmagazine.recipe
2500share/calibre/recipes/sb_nation.recipe 2844share/calibre/recipes/sb_nation.recipe
 2845share/calibre/recipes/schattenblick.recipe
2501share/calibre/recipes/science_aas.recipe 2846share/calibre/recipes/science_aas.recipe
2502share/calibre/recipes/science_based_medicine.recipe 2847share/calibre/recipes/science_based_medicine.recipe
2503share/calibre/recipes/science_news.recipe 2848share/calibre/recipes/science_news.recipe
2504share/calibre/recipes/science_news_recent_issues.recipe 2849share/calibre/recipes/science_news_recent_issues.recipe
2505share/calibre/recipes/sciencedaily.recipe 2850share/calibre/recipes/sciencedaily.recipe
2506share/calibre/recipes/scientific_american.recipe 2851share/calibre/recipes/scientific_american.recipe
2507share/calibre/recipes/scinexx.recipe 2852share/calibre/recipes/scinexx.recipe
2508share/calibre/recipes/scmp.recipe 2853share/calibre/recipes/scmp.recipe
2509share/calibre/recipes/scott_hanselman.recipe 2854share/calibre/recipes/scott_hanselman.recipe
2510share/calibre/recipes/scprint.recipe 2855share/calibre/recipes/scprint.recipe
2511share/calibre/recipes/seanhannity.recipe 2856share/calibre/recipes/seanhannity.recipe
2512share/calibre/recipes/seattle_times.recipe 2857share/calibre/recipes/seattle_times.recipe
2513share/calibre/recipes/security_watch.recipe 2858share/calibre/recipes/security_watch.recipe
 2859share/calibre/recipes/sekurak_pl.recipe
2514share/calibre/recipes/serverside.recipe 2860share/calibre/recipes/serverside.recipe
 2861share/calibre/recipes/seventh_guard.recipe
2515share/calibre/recipes/sfbg.recipe 2862share/calibre/recipes/sfbg.recipe
2516share/calibre/recipes/sfin.recipe 2863share/calibre/recipes/sfin.recipe
2517share/calibre/recipes/sg_hu.recipe 2864share/calibre/recipes/sg_hu.recipe
2518share/calibre/recipes/shacknews.recipe 2865share/calibre/recipes/shacknews.recipe
2519share/calibre/recipes/shortlist.recipe 2866share/calibre/recipes/shortlist.recipe
2520share/calibre/recipes/sigma_live.recipe 2867share/calibre/recipes/sigma_live.recipe
2521share/calibre/recipes/sign_of_the_times.recipe 2868share/calibre/recipes/sign_of_the_times.recipe
2522share/calibre/recipes/sign_on_sd.recipe 2869share/calibre/recipes/sign_on_sd.recipe
2523share/calibre/recipes/silicon_republic.recipe 2870share/calibre/recipes/silicon_republic.recipe
2524share/calibre/recipes/sinfest.recipe 2871share/calibre/recipes/sinfest.recipe
2525share/calibre/recipes/singtao_daily.recipe 2872share/calibre/recipes/singtao_daily.recipe
2526share/calibre/recipes/singtaohk.recipe 2873share/calibre/recipes/singtaohk.recipe
2527share/calibre/recipes/siol.recipe 2874share/calibre/recipes/siol.recipe
@@ -2535,31 +2882,34 @@ share/calibre/recipes/slashdot.recipe @@ -2535,31 +2882,34 @@ share/calibre/recipes/slashdot.recipe
2535share/calibre/recipes/slate.recipe 2882share/calibre/recipes/slate.recipe
2536share/calibre/recipes/slovo.recipe 2883share/calibre/recipes/slovo.recipe
2537share/calibre/recipes/smashing.recipe 2884share/calibre/recipes/smashing.recipe
2538share/calibre/recipes/sme.recipe 2885share/calibre/recipes/sme.recipe
2539share/calibre/recipes/smh.recipe 2886share/calibre/recipes/smh.recipe
2540share/calibre/recipes/smilezilla.recipe 2887share/calibre/recipes/smilezilla.recipe
2541share/calibre/recipes/smith.recipe 2888share/calibre/recipes/smith.recipe
2542share/calibre/recipes/snopes.recipe 2889share/calibre/recipes/snopes.recipe
2543share/calibre/recipes/socialdiva.recipe 2890share/calibre/recipes/socialdiva.recipe
2544share/calibre/recipes/sol_haber.recipe 2891share/calibre/recipes/sol_haber.recipe
2545share/calibre/recipes/soldiers.recipe 2892share/calibre/recipes/soldiers.recipe
2546share/calibre/recipes/something_awful.recipe 2893share/calibre/recipes/something_awful.recipe
2547share/calibre/recipes/southernstar.recipe 2894share/calibre/recipes/southernstar.recipe
 2895share/calibre/recipes/spectator_magazine.recipe
2548share/calibre/recipes/spektrum.recipe 2896share/calibre/recipes/spektrum.recipe
2549share/calibre/recipes/spiders_web_pl.recipe 2897share/calibre/recipes/spiders_web_pl.recipe
2550share/calibre/recipes/spiegel_int.recipe 2898share/calibre/recipes/spiegel_int.recipe
2551share/calibre/recipes/spiegelde.recipe 2899share/calibre/recipes/spiegelde.recipe
2552share/calibre/recipes/spin_magazine.recipe 2900share/calibre/recipes/spin_magazine.recipe
 2901share/calibre/recipes/sport_pl.recipe
 2902share/calibre/recipes/sportowefakty.recipe
2553share/calibre/recipes/sportsillustrated.recipe 2903share/calibre/recipes/sportsillustrated.recipe
2554share/calibre/recipes/sportsillustrated_columnists.recipe 2904share/calibre/recipes/sportsillustrated_columnists.recipe
2555share/calibre/recipes/st_louis_post_dispatch.recipe 2905share/calibre/recipes/st_louis_post_dispatch.recipe
2556share/calibre/recipes/st_petersburg_times.recipe 2906share/calibre/recipes/st_petersburg_times.recipe
2557share/calibre/recipes/stackoverflow.recipe 2907share/calibre/recipes/stackoverflow.recipe
2558share/calibre/recipes/stamgasten.recipe 2908share/calibre/recipes/stamgasten.recipe
2559share/calibre/recipes/standardmedia_ke.recipe 2909share/calibre/recipes/standardmedia_ke.recipe
2560share/calibre/recipes/standardmoney.recipe 2910share/calibre/recipes/standardmoney.recipe
2561share/calibre/recipes/star_gazetesi.recipe 2911share/calibre/recipes/star_gazetesi.recipe
2562share/calibre/recipes/staradvertiser.recipe 2912share/calibre/recipes/staradvertiser.recipe
2563share/calibre/recipes/stars_and_stripes.recipe 2913share/calibre/recipes/stars_and_stripes.recipe
2564share/calibre/recipes/starwars.recipe 2914share/calibre/recipes/starwars.recipe
2565share/calibre/recipes/statesman.recipe 2915share/calibre/recipes/statesman.recipe
@@ -2579,53 +2929,55 @@ share/calibre/recipes/superesportes.reci @@ -2579,53 +2929,55 @@ share/calibre/recipes/superesportes.reci
2579share/calibre/recipes/svd_se.recipe 2929share/calibre/recipes/svd_se.recipe
2580share/calibre/recipes/swiat_obrazu.recipe 2930share/calibre/recipes/swiat_obrazu.recipe
2581share/calibre/recipes/swiatkindle.recipe 2931share/calibre/recipes/swiatkindle.recipe
2582share/calibre/recipes/tablety_pl.recipe 2932share/calibre/recipes/tablety_pl.recipe
2583share/calibre/recipes/tabu.recipe 2933share/calibre/recipes/tabu.recipe
2584share/calibre/recipes/tagesan.recipe 2934share/calibre/recipes/tagesan.recipe
2585share/calibre/recipes/tagesspiegel.recipe 2935share/calibre/recipes/tagesspiegel.recipe
2586share/calibre/recipes/taggeschau_de.recipe 2936share/calibre/recipes/taggeschau_de.recipe
2587share/calibre/recipes/taipei.recipe 2937share/calibre/recipes/taipei.recipe
2588share/calibre/recipes/tanea.recipe 2938share/calibre/recipes/tanea.recipe
2589share/calibre/recipes/tanjug.recipe 2939share/calibre/recipes/tanjug.recipe
2590share/calibre/recipes/tanuki.recipe 2940share/calibre/recipes/tanuki.recipe
2591share/calibre/recipes/tasfiye_dergisi.recipe 2941share/calibre/recipes/tasfiye_dergisi.recipe
 2942share/calibre/recipes/tawernarpg_pl.recipe
2592share/calibre/recipes/taz.recipe 2943share/calibre/recipes/taz.recipe
2593share/calibre/recipes/taz_rss.recipe 2944share/calibre/recipes/taz_rss.recipe
2594share/calibre/recipes/tech_economy.recipe 2945share/calibre/recipes/tech_economy.recipe
2595share/calibre/recipes/tech_world.recipe 2946share/calibre/recipes/tech_world.recipe
2596share/calibre/recipes/techcrunch.recipe 2947share/calibre/recipes/techcrunch.recipe
2597share/calibre/recipes/techdirt.recipe 2948share/calibre/recipes/techdirt.recipe
2598share/calibre/recipes/technology_review.recipe 2949share/calibre/recipes/technology_review.recipe
2599share/calibre/recipes/technology_review_de.recipe 2950share/calibre/recipes/technology_review_de.recipe
2600share/calibre/recipes/techtarget.recipe 2951share/calibre/recipes/techtarget.recipe
2601share/calibre/recipes/tedneward.recipe 2952share/calibre/recipes/tedneward.recipe
2602share/calibre/recipes/telam.recipe 2953share/calibre/recipes/telam.recipe
2603share/calibre/recipes/telegraph_in.recipe 2954share/calibre/recipes/telegraph_in.recipe
2604share/calibre/recipes/telegraph_uk.recipe 2955share/calibre/recipes/telegraph_uk.recipe
2605share/calibre/recipes/telepolis.recipe 2956share/calibre/recipes/telepolis.recipe
2606share/calibre/recipes/telepolis_artikel.recipe 2957share/calibre/recipes/telepolis_artikel.recipe
2607share/calibre/recipes/telepolis_pl.recipe 2958share/calibre/recipes/telepolis_pl.recipe
2608share/calibre/recipes/teleread.recipe 2959share/calibre/recipes/teleread.recipe
2609share/calibre/recipes/television_without_pity.recipe 2960share/calibre/recipes/television_without_pity.recipe
2610share/calibre/recipes/thai_post_daily.recipe 2961share/calibre/recipes/thai_post_daily.recipe
2611share/calibre/recipes/thairath.recipe 2962share/calibre/recipes/thairath.recipe
2612share/calibre/recipes/the_age.recipe 2963share/calibre/recipes/the_age.recipe
2613share/calibre/recipes/the_budget_fashionista.recipe 2964share/calibre/recipes/the_budget_fashionista.recipe
2614share/calibre/recipes/the_clinic_online.recipe 2965share/calibre/recipes/the_clinic_online.recipe
2615share/calibre/recipes/the_daily_news_egypt.recipe 2966share/calibre/recipes/the_daily_news_egypt.recipe
2616share/calibre/recipes/the_escapist.recipe 2967share/calibre/recipes/the_escapist.recipe
 2968share/calibre/recipes/the_feature.recipe
2617share/calibre/recipes/the_freeman.recipe 2969share/calibre/recipes/the_freeman.recipe
2618share/calibre/recipes/the_h.recipe 2970share/calibre/recipes/the_friday_times.recipe
2619share/calibre/recipes/the_journal.recipe 2971share/calibre/recipes/the_journal.recipe
2620share/calibre/recipes/the_manila_bulletin.recipe 2972share/calibre/recipes/the_manila_bulletin.recipe
2621share/calibre/recipes/the_manila_times.recipe 2973share/calibre/recipes/the_manila_times.recipe
2622share/calibre/recipes/the_marker.recipe 2974share/calibre/recipes/the_marker.recipe
2623share/calibre/recipes/the_nation.recipe 2975share/calibre/recipes/the_nation.recipe
2624share/calibre/recipes/the_nation_thai.recipe 2976share/calibre/recipes/the_nation_thai.recipe
2625share/calibre/recipes/the_new_age_za.recipe 2977share/calibre/recipes/the_new_age_za.recipe
2626share/calibre/recipes/the_new_republic.recipe 2978share/calibre/recipes/the_new_republic.recipe
2627share/calibre/recipes/the_oz.recipe 2979share/calibre/recipes/the_oz.recipe
2628share/calibre/recipes/the_philippine_daily_inquirer.recipe 2980share/calibre/recipes/the_philippine_daily_inquirer.recipe
2629share/calibre/recipes/the_philippine_star.recipe 2981share/calibre/recipes/the_philippine_star.recipe
2630share/calibre/recipes/the_register.recipe 2982share/calibre/recipes/the_register.recipe
2631share/calibre/recipes/the_scotsman.recipe 2983share/calibre/recipes/the_scotsman.recipe
@@ -2642,152 +2994,175 @@ share/calibre/recipes/themarketticker.re @@ -2642,152 +2994,175 @@ share/calibre/recipes/themarketticker.re
2642share/calibre/recipes/thenews.recipe 2994share/calibre/recipes/thenews.recipe
2643share/calibre/recipes/theoldfoodie.recipe 2995share/calibre/recipes/theoldfoodie.recipe
2644share/calibre/recipes/theonion.recipe 2996share/calibre/recipes/theonion.recipe
2645share/calibre/recipes/theonlinephotographer.recipe 2997share/calibre/recipes/theonlinephotographer.recipe
2646share/calibre/recipes/thestar.recipe 2998share/calibre/recipes/thestar.recipe
2647share/calibre/recipes/thewest_au.recipe 2999share/calibre/recipes/thewest_au.recipe
2648share/calibre/recipes/think_progress.recipe 3000share/calibre/recipes/think_progress.recipe
2649share/calibre/recipes/thn.recipe 3001share/calibre/recipes/thn.recipe
2650share/calibre/recipes/tidbits.recipe 3002share/calibre/recipes/tidbits.recipe
2651share/calibre/recipes/tijd.recipe 3003share/calibre/recipes/tijd.recipe
2652share/calibre/recipes/tijolaco.recipe 3004share/calibre/recipes/tijolaco.recipe
2653share/calibre/recipes/tillsonburg.recipe 3005share/calibre/recipes/tillsonburg.recipe
2654share/calibre/recipes/time_magazine.recipe 3006share/calibre/recipes/time_magazine.recipe
 3007share/calibre/recipes/time_turk.recipe
2655share/calibre/recipes/times_of_malta.recipe 3008share/calibre/recipes/times_of_malta.recipe
2656share/calibre/recipes/times_online.recipe 3009share/calibre/recipes/times_online.recipe
2657share/calibre/recipes/timesnewroman.recipe 3010share/calibre/recipes/timesnewroman.recipe
 3011share/calibre/recipes/titanic_de.recipe
 3012share/calibre/recipes/tjournal.recipe
2658share/calibre/recipes/tmz.recipe 3013share/calibre/recipes/tmz.recipe
2659share/calibre/recipes/tnxm.recipe 3014share/calibre/recipes/tnxm.recipe
2660share/calibre/recipes/today_online.recipe 3015share/calibre/recipes/today_online.recipe
2661share/calibre/recipes/todays_zaman.recipe 3016share/calibre/recipes/todays_zaman.recipe
2662share/calibre/recipes/toi.recipe 3017share/calibre/recipes/toi.recipe
2663share/calibre/recipes/tomshardware.recipe 3018share/calibre/recipes/tomshardware.recipe
2664share/calibre/recipes/tomshardware_de.recipe 3019share/calibre/recipes/tomshardware_de.recipe
2665share/calibre/recipes/tomshardware_it.recipe 3020share/calibre/recipes/tomshardware_it.recipe
2666share/calibre/recipes/toronto_sun.recipe 3021share/calibre/recipes/toronto_sun.recipe
2667share/calibre/recipes/tovima.recipe 3022share/calibre/recipes/tovima.recipe
2668share/calibre/recipes/toyokeizai.recipe 3023share/calibre/recipes/toyokeizai.recipe
2669share/calibre/recipes/tpm_uk.recipe 3024share/calibre/recipes/tpm_uk.recipe
2670share/calibre/recipes/tr.recipe 3025share/calibre/recipes/tr.recipe
2671share/calibre/recipes/tri_city_herald.recipe 3026share/calibre/recipes/tri_city_herald.recipe
 3027share/calibre/recipes/trojmiasto_pl.recipe
2672share/calibre/recipes/trombon.recipe 3028share/calibre/recipes/trombon.recipe
2673share/calibre/recipes/trouw.recipe 3029share/calibre/recipes/trouw.recipe
2674share/calibre/recipes/trv.recipe 3030share/calibre/recipes/trv.recipe
 3031share/calibre/recipes/trystero.recipe
2675share/calibre/recipes/tsn.recipe 3032share/calibre/recipes/tsn.recipe
2676share/calibre/recipes/tulsaworld.recipe 3033share/calibre/recipes/tulsaworld.recipe
2677share/calibre/recipes/tuttojove.recipe 3034share/calibre/recipes/tuttojove.recipe
2678share/calibre/recipes/tuttosport.recipe 3035share/calibre/recipes/tuttosport.recipe
2679share/calibre/recipes/tvmania.recipe 3036share/calibre/recipes/tvmania.recipe
2680share/calibre/recipes/tvn24.recipe 3037share/calibre/recipes/tvn24.recipe
 3038share/calibre/recipes/tvp_info.recipe
2681share/calibre/recipes/tvxs.recipe 3039share/calibre/recipes/tvxs.recipe
2682share/calibre/recipes/tweakers.recipe 3040share/calibre/recipes/tweakers.recipe
2683share/calibre/recipes/tweakers_net.recipe 3041share/calibre/recipes/tweakers_net.recipe
2684share/calibre/recipes/twitchfilms.recipe 3042share/calibre/recipes/twitchfilms.recipe
2685share/calibre/recipes/twtfb.recipe 3043share/calibre/recipes/twtfb.recipe
2686share/calibre/recipes/tyden.cz.recipe 3044share/calibre/recipes/tyden.cz.recipe
2687share/calibre/recipes/tyzden.recipe 3045share/calibre/recipes/tyzden.recipe
2688share/calibre/recipes/ubuntu_pl.recipe 3046share/calibre/recipes/ubuntu_pl.recipe
 3047share/calibre/recipes/ubuntu_pomoc_org.recipe
 3048share/calibre/recipes/ukraiyns_kii_tizhdien.recipe
2689share/calibre/recipes/ultimahora.recipe 3049share/calibre/recipes/ultimahora.recipe
2690share/calibre/recipes/uncrate.recipe 3050share/calibre/recipes/uncrate.recipe
2691share/calibre/recipes/unica.recipe 3051share/calibre/recipes/unica.recipe
2692share/calibre/recipes/uninohimitu.recipe 3052share/calibre/recipes/uninohimitu.recipe
2693share/calibre/recipes/united_daily.recipe 3053share/calibre/recipes/united_daily.recipe
 3054share/calibre/recipes/universe_today.recipe
 3055share/calibre/recipes/unoticias.recipe
 3056share/calibre/recipes/unperiodico.recipe
2694share/calibre/recipes/upi.recipe 3057share/calibre/recipes/upi.recipe
2695share/calibre/recipes/usatoday.recipe 3058share/calibre/recipes/usatoday.recipe
2696share/calibre/recipes/usnews.recipe 3059share/calibre/recipes/usnews.recipe
2697share/calibre/recipes/utne.recipe 3060share/calibre/recipes/utne.recipe
2698share/calibre/recipes/utrinski.recipe 3061share/calibre/recipes/utrinski.recipe
2699share/calibre/recipes/vancouver_provice.recipe 
2700share/calibre/recipes/vancouver_province.recipe 3062share/calibre/recipes/vancouver_province.recipe
2701share/calibre/recipes/vancouver_sun.recipe 3063share/calibre/recipes/vancouver_sun.recipe
2702share/calibre/recipes/vanityfair.recipe 3064share/calibre/recipes/vanityfair.recipe
2703share/calibre/recipes/variety.recipe 3065share/calibre/recipes/variety.recipe
2704share/calibre/recipes/vecernji_list.recipe 3066share/calibre/recipes/vecernji_list.recipe
2705share/calibre/recipes/vedomosti.recipe 3067share/calibre/recipes/vedomosti.recipe
2706share/calibre/recipes/veintitres.recipe 3068share/calibre/recipes/veintitres.recipe
2707share/calibre/recipes/version2.recipe 3069share/calibre/recipes/version2.recipe
 3070share/calibre/recipes/vfr_magazine.recipe
2708share/calibre/recipes/vic_times.recipe 3071share/calibre/recipes/vic_times.recipe
2709share/calibre/recipes/vice_magazine.recipe 3072share/calibre/recipes/vice_magazine.recipe
 3073share/calibre/recipes/vice_magazine_de.recipe
2710share/calibre/recipes/vignette.recipe 3074share/calibre/recipes/vignette.recipe
2711share/calibre/recipes/vijesti.recipe 3075share/calibre/recipes/vijesti.recipe
2712share/calibre/recipes/villagevoice.recipe 3076share/calibre/recipes/villagevoice.recipe
2713share/calibre/recipes/vio_mundo.recipe 3077share/calibre/recipes/vio_mundo.recipe
2714share/calibre/recipes/virtualshackles.recipe 3078share/calibre/recipes/virtualshackles.recipe
2715share/calibre/recipes/vitalia.recipe 3079share/calibre/recipes/vitalia.recipe
2716share/calibre/recipes/viva.recipe 3080share/calibre/recipes/viva.recipe
2717share/calibre/recipes/vnexpress.recipe 3081share/calibre/recipes/vnexpress.recipe
 3082share/calibre/recipes/voice_of_america.recipe
2718share/calibre/recipes/volksrant.recipe 3083share/calibre/recipes/volksrant.recipe
2719share/calibre/recipes/vreme.recipe 3084share/calibre/recipes/vreme.recipe
2720share/calibre/recipes/vrijnederland.recipe 3085share/calibre/recipes/vrijnederland.recipe
2721share/calibre/recipes/waco_tribune.recipe 3086share/calibre/recipes/waco_tribune.recipe
2722share/calibre/recipes/walla.recipe 3087share/calibre/recipes/walla.recipe
2723share/calibre/recipes/wallstreetro.recipe 3088share/calibre/recipes/wallstreetro.recipe
2724share/calibre/recipes/walrusmag.recipe 3089share/calibre/recipes/walrusmag.recipe
2725share/calibre/recipes/wapo_cartoons.recipe 3090share/calibre/recipes/wapo_cartoons.recipe
2726share/calibre/recipes/warentest.recipe 3091share/calibre/recipes/warentest.recipe
2727share/calibre/recipes/wash_post.recipe 3092share/calibre/recipes/wash_post.recipe
2728share/calibre/recipes/wash_times.recipe 3093share/calibre/recipes/wash_times.recipe
2729share/calibre/recipes/watchingamerica.recipe 3094share/calibre/recipes/watchingamerica.recipe
2730share/calibre/recipes/weblogs_sl.recipe 3095share/calibre/recipes/weblogs_sl.recipe
 3096share/calibre/recipes/websecurity_pl.recipe
2731share/calibre/recipes/welt.recipe 3097share/calibre/recipes/welt.recipe
2732share/calibre/recipes/welt_der_physik.recipe 3098share/calibre/recipes/welt_der_physik.recipe
2733share/calibre/recipes/wenxuecity-znjy.recipe 3099share/calibre/recipes/wenxuecity-znjy.recipe
 3100share/calibre/recipes/what_if.recipe
2734share/calibre/recipes/wichita_eagle.recipe 3101share/calibre/recipes/wichita_eagle.recipe
2735share/calibre/recipes/wikinews_en.recipe 3102share/calibre/recipes/wikinews_en.recipe
2736share/calibre/recipes/windows_star.recipe 3103share/calibre/recipes/windows_star.recipe
2737share/calibre/recipes/windsor_star.recipe 3104share/calibre/recipes/windsor_star.recipe
2738share/calibre/recipes/winnipeg_free_press.recipe 3105share/calibre/recipes/winnipeg_free_press.recipe
2739share/calibre/recipes/winnipeg_sun.recipe 3106share/calibre/recipes/winnipeg_sun.recipe
2740share/calibre/recipes/winsupersite.recipe 3107share/calibre/recipes/winsupersite.recipe
2741share/calibre/recipes/winter_olympics.recipe 3108share/calibre/recipes/winter_olympics.recipe
2742share/calibre/recipes/wired.recipe 3109share/calibre/recipes/wired.recipe
2743share/calibre/recipes/wired_daily.recipe 3110share/calibre/recipes/wired_daily.recipe
2744share/calibre/recipes/wired_it.recipe 3111share/calibre/recipes/wired_it.recipe
2745share/calibre/recipes/wired_uk.recipe 3112share/calibre/recipes/wired_uk.recipe
 3113share/calibre/recipes/wirtscafts_woche.recipe
2746share/calibre/recipes/wirtualnemedia_pl.recipe 3114share/calibre/recipes/wirtualnemedia_pl.recipe
2747share/calibre/recipes/wnp.recipe 3115share/calibre/recipes/wnp.recipe
 3116share/calibre/recipes/wolne_media.recipe
2748share/calibre/recipes/words_without_borders.recipe 3117share/calibre/recipes/words_without_borders.recipe
2749share/calibre/recipes/workers_world.recipe 3118share/calibre/recipes/workers_world.recipe
2750share/calibre/recipes/worldcrunch.recipe 3119share/calibre/recipes/worldcrunch.recipe
2751share/calibre/recipes/wow.recipe 3120share/calibre/recipes/wow.recipe
2752share/calibre/recipes/woz_die.recipe 3121share/calibre/recipes/woz_die.recipe
2753share/calibre/recipes/wprost.recipe 3122share/calibre/recipes/wprost.recipe
 3123share/calibre/recipes/wprost_rss.recipe
2754share/calibre/recipes/wsj.recipe 3124share/calibre/recipes/wsj.recipe
2755share/calibre/recipes/wsj_free.recipe 3125share/calibre/recipes/wsj_free.recipe
2756share/calibre/recipes/wvhooligan.recipe 3126share/calibre/recipes/wvhooligan.recipe
2757share/calibre/recipes/wyborcza_duzy_format.recipe 3127share/calibre/recipes/wysokie_obcasy.recipe
2758share/calibre/recipes/xkcd.recipe 3128share/calibre/recipes/xkcd.recipe
2759share/calibre/recipes/xpatloop.recipe 3129share/calibre/recipes/xpatloop.recipe
2760share/calibre/recipes/yagmur_dergisi.recipe 3130share/calibre/recipes/yagmur_dergisi.recipe
2761share/calibre/recipes/yahoo_news.recipe 3131share/calibre/recipes/yahoo_news.recipe
2762share/calibre/recipes/yakima_herald.recipe 3132share/calibre/recipes/yakima_herald.recipe
 3133share/calibre/recipes/yalansavar.recipe
2763share/calibre/recipes/yazihane.recipe 3134share/calibre/recipes/yazihane.recipe
2764share/calibre/recipes/yementimes.recipe 3135share/calibre/recipes/yementimes.recipe
2765share/calibre/recipes/yeni_umit_dergisi.recipe 3136share/calibre/recipes/yeni_umit_dergisi.recipe
2766share/calibre/recipes/yenisafak_gazetesi.recipe 3137share/calibre/recipes/yenisafak_gazetesi.recipe
2767share/calibre/recipes/ynet.recipe 3138share/calibre/recipes/ynet.recipe
2768share/calibre/recipes/yomiuri.recipe 3139share/calibre/recipes/yomiuri.recipe
2769share/calibre/recipes/yomiuri_world.recipe 3140share/calibre/recipes/yomiuri_world.recipe
2770share/calibre/recipes/zaman.recipe 3141share/calibre/recipes/zaman.recipe
2771share/calibre/recipes/zaobao.recipe 3142share/calibre/recipes/zaobao.recipe
 3143share/calibre/recipes/zaufana_trzecia_strona.recipe
 3144share/calibre/recipes/zaxid_net.recipe
2772share/calibre/recipes/zdnet.fr.recipe 3145share/calibre/recipes/zdnet.fr.recipe
2773share/calibre/recipes/zdnet.recipe 3146share/calibre/recipes/zdnet.recipe
2774share/calibre/recipes/zeitde.recipe 3147share/calibre/recipes/zeitde.recipe
2775share/calibre/recipes/zeitde_sub.recipe 3148share/calibre/recipes/zeitde_sub.recipe
2776share/calibre/recipes/zerocalcare.recipe 3149share/calibre/recipes/zerocalcare.recipe
2777share/calibre/recipes/zerohedge.recipe 3150share/calibre/recipes/zerohedge.recipe
2778share/calibre/recipes/ziarulfinanciar.recipe 3151share/calibre/recipes/ziarulfinanciar.recipe
2779share/calibre/recipes/ziuaveche.recipe 3152share/calibre/recipes/ziuaveche.recipe
 3153share/calibre/recipes/znadplanszy_pl.recipe
2780share/calibre/recipes/zougla.recipe 3154share/calibre/recipes/zougla.recipe
 3155share/calibre/recipes/zycie_warszawy.recipe
2781share/calibre/scripts.pickle 3156share/calibre/scripts.pickle
2782share/calibre/template-functions.json 3157share/calibre/template-functions.json
2783share/calibre/templates/book_details.css 3158share/calibre/templates/book_details.css
2784share/calibre/templates/fb2.xsl 3159share/calibre/templates/fb2.xsl
2785share/calibre/templates/html.css 3160share/calibre/templates/html.css
2786share/calibre/templates/html_export_default.css 3161share/calibre/templates/html_export_default.css
2787share/calibre/templates/html_export_default.tmpl 3162share/calibre/templates/html_export_default.tmpl
2788share/calibre/templates/html_export_default_index.tmpl 3163share/calibre/templates/html_export_default_index.tmpl
2789share/calibre/templates/lrf.xsl 3164share/calibre/templates/lrf.xsl
2790share/calibre/templates/rtf.xsl 3165share/calibre/templates/rtf.xsl
2791share/calibre/tracer.epub 3166share/calibre/tracer.epub
2792share/calibre/viewer/blank.html 3167share/calibre/viewer/blank.html
2793share/calibre/viewer/bookmarks.js 3168share/calibre/viewer/bookmarks.js
@@ -2983,18 +3358,18 @@ share/calibre/viewer/mathjax/jax/output/ @@ -2983,18 +3358,18 @@ share/calibre/viewer/mathjax/jax/output/
2983share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/BasicLatin.js 3358share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/BasicLatin.js
2984share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js 3359share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js
2985share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Main.js 3360share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Main.js
2986share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Other.js 3361share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Other.js
2987share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata-extra.js 3362share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata-extra.js
2988share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata.js 3363share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata.js
2989share/calibre/viewer/mathjax/jax/output/SVG/jax.js 3364share/calibre/viewer/mathjax/jax/output/SVG/jax.js
2990share/calibre/viewer/referencing.js 3365share/calibre/viewer/referencing.js
2991share/doc/calibre/COPYRIGHT 3366share/doc/calibre/COPYRIGHT
2992share/doc/calibre/Changelog.old.yaml 3367share/doc/calibre/Changelog.old.yaml
2993share/doc/calibre/Changelog.yaml 3368share/doc/calibre/Changelog.yaml
2994share/doc/calibre/INSTALL 3369share/doc/calibre/INSTALL
2995share/doc/calibre/LICENSE.rtf 3370share/doc/calibre/LICENSE.rtf
2996share/doc/calibre/README 3371share/doc/calibre/README.md
2997share/mime/packages/calibre.xml 3372share/pixmaps/calibre-ebook-edit.png
2998share/pixmaps/calibre-gui.png 3373share/pixmaps/calibre-gui.png
2999share/pixmaps/calibre-lrf.png 3374share/pixmaps/calibre-lrf.png
3000share/pixmaps/calibre-viewer.png 3375share/pixmaps/calibre-viewer.png
cvs diff -r1.14 -r1.15 pkgsrc/misc/calibre/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/calibre/distinfo 2012/11/26 14:02:50 1.14
+++ pkgsrc/misc/calibre/distinfo 2014/04/16 17:22:30 1.15
@@ -1,7 +1,10 @@ @@ -1,7 +1,10 @@
1$NetBSD: distinfo,v 1.14 2012/11/26 14:02:50 ryoon Exp $ 1$NetBSD: distinfo,v 1.15 2014/04/16 17:22:30 wiz Exp $
2 2
3SHA1 (calibre-0.9.7.tar.xz) = cdc09d54924b4108e8137685082893e628dd7e40 3SHA1 (calibre-1.31.0.tar.xz) = 36854aded8fb67a7d8a529ce84ed7a56341c4591
4RMD160 (calibre-0.9.7.tar.xz) = 44480946e6bec7b05b3aa10c5189a4e14225255a 4RMD160 (calibre-1.31.0.tar.xz) = 127193d6abc5b6d62d9b316416191ebb96bc7063
5Size (calibre-0.9.7.tar.xz) = 27408848 bytes 5Size (calibre-1.31.0.tar.xz) = 33189956 bytes
6SHA1 (patch-setup_extensions.py) = aa8ee237a80b4da8dea03af950a7ac4caed9e51a 6SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e
7SHA1 (patch-src_calibre_linux_py) = 6780e90eff604c66ef3213d638cf917d34f3c1fd 7RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d
 8Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes
 9SHA1 (patch-setup_extensions.py) = 285ab1aff5b0d5f7c0a016f68e705d312a120d65
 10SHA1 (patch-src_calibre_linux.py) = 06e953e3a437ae76783d80bf0986bbbece991431
cvs diff -r1.3 -r1.4 pkgsrc/misc/calibre/patches/Attic/patch-setup_extensions.py (expand / switch to unified diff)

--- pkgsrc/misc/calibre/patches/Attic/patch-setup_extensions.py 2012/09/19 15:38:27 1.3
+++ pkgsrc/misc/calibre/patches/Attic/patch-setup_extensions.py 2014/04/16 17:22:30 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-setup_extensions.py,v 1.3 2012/09/19 15:38:27 ryoon Exp $ 1$NetBSD: patch-setup_extensions.py,v 1.4 2014/04/16 17:22:30 wiz Exp $
2 2
3--- setup/extensions.py.orig 2012-09-19 15:19:07.000000000 +0000 3Correct directory name.
 4
 5--- setup/extensions.py.orig 2014-04-04 02:33:40.000000000 +0000
4+++ setup/extensions.py 6+++ setup/extensions.py
5@@ -483,7 +483,7 @@ class Build(Command): 7@@ -567,7 +567,7 @@ class Build(Command):
6 self.check_call(qmc + ['qtcurve.pro']) 8 self.check_call(qmc + ['qtcurve.pro'])
7 self.check_call([make]+([] if iswindows else ['-j%d'%(cpu_count() 9 self.check_call([make]+([] if iswindows else ['-j%d'%(cpu_count()
8 or 1)])) 10 or 1)]))
9- src = (glob.glob('*.so') + glob.glob('release/*.dll') + 11- src = (glob.glob('*.so') + glob.glob('release/*.dll') +
10+ src = (glob.glob('.libs/*.so') + glob.glob('release/*.dll') + 12+ src = (glob.glob('.libs/*.so') + glob.glob('release/*.dll') +
11 glob.glob('*.dylib')) 13 glob.glob('*.dylib'))
12 ext = 'pyd' if iswindows else 'so' 14 ext = 'pyd' if iswindows else 'so'
13 shutil.copy2(src[0], self.j(dest, 'calibre_style.'+ext)) 15 if not os.path.exists(dest):
File Added: pkgsrc/misc/calibre/patches/patch-src_calibre_linux.py
$NetBSD: patch-src_calibre_linux.py,v 1.3 2014/04/16 17:22:30 wiz Exp $

Lifted from ArchLinux, saves mime and desktop files on disk
instead of trying to add them directly.

See https://www.archlinux.org/packages/community/x86_64/calibre/ ->
https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/calibre ->
https://projects.archlinux.org/svntogit/community.git/plain/trunk/desktop_integration.patch?h=packages/calibre

--- src/calibre/linux.py.orig	2014-04-04 02:33:40.000000000 +0000
+++ src/calibre/linux.py
@@ -495,18 +495,6 @@ class PostInstall:
             self.setup_completion()
         if islinux or isbsd:
             self.setup_desktop_integration()
-        self.create_uninstaller()
-
-        from calibre.utils.config import config_dir
-        if os.path.exists(config_dir):
-            os.chdir(config_dir)
-            if islinux or isbsd:
-                for f in os.listdir('.'):
-                    if os.stat(f).st_uid == 0:
-                        import shutil
-                        shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
-                if os.stat(config_dir).st_uid == 0:
-                    os.rmdir(config_dir)
 
         if warn is None and self.warnings:
             self.info('\n\nThere were %d warnings\n'%len(self.warnings))
@@ -564,7 +552,7 @@ class PostInstall:
                 if isnetbsd:
                     f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
                 else:
-                    f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
+                    f = os.path.join(self.opts.staging_root, 'usr/share/bash_completion.d/calibre')
             if not os.path.exists(os.path.dirname(f)):
                 os.makedirs(os.path.dirname(f))
             bash_comp_dest, zsh_comp_dest = f, None
@@ -713,56 +701,39 @@ class PostInstall:
 
             with TemporaryDirectory() as tdir, CurrentDir(tdir), \
                                 PreserveMIMEDefaults():
-                render_img('mimetypes/lrf.png', 'calibre-lrf.png')
-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
-                self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
-                self.icon_resources.append(('mimetypes', 'application-lrs',
-                '128'))
-                render_img('mimetypes/mobi.png', 'calibre-mobi.png')
-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True)
-                self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128'))
-                render_img('mimetypes/tpz.png', 'calibre-tpz.png')
-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True)
-                self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128'))
-                render_img('mimetypes/azw2.png', 'calibre-azw2.png')
-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True)
-                self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128'))
-                render_img('mimetypes/azw3.png', 'calibre-azw3.png')
-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True)
-                self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128'))
-                render_img('lt.png', 'calibre-gui.png', width=256, height=256)
-                cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
-                self.icon_resources.append(('apps', 'calibre-gui', '256'))
-                render_img('viewer.png', 'calibre-viewer.png', width=256, height=256)
-                cc('xdg-icon-resource install --size 256 calibre-viewer.png calibre-viewer', shell=True)
-                self.icon_resources.append(('apps', 'calibre-viewer', '256'))
-                render_img('tweak.png', 'calibre-ebook-edit.png', width=256, height=256)
-                cc('xdg-icon-resource install --size 256 calibre-ebook-edit.png calibre-ebook-edit', shell=True)
+                dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
+                os.mkdir(dir)
+                render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
+                render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
+                render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
+                render_img('tweak.png', os.path.join(dir, 'calibre-ebook-edit.png'))
                 self.icon_resources.append(('apps', 'calibre-ebook-edit', '256'))
 
                 mimetypes = set([])
                 for x in all_input_formats():
                     mt = guess_type('dummy.'+x)[0]
-                    if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
+                    if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
                         mimetypes.add(mt)
 
                 def write_mimetypes(f):
                     f.write('MimeType=%s;\n'%';'.join(mimetypes))
 
                 from calibre.ebooks.oeb.polish.main import SUPPORTED
-                f = open('calibre-lrfviewer.desktop', 'wb')
+                dir = os.path.join(self.opts.staging_sharedir,'../applications')
+                os.mkdir(dir)
+                f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
+                
                 f.write(VIEWER)
                 f.close()
-                f = open('calibre-ebook-viewer.desktop', 'wb')
+                f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
                 f.write(EVIEWER)
                 write_mimetypes(f)
-                f = open('calibre-ebook-edit.desktop', 'wb')
+                f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb')
                 f.write(ETWEAK)
                 mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED]
                 f.write('MimeType=%s;\n'%';'.join(mt))
                 f.close()
-                f = open('calibre-gui.desktop', 'wb')
+                f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
                 f.write(GUI)
                 write_mimetypes(f)
                 f.close()
File Deleted: pkgsrc/misc/calibre/patches/Attic/patch-src_calibre_linux_py